Sfoglia il codice sorgente

feat: 优化细节

叶静 3 settimane fa
parent
commit
0cbe713929

+ 20 - 23
src/app/shop/admin/finance/recharge/detail.vue

@@ -21,22 +21,22 @@
           </el-col>
           <el-col :span="6">
             <div class="info-item" :style="{ '--label-width': formLabelWidth }">
-              <span class="label">{{ t('modules.recharge.bank') }}:</span>
-              <span class="value">{{ rechargeDetail.bank || '--' }}</span>
+              <span class="label">{{ t('modules.recharge.amount') }}:</span>
+              <span class="value">৳{{ rechargeDetail.amount || 0 }}</span>
             </div>
           </el-col>
           <el-col :span="6">
             <div class="info-item" :style="{ '--label-width': formLabelWidth }">
-              <span class="label">{{ t('modules.recharge.userName') }}:</span>
-              <span class="value">{{ rechargeDetail.userName || '--' }}</span>
+              <span class="label">{{ t('modules.recharge.currency') }}:</span>
+              <span class="value">{{ getCurrencyText(rechargeDetail.currency) }}</span>
             </div>
           </el-col>
         </el-row>
         <el-row :gutter="20" class="sa-m-t-12">
           <el-col :span="6">
             <div class="info-item" :style="{ '--label-width': formLabelWidth }">
-              <span class="label">{{ t('modules.recharge.accountName') }}:</span>
-              <span class="value">{{ rechargeDetail.bankAccountName || '--' }}</span>
+              <span class="label">{{ t('modules.recharge.userName') }}:</span>
+              <span class="value">{{ rechargeDetail.userName || '--' }}</span>
             </div>
           </el-col>
           <el-col :span="6">
@@ -47,48 +47,48 @@
           </el-col>
           <el-col :span="6">
             <div class="info-item" :style="{ '--label-width': formLabelWidth }">
-              <span class="label">{{ t('modules.recharge.channel') }}:</span>
-              <span class="value">{{ rechargeDetail.channelName || '--' }}</span>
+              <span class="label">{{ t('modules.recharge.walletBalance') }}:</span>
+              <span class="value">৳{{ rechargeDetail.walletBalance || 0 }}</span>
             </div>
           </el-col>
           <el-col :span="6">
             <div class="info-item" :style="{ '--label-width': formLabelWidth }">
-              <span class="label">{{ t('modules.recharge.account') }}:</span>
-              <span class="value">{{ rechargeDetail.bankAccount || '--' }}</span>
+              <span class="label">{{ t('modules.recharge.earningsBalance') }}:</span>
+              <span class="value">৳{{ rechargeDetail.earningsBalance || 0 }}</span>
             </div>
           </el-col>
         </el-row>
         <el-row :gutter="20" class="sa-m-t-12">
           <el-col :span="6">
             <div class="info-item" :style="{ '--label-width': formLabelWidth }">
-              <span class="label">{{ t('modules.recharge.method') }}:</span>
-              <span class="value">{{ rechargeDetail.methodName || '--' }}</span>
+              <span class="label">{{ t('modules.recharge.accountName') }}:</span>
+              <span class="value">{{ rechargeDetail.bankAccountName || '--' }}</span>
             </div>
           </el-col>
           <el-col :span="6">
             <div class="info-item" :style="{ '--label-width': formLabelWidth }">
-              <span class="label">{{ t('modules.recharge.walletBalance') }}:</span>
-              <span class="value">৳{{ rechargeDetail.walletBalance || 0 }}</span>
+              <span class="label">{{ t('modules.recharge.bank') }}:</span>
+              <span class="value">{{ rechargeDetail.bank || '--' }}</span>
             </div>
           </el-col>
           <el-col :span="6">
             <div class="info-item" :style="{ '--label-width': formLabelWidth }">
-              <span class="label">{{ t('modules.recharge.currency') }}:</span>
-              <span class="value">{{ getCurrencyText(rechargeDetail.currency) }}</span>
+              <span class="label">{{ t('modules.recharge.account') }}:</span>
+              <span class="value">{{ rechargeDetail.bankAccount || '--' }}</span>
             </div>
           </el-col>
           <el-col :span="6">
             <div class="info-item" :style="{ '--label-width': formLabelWidth }">
