Merge branch 'v3.0' into company

src/config/env.development.js

@@ -10,7 +10,7 @@ module.exports = {
 
     // baseApi: 'http://stockwm.test241.wanyuhengtong.com/'
   },
-  webUrl: 'http://project.web.caixiao365.com/#/test-good-share?id=',
+  webUrl: 'http://project.web.caixiao365.com/#/good-share?id=',
   fileURL: `https://api2.edu.futurelab.tv`,
   shareWebUrl: 'http://post.web.caixiao365.com/?prod=1&outCode=',
   // 分仓
@@ -25,10 +25,10 @@ module.exports = {
   // 结算平台url
   // settlementPlatformUrl: 'http://127.0.0.1:8848',
   // 结算平台url
-  settlementPlatformUrl: 'http://webcx.test241.wanyuhengtong.com/',
+  settlementPlatformUrl: 'http://fin.caixiao365.com/',
   // 工单管理系统url
-  GDUrl: 'http://http://bugweb.test241.wanyuhengtong.com/',
-  dashboardUrl:"http://web.report.caixiao365.com/",
+  GDUrl: 'http://bug.caixiao365.com/',
+  dashboardUrl: 'http://web.report.caixiao365.com/',
   // token加密key
   secretKey: 'key123',
   loginTitle: '',

src/views/goodStore/goodsOnline/detail.vue

@@ -264,9 +264,7 @@
                 :newTime="newTime"
                 v-if="
                   newTime !== '' &&
-                  private_field &&
-                  private_field.length > 0 &&
-                  private_field.some((item) => item == '2') &&
+                  isDisplayPrivateField('2') &&
                   ladderlist &&
                   ladderlist.length > 0
                 "

src/views/sellOut/salesOrder/detail.vue

@@ -107,7 +107,7 @@
                     placement="top"
                     width="300"
                     trigger="hover"
-                    v-if="sitem.proof_type === '1'"
+                    v-if="sitem.proof_type === '1' && sitem.proof_url"
                   >
                     <video width="275" controls class="fl">
                       <source :src="sitem.proof_url" type="video/mp4" />
@@ -121,7 +121,7 @@
                   </el-popover>
 
                   <img
-                    v-else-if="sitem.proof_type + '' === '2'"
+                    v-else-if="sitem.proof_type + '' === '2' && sitem.proof_url"
                     style="width: 28px; height: 28px"
                     :src="sitem.proof_url"
                     class="avatar fl hover"
@@ -129,7 +129,7 @@
                   />
 
                   <a
-                    v-else-if="sitem.proof_type + '' === '3'"
+                    v-else-if="sitem.proof_type + '' === '3' && sitem.proof_url"
                     :href="sitem.proof_url"
                     download="凭证文件"
                   >点击下载</a>