From c11353f4d9b7d38ab99e83737372a3260a0ea669 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E4=B8=96=E7=95=8C?= <642747453@qq.com>
Date: Mon, 19 Sep 2022 13:21:36 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20#10000=20=E6=95=B0=E6=8D=AE=E5=8A=A0?=
 =?UTF-8?q?=E8=BD=BD=E6=98=BE=E7=A4=BA=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resources/frontend/src/views/goods/goods.vue | 16 ++++++++++++++--
 resources/frontend/src/views/store/store.vue | 18 ++++++++++++++----
 2 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/resources/frontend/src/views/goods/goods.vue b/resources/frontend/src/views/goods/goods.vue
index 9685931..b0e9084 100644
--- a/resources/frontend/src/views/goods/goods.vue
+++ b/resources/frontend/src/views/goods/goods.vue
@@ -64,7 +64,8 @@
                         <el-button type="primary" plain @click="update()">上新</el-button>
                         <el-upload ref="myUpload" action="/api/inventory/goods_skus" :multiple="false"
                             name="inventoryFile" :show-file-list="false" :on-success="inventorySuccess"
-                            :on-error="inventoryError" style="display:inline-block;margin: 0 10px 0 10px;">
+                            :before-upload="beforeInventory" :on-error="inventoryError"
+                            style="display:inline-block;margin: 0 10px 0 10px;">
                             <el-button type="primary" plain>盘点导入</el-button>
                         </el-upload>
                         <el-button type="primary" plain @click="addNewgoods">新建商品</el-button>
@@ -491,6 +492,7 @@ export default {
             publicId: "", //参考售价 预留量公用id
             reference_price: "", //参考价格修改传参
             reserve: "", //预留量修改传参
+            loadingModule: ""
         };
     },
     methods: {
@@ -907,17 +909,27 @@ export default {
                 this.brand = res.data.data;
             });
         },
+        beforeInventory() {
+            this.loadingModule = this.$loading({
+                lock: true,
+                text: '盘点导入中...',
+                spinner: 'el-icon-loading',
+                background: 'rgba(0, 0, 0, 0.7)'
+            });
+        },
         inventorySuccess(response) {
             this.$message({
                 message: response.message,
                 type: "success",
             });
+            this.loadingModule.close();
         },
         inventoryError(err) {
             this.$message({
-                message: res.errorMessage,
+                message: err.errorMessage,
                 type: "error",
             });
+            this.loadingModule.close();
         }
     },
 
diff --git a/resources/frontend/src/views/store/store.vue b/resources/frontend/src/views/store/store.vue
index 5935023..19451e2 100644
--- a/resources/frontend/src/views/store/store.vue
+++ b/resources/frontend/src/views/store/store.vue
@@ -17,7 +17,7 @@
                         </el-button>
                         <div v-if="scope.row.status === '已授权'">
                             <el-button type="success" :disabled="true">{{
-                                    scope.row.status
+                            scope.row.status
                             }}</el-button>
                             <el-button @click="download(scope.row)">下载商品</el-button>
                         </div>
@@ -30,9 +30,8 @@
 
                         <div v-if="scope.row.status === '无需授权'">
                             <el-button type="success" :disabled="true">{{
-                                    scope.row.status
+                            scope.row.status
                             }}</el-button>
-                            <el-button @click="download(scope.row)">下载商品</el-button>
                         </div>
                     </template>
                 </el-table-column>
@@ -148,8 +147,18 @@ export default {
 
         // 下载商品
         download(row) {
+            const loading = this.$loading({
+                lock: true,
+                text: row.name + ' 店铺商品下载中...',
+                spinner: 'el-icon-loading',
+                background: 'rgba(0, 0, 0, 0.7)'
+            });
             downloadGoods(row.id).then((res) => {
-
+                loading.close();
+                this.$message({
+                    type: "success",
+                    message: res.data.message,
+                });
             });
         },
     },
@@ -161,6 +170,7 @@ a {
     text-decoration: none;
     color: white;
 }
+
 .block {
     margin-top: 20px;
 }