From 2c32088f4c5b5bf72aa20d0a84a351904fb83c7a Mon Sep 17 00:00:00 2001
From: Yer <17633066053@163.com>
Date: Fri, 15 Sep 2023 19:43:41 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=EF=BC=8C=E6=96=B0=E5=A2=9E=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E8=A7=86=E9=A2=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manager/src/views/goods/goods-info/goodsDetail.vue |  8 ++++++++
 seller/src/views/goods/goods-seller/goods.vue      | 14 ++++++--------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/manager/src/views/goods/goods-info/goodsDetail.vue b/manager/src/views/goods/goods-info/goodsDetail.vue
index 4eb3dcff..7446b5ab 100644
--- a/manager/src/views/goods/goods-info/goodsDetail.vue
+++ b/manager/src/views/goods/goods-info/goodsDetail.vue
@@ -72,6 +72,14 @@
                 </Modal>
               </div>
             </FormItem>
+            <FormItem label="商品视频">
+              <video
+                v-if="goods.goodsVideo"
+                controls
+                class="player"
+                :src="goods.goodsVideo"
+              />
+            </FormItem>
             <FormItem label="商品规格">
               <Table :columns="skuColumn" :data="skuData">
                 <template slot="showImage" slot-scope="scope">
diff --git a/seller/src/views/goods/goods-seller/goods.vue b/seller/src/views/goods/goods-seller/goods.vue
index b1871120..e9e62444 100644
--- a/seller/src/views/goods/goods-seller/goods.vue
+++ b/seller/src/views/goods/goods-seller/goods.vue
@@ -199,6 +199,7 @@
             <Icon type="ios-cloud-upload" size="102" style="color: #3399ff"></Icon>
             <h2>选择或拖拽文件上传</h2>
           </div>
+          <Spin fix v-if="spinShow"></Spin>
         </Upload>
         <Button @click="exportGoods" type="text" style="color: red">下载导入模板</Button>
       </div>
@@ -222,13 +223,14 @@ import {
 } from "@/api/goods";
 import { baseUrl } from "@/libs/axios.js";
 import * as API_Shop from "@/api/shops";
-import Cookies from "js-cookie";
+
 import {uploadGoodsExcel} from "../../../api/goods";
 
 export default {
   name: "goods",
   data() {
     return {
+      spinShow:false,
       accessToken: {}, // 验证token
       importModal: false,
       action: baseUrl + "/goods/import/import", // 上传接口
@@ -546,15 +548,11 @@ export default {
     async upload() {
       let fd = new FormData();
       fd.append("files", this.file);
+      this.spinShow = false
       let res = await uploadGoodsExcel(fd);
       if (res.success) {
-        this.stepList.map((item) => {
-          item.checked = false;
-          this.$Message.success("导入成功")
-          this.importModal = false
-        });
-
-        this.stepList[2].checked = true;
+        this.spinShow = true
+        this.$Message.success("导入成功")
       }
     },
     openImportGoods(){