From 597af1a2100a52e7a9aa0968726df29fa2cdbfdc Mon Sep 17 00:00:00 2001
From: Chopper <liushuai711@gmail.com>
Date: Mon, 21 Jun 2021 14:35:33 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=9D=E5=AD=98json=20excel=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 seller/package.json | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/seller/package.json b/seller/package.json
index dee8c0ed..8ee9e65b 100644
--- a/seller/package.json
+++ b/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",

From 4a6fd431bc6eb7610cb5af684e6050011830a997 Mon Sep 17 00:00:00 2001
From: Chopper <liushuai711@gmail.com>
Date: Mon, 21 Jun 2021 16:03:23 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=89=B9=E6=AE=8A=E6=83=85=E5=86=B5?=
 =?UTF-8?q?=E4=B8=8B=E4=BC=9A=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98=E5=A4=84?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 seller/src/views/goods/goods-seller/goodsOperation.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/seller/src/views/goods/goods-seller/goodsOperation.vue b/seller/src/views/goods/goods-seller/goodsOperation.vue
index 34434bfe..f6bd0ec1 100644
--- a/seller/src/views/goods/goods-seller/goodsOperation.vue
+++ b/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,