From a0d334f6a2dd329af28bc393e9e0c9a3625fc6ff Mon Sep 17 00:00:00 2001 From: zhengyiming <540361168@qq.com> Date: 星期三, 21 五月 2025 13:25:42 +0800 Subject: [PATCH] Merge branch 'dev-ui' of http://120.26.58.240:8888/r/LifePaymentFront into dev-ui --- packages/components/src/views/userAccount/UserAccountListView.vue | 40 ++++++++++++++++++++++++++++++---------- 1 files changed, 30 insertions(+), 10 deletions(-) diff --git a/packages/components/src/views/userAccount/UserAccountListView.vue b/packages/components/src/views/userAccount/UserAccountListView.vue index 2c33b1b..c8fcb43 100644 --- a/packages/components/src/views/userAccount/UserAccountListView.vue +++ b/packages/components/src/views/userAccount/UserAccountListView.vue @@ -4,24 +4,35 @@ v-bind="infiniteLoadingProps" > <template #renderItem="{ item }"> - <AccountCard + <UserAccountCard :title="TitleMap[item.lifePayType]" + :icon="TitleIconMap[item.lifePayType]" :content=" item.lifePayType === LifeRechargeConstants.LifePayOrderTypeEnum.璇濊垂璁㈠崟 - ? item.content + ? `${ + BlLifeRecharge.constants.IspCodeText[ + JSON.parse(item?.extraProperties)?.ispCode ?? '' + ] + }-${item.content}` : `${item.city}-${item.content}` " :remark="item.remark" :style="{ - marginBottom: Taro.pxTransform(20), + marginBottom: Taro.pxTransform(32), backgroundColor: '#ffffff', }" > <template #action> - <div class="account-card-action" @click="handleEditUserAccount(item)">缂栬緫</div> - <div class="account-card-action" @click="handleDeleteUserAccount(item)">鍒犻櫎</div> + <div class="user-account-card-action" @click="handleEditUserAccount(item)"> + <img :src="IconAccountEdit" class="user-account-card-action-icon" /> + <span class="user-account-card-action-text">缂栬緫</span> + </div> + <div class="user-account-card-action" @click="handleDeleteUserAccount(item)"> + <img :src="IconAccountDelete" class="user-account-card-action-icon" /> + <span class="user-account-card-action-text">鍒犻櫎</span> + </div> </template> - </AccountCard> + </UserAccountCard> </template> </InfiniteLoading> </template> @@ -37,7 +48,10 @@ } from '@life-payment/core-vue'; import { useInfiniteLoading } from '../../hooks/infiniteLoading'; import { OrderInputType } from '../../constants'; -import AccountCard from '../../components/Card/AccountCard.vue'; +import UserAccountCard from '../../components/Card/UserAccountCard.vue'; +import IconAccountDelete from '../../assets/account/icon-account-delete.png'; +import IconAccountEdit from '../../assets/account/icon-account-edit.png'; +import { OssAssets } from '../../constants'; import Taro from '@tarojs/taro'; defineOptions({ @@ -51,9 +65,15 @@ const { blLifeRecharge } = useLifeRechargeContext(); const TitleMap = { - [LifeRechargeConstants.LifePayOrderTypeEnum.璇濊垂璁㈠崟]: '鎵嬫満鍙�', - [LifeRechargeConstants.LifePayOrderTypeEnum.鐢佃垂璁㈠崟]: '鐢佃垂鎴峰彿', - [LifeRechargeConstants.LifePayOrderTypeEnum.鐕冩皵璁㈠崟]: '鐕冩皵鎴峰彿', + [LifeRechargeConstants.LifePayOrderTypeEnum.璇濊垂璁㈠崟]: '璇濊垂', + [LifeRechargeConstants.LifePayOrderTypeEnum.鐢佃垂璁㈠崟]: '鐢佃垂', + [LifeRechargeConstants.LifePayOrderTypeEnum.鐕冩皵璁㈠崟]: '鐕冩皵璐�', +}; + +const TitleIconMap = { + [LifeRechargeConstants.LifePayOrderTypeEnum.璇濊垂璁㈠崟]: OssAssets.accountCard.Phone, + [LifeRechargeConstants.LifePayOrderTypeEnum.鐢佃垂璁㈠崟]: OssAssets.accountCard.Electric, + [LifeRechargeConstants.LifePayOrderTypeEnum.鐕冩皵璁㈠崟]: OssAssets.accountCard.Gas, }; const { infiniteLoadingProps, invalidateQueries } = useInfiniteLoading( -- Gitblit v1.9.1