Merge branch 'release/6.9.24' of http://git.yoho.cn/fe/yoho-shop-manage into release/6.9.24

@@ -12,13 +12,7 @@
         <tr :key="index">
           <td>{{ goods.productSku }}</td>
           <td>
-            <img
-              :src="
-                'http://shopmanage.yohobuy.com/platform/product/getRemoteImageUrlBySku?sku_id=' +
-                  goods.productSku +
-                  '&size=40x60'
-              "
-            />
+            <img :src="prodImage({ sku: goods.productSku })" />
           </td>
           <td style="text-align: left">
             <p>{{ goods.productName }}</p>
@@ -73,14 +67,26 @@
       </tr>
       <tr>
         <td colspan="13">
-          <template v-if="orderPromos">
-            <template v-for="(item, index) in orderPromos">
-              <Row :key="index">{{ item.promotionTitle }} {{ item.beginTime }} — {{ item.endTime }}</Row>
-            </template>
-          </template>
-          <template v-else>
-            <span>没有参加活动.</span>
-          </template>
+          <div class="ivu-card">
+            <div class="ivu-card-head" style="text-align: left">
+              <p slot="title">参与促销</p>
+            </div>
+            <div style="text-align: left; padding: 10px;">
+              <template v-if="orderPromos">
+                <template v-for="(item, index) in orderPromos">
+                  <Row :key="index">
+                    {{ item.promotionTitle }}
+                    <span v-if="item.beginTime || item.endTime">
+                      ( 有效期:{{ item.beginTime }} — {{ item.endTime }} )
+                    </span>
+                  </Row>
+                </template>
+              </template>
+              <template v-else>
+                <span>没有参加活动.</span>
+              </template>
+            </div>
+          </div>
         </td>
       </tr>
     </tfoot>
@@ -88,6 +94,7 @@
 </template>
 
 <script>
+import prodImage from 'util/prod-image';
 export default {
   name: 'OrderGoodsInfo',
   props: ['orderInfo', 'tableData', 'couponsData', 'goodsPromos', 'orderPromos'],
@@ -132,6 +139,9 @@ export default {
       ],
     };
   },
+  methods: {
+    prodImage,
+  },
 };
 </script>
 <style lang="scss">

@@ -19,13 +19,7 @@
         <template v-for="(goods, gindex) in item.goodsList">
           <tr :key="tindex + '_' + gindex">
             <td>
-              <img
-                :src="
-                  'http://shopmanage.yohobuy.com/platform/product/getRemoteImageUrlBySku?sku_id=' +
-                    goods.productSku +
-                    '&size=40x60'
-                "
-              />
+              <img :src="prodImage({ sku: goods.productSku })" />
             </td>
             <td style="text-align: left">
               <p>{{ goods.prodcutName }}</p>
@@ -53,6 +47,7 @@
 </template>
 
 <script>
+import prodImage from 'util/prod-image';
 export default {
   name: 'OrderListTable',
   props: {
@@ -93,6 +88,7 @@ export default {
         },
       });
     },
+    prodImage,
   },
 };
 </script>

@@ -19,7 +19,7 @@
       <Row>
         <i-col span="24">邮政编码：{{ orderInfo.zipCode > 0 ? orderInfo.zipCode : '' }}</i-col>
       </Row>
-      <Row>
+      <Row v-if="isShowExpress">
         <i-col span="24">
           物流公司：
           <template v-for="(item, index) in logisticsList">
@@ -27,7 +27,7 @@
           </template>
         </i-col>
       </Row>
-      <Row>
+      <Row v-if="isShowExpress">
         <i-col span="24">运单号：{{ orderInfo.expressNumber > 0 ? orderInfo.expressNumber : '' }} </i-col>
       </Row>
     </div>
