Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop-ui into dev-gl

seller/src/config/index.js

@@ -13,6 +13,6 @@ module.exports = {
    */
   aMapKey: "b440952723253aa9fe483e698057bf7d", //高德web端申请的api key
   website: "https://www.pickmall.cn", //官网地址
-  enableCDN: false, //生产环境 是否启用cdn加载 vue等js
+  enableCDN: true, //生产环境 是否启用cdn加载 vue等js
   port: 10002, //端口
 };

seller/src/libs/routerJson.js

@@ -432,15 +432,15 @@ export const result = [{
             component: "shop/shopSetting",
             children: null,
           },
-          {
-            name: "shopAddress",
-            level: 2,
-            type: 0,
-            title: "自提管理",
-            path: "shopAddress",
-            component: "shop/shopAddress",
-            children: null,
-          }
+          // {
+          //   name: "shopAddress",
+          //   level: 2,
+          //   type: 0,
+          //   title: "自提管理",
+          //   path: "shopAddress",
+          //   component: "shop/shopAddress",
+          //   children: null,
+          // }
         ]
       }
     ]

seller/src/views/goods/goods-seller/goodsOperationSec.vue

@@ -1125,6 +1125,7 @@ export default {
           this.$Message.error("规格值不能大于10个！");
           return;
         }
+
         this.$set(item.spec_values, item.spec_values.length, {
           name: item.name,
           value: "",
@@ -1209,7 +1210,6 @@ export default {
       this.skuTableColumn = pushData;
       //克隆所有渲染的数据
       let cloneTemp = cloneObj(this.skuInfo);
-
       if (cloneTemp[0]) {
         //存放最终结果
         let result = [];
@@ -1353,6 +1353,15 @@ export default {
         });
       }
     },
+    // 判断相同数组的值
+    scalarArrayEquals(array1, array2) {
+      return (
+        array1.length === array2.length &&
+        array1.every(function (v, i) {
+          return v === array2[i];
+        })
+      );
+    },
     /** 自动完成表单所需方法*/
     filterMethod(value, option) {
       return option.toUpperCase().indexOf(value.toUpperCase()) !== -1;