feat: 调整订单详情基本布局

src/app/shop/admin/order/order/detail.vue

@@ -13,7 +13,7 @@
       <!-- 基本信息 -->
       <div class="basic-info sa-m-b-26">
         <h3 class="sa-m-b-20">{{ t('modules.order.basicInfo') }}</h3>
-        <!-- 第一行：订单编号、订单状态、拼团状态、全部金额 -->
+        <!-- 第一列：订单号、用户名、手机号 -->
         <el-row :gutter="20">
           <el-col :span="6">
             <div class="info-item">
@@ -21,6 +21,24 @@
               <span class="value">{{ state.orderDetail.orderId || '--' }}</span>
             </div>
           </el-col>
+          <el-col :span="6">
+            <div class="info-item">
+              <span class="label">{{ t('modules.order.username') }}：</span>
+              <span class="value">{{ state.orderDetail.realName || '--' }}</span>
+            </div>
+          </el-col>
+          <el-col :span="6">
+            <div class="info-item">
+              <span class="label">{{ t('modules.order.phoneNumber') }}：</span>
+              <span class="value">{{ state.orderDetail.userPhone || '--' }}</span>
+            </div>
+          </el-col>
+          <el-col :span="6">
+            <!-- 预留位置 -->
+          </el-col>
+        </el-row>
+        <!-- 第二列：订单状态、拼团状态、中奖状态 -->
+        <el-row :gutter="20" class="sa-m-t-12">
           <el-col :span="6">
             <div class="info-item">
               <span class="label">{{ t('modules.order.orderStatus') }}：</span>
@@ -37,15 +55,6 @@
               </el-tag>
             </div>
           </el-col>
-          <el-col :span="6">
-            <div class="info-item">
-              <span class="label">{{ t('modules.order.totalAmount') }}：</span>
-              <span class="value">৳{{ state.orderDetail.totalPrice || 0 }}</span>
-            </div>
-          </el-col>
-        </el-row>
-        <!-- 第二行：中奖状态、用户名、支付方式、优惠金额 -->
-        <el-row :gutter="20" class="sa-m-t-12">
           <el-col :span="6">
             <div class="info-item">
               <span class="label">{{ t('modules.order.winStatusLabel') }}：</span>
@@ -55,11 +64,11 @@
             </div>
           </el-col>
           <el-col :span="6">
-            <div class="info-item">
-              <span class="label">{{ t('modules.order.username') }}：</span>
-              <span class="value">{{ state.orderDetail.realName || '--' }}</span>
-            </div>
+            <!-- 预留位置 -->
           </el-col>
+        </el-row>
+        <!-- 第三列：支付方式、支付金额、奖励佣金 -->
+        <el-row :gutter="20" class="sa-m-t-12">
           <el-col :span="6">
             <div class="info-item">
               <span class="label">{{ t('modules.order.paymentMethod') }}：</span>
@@ -68,13 +77,10 @@
           </el-col>
           <el-col :span="6">
             <div class="info-item">
-              <span class="label">{{ t('modules.order.discountAmount') }}：</span>
-              <span class="value">৳{{ state.orderDetail.deductionPrice || 0 }}</span>
+              <span class="label">{{ t('modules.order.paymentAmount') }}：</span>
+              <span class="value">৳{{ state.orderDetail.payPrice || 0 }}</span>
             </div>
           </el-col>
-        </el-row>
-        <!-- 第三行：奖励佣金、手机号码、支付金额、实付金额 -->
-        <el-row :gutter="20" class="sa-m-t-12">
           <el-col :span="6">
             <div class="info-item">
               <span class="label">{{ t('modules.order.rewardCommission') }}：</span>
@@ -82,22 +88,7 @@
             </div>
           </el-col>
           <el-col :span="6">
-            <div class="info-item">
-              <span class="label">{{ t('modules.order.phoneNumber') }}：</span>
-              <span class="value">{{ state.orderDetail.userPhone || '--' }}</span>
-            </div>
-          </el-col>
-          <el-col :span="6">
-            <div class="info-item">
-              <span class="label">{{ t('modules.order.paymentAmount') }}：</span>
-              <span class="value">৳{{ state.orderDetail.totalPrice || 0 }}</span>
-            </div>
-          </el-col>
-          <el-col :span="6">
-            <div class="info-item">
-              <span class="label">{{ t('modules.order.actualPayment') }}：</span>
-              <span class="value">৳{{ state.orderDetail.payPrice || 0 }}</span>
-            </div>
+            <!-- 预留位置 -->
           </el-col>
         </el-row>
       </div>

src/locales/en-US/index.json

@@ -1178,7 +1178,7 @@
       "orderDetail": "Order Detail",
       "orderNo": "Order No.",
       "orderNumber": "Order Number",
-      "orderStatus": "Status",
+      "orderStatus": "Order Status",
       "orderAmount": "Order Amount",
       "orderTime": "Order Time",
       "payTime": "Pay Time",

src/locales/zh-CN/index.json

@@ -1179,7 +1179,7 @@
       "orderDetail": "订单详情",
       "orderNo": "订单号",
       "orderNumber": "订单编号",
-      "orderStatus": "状态",
+      "orderStatus": "订单状态",
       "orderAmount": "订单金额",
       "orderTime": "下单时间",
       "payTime": "支付时间",