Przeglądaj źródła

feat:新增冻结余额可用余额

叶静 6 dni temu
rodzic
commit
6aed6663c3

+ 13 - 5
src/app/shop/admin/user/list/detail.vue

@@ -2,11 +2,11 @@
   <el-container class="user-detail" v-loading="loading">
     <el-main>
       <!-- 操作按钮 -->
-      <div class="action-buttons sa-m-b-2">
-        <!-- <el-button @click="onSendSms">发短信</el-button> -->
-        <!-- <el-button @click="onAppPush">APP推送</el-button> -->
-        <el-button type="primary" @click="onEdit">{{ t('modules.user.editProfile') }}</el-button>
-      </div>
+      <!-- <div class="action-buttons sa-m-b-2"> -->
+      <!-- <el-button @click="onSendSms">发短信</el-button> -->
+      <!-- <el-button @click="onAppPush">APP推送</el-button> -->
+      <!-- <el-button type="primary" @click="onEdit">{{ t('modules.user.editProfile') }}</el-button> -->
+      <!-- </div> -->
 
       <!-- 基本信息 -->
       <div class="basic-info sa-m-b-26">
@@ -108,6 +108,9 @@
           <el-table-column :label="t('modules.user.successOrders')" align="center">
             <template #default="{ row }">{{ row.successGroupNum }}</template>
           </el-table-column>
+          <el-table-column :label="t('modules.user.availableBalance')" align="center">
+            <template #default="{ row }">{{ formatCurrency(row.availableAmount) }}</template>
+          </el-table-column>
           <el-table-column :label="t('modules.user.availableGroups')" align="center">
             <template #default="{ row }">{{ row.groupNum }}</template>
           </el-table-column>
@@ -130,6 +133,9 @@
           <el-table-column :label="t('modules.user.accountBalance')" align="center">
             <template #default="{ row }">{{ formatCurrency(row.walletBalance) }}</template>
           </el-table-column>
+          <el-table-column :label="t('modules.user.frozenBalance')" align="center">
+            <template #default="{ row }">{{ formatCurrency(row.freezeAmount) }}</template>
+          </el-table-column>
           <el-table-column :label="t('modules.user.commissionBalance')" align="center">
             <template #default="{ row }">{{ formatCurrency(row.earningsBalance) }}</template>
           </el-table-column>
@@ -520,6 +526,7 @@ const initBasicInfoTableData = () => {
       successGroupNum: state.userDetail.successGroupNum || 0, // 成团数
       groupNum: state.userDetail.groupNum || 0, // 可参团数
       totalEarnings: state.userDetail.totalEarnings || 0, // 总收益
+      availableAmount: state.userDetail.availableAmount || 0, // 可用余额
       settledEarnings: state.userDetail.settledEarnings || 0, // 已结算收益
       rechargeAmount: state.userDetail.rechargeAmount || 0, // 充值
     },
@@ -530,6 +537,7 @@ const initBasicInfoTableData = () => {
       teamNum: state.userDetail.teamNum || 0, // 团队人数
       walletBalance: state.userDetail.walletBalance || 0, // 钱包余额
       earningsBalance: state.userDetail.earningsBalance || 0, // 收益余额
+      freezeAmount: state.userDetail.freezeAmount || 0, // 冻结金额
       l7DEarnings: state.userDetail.l7DEarnings || 0, // 近7天收益
       pendingEarnings: state.userDetail.pendingEarnings || 0, // 待结算金额
       withdrawAmount: state.userDetail.withdrawAmount || 0, // 提现总金额

+ 3 - 1
src/locales/en-US/index.json

@@ -1024,7 +1024,9 @@
       "inviteFriends": "Invited Friends",
       "teamMembers": "Team Members",
       "successOrders": "Paid Orders Num",
-      "accountBalance": "Account Balance",
+      "accountBalance": "Wallet Account Balance",
+      "availableBalance": "Available Balance",
+      "frozenBalance": "Frozen Amount",
       "commissionBalance": "Commission Balance",
       "loginPermission": "Login Permission",
       "orderPermission": "Order Permission",

+ 3 - 1
src/locales/zh-CN/index.json

@@ -1027,7 +1027,9 @@
       "inviteFriends": "邀请好友数",
       "teamMembers": "团队人数",
       "successOrders": "支付订单数",
-      "accountBalance": "账户余额",
+      "accountBalance": "钱包账户余额",
+      "availableBalance": "钱包可用余额",
+      "frozenBalance": "钱包冻结金额",
       "commissionBalance": "佣金余额",
       "loginPermission": "登录权限",
       "orderPermission": "下单权限",