@@ -38,7 +38,7 @@ import _ from 'lodash';
 import LogisticsService from 'services/logistics/logistics-service';
 export default {
   name: 'OrderUserInfo',
-  props: ['orderInfo'],
+  props: ['orderInfo', 'isShowExpress'],
   data() {
     return {
       logisticsList: [],

@@ -3,10 +3,10 @@ export default {
   orderStatus: {
     20: '已付订金',
     40: '待付尾款',
-    100: '已审核',
+    100: '待发货',
     200: '备货中',
-    600: '已交寄',
-    700: '订单完成',
+    600: '已发货',
+    700: '交易完成',
     900: '用户取消',
     901: '客服取消',
     906: '超时取消',

@@ -2,7 +2,7 @@
   <div>
     <Row :gutter="16">
       <i-col span="8">
-        <order-user-info :order-info="orderInfo"></order-user-info>
+        <order-user-info :order-info="orderInfo" :is-show-express="false"></order-user-info>
       </i-col>
       <i-col span="8">
         <div class="ivu-card">

@@ -63,7 +63,7 @@ export default {
     this.OrderService = new OrderService();
     this.$emit('nextStep', 2);
     this.getLogisticsList();
-    this.orderInfo.expressNumber = this.orderInfo.expressNumber > 0 ? this.orderInfo.expressNumber : '';
+    this.orderInfo.expressNumber = +this.orderInfo.expressNumber > 0 ? this.orderInfo.expressNumber : '';
   },
 
   methods: {

@@ -15,7 +15,7 @@
       </div>
     </div>
     <order-base-info :order-info="orderInfo" :order-status="orderStatus"></order-base-info>
-    <order-user-info :order-info="orderInfo"></order-user-info>
+    <order-user-info :order-info="orderInfo" :is-show-express="true"></order-user-info>
     <div class="ivu-card">
       <div class="ivu-card-head">
         <p slot="title">商品信息</p>

@@ -19,13 +19,7 @@
         <template v-for="(goods, gindex) in item.goodsList">
           <tr :key="tindex + '_' + gindex">
             <td>
-              <img
-                :src="
-                  'http://shopmanage.yohobuy.com/platform/product/getRemoteImageUrlBySku?sku_id=' +
-                    goods.productSku +
-                    '&size=40x60'
-                "
-              />
+              <img :src="prodImage({ sku: goods.productSku })" />
             </td>
             <td style="text-align: left">
               <p>{{ goods.productName }}</p>
@@ -52,6 +46,7 @@
 </template>
 
 <script>
+import prodImage from 'util/prod-image';
 export default {
   name: 'DataTable',
   props: {
@@ -92,6 +87,7 @@ export default {
         },
       });
     },
+    prodImage,
   },
 };
 </script>

@@ -17,13 +17,7 @@
             <tr :key="index">
               <td>{{ goods.productSku }}</td>
               <td>
-                <img
-                  :src="
-                    'http://shopmanage.yohobuy.com/platform/product/getRemoteImageUrlBySku?sku_id=' +
-                      goods.productSku +
-                      '&size=40x60'
-                  "
-                />
+                <img :src="prodImage({ sku: goods.productSku })" />
               </td>
               <td style="text-align: left">
                 <p>{{ goods.productName }}</p>
@@ -38,9 +32,9 @@
               <td>{{ goods.activityDiscount }}</td>
               <td>{{ returnedReason[goods.returnedReason] }}</td>
             </tr>
-            <tr v-if="goods.mark || goods.imperfectImage" :key="index + '_1'">
+            <tr v-if="goods.remark || goods.imperfectImage" :key="index + '_1'" class="returned-remark">
               <td colspan="14">
-                <span v-if="goods.mark">买家备注：{{ goods.mark }}</span>
+                <span v-if="goods.remark">买家备注：{{ goods.remark }}</span>
                 <Row>
                   <template v-for="(img, imgIndex) in goods.imperfectImage">
                     <img :key="imgIndex" :src="img.imageUrl" />
@@ -56,6 +50,7 @@
 </template>
 
 <script>
+import prodImage from 'util/prod-image';
 export default {
   name: 'ReturnedGoodsInfo',
   props: ['tableData', 'returnedReason'],
@@ -76,6 +71,9 @@ export default {
       ],
     };
   },
+  methods: {
+    prodImage,
+  },
 };
 </script>
 <style lang="scss">
@@ -108,6 +106,16 @@ table.order-detail {
         border-right: 1px solid #cccccc;
       }
     }
+    tr.returned-remark {
+      td {
+        text-align: left;
+        img {
+          width: 60px;
+          margin-left: 10px;
+          margin-top: 10px;
+        }
+      }
+    }
   }
 }
 </style>

@@ -19,13 +19,7 @@
         <template v-for="(goods, key) in item.returnedGoodsListBoArray">
           <tr :key="index + '_' + key">
             <td>
