From 67fc5990317f453b70f2a103dcb2b0b74d1cee66 Mon Sep 17 00:00:00 2001
From: van <van333@foxmail.com>
Date: Mon, 22 Jun 2026 14:28:33 +0800
Subject: [PATCH] 1

---
 src/views/open/jd/promoter/index.vue |  2 -
 src/views/system/orderrows/index.vue | 64 ++++++++++++++++++++++++----
 2 files changed, 55 insertions(+), 11 deletions(-)

diff --git a/src/views/open/jd/promoter/index.vue b/src/views/open/jd/promoter/index.vue
index 5e58f31..671f0f0 100644
--- a/src/views/open/jd/promoter/index.vue
+++ b/src/views/open/jd/promoter/index.vue
@@ -65,7 +65,6 @@
           <div>完成时间：{{ item.finishTime }}</div>
           <div v-if="item.proPriceAmount && item.proPriceAmount !== '0.00'" class="pro-price-line">
             价保赔付：<span class="pro-price-val">¥{{ item.proPriceAmount }}</span>
-            <span v-if="item.proPriceTime" class="pro-price-time">（{{ item.proPriceTime }}）</span>
           </div>
         </div>
       </div>
@@ -282,7 +281,6 @@ export default {
 .info-footer { margin-top: 16px; color: #666; }
 .pro-price-line { margin-top: 4px; }
 .pro-price-val { color: #e02f2f; font-weight: bold; }
-.pro-price-time { color: #999; font-weight: normal; }
 .tag {
   display: inline-block;
   font-size: 11px;
diff --git a/src/views/system/orderrows/index.vue b/src/views/system/orderrows/index.vue
index 7c12b9f..12fcb81 100644
--- a/src/views/system/orderrows/index.vue
+++ b/src/views/system/orderrows/index.vue
@@ -230,12 +230,24 @@
 
     <!-- 查看订单详情对话框 -->
     <el-dialog :title="'订单详情 - ' + currentOrder.orderId" :visible.sync="viewDialogVisible" width="900px" append-to-body>
+      <div v-loading="viewLoading">
       <el-descriptions :column="2" border>
         <!-- 基本信息 -->
         <el-descriptions-item label="订单号">{{ currentOrder.orderId }}</el-descriptions-item>
         <el-descriptions-item label="主单号">{{ currentOrder.parentId || '-' }}</el-descriptions-item>
         <el-descriptions-item label="商品ID">{{ currentOrder.skuId }}</el-descriptions-item>
         <el-descriptions-item label="商品名称" :span="2">{{ currentOrder.skuName }}</el-descriptions-item>
+        <el-descriptions-item label="店铺名称" :span="2">{{ goodsDetailShopName }}</el-descriptions-item>
+        <el-descriptions-item label="商品主图" :span="2">
+          <img
+            v-if="goodsDetailImageUrl && !detailImageFailed"
+            :src="goodsDetailImageUrl"
+            referrerpolicy="no-referrer"
+            class="detail-goods-img"
+            @error="detailImageFailed = true"
+          >
+          <span v-else>-</span>
+        </el-descriptions-item>
         <el-descriptions-item label="商品价格">¥{{ currentOrder.price }}</el-descriptions-item>
         <el-descriptions-item label="商品数量">{{ currentOrder.skuNum }}</el-descriptions-item>
         <el-descriptions-item label="已退货数量">{{ currentOrder.skuReturnNum || 0 }}</el-descriptions-item>
@@ -311,13 +323,7 @@
         <el-descriptions-item label="计佣扩展信息">{{ currentOrder.balanceExt || '-' }}</el-descriptions-item>
         <el-descriptions-item label="价保赔付金额">¥{{ currentOrder.proPriceAmount || 0 }}</el-descriptions-item>
         
-        <!-- 商品信息 -->
-        <el-descriptions-item label="商品主图" :span="2" v-if="currentOrder.goodsInfo">
-          <img :src="currentOrder.goodsInfo.imageUrl" style="max-width: 200px; max-height: 200px;" v-if="currentOrder.goodsInfo.imageUrl" />
-          <span v-else>-</span>
-        </el-descriptions-item>
-        <el-descriptions-item label="店铺名称" v-if="currentOrder.goodsInfo">{{ currentOrder.goodsInfo.shopName || '-' }}</el-descriptions-item>
-        <el-descriptions-item label="店铺ID" v-if="currentOrder.goodsInfo">{{ currentOrder.goodsInfo.shopId || '-' }}</el-descriptions-item>
+        <el-descriptions-item label="店铺ID">{{ (currentOrder.goodsInfo && currentOrder.goodsInfo.shopId) || '-' }}</el-descriptions-item>
         
         <!-- 类目信息 -->
         <el-descriptions-item label="类目信息" :span="2" v-if="currentOrder.categoryInfo">
@@ -332,6 +338,7 @@
         <el-descriptions-item label="招商团活动ID">{{ currentOrder.cpActId || '-' }}</el-descriptions-item>
         <el-descriptions-item label="账户ID">{{ currentOrder.account || '-' }}</el-descriptions-item>
       </el-descriptions>
+      </div>
       <div slot="footer" class="dialog-footer">
         <el-button @click="viewDialogVisible = false">关闭</el-button>
       </div>
@@ -403,6 +410,8 @@ export default {
       viewDialogVisible: false,
       // 当前查看的订单
       currentOrder: {},
+      detailImageFailed: false,
+      viewLoading: false,
       // 统计相关
       showStatistics: true,
       statistics: {
@@ -442,6 +451,20 @@ export default {
         { key: 'export', label: '导出', type: 'warning', icon: 'el-icon-download', handler: () => this.handleExport(), disabled: false },
         { key: 'backfill', label: '补全商品图', type: 'info', icon: 'el-icon-picture-outline', handler: () => this.handleBackfillGoodsInfo(), disabled: this.backfillLoading }
       ]
+    },
+    goodsDetailShopName() {
+      const shopName = this.currentOrder.goodsInfo && this.currentOrder.goodsInfo.shopName
+      return shopName || '-'
+    },
+    goodsDetailImageUrl() {
+      const imageUrl = this.currentOrder.goodsInfo && this.currentOrder.goodsInfo.imageUrl
+      if (imageUrl) {
+        return imageUrl
+      }
+      if (this.currentOrder.skuId) {
+        return 'https://img14.360buyimg.com/n5/s450x450_' + this.currentOrder.skuId + '.jpg'
+      }
+      return ''
     }
   },
   created() {
@@ -796,8 +819,23 @@ export default {
     },
     /** 查看订单详情 */
     handleView(row) {
-      this.currentOrder = row;
-      this.viewDialogVisible = true;
+      const id = row.id
+      this.detailImageFailed = false
+      if (!id) {
+        this.currentOrder = row
+        this.viewDialogVisible = true
+        return
+      }
+      this.viewLoading = true
+      getOrderrows(id).then(response => {
+        this.currentOrder = response.data || row
+        this.viewDialogVisible = true
+      }).catch(() => {
+        this.currentOrder = row
+        this.viewDialogVisible = true
+      }).finally(() => {
+        this.viewLoading = false
+      })
     },
     /** 新增按钮操作 */
     handleAdd() {
@@ -993,6 +1031,14 @@ export default {
 </script>
 
 <style scoped>
+.detail-goods-img {
+  max-width: 200px;
+  max-height: 200px;
+  object-fit: contain;
+  border-radius: 4px;
+  border: 1px solid #ebeef5;
+}
+
 /* 主容器布局 */
 .app-container {
   display: flex;