Merge remote-tracking branch 'origin/feature/20240918_1005_091801' into release_pre_20240918175811

src/views/order/ChangeOrderDetailnew.vue

@@ -145,7 +145,7 @@
         <el-form ref="addInviteRef" label-width="140px" style="width: 30%">
 
           <el-form-item label="收货地址：">
-            <div>{{ itemContent && itemContent.receiveTargetOrderInfo.receiverName + "," +itemContent.receiveTargetOrderInfo.receiverPhone+ "," +itemContent.receiveTargetOrderInfo.receiverAddress || '-' }}</div>
+            <div>{{ itemContent && itemContent.receiveTargetOrderInfo.receiverName + "," +itemContent.receiveTargetOrderInfo.receiverPhone + "," +itemContent.receiveTargetOrderInfo.receiverAddress || '-' }}</div>
           </el-form-item>
           <el-form-item label="平台寄出物流信息：">
             <div>{{ itemContent && itemContent.receiveTargetOrderInfo.waybill || '-' }}</div>

src/views/order/UserChangeOrderView.vue

@@ -53,6 +53,7 @@
       fit
       highlight-current-row>
       <el-table-column align="center" min-width="180px" prop="exchangeApplyOrderId" label="交换单号" />
+      <el-table-column align="center" min-width="180px" prop="userId" label="申请方用户ID" />
       <!-- <el-table-column align="center" label="申请方昵称" min-width="150px" prop="sellerName">
         <template slot-scope="scope">
           <Line2Hidden :text="scope.row.sellerName || ''" />
@@ -72,12 +73,12 @@
           </div>
         </template>
       </el-table-column>
-
       <el-table-column align="center" label="申请方藏品名称" min-width="200px" prop="userExchangeItemName">
         <template slot-scope="scope">
           <div class="user_self" @click="handleToDetailuser(scope.row)">{{ scope.row.userItemList[0].name }}</div>
         </template>
       </el-table-column>
+      <el-table-column align="center" min-width="180px" prop="targetUserId" label="受理方用户ID" />
       <el-table-column align="center" label="受理方藏品图片" min-width="120px" prop="homePageImage">
         <template slot-scope="scope">
           <!-- <img v-if="scope.row.homePageImage && scope.row.homePageImage.url" :src="scope.row.homePageImage.url" width="60px" height="60px"> -->