-              <span class="label">{{ t('modules.recharge.earningsBalance') }}:</span>
-              <span class="value">৳{{ rechargeDetail.earningsBalance || 0 }}</span>
+              <span class="label">{{ t('modules.recharge.channel') }}:</span>
+              <span class="value">{{ rechargeDetail.channelName || '--' }}</span>
             </div>
           </el-col>
         </el-row>
         <el-row :gutter="20" class="sa-m-t-12">
           <el-col :span="6">
             <div class="info-item" :style="{ '--label-width': formLabelWidth }">
-              <span class="label">{{ t('modules.recharge.amount') }}:</span>
-              <span class="value">৳{{ rechargeDetail.amount || 0 }}</span>
+              <span class="label">{{ t('modules.recharge.method') }}:</span>
+              <span class="value">{{ rechargeDetail.methodName || '--' }}</span>
             </div>
           </el-col>
           <el-col :span="6">
@@ -97,9 +97,6 @@
           <el-col :span="6">
             <!-- 预留位置 -->
           </el-col>
-          <el-col :span="6">
-            <!-- 预留位置 -->
-          </el-col>
         </el-row>
       </div>
 

+ 30 - 26
src/app/shop/admin/finance/withdraw/detail.vue

@@ -12,6 +12,7 @@
             <el-button type="danger" plain @click="handleReject">{{ t('modules.withdraw.reject') }}</el-button>
           </div>
         </div>
+        <!-- 第一行 - 提现订单基本信息 -->
         <el-row :gutter="20">
           <el-col :span="6">
             <div class="info-item" :style="{ '--label-width': formLabelWidth }">
@@ -29,82 +30,85 @@
           </el-col>
           <el-col :span="6">
             <div class="info-item" :style="{ '--label-width': formLabelWidth }">
-              <span class="label">{{ t('modules.withdraw.receivingBank') }}:</span>
-              <span class="value">{{ withdrawDetail.bank || '--' }}</span>
+              <span class="label">{{ t('modules.withdraw.amount') }}:</span>
+              <span class="value">৳{{ withdrawDetail.amount || 0 }}</span>
             </div>
           </el-col>
           <el-col :span="6">
             <div class="info-item" :style="{ '--label-width': formLabelWidth }">
-              <span class="label">{{ t('modules.withdraw.userName') }}:</span>
-              <span class="value">{{ withdrawDetail.userName || '--' }}</span>
+              <span class="label">{{ t('modules.withdraw.currency') }}:</span>
+              <span class="value">{{ getCurrencyText(withdrawDetail.currency) }}</span>
             </div>
           </el-col>
         </el-row>
+        <!-- 第二行 - 用户信息+余额信息 -->
         <el-row :gutter="20" class="sa-m-t-12">
           <el-col :span="6">
             <div class="info-item" :style="{ '--label-width': formLabelWidth }">
-              <span class="label">{{ t('modules.withdraw.accountType') }}:</span>
-              <el-tag :type="withdrawDetail.accountType === 1 ? 'primary' : 'success'">
-                {{ getAccountTypeTextLocal(withdrawDetail.accountType) }}
-              </el-tag>
+              <span class="label">{{ t('modules.withdraw.userName') }}:</span>
+              <span class="value">{{ withdrawDetail.userName || '--' }}</span>
             </div>
           </el-col>
           <el-col :span="6">
             <div class="info-item" :style="{ '--label-width': formLabelWidth }">
-              <span class="label">{{ t('modules.withdraw.accountName') }}:</span>
-              <span class="value">{{ withdrawDetail.bankAccountName || '--' }}</span>
+              <span class="label">{{ t('modules.withdraw.phoneNo') }}:</span>
+              <span class="value">{{ withdrawDetail.userPhone || '--' }}</span>
             </div>
           </el-col>
           <el-col :span="6">
             <div class="info-item" :style="{ '--label-width': formLabelWidth }">
