浏览代码

feat: 优化细节

叶静 3 周之前
父节点
当前提交
9df2da9592
共有 2 个文件被更改,包括 23 次插入21 次删除
  1. 18 16
      src/app/shop/admin/order/order/detail.vue
  2. 5 5
      src/app/shop/admin/user/list/detail.vue

+ 18 - 16
src/app/shop/admin/order/order/detail.vue

@@ -1,6 +1,21 @@
 <template>
   <el-container class="order-detail">
     <el-main v-loading="loading" :element-loading-text="t('common.loading')">
+      <!-- 操作按钮 -->
+      <div class="action-buttons sa-m-b-26">
+        <!-- 取消订单按钮 - 只在待支付状态显示 -->
+        <el-button v-if="state.orderDetail.status === 1" type="warning" plain @click="onCancelOrder">{{
+          t('modules.order.cancelOrder') }}</el-button>
+        <!-- 立即发货按钮 - 待发货状态显示 -->
+        <el-button type="primary" @click="onDispatch" v-if="state.orderDetail.status === 5">{{
+          t('modules.order.shipOrder')
+        }}</el-button>
+        <!-- 全部退款按钮 - 订单状态已支付且拼团状态未成团时显示 -->
+        <el-button v-if="state.orderDetail.status === 3 && state.orderDetail.storePink?.status == 1" type="danger" plain
+          @click="onRefund">
+          {{ t('modules.order.refund') }}
+        </el-button>
+      </div>
       <!-- 订单轨迹 -->
       <div class="order-track sa-m-b-46">
         <h3 class="sa-m-b-20">{{ t('modules.order.orderTrack') }}</h3>
@@ -123,22 +138,6 @@
   <span class="value">{{ state.orderDetail.remark || '暂无留言' }}</span>
 </div>
 </div> -->
-
-      <!-- 操作按钮 -->
-      <div class="action-buttons sa-m-b-26">
-        <!-- 取消订单按钮 - 只在待支付状态显示 -->
-        <el-button v-if="state.orderDetail.status === 1" type="warning" plain @click="onCancelOrder">{{
-          t('modules.order.cancelOrder') }}</el-button>
-        <!-- 立即发货按钮 - 待发货状态显示 -->
-        <el-button type="primary" @click="onDispatch" v-if="state.orderDetail.status === 5">{{
-          t('modules.order.shipOrder')
-        }}</el-button>
-        <!-- 全部退款按钮 - 订单状态已支付且拼团状态未成团时显示 -->
-        <el-button v-if="state.orderDetail.status === 3 && state.orderDetail.storePink?.status == 1" type="danger" plain
-          @click="onRefund">
-          {{ t('modules.order.refund') }}
-        </el-button>
-      </div>
       <!-- 商品信息 -->
       <div class="goods-content sa-m-b-16">
         <div class="sa-title sa-m-b-10">{{ t('modules.order.goodsInfo') }}</div>
@@ -643,6 +642,9 @@ onMounted(() => {
   }
 
   .action-buttons {
+    display: flex;
+    justify-content: end;
+
     .el-button {
       margin-right: 12px;
     }

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

@@ -15,6 +15,11 @@
           <!-- 第一行表格 -->
           <el-table class="sa-table basic-info-table-1" :data="[state.basicInfoTableData[0]]" stripe border
             :show-header="true">
+            <el-table-column :label="t('modules.user.userName')" align="center">
+              <template #default="{ row }">
+                {{ row.field3 || '--' }}
+              </template>
+            </el-table-column>
             <el-table-column :label="t('modules.user.userId')" align="center">
               <template #default="{ row }">
                 {{ row.field1 || '--' }}
@@ -25,11 +30,6 @@
                 {{ row.field2 || '--' }}
               </template>
             </el-table-column>
-            <el-table-column :label="t('modules.user.userName')" align="center">
-              <template #default="{ row }">
-                {{ row.field3 || '--' }}
-              </template>
-            </el-table-column>
             <el-table-column :label="t('modules.user.accountName')" align="center">
               <template #default="{ row }">
                 {{ state.userDetail.bankAccountName || '--' }}