合并master

seller/package.json

@@ -29,7 +29,7 @@
     "sockjs-client": "^1.4.0",
     "stompjs": "^2.3.3",
     "swiper": "^6.3.5",
-    "vue-qr": "^2.3.0",
+    "uuid": "^8.3.2",
     "view-design": "^4.2.0",
     "vue": "^2.6.10",
     "vue-awesome": "^4.0.2",
@@ -37,15 +37,16 @@
     "vue-clipboard2": "^0.3.0",
     "vue-cropper": "^0.4.9",
     "vue-i18n": "^8.15.1",
+    "vue-json-excel": "^0.3.0",
     "vue-json-pretty": "^1.4.1",
     "vue-lazyload": "^1.3.3",
+    "vue-qr": "^2.3.0",
     "vue-router": "^3.1.3",
     "vuedraggable": "^2.23.2",
     "vuex": "^3.4.0",
     "wangeditor": "^4.6.13",
     "xlsx": "^0.16.2",
-    "xss": "^1.0.7",
-    "uuid": "^8.3.2"
+    "xss": "^1.0.7"
   },
   "devDependencies": {
     "@vue/cli-plugin-babel": "^4.4.4",

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

@@ -1203,6 +1203,9 @@ export default {
       );
     },
     async GET_SkuSpec() {
+      if(!this.specSelected){
+        return;
+      }
       let specResult = await API_GOODS.getSpecListSellerData({
         pageNumber: 1,
         pageSize: 10,