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 @@
完成时间:{{ item.finishTime }}
价保赔付:¥{{ item.proPriceAmount }}
- ({{ item.proPriceTime }})
@@ -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 @@
+
{{ currentOrder.orderId }}
{{ currentOrder.parentId || '-' }}
{{ currentOrder.skuId }}
{{ currentOrder.skuName }}
+ {{ goodsDetailShopName }}
+
+
+ -
+
¥{{ currentOrder.price }}
{{ currentOrder.skuNum }}
{{ currentOrder.skuReturnNum || 0 }}
@@ -311,13 +323,7 @@
{{ currentOrder.balanceExt || '-' }}
¥{{ currentOrder.proPriceAmount || 0 }}
-
-
-
- -
-
- {{ currentOrder.goodsInfo.shopName || '-' }}
- {{ currentOrder.goodsInfo.shopId || '-' }}
+ {{ (currentOrder.goodsInfo && currentOrder.goodsInfo.shopId) || '-' }}
@@ -332,6 +338,7 @@
{{ currentOrder.cpActId || '-' }}
{{ currentOrder.account || '-' }}
+
@@ -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 {