新增：买家留言和商家备注字段

src/views/shop/shopOrder/components/orderInfo.vue

@@ -179,10 +179,10 @@
         </a-descriptions-item>
         <!-- 第四排-->
         <a-descriptions-item
-          label="收货地址"
+          label="下单时间"
           :labelStyle="{ width: '90px', color: '#808080' }"
         >
-          {{ form.address }}
+          {{ toDateString(form.createTime, 'yyyy-MM-dd HH:mm') }}
         </a-descriptions-item>
         <a-descriptions-item
           label="减少的金额"
@@ -204,10 +204,10 @@
         </a-descriptions-item>
         <!-- 第五排-->
         <a-descriptions-item
-          label="备注信息"
+          label="交易流水号"
           :labelStyle="{ width: '90px', color: '#808080' }"
         >
-          {{ form.comments }}
+          {{ form.transactionId }}
         </a-descriptions-item>
         <a-descriptions-item
           label="支付方式"
@@ -300,60 +300,25 @@
           <a-tag v-if="form.isInvoice == 2" color="blue">不能开具</a-tag>
         </a-descriptions-item>
         <!-- 第六排-->
-        <a-descriptions-item
+<!--        <a-descriptions-item-->
-          label="下单时间"
+<!--          label="结算状态"-->
-          :labelStyle="{ width: '90px', color: '#808080' }"
+<!--          :labelStyle="{ width: '90px', color: '#808080' }"-->
-        >
+<!--        >-->
-          {{ toDateString(form.createTime, 'yyyy-MM-dd HH:mm') }}
+<!--          <a-tag v-if="form.isSettled == 0">未结算</a-tag>-->
-        </a-descriptions-item>
+<!--          <a-tag v-if="form.isSettled == 1" color="green">已结算</a-tag>-->
-        <a-descriptions-item
+<!--        </a-descriptions-item>-->
-          label="交易流水号"
+        <!-- 第七排 -->
-          :labelStyle="{ width: '90px', color: '#808080' }"
+<!--        <a-descriptions-item-->
-        >
+<!--          label="备注信息"-->
-          {{ form.transactionId }}
+<!--          :span="3"-->
-        </a-descriptions-item>
+<!--          :labelStyle="{ width: '90px', color: '#808080' }"-->
-        <a-descriptions-item
+<!--        >-->
-          label="结算状态"
+<!--          {{ form.comments }}-->
-          :labelStyle="{ width: '90px', color: '#808080' }"
+<!--        </a-descriptions-item>-->
-        >
-          <a-tag v-if="form.isSettled == 0">未结算</a-tag>
-          <a-tag v-if="form.isSettled == 1" color="green">已结算</a-tag>
-        </a-descriptions-item>
-
-        <!--        <a-descriptions-item span="3">-->
-        <!--          <a-divider/>-->
-        <!--        </a-descriptions-item>-->
 
       </a-descriptions>
     </a-card>
 
-    <!-- 订单流程步骤条 -->
-    <a-card title="订单流程" style="margin-bottom: 20px" :bordered="false">
-      <a-steps :current="active" :items="steps" />
-    </a-card>
-    <a-card title="商品信息" style="margin-bottom: 20px" :bordered="false">
-      <a-spin :spinning="loading">
-        <a-table
-          :data-source="orderGoods"
-          :columns="columns"
-          :pagination="false"
-        >
-          <template #bodyCell="{ column, record }">
-            <template v-if="column.key === 'goodsName'">
-              <div style="display: flex; align-items: center; gap: 12px;">
-                <a-avatar
-                  :src="record.image || record.goodsImage"
-                  shape="square"
-                  :size="50"
-                  style="flex-shrink: 0;"
-                />
-                <span style="flex: 1;">{{ record.goodsName || '未知商品' }}</span>
-              </div>
-            </template>
-          </template>
-        </a-table>
-      </a-spin>
-    </a-card>
     <a-card title="收货信息" style="margin-bottom: 20px" :bordered="false">
       <a-spin :spinning="loading">
         <a-descriptions :column="2">
@@ -421,6 +386,41 @@
         </a-descriptions>
       </a-spin>
     </a-card>
+
+    <a-card title="商品信息" style="margin-bottom: 20px" :bordered="false">
+      <a-spin :spinning="loading">
+        <a-table
+          :data-source="orderGoods"
+          :columns="columns"
+          :pagination="false"
+        >
+          <template #bodyCell="{ column, record }">
+            <template v-if="column.key === 'goodsName'">
+              <div style="display: flex; align-items: center; gap: 12px;">
+                <a-avatar
+                  :src="record.image || record.goodsImage"
+                  shape="square"
+                  :size="50"
+                  style="flex-shrink: 0;"
+                />
+                <span style="flex: 1;">{{ record.goodsName || '未知商品' }}</span>
+              </div>
+            </template>
+          </template>
+        </a-table>
+      </a-spin>
+    </a-card>
+    <a-card title="买家留言" style="margin-bottom: 20px" :bordered="false">
+      <a-spin :spinning="loading">
+        {{ form.buyerRemarks || '-' }}
+      </a-spin>
+    </a-card>
+    <a-card title="商家备注" style="margin-bottom: 20px" :bordered="false">
+      <a-spin :spinning="loading">
+        {{ form.merchantRemarks }}
+      </a-spin>
+    </a-card>
+
   </a-drawer>
 </template>