Merge branch 'sit'

src/common/echart/index.vue

@@ -49,7 +49,7 @@ export default {
   mounted () {
     console.log(this.$route.name == "newDatavScr")
 
-    //由于现在开发新的数据大屏、主题冲突了，暂时判断一下路由来源、作为主题切换
+    //由于现在开发新的数据大屏、主题冲突了，暂时判断以下路由来源、作为主题切换
     if(this.$route.name == "newDatavScr"){
       this.$echarts.registerTheme('tdTheme', themeCopy); // 修改默认主题
 

src/views/goodStore/dealGoodsPool/addEdit.vue

@@ -302,7 +302,7 @@ export default {
               });
               htmlList += "</ul>";
               this.$notify({
-                title: "一下商品已上线或已经在审批流程中！",
+                title: "以下商品已上线或已经在审批流程中！",
                 dangerouslyUseHTMLString: true,
                 message: htmlList,
               });

src/views/goodStore/goodsCost/components/addEdit.vue

@@ -296,7 +296,7 @@ export default {
               });
               htmlList += "</ul>";
               this.$notify({
-                title: "一下商品已上线或已经在审批流程中！",
+                title: "以下商品已上线或已经在审批流程中！",
                 dangerouslyUseHTMLString: true,
                 message: htmlList,
               });

src/views/standingBook/components/detail16/main.vue

@@ -36,104 +36,66 @@
       </template>
 
       <template slot="coop_state">
-        <span>{{ sitem.coop_state }}</span>
-        <!-- <span
+        <span
           v-text="
-            (
-              coop_stateoptions.find(
-                (item) => item.value == sitem.coop_state
-              ) || {}
-            ).label || '--'
+            (coop_stateoptions.find((item) => item.value == sitem.coop_state) || {})
+              .label || '--'
           "
-        ></span> -->
+        ></span>
       </template>
 
       <template slot="source">
-        <span>{{ sitem.source }}</span>
-
-        <!-- <span
+        <span
           v-text="
-            (
-              sourceoptions.find(
-                (item) => item.value == sitem.source
-              ) || {}
-            ).label || '--'
+            (sourceoptions.find((item) => item.value == sitem.source) || {}).label || '--'
           "
-        ></span> -->
+        ></span>
       </template>
       <template slot="type">
-        <span>{{ sitem.type }}</span>
-
-        <!-- <span
+        <span
           v-text="
-            (
-              typeoptions.find(
-                (item) => item.value == sitem.type
-              ) || {}
-            ).label || '--'
+            (typeoptions.find((item) => item.value == sitem.type) || {}).label || '--'
           "
-        ></span> -->
+        ></span>
       </template>
       <template slot="category">
-        <span>{{ sitem.category }}</span>
-
-        <!-- <span
+        <span
           v-text="
-            (
-              categoryoptions.find(
-                (item) => item.value == sitem.category
-              ) || {}
-            ).label || '--'
+            (categoryoptions.find((item) => item.value == sitem.category) || {}).label ||
+            '--'
           "
-        ></span> -->
+        ></span>
       </template>
       <template slot="delivery_way">
-        <span>{{ sitem.delivery_way }}</span>
-        <!-- <span
+        <span
           v-text="
-            (
-              delivery_wayoptions.find(
-                (item) => item.value == sitem.delivery_way
-              ) || {}
-            ).label || '--'
+            (delivery_wayoptions.find((item) => item.value == sitem.delivery_way) || {})
+              .label || '--'
           "
-        ></span> -->
+        ></span>
       </template>
       <template slot="supplier_type">
-        <span>{{ sitem.supplier_type }}</span>
-        <!-- <span
+        <span
           v-text="
-            (
-              supplier_typeoptions.find(
-                (item) => item.value == sitem.supplier_type
-              ) || {}
-            ).label || '--'
+            (supplier_typeoptions.find((item) => item.value == sitem.supplier_type) || {})
+              .label || '--'
           "
-        ></span> -->
+        ></span>
       </template>
       <template slot="level">
-        <span>{{ sitem.level }}</span>
-        <!-- <span
+        <span
           v-text="
-            (
-              leveloptions.find(
-                (item) => item.value == sitem.level
-              ) || {}
-            ).label || '--'
+            (leveloptions.find((item) => item.value == sitem.level) || {}).label || '--'
           "
-        ></span> -->
+        ></span>
       </template>
       <template slot="pay_type">
-        <span>{{ sitem.pay_type }}</span>
-        <!-- <span
+        <span
           v-text="
-            (
-              pay_typeoptions.find(
-                (item) => item.value == sitem.pay_type
-              ) || {}
-            ).label || '--'
+            (pay_typeoptions.find((item) => item.value == sitem.pay_type) || {}).label ||
+            '--'
           "
-        ></span> -->
+        ></span>
       </template>
 
       <template slot="supplier_img">