-              <img
-                :src="
-                  'http://shopmanage.yohobuy.com/platform/product/getRemoteImageUrlBySku?sku_id=' +
-                    goods.productSku +
-                    '&size=40x60'
-                "
-              />
+              <img :src="prodImage({ sku: goods.productSku })" />
             </td>
             <td style="text-align: left">
               <p>{{ goods.productName }}</p>
@@ -52,6 +46,7 @@
 </template>
 
 <script>
+import prodImage from 'util/prod-image';
 export default {
   name: 'ReturnedListTable',
   props: ['tableData', 'shopStatus'],
@@ -92,6 +87,7 @@ export default {
         },
       });
     },
+    prodImage,
   },
 };
 </script>

@@ -11,7 +11,7 @@
       </div>
     </div>
     <order-base-info :order-info="orderInfo" :order-status="orderStatus"></order-base-info>
-    <order-user-info :order-info="orderInfo"></order-user-info>
+    <order-user-info :order-info="orderInfo" :is-show-express="true"></order-user-info>
     <div class="ivu-card">
       <div class="ivu-card-head">
         <p slot="title">商品信息</p>

@@ -28,25 +28,24 @@
       </div>
       <div class="ivu-card-body">
         <Row>
-          <i-col span="24">
-            物流公司：
-            <template v-for="(item, index) in logisticsList">
-              <span v-if="item.id == orderInfo.expressId" :key="index">{{ item.companyName }}</span>
-            </template>
-          </i-col>
+          <i-col span="24">物流公司：{{ returnedInfo.expressName }}</i-col>
         </Row>
         <Row>
-          <i-col span="24">运单号：{{ orderInfo.expressNumber }}</i-col>
+          <i-col span="24">运单号：{{ returnedInfo.expressNumber }}</i-col>
         </Row>
       </div>
     </div>
     <div class="ivu-card">
       <div class="ivu-card-body">
-        <p class="red">若您同意退货，待买家寄回后，将退款给买家，若有异议请与平台联系</p>
-        <p class="red">若您未响应申请，视作同意退货</p>
-        <p class="red">若您不同意退货可点击驳回，若买家向平台投诉，如核实是您的责任，将会影响店铺评分</p>
-        <p class="red">-若您同意退款，将直接退款给买家</p>
-        <p class="red">-若您逾期未响应，视作同意退款，系统将自动打款给买家</p>
+        <template v-if="returnedInfo.status === 0">
+          <p class="red">若您同意退货，待买家寄回后，将退款给买家，若有异议请与平台联系</p>
+          <p class="red">若您未响应申请，视作同意退货</p>
+          <p class="red">若您不同意退货可点击驳回，若买家向平台投诉，如核实是您的责任，将会影响店铺评分</p>
+        </template>
+        <template v-if="returnedInfo.status === 10">
+          <p class="red">-若您同意退款，将直接退款给买家</p>
+          <p class="red">-若您逾期未响应，视作同意退款，系统将自动打款给买家</p>
+        </template>
         <br />
         <template v-if="returnedInfo.status === 0">
           <i-button type="info" @click="pass()">同意</i-button>

+function prodImage({ skn, sku, size }) {
+  const baseUrl = '/Api/platform/getRemoteImageUrlBySku';
+  const params = [];
+
+  if (skn) {
+    params.push(`skn_id=${skn}`);
+  }
+
+  if (sku) {
+    params.push(`sku_id=${sku}`);
+  }
+
+  params.push(size ? `size=${size}` : 'size=80x80');
+
+  params.push(`t=${new Date().getTime()}`);
+
+  return `${baseUrl}?${params.join('&')}`;
+}
+
+export default prodImage;

 {
   "name": "yoho-shop-manage",
-  "version": "6.9.24-beta6",
+  "version": "6.9.24-beta10",
   "description": "",
   "main": "app.js",
   "scripts": {

@@ -103,7 +103,7 @@ const domainApis = {
     exportOrdersByStatus: '/erp-gateway-web/shop/export/exportOrdersByStatus', //导出订单列表
 
     //物流接口
-    queryLogisticsList: '/erp-gateway-web/logistics_company/list', //获取物流公司列表
+    queryLogisticsList: '/erp-gateway-web/shop/logistics_company/list', //获取物流公司列表
     proxyOutStorage: '/erp-gateway-web/outStorageV2/proxyOutStorage', //发货
     proxyReturnedGoodsInstorage: '/erp-gateway-web/inStorageV2/proxyReturnedGoodsInstorage',