-              <span class="label">{{ t('modules.withdraw.phoneNo') }}:</span>
-              <span class="value">{{ withdrawDetail.userPhone || '--' }}</span>
+              <span class="label">{{ t('modules.withdraw.accountName') }}:</span>
+              <span class="value">{{ withdrawDetail.bankAccountName || '--' }}</span>
             </div>
           </el-col>
           <el-col :span="6">
             <div class="info-item" :style="{ '--label-width': formLabelWidth }">
-              <span class="label">{{ t('modules.withdraw.channel') }}:</span>
-              <span class="value">{{ withdrawDetail.channel || '--' }}</span>
+              <span class="label">{{ t('modules.withdraw.walletBalance') }}:</span>
+              <span class="value">৳{{ withdrawDetail.walletBalance || 0 }}</span>
             </div>
           </el-col>
         </el-row>
+        <!-- 第三行 - 银行账户信息 -->
         <el-row :gutter="20" class="sa-m-t-12">
           <el-col :span="6">
             <div class="info-item" :style="{ '--label-width': formLabelWidth }">
-              <span class="label">{{ t('modules.withdraw.method') }}:</span>
-              <span class="value">{{ withdrawDetail.bank || '--' }}</span>
+              <span class="label">{{ t('modules.withdraw.accountType') }}:</span>
+              <el-tag :type="withdrawDetail.accountType === 1 ? 'primary' : 'success'">
+                {{ getAccountTypeTextLocal(withdrawDetail.accountType) }}
+              </el-tag>
             </div>
           </el-col>
           <el-col :span="6">
             <div class="info-item" :style="{ '--label-width': formLabelWidth }">
-              <span class="label">{{ t('modules.withdraw.receivingAccount') }}:</span>
-              <span class="value">{{ withdrawDetail.bankAccount || '--' }}</span>
+              <span class="label">{{ t('modules.withdraw.earningsBalance') }}:</span>
+              <span class="value">৳{{ withdrawDetail.earningsBalance || 0 }}</span>
             </div>
           </el-col>
           <el-col :span="6">
             <div class="info-item" :style="{ '--label-width': formLabelWidth }">
-              <span class="label">{{ t('modules.withdraw.walletBalance') }}:</span>
-              <span class="value">৳{{ withdrawDetail.walletBalance || 0 }}</span>
+              <span class="label">{{ t('modules.withdraw.receivingBank') }}:</span>
+              <span class="value">{{ withdrawDetail.bank || '--' }}</span>
             </div>
           </el-col>
           <el-col :span="6">
             <div class="info-item" :style="{ '--label-width': formLabelWidth }">
-              <span class="label">{{ t('modules.withdraw.currency') }}:</span>
-              <span class="value">{{ getCurrencyText(withdrawDetail.currency) }}</span>
+              <span class="label">{{ t('modules.withdraw.receivingAccount') }}:</span>
+              <span class="value">{{ withdrawDetail.bankAccount || '--' }}</span>
             </div>
           </el-col>
         </el-row>
+        <!-- 第四行 - 提现渠道信息 -->
         <el-row :gutter="20" class="sa-m-t-12">
           <el-col :span="6">
             <div class="info-item" :style="{ '--label-width': formLabelWidth }">
-              <span class="label">{{ t('modules.withdraw.earningsBalance') }}:</span>
-              <span class="value">৳{{ withdrawDetail.earningsBalance || 0 }}</span>
+              <span class="label">{{ t('modules.withdraw.channel') }}:</span>
+              <span class="value">{{ withdrawDetail.channel || '--' }}</span>
             </div>
           </el-col>
           <el-col :span="6">
             <div class="info-item" :style="{ '--label-width': formLabelWidth }">
-              <span class="label">{{ t('modules.withdraw.amount') }}:</span>
-              <span class="value">৳{{ withdrawDetail.amount || 0 }}</span>
+              <span class="label">{{ t('modules.withdraw.method') }}:</span>
+              <span class="value">{{ withdrawDetail.bank || '--' }}</span>
             </div>
           </el-col>
           <el-col :span="6">