1、优化商品评论

src/components/order-scan-delivery/index.vue

@@ -243,13 +243,13 @@ export default {
             message: "发货成功",
             type: 'success'
           })
-          if(this.logistics === 'YUNDA' || this.logistics === 'ZTO'){
+          /*if(this.logistics === 'YUNDA' || this.logistics === 'ZTO'){
             if(!data.hadPrint){
               //打印韵达或者中通面单
               this.printOrder = data;
               this.printWallbill(this.printOrder.orderLogistics)
             }
-          }
+          }*/
           this.waitScanNumCheck();
         }else{
           this.$message({

src/views/modules/afterSales/returnDelivery.vue

@@ -207,13 +207,13 @@ export default {
       }
       document.addEventListener('copy', copy)
       document.execCommand('Copy')
-      if (dvyNo === 'STO') {
+      if (dvyNo === 'STO' || deliveryNo.startsWith('77')) {
         window.open('https://www.sto.cn/pc/service-page/iframe_2_21_' + deliveryNo + ',')
-      } else if (dvyNo === 'YTO') {
+      } else if (dvyNo === 'YTO' || deliveryNo.startsWith('YTO')) {
         window.open('https://www.yto.net.cn/tracesimple.html/?orders=' + deliveryNo)
-      } else if (dvyNo === 'ZTO') {
+      } else if (dvyNo === 'ZTO' || deliveryNo.startsWith('78')) {
         window.open('https://www.zto.com/express/expressCheck.html?txtBill=' + deliveryNo)
-      } else if (dvyNo === 'YUNDA') {
+      } else if (dvyNo === 'YUNDA' || deliveryNo.startsWith('31')) {
         window.open('http://ydgw.yundasys.com:31620/view/zxfuwu/sfastgood.html?na_id=136&homeWaybill=' + deliveryNo)
       }else {
         window.open('https://www.baidu.com/s?wd=%E7%89%A9%E6%B5%81%E6%9F%A5%E8%AF%A2&rsv_spt=1&rsv_iqid=0xe1fe334b0008559a&issp=1&f=8&rsv_bp=1&rsv_idx=2&ie=utf-8&tn=baiduhome_pg&rsv_enter=1&rsv_dl=tb&rsv_sug3=16&rsv_sug1=12&rsv_sug7=100&rsv_sug2=0&rsv_btype=i&inputT=2849&rsv_sug4=3141', '_blank')

src/views/modules/print/print-scan-delivery.vue

@@ -188,6 +188,7 @@ export default {
           method: 'POST',
           data: this.$http.adornData(dataBody),
         }).then(({data}) => {
+          debugger
           if(data){
             this.getLogisticsInfo(this.scanOrderNo);
             if(this.logistics === 'YUNDA'){

src/views/modules/prod/prodComm-add-or-update.vue

@@ -46,7 +46,13 @@
         <!-- 评论图片 -->
         <el-form-item :label="this.$i18n.t('productComm.pics')" prop="userName">
           <div v-if="!pics">{{$t("productComm.no")}}</div>
-          <imgs-upload v-model="pics" :disabled="true" :modal="false" :prompt="false" />
+          <span v-for="pic in picUrlArr">
+            <video style="width: 150px;height: 150px" :src="resourcesUrl + pic" v-if="pic.slice(pic.lastIndexOf('.') + 1) !== 'jpg' && pic.slice(pic.lastIndexOf('.') + 1) !== 'png'" controls="controls"></video>
+            <el-image @click="previewPic(pic.indexOf('poster') != -1? resourcesUrl + pic.substring(7, pic.length) : resourcesUrl + pic)" style="margin-left: 20px;width: 150px;height: 150px"
+                      :src="pic.indexOf('poster') != -1? resourcesUrl + pic.substring(7, pic.length) : resourcesUrl + pic"
+                      v-if="pic.slice(pic.lastIndexOf('.') + 1) === 'jpg' || pic.slice(pic.lastIndexOf('.') + 1) === 'png'"></el-image>
+          </span>
+<!--          <imgs-upload v-for="pic in picUrlArr" v-model="pic" :disabled="true" :modal="false" :prompt="false" />-->
         </el-form-item>
         <!-- 是否匿名 -->
         <el-form-item :label="this.$i18n.t('productComm.isAnonymous')" size="mini" prop="isAnonymous">
@@ -73,7 +79,11 @@
       <div class="default-btn" @click="visible = false">{{$t("crud.filter.cancelBtn")}}</div>
       <div class="default-btn primary-btn" v-if="isEdit" @click="dataFormSubmit()">{{$t("crud.filter.submitBtn")}}</div>
     </span>
+    <el-dialog :visible.sync="previewPicDialogVisible" :modal="false" title="图片预览" width="30%" top="3vh">
+      <el-image :src="previewPicUrl" alt=""  style="width: 100%; height: 100%"/>
+    </el-dialog>
   </el-dialog>
+
 </template>
 
 <script>
@@ -89,6 +99,8 @@ export default {
       }
     }
     return {
+      previewPicUrl: null,
+      previewPicDialogVisible: false,
       isEdit: false,
       visible: false,
       dataForm: {
@@ -109,6 +121,7 @@ export default {
         status: 1
       },
       pics: '',
+      picUrlArr: [],
       dataRule: {
         replyContent: [{validator: validateReplyContent}]
       },
@@ -134,6 +147,7 @@ export default {
           }).then(({ data }) => {
             this.dataForm = data
             var imgs = ''
+            this.picUrlArr = this.dataForm.picsArray
             this.dataForm.picsArray.forEach(element => {
               imgs = imgs + element + ','
             })
@@ -164,7 +178,11 @@ export default {
           })
         }
       })
-    }
+    },
+    previewPic(pic){
+      this.previewPicUrl = pic
+      this.previewPicDialogVisible = true;
+    },
   }
 }
 </script>

src/views/modules/shop/feature/create/edit/components/goods/index.vue

@@ -184,7 +184,7 @@
                 <div style="border: 1px solid deepskyblue;margin-bottom: 5px;">
                   <div style="display: inline-flex;">
                     <div style="display: inline-block;margin: 5px;width: 50px;height: 50px;line-height: 50px;text-align: center;">{{index+1}}</div>
-                    <el-image :src="goodsList.find(i => i.prodId === item.prodId).pic" style="width: 50px;height: 50px;margin: 5px 5px 5px 0;"></el-image>
+                    <el-image v-if="goodsList.find(i => i.prodId === item.prodId)" :src="goodsList.find(i => i.prodId === item.prodId).pic" style="width: 50px;height: 50px;margin: 5px 5px 5px 0;"></el-image>
                   </div>
                   <div style="display: inline-block;">
 <!--                    <div style="display: none;">{{item.styleData = new Object()}}</div>-->