Merge branch 'dev' of git.gicdev.com:dm4/welfare into dev

dist/css/chunk-555e0f7e.dfb700f0.css

-.empty_block[data-v-9c2d05ba]:after{content:"\6682\65E0\7269\6D41\4FE1\606F"}.logistics-info[data-v-9c2d05ba]{display:-webkit-box;display:-ms-flexbox;display:flex}.logistics-info>div[data-v-9c2d05ba]{-webkit-box-flex:1;-ms-flex:1;flex:1}.logistics-info span[data-v-9c2d05ba]{display:inline-block}.logistics-info span+span[data-v-9c2d05ba]{margin-left:10px}.logistics-step[data-v-9c2d05ba]{margin-top:24px;background:#fafafa;padding:15px 0}.logistics-step h3[data-v-9c2d05ba]{color:#303133;font-size:16px;border-bottom:1px solid #dcdfe6;padding:0 20px 15px 20px}.logistics-step .logistics-list[data-v-9c2d05ba]{height:328px;overflow-y:auto;padding:20px}.logistics-step .logistics-item[data-v-9c2d05ba]{position:relative;padding-bottom:10px}.logistics-step .logistics-line-step[data-v-9c2d05ba]{display:-webkit-box;display:-ms-flexbox;display:flex;font-size:12px}.logistics-step .logistics-line-step .time[data-v-9c2d05ba]{margin-right:20px;width:160px;line-height:22px;font-weight:500;color:#303133}.logistics-step .logistics-line-step .content[data-v-9c2d05ba]{color:#303133;-webkit-box-flex:1;-ms-flex:1;flex:1;line-height:22px}
\ No newline at end of file

dist/css/chunk-d7364742.be14d1e8.css

+.empty_block[data-v-7e95e01c]:after{content:"\6682\65E0\7269\6D41\4FE1\606F"}.logistics-info[data-v-7e95e01c]{display:-webkit-box;display:-ms-flexbox;display:flex}.logistics-info>div[data-v-7e95e01c]{-webkit-box-flex:1;-ms-flex:1;flex:1}.logistics-info span[data-v-7e95e01c]{display:inline-block}.logistics-info span+span[data-v-7e95e01c]{margin-left:10px}.logistics-step[data-v-7e95e01c]{margin-top:24px;background:#fafafa;padding:15px 0}.logistics-step h3[data-v-7e95e01c]{color:#303133;font-size:16px;border-bottom:1px solid #dcdfe6;padding:0 20px 15px 20px}.logistics-step .logistics-list[data-v-7e95e01c]{height:328px;overflow-y:auto;padding:20px}.logistics-step .logistics-item[data-v-7e95e01c]{position:relative;padding-bottom:10px}.logistics-step .logistics-line-step[data-v-7e95e01c]{display:-webkit-box;display:-ms-flexbox;display:flex;font-size:12px}.logistics-step .logistics-line-step .time[data-v-7e95e01c]{margin-right:20px;width:160px;line-height:22px;font-weight:500;color:#303133}.logistics-step .logistics-line-step .content[data-v-7e95e01c]{color:#303133;-webkit-box-flex:1;-ms-flex:1;flex:1;line-height:22px}
\ No newline at end of file

src/views/performance-manage/delivery-list.vue

@@ -31,7 +31,7 @@
       <el-table-column label="商品" width="300">
         <template slot-scope="{ row }">
           <div class="goods-info">
-            <img class="imgs-style" :src="row.giftImgUrl" alt="" />
+            <img class="imgs-style" :src="row.giftImgUrl[0]" alt="" />
             <div class="goods-text">
               <div class="goods-text-name">
                 {{row.giftName}}
@@ -251,7 +251,10 @@ export default {
       };
       this.loading = true;
       let { result: { result, totalCount } } = await getDelivery(query).finally(() => this.loading = false);
-      this.list = result || [];
+      this.list = (result || []).map(el => {
+        el.giftImgUrl = typeof el.giftImgUrl == 'string' ? el.giftImgUrl.split(',') : [];
+        return el;
+      });
       this.pager.totalCount = totalCount;
       if(this.type === 0) this.$emit('count', totalCount);
     },

src/views/performance-manage/refund.vue

@@ -350,7 +350,7 @@ export default {
       this.row = row;
       if(dialogName == 'logisticsDialog') {
         let { result } = await getLogisticsInfo({
-          companyCode: row.refundId/* 'YD' */,
+          companyCode: row.refundCompanyCode/* 'YD' */,
           logisticsNo: row.refundLogisticsNo/* '4312317986451' */,
         });
         this.logisticsDialog.logisticsList = result.traces || [];