From 6b61b86585198414856d4d461366cc3fadcd1cbe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=94=B0=E9=A6=99=E7=90=AA?= <624506849@qq.com>
Date: Tue, 7 Jul 2026 19:50:07 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E4=B8=8E=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=20-=20=E5=9C=A8=E5=A4=9A=E4=B8=AA=E7=BB=84=E4=BB=B6=E4=B8=AD?=
 =?UTF-8?q?=E5=B0=86=20require=20=E6=9B=BF=E6=8D=A2=E4=B8=BA=20import?=
 =?UTF-8?q?=EF=BC=8C=E6=8F=90=E5=8D=87=E4=BB=A3=E7=A0=81=E5=8F=AF=E8=AF=BB?=
 =?UTF-8?q?=E6=80=A7=E5=92=8C=E4=B8=80=E8=87=B4=E6=80=A7=E3=80=82=20-=20?=
 =?UTF-8?q?=E5=9C=A8=20App.vue=20=E4=B8=AD=E6=B7=BB=E5=8A=A0=E5=88=86?=
 =?UTF-8?q?=E7=B1=BB=E6=A0=91=E7=9A=84=20API=20=E8=AF=B7=E6=B1=82=EF=BC=8C?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=88=86=E7=B1=BB=E6=95=B0=E6=8D=AE=E7=9A=84?=
 =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E9=80=BB=E8=BE=91=E3=80=82=20-=20=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E6=A0=B7=E5=BC=8F=E4=BB=A5=E9=80=82=E9=85=8D=20Elemen?=
 =?UTF-8?q?t=20Plus=20=E7=BB=84=E4=BB=B6=EF=BC=8C=E7=A1=AE=E4=BF=9D?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E4=B8=80=E8=87=B4=E6=80=A7=E3=80=82=20-=20?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=B8=8D=E5=86=8D=E4=BD=BF=E7=94=A8=E7=9A=84?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E6=96=87=E4=BB=B6=EF=BC=8C=E7=AE=80=E5=8C=96?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=BB=93=E6=9E=84=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 seller/src/App.vue                            |   8 +
 seller/src/libs/util.js                       |   3 +-
 seller/src/main.js                            |   9 +-
 seller/src/router/router.js                   |   3 +-
 seller/src/store/modules/setting.js           |   4 +-
 seller/src/styles/table-common.scss           |   6 -
 seller/src/views/ForgetPassword.vue           |   5 +-
 seller/src/views/Main.vue                     |   4 +-
 .../change-password/change-password.scss      |  19 -
 .../views/change-password/change-password.vue |  44 +-
 .../views/goods/goods-seller/addGoods.scss    |   8 +-
 .../goods-seller/goodsOperationFirst.vue      |   6 +-
 .../goods/goods-seller/goodsOperationSec.vue  |  27 +-
 seller/src/views/home/home.vue                |   4 +-
 .../views/lili-components/editor/plugins.js   |   2 +-
 .../views/lili-dialog/template/category.vue   |  54 +-
 .../src/views/lili-dialog/template/index.js   |   2 +
 .../src/views/lili-dialog/template/shops.vue  |   2 +-
 seller/src/views/main-components/footer.vue   |   2 +-
 seller/src/views/main-components/header.vue   |   3 +-
 seller/src/views/main.scss                    |  11 -
 seller/src/views/my-components/map/index.vue  |   3 +-
 .../my-components/tree-table/Table/Table.vue  |   7 +-
 .../after-order/reurnGoodsOrderDetail.vue     |   9 +-
 .../views/order/order/exportOrderDeliver.vue  |   9 +-
 .../views/promotion/coupon/coupon-publish.vue |   2 +-
 seller/src/views/promotion/live/addLive.vue   |   2 +-
 .../views/shop/hotzone/components/Zone.vue    |   2 +-
 seller/src/views/shop/hotzone/index.js        |   8 +-
 seller/src/views/shop/modelConfig.js          | 257 ++++----
 seller/src/views/shop/modelForm.vue           |   4 +-
 seller/src/views/shop/modelFormItem.vue       |   4 +-
 .../views/shop/modelList/mixs/mix-brand.vue   |   1 -
 .../src/views/shop/modelList/setup-box.scss   |   1 -
 seller/src/views/shop/ossManage.scss          |   4 +-
 seller/src/views/shop/ossManage.vue           | 251 +-------
 seller/src/views/shop/ossManages.vue          | 251 +-------
 seller/src/views/shop/wap/decorate.vue        |  12 +-
 .../views/statistics/order/orderDetail.vue    |  12 +-
 .../views/statistics/order/refundOrder.vue    |  12 +-
 .../src/views/sys/oss-manage/ossManage.scss   |   4 +-
 seller/src/views/sys/oss-manage/ossManage.vue | 597 +-----------------
 42 files changed, 303 insertions(+), 1375 deletions(-)
 delete mode 100644 seller/src/views/change-password/change-password.scss

diff --git a/seller/src/App.vue b/seller/src/App.vue
index b58e73c8..a73b614f 100644
--- a/seller/src/App.vue
+++ b/seller/src/App.vue
@@ -7,6 +7,7 @@
 <script>
 import Cookies from "js-cookie";
 import util from "@/libs/util";
+import { getCategoryTree } from "@/api/goods.js";
 
 export default {
   name: "App",
@@ -18,6 +19,13 @@ export default {
       util.initRouter(this);
       this.$store.commit("setOpenedList");
       this.$store.commit("initCachepage");
+      if (!localStorage.getItem("category")) {
+        getCategoryTree().then((res) => {
+          if (res.success && Array.isArray(res.result)) {
+            localStorage.setItem("category", JSON.stringify(res.result));
+          }
+        });
+      }
     }
   },
 };
diff --git a/seller/src/libs/util.js b/seller/src/libs/util.js
index 9a33fbd6..2c9854bf 100644
--- a/seller/src/libs/util.js
+++ b/seller/src/libs/util.js
@@ -2,8 +2,7 @@ import { getCurrentPermissionList } from "@/api/index";
 import lazyLoading from "./lazyLoading.js";
 import { router } from "@/router/index";
 import Cookies from "js-cookie";
-
-const config = require("@/config/index");
+import config from "@/config/index";
 
 let util = {};
 
diff --git a/seller/src/main.js b/seller/src/main.js
index 902615fd..a536c18e 100644
--- a/seller/src/main.js
+++ b/seller/src/main.js
@@ -22,8 +22,11 @@ import { setStore, getStore, removeStore } from "@/libs/storage";
 import util from "@/libs/util";
 import { md5 } from "@/utils/md5.js";
 import * as filters from "@/utils/filters";
+import config from "@/config/index";
+import imgError from "./assets/img-error.png";
+import loadingGif from "./assets/loading2.gif";
 
-const { aMapSecurityJsCode, mainColor } = require("@/config");
+const { aMapSecurityJsCode, mainColor } = config;
 
 if (aMapSecurityJsCode) {
   window._AMapSecurityConfig = {
@@ -43,8 +46,8 @@ setupLegacyMessage(app);
 installVueQr(app);
 
 app.use(VueLazyload, {
-  error: require("./assets/img-error.png"),
-  loading: require("./assets/loading2.gif"),
+  error: imgError,
+  loading: loadingGif,
 });
 
 app.use(router);
diff --git a/seller/src/router/router.js b/seller/src/router/router.js
index 5c65a986..95f8e829 100644
--- a/seller/src/router/router.js
+++ b/seller/src/router/router.js
@@ -1,6 +1,5 @@
 import Main from "@/views/Main.vue";
-
-const config = require('@/config/index')
+import config from "@/config/index";
 // 不作为Main组件的子页面展示的页面单独写，如下
 export const loginRouter = {
   path: "/login",
diff --git a/seller/src/store/modules/setting.js b/seller/src/store/modules/setting.js
index da09484d..b7b1ac2f 100644
--- a/seller/src/store/modules/setting.js
+++ b/seller/src/store/modules/setting.js
@@ -1,4 +1,6 @@
-const { setting } = require("@/config");
+import config from "@/config/index";
+
+const { setting } = config;
 
 const localSetting = window.localStorage.getItem('setting')
 const settingData = {
diff --git a/seller/src/styles/table-common.scss b/seller/src/styles/table-common.scss
index 4f670ed8..4383349c 100644
--- a/seller/src/styles/table-common.scss
+++ b/seller/src/styles/table-common.scss
@@ -19,7 +19,6 @@
   border-radius: 0.4em;
   flex-wrap: wrap;
 
-  > .ivu-form-item,
   > .el-form-item {
     margin: 8px 10px !important;
   }
@@ -44,8 +43,3 @@
 .search > .el-card + .el-card {
   margin-top: 10px;
 }
-
-// 兼容遗留 iView
-.ivu-card + .ivu-card {
-  margin-top: 10px;
-}
diff --git a/seller/src/views/ForgetPassword.vue b/seller/src/views/ForgetPassword.vue
index cd4447e0..197e0771 100644
--- a/seller/src/views/ForgetPassword.vue
+++ b/seller/src/views/ForgetPassword.vue
@@ -120,6 +120,7 @@ import { Iphone, Message, Lock } from "@element-plus/icons-vue";
 import * as RegExp from "@/utils/regular.js";
 import * as apiLogin from "@/api/index.js";
 import { sendSms } from "@/api/common.js";
+import config from "@/config/index";
 import verify from "@/views/my-components/verify";
 
 export default {
@@ -127,7 +128,7 @@ export default {
   components: { verify, Iphone, Message, Lock },
   data() {
     return {
-      config: require("@/config"),
+      config,
       loading: false,
       loading1: false,
       formFirst: {
@@ -207,7 +208,7 @@ export default {
               }
             })
             .catch(() => {
-              this.loading = false;
+              this.loading1 = false;
             });
         }
       });
diff --git a/seller/src/views/Main.vue b/seller/src/views/Main.vue
index 95115619..fe987a5f 100644
--- a/seller/src/views/Main.vue
+++ b/seller/src/views/Main.vue
@@ -16,7 +16,6 @@
           <div></div>
           <div class="user-dropdown-menu-con">
             <el-row
-              type="flex"
               justify="end"
               align="middle"
               class="user-dropdown-innercon"
@@ -90,8 +89,7 @@ import util from "@/libs/util.js";
 import { logout } from "@/api/index";
 import { getIMDetail } from "@/api/common";
 import { userMsg } from "@/api/index";
-
-const config = require("@/config/index.js");
+import config from "@/config/index.js";
 
 export default {
   components: {
diff --git a/seller/src/views/change-password/change-password.scss b/seller/src/views/change-password/change-password.scss
deleted file mode 100644
index 96f74fcc..00000000
--- a/seller/src/views/change-password/change-password.scss
+++ /dev/null
@@ -1,19 +0,0 @@
-.change-pass {
-    &-btn-box {
-        margin-bottom: 10px;
-
-        button {
-            padding-left: 0;
-
-            span {
-                color: #2D8CF0;
-                transition: all .2s;
-            }
-
-            span:hover {
-                color: #0C25F1;
-                transition: all .2s;
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/seller/src/views/change-password/change-password.vue b/seller/src/views/change-password/change-password.vue
index 24ca7f69..1919afed 100644
--- a/seller/src/views/change-password/change-password.vue
+++ b/seller/src/views/change-password/change-password.vue
@@ -93,19 +93,21 @@ export default {
       this.$refs.editPasswordForm.validate((valid) => {
         if (!valid) return;
         this.savePassLoading = true;
-        changePass(params).then((res) => {
-          this.savePassLoading = false;
-          if (res.success) {
-            ElMessageBox.alert("修改密码成功，需重新登录", "修改密码成功", {
-              confirmButtonText: "确定",
-              callback: () => {
+        changePass(params)
+          .then((res) => {
+            if (res?.success) {
+              ElMessageBox.alert("修改密码成功，需重新登录", "修改密码成功", {
+                confirmButtonText: "确定",
+              }).then(() => {
                 this.$store.commit("logout", this);
                 this.$store.commit("clearOpenedSubmenu");
                 this.$router.push({ name: "login" });
-              },
-            });
-          }
-        });
+              });
+            }
+          })
+          .finally(() => {
+            this.savePassLoading = false;
+          });
       });
     },
     cancelEditPass() {
@@ -120,25 +122,3 @@ export default {
   },
 };
 </script>
-
-<style lang="scss" scoped>
-.change-pass {
-  &-btn-box {
-    margin-bottom: 10px;
-
-    button {
-      padding-left: 0;
-
-      span {
-        color: #2d8cf0;
-        transition: all 0.2s;
-      }
-
-      span:hover {
-        color: #0c25f1;
-        transition: all 0.2s;
-      }
-    }
-  }
-}
-</style>
diff --git a/seller/src/views/goods/goods-seller/addGoods.scss b/seller/src/views/goods/goods-seller/addGoods.scss
index 4f527987..7a937f0c 100644
--- a/seller/src/views/goods/goods-seller/addGoods.scss
+++ b/seller/src/views/goods/goods-seller/addGoods.scss
@@ -94,7 +94,7 @@
     width: 100%;
   }
 
-  >.ivu-form {
+  >.el-form {
     flex-wrap: wrap !important;
   }
 
@@ -175,11 +175,11 @@ div.base-info-item {
         justify-content: flex-start;
         width: 100%;
 
-        >.ivu-card-body {
+        >.el-card__body {
           width: 100%;
         }
 
-        .ivu-card-body {
+        .el-card__body {
           width: 100%;
           justify-content: center;
           align-items: flex-start;
@@ -344,7 +344,7 @@ div.base-info-item {
   text-align: center;
   z-index: 999;
 
-  >.ivu-btn {
+  >.el-button {
     margin: 0 10px;
   }
 }
diff --git a/seller/src/views/goods/goods-seller/goodsOperationFirst.vue b/seller/src/views/goods/goods-seller/goodsOperationFirst.vue
index 96128aa8..b4f620e6 100644
--- a/seller/src/views/goods/goods-seller/goodsOperationFirst.vue
+++ b/seller/src/views/goods/goods-seller/goodsOperationFirst.vue
@@ -78,6 +78,8 @@
 </template>
 <script>
 import * as API_GOODS from "@/api/goods";
+import goodsType1Img from "@/assets/goodsType1.png";
+import goodsType2Img from "@/assets/goodsType2.png";
 export default {
   data() {
     return {
@@ -85,14 +87,14 @@ export default {
       goodsTypeWay: [
         {
           title: "实物商品",
-          img: require("@/assets/goodsType1.png"),
+          img: goodsType1Img,
           desc: "零售批发，物流配送",
           type: "PHYSICAL_GOODS",
           check: false,
         },
         {
           title: "虚拟商品",
-          img: require("@/assets/goodsType2.png"),
+          img: goodsType2Img,
           desc: "虚拟核验，无需物流",
           type: "VIRTUAL_GOODS",
           check: false,
diff --git a/seller/src/views/goods/goods-seller/goodsOperationSec.vue b/seller/src/views/goods/goods-seller/goodsOperationSec.vue
index c6eaffd4..62262d35 100644
--- a/seller/src/views/goods/goods-seller/goodsOperationSec.vue
+++ b/seller/src/views/goods/goods-seller/goodsOperationSec.vue
@@ -10,10 +10,10 @@
           <div class="form-item-view">
             <el-form-item label="商品分类">
               <span class="goods-category-name">{{
-                this.baseInfoForm.categoryName[0]
+                baseInfoForm.categoryName[0]
                 }}</span>
-              <span> &gt; {{ this.baseInfoForm.categoryName[1] }}</span>
-              <span> &gt; {{ this.baseInfoForm.categoryName[2] }}</span>
+              <span> &gt; {{ baseInfoForm.categoryName[1] }}</span>
+              <span> &gt; {{ baseInfoForm.categoryName[2] }}</span>
             </el-form-item>
             <el-form-item label="商品名称" prop="goodsName">
               <el-input v-model="baseInfoForm.goodsName" clearable placeholder="商品名称" style="width: 260px" type="text" />
@@ -190,7 +190,7 @@
                 <el-collapse-item title="自定义规格项" name="1">
                     <div>
                       <div v-for="(item, $index) in skuInfo" :key="$index" class="sku-item-content">
-                        <el-card class="ivu-card-body">
+                        <el-card>
                           <template #header>
                             <el-button link type="danger" @click="handleCloseSkuItem($index, item)">删除规格项</el-button>
                           </template>
@@ -478,7 +478,7 @@
       <div class="footer-btns">
         <el-button type="primary" @click="pre">上一步</el-button>
         <el-button :loading="submitLoading" type="primary" @click="save">
-          {{ this.$route.query.id ? "保存" : "保存商品" }}
+          {{ $route.query.id ? "保存" : "保存商品" }}
         </el-button>
       </div>
     </div>
@@ -1310,7 +1310,12 @@ export default {
       this.params_panel = [];
       API_GOODS.getCategoryParamsListDataSeller(this.categoryId).then(
         (response) => {
-          if (!response || response.length <= 0) {
+          const list = Array.isArray(response)
+            ? response
+            : Array.isArray(response?.result)
+              ? response.result
+              : [];
+          if (!list.length) {
             return;
           }
 
@@ -1355,15 +1360,15 @@ export default {
             return undefined;
           };
 
-          const isGrouped = response[0] && Array.isArray(response[0].params);
+          const isGrouped = list[0] && Array.isArray(list[0].params);
           const flatParams = isGrouped
-            ? response.reduce((acc, g) => {
+            ? list.reduce((acc, g) => {
               if (g && Array.isArray(g.params)) {
                 acc.push(...g.params);
               }
               return acc;
             }, [])
-            : response;
+            : list;
 
           this.goodsParams = flatParams
             .map((p) => {
@@ -1547,7 +1552,7 @@ export default {
         }
       } else if (val._error) {
         // 清除错误
-        this.$delete(val, '_error');
+        delete val._error;
         if (this.skuInfo[groupIndex]) {
           this.skuInfo[groupIndex].spec_values = this.skuInfo[groupIndex].spec_values.filter((i) => i.value !== "");
         }
@@ -2316,7 +2321,7 @@ export default {
 </style>
 
 <style scoped>
-.ivu-select .ivu-select-dropdown {
+.el-select .el-select-dropdown {
   overflow: hidden !important;
 }
 
diff --git a/seller/src/views/home/home.vue b/seller/src/views/home/home.vue
index f43f0506..27011006 100644
--- a/seller/src/views/home/home.vue
+++ b/seller/src/views/home/home.vue
@@ -10,7 +10,7 @@
             <h4>Hi,<span style="margin-left: 5px">{{ userData.nickName }}</span></h4>
             <img
               class="shop-logo"
-              :src="userData.storeLogo || require('@/assets/logo1.png')"
+              :src="userData.storeLogo || defaultLogo"
               alt=""
             />
           </div>
@@ -199,6 +199,7 @@
 </template>
 
 <script>
+import defaultLogo from "@/assets/logo1.png";
 import { Picture, CreditCard, List, User } from "@element-plus/icons-vue";
 import { getSellerHomeData, getHomeNotice } from "@/api/index";
 import { getIMDetail } from "@/api/common";
@@ -216,6 +217,7 @@ export default {
   },
   data() {
     return {
+      defaultLogo,
       noticeFlage: false,
       homeData: {},
       userData: "",
diff --git a/seller/src/views/lili-components/editor/plugins.js b/seller/src/views/lili-components/editor/plugins.js
index d3b259ad..9639e0fc 100644
--- a/seller/src/views/lili-components/editor/plugins.js
+++ b/seller/src/views/lili-components/editor/plugins.js
@@ -1,4 +1,4 @@
 const plugins = [
-  'advlist', 'anchor', 'autolink', 'autosave', 'code', 'codesample', 'directionality', 'emoticons', 'fullscreen', 'image', 'importcss', 'insertdatetime', 'link', 'lists', 'media', 'nonbreaking', 'pagebreak', 'preview', 'save', 'searchreplace', 'table', 'template', 'visualblocks', 'visualchars', 'wordcount'
+  'advlist', 'anchor', 'autolink', 'autosave', 'charmap', 'code', 'codesample', 'directionality', 'emoticons', 'fullscreen', 'image', 'importcss', 'insertdatetime', 'link', 'lists', 'media', 'nonbreaking', 'pagebreak', 'preview', 'save', 'searchreplace', 'table', 'template', 'visualblocks', 'visualchars', 'wordcount'
 ]
 export default plugins
diff --git a/seller/src/views/lili-dialog/template/category.vue b/seller/src/views/lili-dialog/template/category.vue
index 9fa076cf..fa6ff7e7 100644
--- a/seller/src/views/lili-dialog/template/category.vue
+++ b/seller/src/views/lili-dialog/template/category.vue
@@ -23,6 +23,7 @@
 
 </template>
 <script>
+import { getCategoryTree } from "@/api/goods.js";
 
 export default {
   data() {
@@ -40,10 +41,32 @@ export default {
     this.init();
   },
   methods: {
+    loadCategoryFromCache() {
+      try {
+        const raw = localStorage.getItem("category");
+        if (!raw) {
+          return null;
+        }
+        const parsed = JSON.parse(raw);
+        return Array.isArray(parsed) ? parsed : null;
+      } catch {
+        return null;
+      }
+    },
+    applyCategoryList(category) {
+      if (!Array.isArray(category)) {
+        this.categoryList = [];
+        return;
+      }
+      category.forEach((item) => {
+        item.___type = "category";
+      });
+      this.categoryList = category;
+    },
     // 点击一级
     handleClickChild(item, index) {
       this.parentIndex = index;
-      this.secondLevel = item.children;
+      this.secondLevel = item.children || [];
       item.___type = "category";
       item.allId = item.id;
 
@@ -51,8 +74,6 @@ export default {
       this.thirdIndex = '';
       this.thirdLevel = []
       this.$emit("selected", [item]);
-      // 点击第一级的时候默认显示第二级第一个
-      // this.handleClickSecondChild(item.children, 0);
     },
     // 点击二级
     handleClickSecondChild(second, index) {
@@ -60,10 +81,9 @@ export default {
       second.allId = `${second.parentId},${second.id}`
 
       this.secondIndex = index;
-      this.thirdLevel = second.children;
+      this.thirdLevel = second.children || [];
       this.thirdIndex = '';
       this.$emit("selected", [second]);
-      // this.handleClickthirdChild(second.children[0], 0);
     },
     // 点击三级
     handleClickthirdChild(item, index) {
@@ -73,21 +93,17 @@ export default {
       this.thirdIndex = index;
     },
     init() {
-      const loadCategory = () => {
-        const category = JSON.parse(localStorage.getItem("category"));
-        if (!Array.isArray(category)) {
-          return;
-        }
-        category.forEach((item) => {
-          item.___type = "category";
-        });
-        this.categoryList = category;
-      };
-
-      loadCategory();
-      if (!this.categoryList.length) {
-        setTimeout(loadCategory, 3000);
+      const cached = this.loadCategoryFromCache();
+      if (cached) {
+        this.applyCategoryList(cached);
+        return;
       }
+      getCategoryTree().then((res) => {
+        if (res.success && Array.isArray(res.result)) {
+          localStorage.setItem("category", JSON.stringify(res.result));
+          this.applyCategoryList(res.result);
+        }
+      });
     },
   },
 };
diff --git a/seller/src/views/lili-dialog/template/index.js b/seller/src/views/lili-dialog/template/index.js
index 92796028..61c1ae76 100644
--- a/seller/src/views/lili-dialog/template/index.js
+++ b/seller/src/views/lili-dialog/template/index.js
@@ -3,10 +3,12 @@ import category from "./category.vue";
 import pages from "./pages.vue";
 import goods from "../goods-dialog.vue";
 import other from "./other.vue";
+import shops from "./shops.vue";
 
 export default {
   category: markRaw(category),
   goods: markRaw(goods),
   other: markRaw(other),
   pages: markRaw(pages),
+  shops: markRaw(shops),
 };
diff --git a/seller/src/views/lili-dialog/template/shops.vue b/seller/src/views/lili-dialog/template/shops.vue
index 09d976ab..75c6e6a8 100644
--- a/seller/src/views/lili-dialog/template/shops.vue
+++ b/seller/src/views/lili-dialog/template/shops.vue
@@ -44,12 +44,12 @@
           </div>
         </div>
         <el-pagination
+          v-model:current-page="params.pageNumber"
           class="pageration"
           size="small"
           layout="total, prev, pager, next, jumper"
           :total="total"
           :page-size="params.pageSize"
-          :current-page="params.pageNumber"
           @current-change="changePageSize"
         />
       </div>
diff --git a/seller/src/views/main-components/footer.vue b/seller/src/views/main-components/footer.vue
index acd3b2e4..eeed92b4 100644
--- a/seller/src/views/main-components/footer.vue
+++ b/seller/src/views/main-components/footer.vue
@@ -19,7 +19,7 @@
 </template>
 
 <script>
-const config = require("@/config/index");
+import config from "@/config/index";
 export default {
   data() {
     return {
diff --git a/seller/src/views/main-components/header.vue b/seller/src/views/main-components/header.vue
index e931d795..9bc5689e 100644
--- a/seller/src/views/main-components/header.vue
+++ b/seller/src/views/main-components/header.vue
@@ -7,12 +7,13 @@
 </template>
 
 <script>
+import defaultLogo from "@/assets/logo.png";
 import { getBaseSite } from "@/api/common.js";
 
 export default {
   data() {
     return {
-      storeSideLogo: require("@/assets/logo.png"),
+      storeSideLogo: defaultLogo,
     };
   },
   methods: {
diff --git a/seller/src/views/main.scss b/seller/src/views/main.scss
index 8e8446e6..bdc40606 100644
--- a/seller/src/views/main.scss
+++ b/seller/src/views/main.scss
@@ -157,17 +157,6 @@
       height: 100%;
 
 
-      .options {
-        .ivu-select-dropdown {
-          transform-origin: center top 0px;
-          position: absolute;
-          top: 45px !important;
-          left: -2px;
-          will-change: top, left;
-        }
-      }
-
-
       .message-con {
         display: inline-block;
 
diff --git a/seller/src/views/my-components/map/index.vue b/seller/src/views/my-components/map/index.vue
index 4838c570..c0c068c9 100644
--- a/seller/src/views/my-components/map/index.vue
+++ b/seller/src/views/my-components/map/index.vue
@@ -20,8 +20,7 @@
 <script>
 import AMapLoader from "@amap/amap-jsapi-loader";
 import { getRegion } from "@/api/common.js";
-
-const config = require("@/config/index");
+import config from "@/config/index";
 export default {
   name: "map",
   data() {
diff --git a/seller/src/views/my-components/tree-table/Table/Table.vue b/seller/src/views/my-components/tree-table/Table/Table.vue
index 8fd408e0..8b5c6e55 100644
--- a/seller/src/views/my-components/tree-table/Table/Table.vue
+++ b/seller/src/views/my-components/tree-table/Table/Table.vue
@@ -214,11 +214,8 @@ export default {
       default: () => []
     },
     size: {
-      default() {
-        return !this.$IVIEW || this.$IVIEW.size === ""
-          ? "default"
-          : this.$IVIEW.size;
-      }
+      type: String,
+      default: "default",
     },
     loading: {
       type: Boolean,
diff --git a/seller/src/views/order/after-order/reurnGoodsOrderDetail.vue b/seller/src/views/order/after-order/reurnGoodsOrderDetail.vue
index 3175656a..65c432b3 100644
--- a/seller/src/views/order/after-order/reurnGoodsOrderDetail.vue
+++ b/seller/src/views/order/after-order/reurnGoodsOrderDetail.vue
@@ -350,12 +350,8 @@
 
 <script>
 import * as API_Order from "@/api/order";
-import vueQr from "vue-qr";
 export default {
-  components: {
-    "vue-qr": vueQr,
-  },
-  name: "orderDetail",
+  name: "returnGoodsOrderDetail",
   data() {
     return {
       sn: "", // 订单号
@@ -624,9 +620,6 @@ export default {
 };
 </script>
 <style lang="scss">
-.ivu-col {
-  width: 100% !important;
-}
 .main-content {
   min-height: 600px;
   padding: 10px;
diff --git a/seller/src/views/order/order/exportOrderDeliver.vue b/seller/src/views/order/order/exportOrderDeliver.vue
index 91c270ba..5d270b5f 100644
--- a/seller/src/views/order/order/exportOrderDeliver.vue
+++ b/seller/src/views/order/order/exportOrderDeliver.vue
@@ -49,6 +49,9 @@
 import { UploadFilled } from "@element-plus/icons-vue";
 import { downLoadDeliverExcel, uploadDeliverExcel } from "@/api/order.js";
 import { baseUrl } from "@/libs/axios.js";
+import downloadImg from "@/assets/download.png";
+import uploadImg from "@/assets/upload.png";
+import successImg from "@/assets/success.png";
 
 export default {
   components: { UploadFilled },
@@ -59,17 +62,17 @@ export default {
       accessToken: {},
       stepList: [
         {
-          img: require("@/assets/download.png"),
+          img: downloadImg,
           title: "1.下载批量发货导入模板",
           checked: true,
         },
         {
-          img: require("@/assets/upload.png"),
+          img: uploadImg,
           title: "2.上传数据",
           checked: false,
         },
         {
-          img: require("@/assets/success.png"),
+          img: successImg,
           title: "3.完成",
           checked: false,
         },
diff --git a/seller/src/views/promotion/coupon/coupon-publish.vue b/seller/src/views/promotion/coupon/coupon-publish.vue
index 1d6e28fe..ed207efb 100644
--- a/seller/src/views/promotion/coupon/coupon-publish.vue
+++ b/seller/src/views/promotion/coupon/coupon-publish.vue
@@ -578,7 +578,7 @@ export default {
 };
 </script>
 
-<style lang="scss" scpoed>
+<style lang="scss" scoped>
 h4 {
   margin-bottom: 10px;
   padding: 0 10px;
diff --git a/seller/src/views/promotion/live/addLive.vue b/seller/src/views/promotion/live/addLive.vue
index cd5f5c01..2b3330ff 100644
--- a/seller/src/views/promotion/live/addLive.vue
+++ b/seller/src/views/promotion/live/addLive.vue
@@ -116,7 +116,7 @@
       <img v-if="imageVisible" :src="imageSrc" style="width: 100%" alt="" />
     </el-dialog>
 
-    <el-dialog v-model="liveGoodsVisible" width="800px" :show-footer="false">
+    <el-dialog v-model="liveGoodsVisible" width="800px">
       <liveGoods reviewed @selectedGoods="callBackData" />
     </el-dialog>
   </div>
diff --git a/seller/src/views/shop/hotzone/components/Zone.vue b/seller/src/views/shop/hotzone/components/Zone.vue
index a33db3dc..06c9a06d 100644
--- a/seller/src/views/shop/hotzone/components/Zone.vue
+++ b/seller/src/views/shop/hotzone/components/Zone.vue
@@ -83,7 +83,7 @@
     <!-- 选择商品。链接 -->
     <liliDialog ref="liliDialog" @selectedLink="selectedLink"></liliDialog>
     <!-- 选择图片 -->
-    <el-dialog width="1200px" v-model="picModelFlag" :show-footer="false">
+    <el-dialog width="1200px" v-model="picModelFlag">
       <ossManage @callback="callbackSelected" :isComponent="true"  :initialize="picModelFlag" ref="ossManage"/>
     </el-dialog>
   </li>
diff --git a/seller/src/views/shop/hotzone/index.js b/seller/src/views/shop/hotzone/index.js
index c818a357..ed93f84b 100644
--- a/seller/src/views/shop/hotzone/index.js
+++ b/seller/src/views/shop/hotzone/index.js
@@ -1,7 +1 @@
-import hotzone from './index.vue'
-
-hotzone.install = (Vue) => {
-  Vue.component(hotzone.name, hotzone)
-}
-
-export default hotzone
+export { default } from "./index.vue";
diff --git a/seller/src/views/shop/modelConfig.js b/seller/src/views/shop/modelConfig.js
index f8b3b209..c20385dc 100644
--- a/seller/src/views/shop/modelConfig.js
+++ b/seller/src/views/shop/modelConfig.js
@@ -1,3 +1,20 @@
+import nav1 from '@/assets/nav/1.jpg';
+import nav2 from '@/assets/nav/2.jpg';
+import nav3 from '@/assets/nav/3.jpg';
+import nav4 from '@/assets/nav/4.jpg';
+import nav5 from '@/assets/nav/5.jpg';
+import navDecorate from '@/assets/nav/decorate.png';
+import navDecorate1 from '@/assets/nav/decorate1.png';
+import navDecorate2 from '@/assets/nav/decorate2.jpeg';
+import navDecorate3 from '@/assets/nav/decorate3.jpeg';
+import navDecorate4 from '@/assets/nav/decorate4.jpeg';
+import navDecorate5 from '@/assets/nav/decorate5.jpeg';
+import navDecorate6 from '@/assets/nav/decorate6.jpeg';
+import navDecorate7 from '@/assets/nav/decorate7.jpeg';
+import navDecorate8 from '@/assets/nav/decorate8.png';
+import navDecorate9 from '@/assets/nav/decorate9.png';
+import navDecorate10 from '@/assets/nav/decorate10.jpeg';
+import navDecorate11 from '@/assets/nav/decorate11.jpeg';
 
 export const modelData = [
   {
@@ -7,32 +24,32 @@ export const modelData = [
     showName: '',
     options: {
       list: [{
-          img: require('@/assets/nav/decorate1.png'),
+          img: navDecorate1,
           url: '',
           size: '1200*自定义'
         },
         {
-          img: require('@/assets/nav/1.jpg'),
+          img: nav1,
           url: '',
           size: '230*190'
         },
         {
-          img: require('@/assets/nav/1.jpg'),
+          img: nav1,
           url: '',
           size: '230*190'
         },
         {
-          img: require('@/assets/nav/1.jpg'),
+          img: nav1,
           url: '',
           size: '230*190'
         },
         {
-          img: require('@/assets/nav/1.jpg'),
+          img: nav1,
           url: '',
           size: '230*190'
         },
         {
-          img: require('@/assets/nav/1.jpg'),
+          img: nav1,
           url: '',
           size: '230*190'
         }
@@ -48,70 +65,70 @@ export const modelData = [
       list: [{
           time: 6,
           goodsList: [{
-              img: require('@/assets/nav/1.jpg'),
+              img: nav1,
               price: 20,
               originalPrice: 30,
               name: '阿迪达斯三叶草asdasdafads123213a',
               url: ''
             },
             {
-              img: require('@/assets/nav/2.jpg'),
+              img: nav2,
               price: 20,
               originalPrice: 30,
               name: '阿迪达斯三叶草asdasdafadsa',
               url: ''
             },
             {
-              img: require('@/assets/nav/3.jpg'),
+              img: nav3,
               price: 20,
               originalPrice: 30,
               name: '阿迪达斯三叶草asdasdafadsa',
               url: ''
             },
             {
-              img: require('@/assets/nav/4.jpg'),
+              img: nav4,
               price: 20,
               originalPrice: 30,
               name: '阿迪达斯三叶草asdasdafadsa',
               url: ''
             },
             {
-              img: require('@/assets/nav/5.jpg'),
+              img: nav5,
               price: 20,
               originalPrice: 30,
               name: '阿迪达斯三叶草asdasdafadsa',
               url: ''
             },
             {
-              img: require('@/assets/nav/1.jpg'),
+              img: nav1,
               price: 20,
               originalPrice: 30,
               name: '阿迪达斯三叶草asdasdafadsa',
               url: ''
             },
             {
-              img: require('@/assets/nav/2.jpg'),
+              img: nav2,
               price: 20,
               originalPrice: 30,
               name: '阿迪达斯三叶草asdasdafadsa',
               url: ''
             },
             {
-              img: require('@/assets/nav/3.jpg'),
+              img: nav3,
               price: 20,
               originalPrice: 30,
               name: '阿迪达斯三叶草asdasdafadsa',
               url: ''
             },
             {
-              img: require('@/assets/nav/4.jpg'),
+              img: nav4,
               price: 20,
               originalPrice: 30,
               name: '阿迪达斯三叶草asdasdafadsa',
               url: ''
             },
             {
-              img: require('@/assets/nav/5.jpg'),
+              img: nav5,
               price: 20,
               originalPrice: 30,
               name: '阿迪达斯三叶草asdasdafadsa',
@@ -122,23 +139,23 @@ export const modelData = [
         {
           time: 8,
           goodsList: [{
-              img: require('@/assets/nav/1.jpg'),
+              img: nav1,
               url: ''
             },
             {
-              img: require('@/assets/nav/2.jpg'),
+              img: nav2,
               url: ''
             },
             {
-              img: require('@/assets/nav/3.jpg'),
+              img: nav3,
               url: ''
             },
             {
-              img: require('@/assets/nav/4.jpg'),
+              img: nav4,
               url: ''
             },
             {
-              img: require('@/assets/nav/5.jpg'),
+              img: nav5,
               url: ''
             },
           ]
@@ -146,23 +163,23 @@ export const modelData = [
         {
           time: 10,
           goodsList: [{
-              img: require('@/assets/nav/1.jpg'),
+              img: nav1,
               url: ''
             },
             {
-              img: require('@/assets/nav/2.jpg'),
+              img: nav2,
               url: ''
             },
             {
-              img: require('@/assets/nav/3.jpg'),
+              img: nav3,
               url: ''
             },
             {
-              img: require('@/assets/nav/4.jpg'),
+              img: nav4,
               url: ''
             },
             {
-              img: require('@/assets/nav/5.jpg'),
+              img: nav5,
               url: ''
             },
           ]
@@ -170,23 +187,23 @@ export const modelData = [
         {
           time: 12,
           goodsList: [{
-              img: require('@/assets/nav/1.jpg'),
+              img: nav1,
               url: ''
             },
             {
-              img: require('@/assets/nav/2.jpg'),
+              img: nav2,
               url: ''
             },
             {
-              img: require('@/assets/nav/3.jpg'),
+              img: nav3,
               url: ''
             },
             {
-              img: require('@/assets/nav/4.jpg'),
+              img: nav4,
               url: ''
             },
             {
-              img: require('@/assets/nav/5.jpg'),
+              img: nav5,
               url: ''
             },
           ]
@@ -213,65 +230,65 @@ export const modelData = [
     icon: 'md-image',
     options: {
       bgImg: {
-        img: require('@/assets/nav/decorate.png'),
+        img: navDecorate,
         url: '',
         size: "1300*585"
       },
       classification: [{
-        img: require('@/assets/nav/decorate2.jpeg'),
+        img: navDecorate2,
         url: '',
         size: '190*210'
       }, {
-        img: require('@/assets/nav/decorate2.jpeg'),
+        img: navDecorate2,
         url: '',
         size: '190*210'
       }, {
-        img: require('@/assets/nav/decorate2.jpeg'),
+        img: navDecorate2,
         url: '',
         size: '190*210'
       }, {
-        img: require('@/assets/nav/decorate2.jpeg'),
+        img: navDecorate2,
         url: '',
         size: '190*210'
       }, {
-        img: require('@/assets/nav/decorate2.jpeg'),
+        img: navDecorate2,
         url: '',
         size: '190*210'
       }, {
-        img: require('@/assets/nav/decorate2.jpeg'),
+        img: navDecorate2,
         url: '',
         size: '190*210'
       }, {
-        img: require('@/assets/nav/decorate2.jpeg'),
+        img: navDecorate2,
         url: '',
         size: '190*210'
       }, {
-        img: require('@/assets/nav/decorate2.jpeg'),
+        img: navDecorate2,
         url: '',
         size: '190*210'
       }, {
-        img: require('@/assets/nav/decorate2.jpeg'),
+        img: navDecorate2,
         url: '',
         size: '190*210'
       }, {
-        img: require('@/assets/nav/decorate2.jpeg'),
+        img: navDecorate2,
         url: '',
         size: '190*210'
       }, ],
       brandList: [{
-        img: require('@/assets/nav/decorate11.jpeg'),
+        img: navDecorate11,
         url: '',
         size: '240*105'
       }, {
-        img: require('@/assets/nav/decorate11.jpeg'),
+        img: navDecorate11,
         url: '',
         size: '240*105'
       }, {
-        img: require('@/assets/nav/decorate11.jpeg'),
+        img: navDecorate11,
         url: '',
         size: '240*105'
       }, {
-        img: require('@/assets/nav/decorate11.jpeg'),
+        img: navDecorate11,
         url: '',
         size: '240*105'
       }, ]
@@ -288,49 +305,49 @@ export const modelData = [
         bgColor: '#449dae',
         url: '',
         list: [{
-            img: require('@/assets/nav/decorate3.jpeg'),
+            img: navDecorate3,
             name: '阿迪达斯三叶草',
             describe: '也许是每一款经典系列都应该有一个独特的故事吧',
             url: '',
             size: '160*160'
           },
           {
-            img: require('@/assets/nav/decorate4.jpeg'),
+            img: navDecorate4,
             name: '360行车记录',
             describe: '夜行 监控 电子狗 蓝牙',
             url: '',
             size: '80*80'
           },
           {
-            img: require('@/assets/nav/decorate4.jpeg'),
+            img: navDecorate4,
             name: '360行车记录',
             describe: '夜行 监控 电子狗 蓝牙',
             url: '',
             size: '80*80'
           },
           {
-            img: require('@/assets/nav/decorate4.jpeg'),
+            img: navDecorate4,
             name: '360行车记录',
             describe: '夜行 监控 电子狗 蓝牙',
             url: '',
             size: '80*80'
           },
           {
-            img: require('@/assets/nav/decorate4.jpeg'),
+            img: navDecorate4,
             name: '360行车记录',
             describe: '夜行 监控 电子狗 蓝牙',
             url: '',
             size: '80*80'
           },
           {
-            img: require('@/assets/nav/decorate4.jpeg'),
+            img: navDecorate4,
             name: '360行车记录',
             describe: '夜行 监控 电子狗 蓝牙',
             url: '',
             size: '80*80'
           },
           {
-            img: require('@/assets/nav/decorate4.jpeg'),
+            img: navDecorate4,
             name: '360行车记录',
             describe: '夜行 监控 电子狗 蓝牙',
             url: '',
@@ -344,28 +361,28 @@ export const modelData = [
         bgColor: '#a25684',
         url: '',
         list: [{
-            img: require('@/assets/nav/decorate5.jpeg'),
+            img: navDecorate5,
             name: '好心情喝出来',
             describe: '遇见懂你的饮品',
             url: '',
             size: '100*100'
           },
           {
-            img: require('@/assets/nav/decorate5.jpeg'),
+            img: navDecorate5,
             name: '好心情喝出来',
             describe: '遇见懂你的饮品',
             url: '',
             size: '100*100'
           },
           {
-            img: require('@/assets/nav/decorate5.jpeg'),
+            img: navDecorate5,
             name: '好心情喝出来',
             describe: '遇见懂你的饮品',
             url: '',
             size: '100*100'
           },
           {
-            img: require('@/assets/nav/decorate5.jpeg'),
+            img: navDecorate5,
             name: '好心情喝出来',
             describe: '遇见懂你的饮品',
             url: '',
@@ -388,35 +405,35 @@ export const modelData = [
         list: [{
             name: '新年心愿单',
             describe: '满269减50,满999减100',
-            img: require('@/assets/nav/decorate6.jpeg'),
+            img: navDecorate6,
             url: '',
             size: "160*160"
           },
           {
             name: 'Ms.Maggie 冬季时尚',
             describe: '满269减50',
-            img: require('@/assets/nav/decorate6.jpeg'),
+            img: navDecorate6,
             url: '',
             size: "90*90"
           },
           {
             name: 'Ms.Maggie 冬季时尚',
             describe: '满269减50',
-            img: require('@/assets/nav/decorate6.jpeg'),
+            img: navDecorate6,
             url: '',
             size: "90*90"
           },
           {
             name: 'Ms.Maggie 冬季时尚',
             describe: '满269减50',
-            img: require('@/assets/nav/decorate6.jpeg'),
+            img: navDecorate6,
             url: '',
             size: "90*90"
           },
           {
             name: '阿迪达斯 领跑时尚',
             describe: '满269减50',
-            img: require('@/assets/nav/decorate6.jpeg'),
+            img: navDecorate6,
             url: '',
             size: "90*90"
           },
@@ -430,42 +447,42 @@ export const modelData = [
         list: [{
             name: '阿迪达斯 领跑时尚',
             describe: '满269减50',
-            img: require('@/assets/nav/decorate6.jpeg'),
+            img: navDecorate6,
             url: '',
             size: "90*90"
           },
           {
             name: '阿迪达斯 领跑时尚',
             describe: '满269减50',
-            img: require('@/assets/nav/decorate6.jpeg'),
+            img: navDecorate6,
             url: '',
             size: "90*90"
           },
           {
             name: '阿迪达斯 领跑时尚',
             describe: '满269减50',
-            img: require('@/assets/nav/decorate6.jpeg'),
+            img: navDecorate6,
             url: '',
             size: "90*90"
           },
           {
             name: '阿迪达斯 领跑时尚',
             describe: '满269减50',
-            img: require('@/assets/nav/decorate6.jpeg'),
+            img: navDecorate6,
             url: '',
             size: "90*90"
           },
           {
             name: '阿迪达斯 领跑时尚',
             describe: '满269减50',
-            img: require('@/assets/nav/decorate6.jpeg'),
+            img: navDecorate6,
             url: '',
             size: "90*90"
           },
           {
             name: '阿迪达斯 领跑时尚',
             describe: '满269减50',
-            img: require('@/assets/nav/decorate6.jpeg'),
+            img: navDecorate6,
             url: '',
             size: "90*90"
           },
@@ -479,37 +496,37 @@ export const modelData = [
         list: [{
             name: '小米红米3s手机壳保护套红米3高配版指纹男女款潮版磨砂硬壳防摔 收藏截图 送大礼包',
             price: 14.9,
-            img: require('@/assets/nav/decorate7.jpeg'),
+            img: navDecorate7,
             url: ''
           },
           {
             name: '小米红米3s手机壳保护套红米3高配版指纹男女款潮版磨砂硬壳防摔 收藏截图 送大礼包',
             price: 14.9,
-            img: require('@/assets/nav/decorate7.jpeg'),
+            img: navDecorate7,
             url: ''
           },
           {
             name: '小米红米3s手机壳保护套红米3高配版指纹男女款潮版磨砂硬壳防摔 收藏截图 送大礼包',
             price: 14.9,
-            img: require('@/assets/nav/decorate7.jpeg'),
+            img: navDecorate7,
             url: ''
           },
           {
             name: '小米红米3s手机壳保护套红米3高配版指纹男女款潮版磨砂硬壳防摔 收藏截图 送大礼包',
             price: 14.9,
-            img: require('@/assets/nav/decorate7.jpeg'),
+            img: navDecorate7,
             url: ''
           },
           {
             name: '小米红米3s手机壳保护套红米3高配版指纹男女款潮版磨砂硬壳防摔 收藏截图 送大礼包',
             price: 14.9,
-            img: require('@/assets/nav/decorate7.jpeg'),
+            img: navDecorate7,
             url: ''
           },
           {
             name: '小米红米3s手机壳保护套红米3高配版指纹男女款潮版磨砂硬壳防摔 收藏截图 送大礼包',
             price: 14.9,
-            img: require('@/assets/nav/decorate7.jpeg'),
+            img: navDecorate7,
             url: ''
           },
         ]
@@ -524,7 +541,7 @@ export const modelData = [
       list: [{
           name: '生鲜',
           describe: "年货带回家 满199减60",
-          img: require('@/assets/nav/decorate8.png'),
+          img: navDecorate8,
           url: '',
           fromColor: '#e89621',
           toColor: "#f5c568",
@@ -533,7 +550,7 @@ export const modelData = [
         {
           name: '众筹',
           describe: "年货带回家",
-          img: require('@/assets/nav/decorate9.png'),
+          img: navDecorate9,
           url: '',
           fromColor: "#325bb4",
           toColor: '#4c9afe',
@@ -542,7 +559,7 @@ export const modelData = [
         {
           name: '生鲜',
           describe: "年货带回家 满199减60",
-          img: require('@/assets/nav/decorate8.png'),
+          img: navDecorate8,
           url: '',
           fromColor: "#1c9daf",
           toColor: '#40cda7',
@@ -551,7 +568,7 @@ export const modelData = [
         {
           name: '众筹',
           describe: "备孕有孕检测仪",
-          img: require('@/assets/nav/decorate9.png'),
+          img: navDecorate9,
           url: '',
           fromColor: "#d13837",
           toColor: '#df6d4f',
@@ -560,7 +577,7 @@ export const modelData = [
         {
           name: '生鲜',
           describe: "年货带回家 满199减60",
-          img: require('@/assets/nav/decorate8.png'),
+          img: navDecorate8,
           url: '',
           fromColor: "#ca4283",
           toColor: '#eb75cf',
@@ -569,7 +586,7 @@ export const modelData = [
         {
           name: '众筹',
           describe: "备孕有孕检测仪",
-          img: require('@/assets/nav/decorate9.png'),
+          img: navDecorate9,
           url: '',
           fromColor: "#5d40c1",
           toColor: '#8c5fdb',
@@ -595,244 +612,244 @@ export const modelData = [
     options: {
       list: [
         [{
-            img: require('@/assets/nav/decorate10.jpeg'),
+            img: navDecorate10,
             name: 'Apple/苹果 13 英寸：MacBook Pro Multi-Touch Bar 和 Touch ID 2.9GHz 处理器 512GB 存储容量',
             price: 6666,
             url: ''
           },
           {
-            img: require('@/assets/nav/decorate10.jpeg'),
+            img: navDecorate10,
             name: 'Apple/苹果 13 英寸：MacBook Pro Multi-Touch Bar 和 Touch ID 2.9GHz 处理器 512GB 存储容量',
             price: 6666,
             url: ''
           },
           {
-            img: require('@/assets/nav/decorate10.jpeg'),
+            img: navDecorate10,
             name: 'Apple/苹果 13 英寸：MacBook Pro Multi-Touch Bar 和 Touch ID 2.9GHz 处理器 512GB 存储容量',
             price: 6666,
             url: ''
           },
           {
-            img: require('@/assets/nav/decorate10.jpeg'),
+            img: navDecorate10,
             name: 'Apple/苹果 13 英寸：MacBook Pro Multi-Touch Bar 和 Touch ID 2.9GHz 处理器 512GB 存储容量',
             price: 6666,
             url: ''
           },
           {
-            img: require('@/assets/nav/decorate10.jpeg'),
+            img: navDecorate10,
             name: 'Apple/苹果 13 英寸：MacBook Pro Multi-Touch Bar 和 Touch ID 2.9GHz 处理器 512GB 存储容量',
             price: 6666,
             url: ''
           },
           {
-            img: require('@/assets/nav/decorate10.jpeg'),
+            img: navDecorate10,
             name: 'Apple/苹果 13 英寸：MacBook Pro Multi-Touch Bar 和 Touch ID 2.9GHz 处理器 512GB 存储容量',
             price: 6666,
             url: ''
           },
           {
-            img: require('@/assets/nav/decorate10.jpeg'),
+            img: navDecorate10,
             name: 'Apple/苹果 13 英寸：MacBook Pro Multi-Touch Bar 和 Touch ID 2.9GHz 处理器 512GB 存储容量',
             price: 6666,
             url: ''
           },
           {
-            img: require('@/assets/nav/decorate10.jpeg'),
+            img: navDecorate10,
             name: 'Apple/苹果 13 英寸：MacBook Pro Multi-Touch Bar 和 Touch ID 2.9GHz 处理器 512GB 存储容量',
             price: 6666,
             url: ''
           },
           {
-            img: require('@/assets/nav/decorate10.jpeg'),
+            img: navDecorate10,
             name: 'Apple/苹果 13 英寸：MacBook Pro Multi-Touch Bar 和 Touch ID 2.9GHz 处理器 512GB 存储容量',
             price: 6666,
             url: ''
           },
           {
-            img: require('@/assets/nav/decorate10.jpeg'),
+            img: navDecorate10,
             name: 'Apple/苹果 13 英寸：MacBook Pro Multi-Touch Bar 和 Touch ID 2.9GHz 处理器 512GB 存储容量',
             price: 6666,
             url: ''
           },
         ],
         [{
-            img: require('@/assets/nav/decorate10.jpeg'),
+            img: navDecorate10,
             name: 'Apple/苹果 13 英寸：MacBook Pro Multi-Touch Bar 和 Touch ID 2.9GHz 处理器 512GB 存储容量',
             price: 6666,
             url: ''
           },
           {
-            img: require('@/assets/nav/decorate10.jpeg'),
+            img: navDecorate10,
             name: 'Apple/苹果 13 英寸：MacBook Pro Multi-Touch Bar 和 Touch ID 2.9GHz 处理器 512GB 存储容量',
             price: 6666,
             url: ''
           },
           {
-            img: require('@/assets/nav/decorate10.jpeg'),
+            img: navDecorate10,
             name: 'Apple/苹果 13 英寸：MacBook Pro Multi-Touch Bar 和 Touch ID 2.9GHz 处理器 512GB 存储容量',
             price: 6666,
             url: ''
           },
           {
-            img: require('@/assets/nav/decorate10.jpeg'),
+            img: navDecorate10,
             name: 'Apple/苹果 13 英寸：MacBook Pro Multi-Touch Bar 和 Touch ID 2.9GHz 处理器 512GB 存储容量',
             price: 6666,
             url: ''
           },
           {
-            img: require('@/assets/nav/decorate10.jpeg'),
+            img: navDecorate10,
             name: 'Apple/苹果 13 英寸：MacBook Pro Multi-Touch Bar 和 Touch ID 2.9GHz 处理器 512GB 存储容量',
             price: 6666,
             url: ''
           },
           {
-            img: require('@/assets/nav/decorate10.jpeg'),
+            img: navDecorate10,
             name: 'Apple/苹果 13 英寸：MacBook Pro Multi-Touch Bar 和 Touch ID 2.9GHz 处理器 512GB 存储容量',
             price: 6666,
             url: ''
           },
           {
-            img: require('@/assets/nav/decorate10.jpeg'),
+            img: navDecorate10,
             name: 'Apple/苹果 13 英寸：MacBook Pro Multi-Touch Bar 和 Touch ID 2.9GHz 处理器 512GB 存储容量',
             price: 6666,
             url: ''
           },
           {
-            img: require('@/assets/nav/decorate10.jpeg'),
+            img: navDecorate10,
             name: 'Apple/苹果 13 英寸：MacBook Pro Multi-Touch Bar 和 Touch ID 2.9GHz 处理器 512GB 存储容量',
             price: 6666,
             url: ''
           },
           {
-            img: require('@/assets/nav/decorate10.jpeg'),
+            img: navDecorate10,
             name: 'Apple/苹果 13 英寸：MacBook Pro Multi-Touch Bar 和 Touch ID 2.9GHz 处理器 512GB 存储容量',
             price: 6666,
             url: ''
           },
           {
-            img: require('@/assets/nav/decorate10.jpeg'),
+            img: navDecorate10,
             name: 'Apple/苹果 13 英寸：MacBook Pro Multi-Touch Bar 和 Touch ID 2.9GHz 处理器 512GB 存储容量',
             price: 6666,
             url: ''
           },
         ],
         [{
-            img: require('@/assets/nav/decorate10.jpeg'),
+            img: navDecorate10,
             name: 'Apple/苹果 13 英寸：MacBook Pro Multi-Touch Bar 和 Touch ID 2.9GHz 处理器 512GB 存储容量',
             price: 6666,
             url: ''
           },
           {
-            img: require('@/assets/nav/decorate10.jpeg'),
+            img: navDecorate10,
             name: 'Apple/苹果 13 英寸：MacBook Pro Multi-Touch Bar 和 Touch ID 2.9GHz 处理器 512GB 存储容量',
             price: 6666,
             url: ''
           },
           {
-            img: require('@/assets/nav/decorate10.jpeg'),
+            img: navDecorate10,
             name: 'Apple/苹果 13 英寸：MacBook Pro Multi-Touch Bar 和 Touch ID 2.9GHz 处理器 512GB 存储容量',
             price: 6666,
             url: ''
           },
           {
-            img: require('@/assets/nav/decorate10.jpeg'),
+            img: navDecorate10,
             name: 'Apple/苹果 13 英寸：MacBook Pro Multi-Touch Bar 和 Touch ID 2.9GHz 处理器 512GB 存储容量',
             price: 6666,
             url: ''
           },
           {
-            img: require('@/assets/nav/decorate10.jpeg'),
+            img: navDecorate10,
             name: 'Apple/苹果 13 英寸：MacBook Pro Multi-Touch Bar 和 Touch ID 2.9GHz 处理器 512GB 存储容量',
             price: 6666,
             url: ''
           },
           {
-            img: require('@/assets/nav/decorate10.jpeg'),
+            img: navDecorate10,
             name: 'Apple/苹果 13 英寸：MacBook Pro Multi-Touch Bar 和 Touch ID 2.9GHz 处理器 512GB 存储容量',
             price: 6666,
             url: ''
           },
           {
-            img: require('@/assets/nav/decorate10.jpeg'),
+            img: navDecorate10,
             name: 'Apple/苹果 13 英寸：MacBook Pro Multi-Touch Bar 和 Touch ID 2.9GHz 处理器 512GB 存储容量',
             price: 6666,
             url: ''
           },
           {
-            img: require('@/assets/nav/decorate10.jpeg'),
+            img: navDecorate10,
             name: 'Apple/苹果 13 英寸：MacBook Pro Multi-Touch Bar 和 Touch ID 2.9GHz 处理器 512GB 存储容量',
             price: 6666,
             url: ''
           },
           {
-            img: require('@/assets/nav/decorate10.jpeg'),
+            img: navDecorate10,
             name: 'Apple/苹果 13 英寸：MacBook Pro Multi-Touch Bar 和 Touch ID 2.9GHz 处理器 512GB 存储容量',
             price: 6666,
             url: ''
           },
           {
-            img: require('@/assets/nav/decorate10.jpeg'),
+            img: navDecorate10,
             name: 'Apple/苹果 13 英寸：MacBook Pro Multi-Touch Bar 和 Touch ID 2.9GHz 处理器 512GB 存储容量',
             price: 6666,
             url: ''
           },
         ],
         [{
-            img: require('@/assets/nav/decorate10.jpeg'),
+            img: navDecorate10,
             name: 'Apple/苹果 13 英寸：MacBook Pro Multi-Touch Bar 和 Touch ID 2.9GHz 处理器 512GB 存储容量',
             price: 6666,
             url: ''
           },
           {
-            img: require('@/assets/nav/decorate10.jpeg'),
+            img: navDecorate10,
             name: 'Apple/苹果 13 英寸：MacBook Pro Multi-Touch Bar 和 Touch ID 2.9GHz 处理器 512GB 存储容量',
             price: 6666,
             url: ''
           },
           {
-            img: require('@/assets/nav/decorate10.jpeg'),
+            img: navDecorate10,
             name: 'Apple/苹果 13 英寸：MacBook Pro Multi-Touch Bar 和 Touch ID 2.9GHz 处理器 512GB 存储容量',
             price: 6666,
             url: ''
           },
           {
-            img: require('@/assets/nav/decorate10.jpeg'),
+            img: navDecorate10,
             name: 'Apple/苹果 13 英寸：MacBook Pro Multi-Touch Bar 和 Touch ID 2.9GHz 处理器 512GB 存储容量',
             price: 6666,
             url: ''
           },
           {
-            img: require('@/assets/nav/decorate10.jpeg'),
+            img: navDecorate10,
             name: 'Apple/苹果 13 英寸：MacBook Pro Multi-Touch Bar 和 Touch ID 2.9GHz 处理器 512GB 存储容量',
             price: 6666,
             url: ''
           },
           {
-            img: require('@/assets/nav/decorate10.jpeg'),
+            img: navDecorate10,
             name: 'Apple/苹果 13 英寸：MacBook Pro Multi-Touch Bar 和 Touch ID 2.9GHz 处理器 512GB 存储容量',
             price: 6666,
             url: ''
           },
           {
-            img: require('@/assets/nav/decorate10.jpeg'),
+            img: navDecorate10,
             name: 'Apple/苹果 13 英寸：MacBook Pro Multi-Touch Bar 和 Touch ID 2.9GHz 处理器 512GB 存储容量',
             price: 6666,
             url: ''
           },
           {
-            img: require('@/assets/nav/decorate10.jpeg'),
+            img: navDecorate10,
             name: 'Apple/苹果 13 英寸：MacBook Pro Multi-Touch Bar 和 Touch ID 2.9GHz 处理器 512GB 存储容量',
             price: 6666,
             url: ''
           },
           {
-            img: require('@/assets/nav/decorate10.jpeg'),
+            img: navDecorate10,
             name: 'Apple/苹果 13 英寸：MacBook Pro Multi-Touch Bar 和 Touch ID 2.9GHz 处理器 512GB 存储容量',
             price: 6666,
             url: ''
           },
           {
-            img: require('@/assets/nav/decorate10.jpeg'),
+            img: navDecorate10,
             name: 'Apple/苹果 13 英寸：MacBook Pro Multi-Touch Bar 和 Touch ID 2.9GHz 处理器 512GB 存储容量',
             price: 6666,
             url: ''
diff --git a/seller/src/views/shop/modelForm.vue b/seller/src/views/shop/modelForm.vue
index 18195209..570af2ca 100644
--- a/seller/src/views/shop/modelForm.vue
+++ b/seller/src/views/shop/modelForm.vue
@@ -25,7 +25,7 @@
         </ul>
       </div>
       <div class="search-con">
-        <img :src="require('@/assets/logo.png')" class="logo" alt="" />
+        <img :src="logoImg" class="logo" alt="" />
         <div class="search">
           <el-input size="large" placeholder="输入你想查找的商品">
             <template #append>
@@ -144,6 +144,7 @@
 </template>
 <script>
 import { ShoppingCart } from "@element-plus/icons-vue";
+import logoImg from "@/assets/logo.png";
 import Draggable from "vuedraggable";
 import ModelFormItem from "./modelFormItem.vue";
 import ossManage from "@/views/sys/oss-manage/ossManage";
@@ -158,6 +159,7 @@ export default {
   props: ["data"],
   data() {
     return {
+      logoImg,
       picModelFlag: false,
       showModal: false,
       showModalNav: false,
diff --git a/seller/src/views/shop/modelFormItem.vue b/seller/src/views/shop/modelFormItem.vue
index 812ae546..4c725ce1 100644
--- a/seller/src/views/shop/modelFormItem.vue
+++ b/seller/src/views/shop/modelFormItem.vue
@@ -67,7 +67,7 @@
           class="discountAdvert"
           :style="{
             'background-image':
-              'url(' + require('@/assets/nav/decorate.png') + ')',
+              'url(' + decorateImg + ')',
           }"
         >
           <div>
@@ -280,6 +280,7 @@ import onlyGoodsModel from "./modelList/onlyGoodsModel.vue";
 
 import oneRowThreeColumns from "./modelList/oneRowThreeColumns.vue";
 import seckillOnlyAlbum from "./modelList/seckill-only-album.vue";
+import decorateImg from "@/assets/nav/decorate.png";
 export default {
   name: "modelFormItem",
   props: ["element", "select", "index", "data"],
@@ -302,6 +303,7 @@ export default {
   },
   data() {
     return {
+      decorateImg,
       showModal: false, // modal显隐
       selected: {}, // 弹窗编辑草稿
       editTarget: null, // 确定后写回的原数据
diff --git a/seller/src/views/shop/modelList/mixs/mix-brand.vue b/seller/src/views/shop/modelList/mixs/mix-brand.vue
index 43cf6ceb..2cd2d337 100644
--- a/seller/src/views/shop/modelList/mixs/mix-brand.vue
+++ b/seller/src/views/shop/modelList/mixs/mix-brand.vue
@@ -36,7 +36,6 @@ export default {
       default: {}
     }
   },
-  components: {},
   mounted() {
 
   },
diff --git a/seller/src/views/shop/modelList/setup-box.scss b/seller/src/views/shop/modelList/setup-box.scss
index 940d2ffb..aff15ecd 100644
--- a/seller/src/views/shop/modelList/setup-box.scss
+++ b/seller/src/views/shop/modelList/setup-box.scss
@@ -16,7 +16,6 @@
     z-index: 99;
     width: 100%;
     height: 100%;
-    .ivu-btn,
     .el-button{
         float: right;
         margin-right: 5px;
diff --git a/seller/src/views/shop/ossManage.scss b/seller/src/views/shop/ossManage.scss
index e63bb919..18b15046 100644
--- a/seller/src/views/shop/ossManage.scss
+++ b/seller/src/views/shop/ossManage.scss
@@ -35,7 +35,7 @@
 
   cursor: pointer;
 
-  .ivu-card-body {
+  .el-card__body {
     padding: 0;
   }
 
@@ -243,7 +243,7 @@
     flex-direction: row-reverse;
   }
 
-  .demo-tree-render .ivu-tree-title{
+  .demo-tree-render .el-tree-node__content{
     width: 94%;
   }
 }
diff --git a/seller/src/views/shop/ossManage.vue b/seller/src/views/shop/ossManage.vue
index 1086a959..09448a4b 100644
--- a/seller/src/views/shop/ossManage.vue
+++ b/seller/src/views/shop/ossManage.vue
@@ -222,166 +222,8 @@
             </el-col>
           </el-row>
 
-
-          <!--<div class="oss-operation padding-row">-->
-          <!--<div>-->
-          <!--<Upload-->
-          <!--ref="up"-->
-          <!--:action="commonUrl + '/common/common/upload/file'"-->
-          <!--:data="{-->
-          <!--directoryPath: searchForm.fileDirectoryId,-->
-          <!--}"-->
-          <!--:headers="accessToken"-->
-          <!--:max-size="20480"-->
-          <!--:on-error="handleError"-->
-          <!--:on-exceeded-size="handleMaxSize"-->
-          <!--:on-success="handleSuccess"-->
-          <!--:show-upload-list="false"-->
-          <!--multiple-->
-          <!--style="display: inline-block"-->
-          <!--&gt;-->
-          <!--<Button>上传图片</Button>-->
-          <!--</Upload>-->
-          <!--<Dropdown @on-click="handleDropdown" v-if="!isComponent">-->
-          <!--<Button>-->
-          <!--更多操作-->
-          <!--<Icon type="md-arrow-dropdown"/>-->
-          <!--</Button>-->
-          <!--<DropdownMenu slot="list">-->
-          <!--<DropdownItem name="refresh">刷新</DropdownItem>-->
-          <!--<DropdownItem v-show="showType == 'list'" name="removeAll"-->
-          <!--&gt;批量删除-->
-          <!--</DropdownItem>-->
-          <!--</DropdownMenu>-->
-          <!--</Dropdown>-->
-          <!--</div>-->
-          <!--</div>-->
         </div>
 
-        <!--<Alert show-icon v-if="!isComponent">-->
-        <!--已选择-->
-        <!--<span>{{ selectCount }}</span> 项-->
-        <!--<a class="select-clear" @click="clearSelectAll">清空</a>-->
-        <!--<span v-if="selectCount > 0" style="margin-left: 15px"-->
-        <!--&gt;共计 {{ totalSize }} 存储量</span-->
-        <!--&gt;-->
-        <!--</Alert>-->
-
-        <!--<div v-show="showType === 'list'" >-->
-        <!--<div class="flex">-->
-        <!--<div class="article-category mr_10">-->
-        <!--<Tree-->
-        <!--:data="treeData"-->
-        <!--@on-contextmenu="handleContextMenu"-->
-        <!--@on-select-change="handleCateChange"-->
-        <!--&gt;-->
-        <!--<template slot="contextMenu" v-if="!isComponent">-->
-        <!--<DropdownItem @click.native="handleContextMenuEdit"-->
-        <!--&gt;编辑-->
-        <!--</DropdownItem-->
-        <!--&gt;-->
-        <!--<DropdownItem-->
-        <!--style="color: #ed4014"-->
-        <!--@click.native="handleContextMenuDelete"-->
-        <!--&gt;删除-->
-        <!--</DropdownItem-->
-        <!--&gt;-->
-        <!--</template>-->
-        <!--</Tree>-->
-        <!--<Alert v-if="!isComponent">鼠标右键编辑/删除分组</Alert>-->
-        <!--<div class="group-row flex" v-if="!isComponent">-->
-        <!--<Button @click="handleClickAddGroup">添加分组</Button>-->
-        <!--</div>-->
-        <!--</div>-->
-
-        <!--<Table-->
-        <!--ref="table"-->
-        <!--:columns="isComponent ? viewColumns : columns"-->
-        <!--:data="data"-->
-        <!--:loading="loading"-->
-        <!--border-->
-        <!--class="table"-->
-        <!--sortable="custom"-->
-        <!--@on-sort-change="changeSort"-->
-        <!--@on-selection-change="changeSelect"-->
-        <!--&gt;-->
-        <!--<template slot="fileKey" slot-scope="{ row }">-->
-        <!--<a @click="copyFileUrl(row)">{{ row.fileKey }}</a>-->
-        <!--</template>-->
-        <!--</Table>-->
-        <!--</div>-->
-        <!--</div>-->
-
-        <!--<div v-show="showType === 'thumb'">-->
-        <!--<div class="oss-wrapper">-->
-        <!--<Card v-for="(item, i) in data" :key="i" class="oss-card">-->
-        <!--<div class="content">-->
-        <!--<img-->
-        <!--v-if="item.fileType.indexOf('image') >= 0"-->
-        <!--:src="item.url"-->
-        <!--class="img"-->
-        <!--@click="showPic(item)"-->
-        <!--/>-->
-        <!--<div-->
-        <!--v-else-if="item.fileType.indexOf('video') >= 0"-->
-        <!--class="video"-->
-        <!--@click="showVideo(item)"-->
-        <!--&gt;-->
-        <!--&lt;!&ndash; 文件小于5MB显示video &ndash;&gt;-->
-        <!--<video v-if="item.fileSize < 1024 * 1024 * 5" class="cover">-->
-        <!--<source :src="item.url"/>-->
-        <!--</video>-->
-        <!--<img class="play" src="@/assets/play.png"/>-->
-        <!--</div>-->
-        <!--<div v-else class="other">-->
-        <!--<div class="name">{{ item.name }}</div>-->
-        <!--<div class="key">{{ item.fileKey }}</div>-->
-        <!--<div class="info">-->
-        <!--文件类型：{{ item.fileType }} 文件大小：{{-->
-        <!--((item.fileSize * 1.0) / (1024 * 1024)).toFixed(2)-->
-        <!--}}-->
-        <!--MB 创建时间：{{ item.createTime }}-->
-        <!--</div>-->
-        <!--</div>-->
-        <!--<div class="actions">-->
-        <!--<div class="btn">-->
-        <!--<Tooltip content="下载" placement="top">-->
-        <!--<Icon-->
-        <!--size="16"-->
-        <!--type="md-download"-->
-        <!--@click="download(item)"-->
-        <!--/>-->
-        <!--</Tooltip>-->
-        <!--</div>-->
-        <!--<div class="btn">-->
-        <!--<Tooltip content="重命名" placement="top">-->
-        <!--<Icon size="16" type="md-create" @click="rename(item)"/>-->
-        <!--</Tooltip>-->
-        <!--</div>-->
-        <!--<div class="btn-no">-->
-        <!--<Tooltip content="删除" placement="top">-->
-        <!--<Icon size="16" type="md-trash" @click="remove(item)"/>-->
-        <!--</Tooltip>-->
-        <!--</div>-->
-        <!--</div>-->
-        <!--</div>-->
-        <!--</Card>-->
-        <!--</div>-->
-        <!--</div>-->
-        <!--<Row class="mt_10" justify="end" type="flex">-->
-        <!--<Page-->
-        <!--:current="searchForm.pageNumber"-->
-        <!--:page-size="searchForm.pageSize"-->
-        <!--:page-size-opts="pageSizeOpts"-->
-        <!--:total="total"-->
-        <!--show-elevator-->
-        <!--show-sizer-->
-        <!--show-total-->
-        <!--size="small"-->
-        <!--@on-change="changePage"-->
-        <!--@on-page-size-change="changePageSize"-->
-        <!--&gt;</Page>-->
-        <!--</Row>-->
       </el-card>
     </el-row>
     <el-dialog
@@ -477,7 +319,8 @@ import {
 import DPlayer from "dplayer";
 import {commonUrl} from "@/libs/axios";
 
-const config = require("@/config/index");
+import config from "@/config/index";
+import playImg from "@/assets/play.png";
 
 let dp;
 export default {
@@ -631,7 +474,7 @@ export default {
               } else {
                 return h("img", {
                   attrs: {
-                    src: require("@/assets/play.png"),
+                    src: playImg,
                   },
                   style: {
                     cursor: "pointer",
@@ -832,7 +675,7 @@ export default {
               } else {
                 return h("img", {
                   attrs: {
-                    src: require("@/assets/play.png"),
+                    src: playImg,
                   },
                   style: {
                     cursor: "pointer",
@@ -917,41 +760,6 @@ export default {
       groupLoading: false,
       // 图片列表
       selectedOss: [],
-      myData: [
-        {
-          title: 'parent 1',
-          expand: true,
-          render: (h, {root, node, data}) => {
-            return h('span', {style: {display: 'inline-block', width: '100%'}}, [
-              h('span', [h("Icon", {type: 'ios-folder-outline', style: {marginRight: '8px'}}), h('span', data.title)]),
-              h('span', {style: {display: 'inline-block', float: 'right', marginRight: '32px'}},
-                [h("Button", {
-                  ...this.buttonProps,
-                  icon: 'ios-add',
-                  type: 'primary',
-                  style: {width: '64px'},
-                  onClick: () => {
-                    this.append(data)
-                  }
-                })
-                ])
-            ]);
-          },
-          children: [
-            {
-              title: 'child 1-1',
-              expand: true,
-              children: [{title: 'leaf 1-1-1', expand: true}, {title: 'leaf 1-1-2', expand: true}]
-            },
-            {
-              title: 'child 1-2',
-              expand: true,
-              children: [{title: 'leaf 1-2-1', expand: true}, {title: 'leaf 1-2-1', expand: true}]
-            }
-          ]
-        }
-      ],
-      buttonProps: {type: 'default', size: 'small',},
     };
   },
   watch: {
@@ -1099,57 +907,6 @@ export default {
       this.searchForm.pageNumber = value;
       this.getDataList();
     },
-    // 自定义tree节点显示内容和交互
-    renderContent(h, {root, node, data}) {
-      if (data.value === '0') {
-        return h('span', {style: {display: 'inline-block', width: '100%'}},
-          [
-            h('span', [h("Icon", {type: 'ios-paper-outline', style: {marginRight: '8px'}}), h('span', data.title)]),
-            h('span', {style: {display: 'inline-block', float: 'right', marginRight: '10px'}}, [])
-          ]
-        );
-      } else {
-        return h('span', {style: {display: 'inline-block', width: '100%'}},
-          [
-            h('span', [h("Icon", {type: 'ios-paper-outline', style: {marginRight: '8px'}}), h('span', data.title)]),
-            h('span', {style: {display: 'inline-block', float: 'right', marginRight: '10px'}},
-              [
-                h("Dropdown", {style: {marginLeft: "4px"}},
-                  [
-                    h("Icon", {
-                      props: {type: 'ios-more', size: "20",},
-                      style: {display: 'inline-block'},
-                      on: {
-                        click: () => {
-                        }
-                      }
-                    }),
-                    h("DropdownMenu", {
-                      slot: "list"
-                    }, [
-                      h("DropdownItem", {
-                        nativeOn: {
-                          click: () => {
-                            this.handleContextMenuEdit(root, node, data)
-                          }
-                        }
-                      }, "编辑"),
-                      h("DropdownItem", {
-                        nativeOn: {
-                          click: () => {
-                            this.handleContextMenuDelete()
-                          }
-                        }
-                      }, "删除"),
-                    ])
-                  ]),
-              ])
-          ]
-        );
-      }
-
-    },
-
 
     handleContextMenu(val) {
       console.log('handleContextMenu', val);
diff --git a/seller/src/views/shop/ossManages.vue b/seller/src/views/shop/ossManages.vue
index a35308ac..108fe959 100644
--- a/seller/src/views/shop/ossManages.vue
+++ b/seller/src/views/shop/ossManages.vue
@@ -218,166 +218,8 @@
             </el-col>
           </el-row>
 
-
-          <!--<div class="oss-operation padding-row">-->
-          <!--<div>-->
-          <!--<Upload-->
-          <!--ref="up"-->
-          <!--:action="commonUrl + '/common/common/upload/file'"-->
-          <!--:data="{-->
-          <!--directoryPath: searchForm.fileDirectoryId,-->
-          <!--}"-->
-          <!--:headers="accessToken"-->
-          <!--:max-size="20480"-->
-          <!--:on-error="handleError"-->
-          <!--:on-exceeded-size="handleMaxSize"-->
-          <!--:on-success="handleSuccess"-->
-          <!--:show-upload-list="false"-->
-          <!--multiple-->
-          <!--style="display: inline-block"-->
-          <!--&gt;-->
-          <!--<el-button>上传图片</el-button>-->
-          <!--</Upload>-->
-          <!--<Dropdown @click="handleDropdown" v-if="!isComponent">-->
-          <!--<el-button>-->
-          <!--更多操作-->
-          <!--<Icon type="md-arrow-dropdown"/>-->
-          <!--</el-button>-->
-          <!--<DropdownMenu #list>-->
-          <!--<DropdownItem name="refresh">刷新</DropdownItem>-->
-          <!--<DropdownItem v-show="showType == 'list'" name="removeAll"-->
-          <!--&gt;批量删除-->
-          <!--</DropdownItem>-->
-          <!--</DropdownMenu>-->
-          <!--</Dropdown>-->
-          <!--</div>-->
-          <!--</div>-->
         </div>
 
-        <!--<Alert show-icon v-if="!isComponent">-->
-        <!--已选择-->
-        <!--<span>{{ selectCount }}</span> 项-->
-        <!--<a class="select-clear" @click="clearSelectAll">清空</a>-->
-        <!--<span v-if="selectCount > 0" style="margin-left: 15px"-->
-        <!--&gt;共计 {{ totalSize }} 存储量</span-->
-        <!--&gt;-->
-        <!--</Alert>-->
-
-        <!--<div v-show="showType === 'list'" >-->
-        <!--<div class="flex">-->
-        <!--<div class="article-category mr_10">-->
-        <!--<Tree-->
-        <!--:data="treeData"-->
-        <!--@on-contextmenu="handleContextMenu"-->
-        <!--@on-select-change="handleCateChange"-->
-        <!--&gt;-->
-        <!--<template #contextMenu v-if="!isComponent">-->
-        <!--<DropdownItem @click.native="handleContextMenuEdit"-->
-        <!--&gt;编辑-->
-        <!--</DropdownItem-->
-        <!--&gt;-->
-        <!--<DropdownItem-->
-        <!--style="color: #ed4014"-->
-        <!--@click.native="handleContextMenuDelete"-->
-        <!--&gt;删除-->
-        <!--</DropdownItem-->
-        <!--&gt;-->
-        <!--</template>-->
-        <!--</Tree>-->
-        <!--<Alert v-if="!isComponent">鼠标右键编辑/删除分组</Alert>-->
-        <!--<div class="group-row flex" v-if="!isComponent">-->
-        <!--<el-button @click="handleClickAddGroup">添加分组</el-button>-->
-        <!--</div>-->
-        <!--</div>-->
-
-        <!--<Table-->
-        <!--ref="table"-->
-        <!--:columns="isComponent ? viewColumns : columns"-->
-        <!--:data="data"-->
-        <!--:loading="loading"-->
-        <!--border-->
-        <!--class="table"-->
-        <!--sortable="custom"-->
-        <!--@on-sort-change="changeSort"-->
-        <!--@on-selection-change="changeSelect"-->
-        <!--&gt;-->
-        <!--<template #fileKey #default="{ row }">-->
-        <!--<a @click="copyFileUrl(row)">{{ row.fileKey }}</a>-->
-        <!--</template>-->
-        <!--</Table>-->
-        <!--</div>-->
-        <!--</div>-->
-
-        <!--<div v-show="showType === 'thumb'">-->
-        <!--<div class="oss-wrapper">-->
-        <!--<Card v-for="(item, i) in data" :key="i" class="oss-card">-->
-        <!--<div class="content">-->
-        <!--<img-->
-        <!--v-if="item.fileType.indexOf('image') >= 0"-->
-        <!--:src="item.url"-->
-        <!--class="img"-->
-        <!--@click="showPic(item)"-->
-        <!--/>-->
-        <!--<div-->
-        <!--v-else-if="item.fileType.indexOf('video') >= 0"-->
-        <!--class="video"-->
-        <!--@click="showVideo(item)"-->
-        <!--&gt;-->
-        <!--&lt;!&ndash; 文件小于5MB显示video &ndash;&gt;-->
-        <!--<video v-if="item.fileSize < 1024 * 1024 * 5" class="cover">-->
-        <!--<source :src="item.url"/>-->
-        <!--</video>-->
-        <!--<img class="play" src="@/assets/play.png"/>-->
-        <!--</div>-->
-        <!--<div v-else class="other">-->
-        <!--<div class="name">{{ item.name }}</div>-->
-        <!--<div class="key">{{ item.fileKey }}</div>-->
-        <!--<div class="info">-->
-        <!--文件类型：{{ item.fileType }} 文件大小：{{-->
-        <!--((item.fileSize * 1.0) / (1024 * 1024)).toFixed(2)-->
-        <!--}}-->
-        <!--MB 创建时间：{{ item.createTime }}-->
-        <!--</div>-->
-        <!--</div>-->
-        <!--<div class="actions">-->
-        <!--<div class="btn">-->
-        <!--<el-tooltip content="下载" placement="top">-->
-        <!--<Icon-->
-        <!--size="16"-->
-        <!--type="md-download"-->
-        <!--@click="download(item)"-->
-        <!--/>-->
-        <!--</el-tooltip>-->
-        <!--</div>-->
-        <!--<div class="btn">-->
-        <!--<el-tooltip content="重命名" placement="top">-->
-        <!--<Icon size="16" type="md-create" @click="rename(item)"/>-->
-        <!--</el-tooltip>-->
-        <!--</div>-->
-        <!--<div class="btn-no">-->
-        <!--<el-tooltip content="删除" placement="top">-->
-        <!--<Icon size="16" type="md-trash" @click="remove(item)"/>-->
-        <!--</el-tooltip>-->
-        <!--</div>-->
-        <!--</div>-->
-        <!--</div>-->
-        <!--</el-card>-->
-        <!--</div>-->
-        <!--</div>-->
-        <!--<div class="mt_10" justify="end" type="flex">-->
-        <!--<Page-->
-        <!--:current="searchForm.pageNumber"-->
-        <!--:page-size="searchForm.pageSize"-->
-        <!--:page-size-opts="pageSizeOpts"-->
-        <!--:total="total"-->
-        <!--show-elevator-->
-        <!--show-sizer-->
-        <!--show-total-->
-        <!--size="small"-->
-        <!--@change="changePage"-->
-        <!--@size-change="changePageSize"-->
-        <!--&gt;</el-pagination>-->
-        <!--</div>-->
       </el-card>
     </el-row>
     <el-dialog
@@ -473,7 +315,8 @@ import {
 import DPlayer from "dplayer";
 import {commonUrl} from "@/libs/axios";
 
-const config = require("@/config/index");
+import config from "@/config/index";
+import playImg from "@/assets/play.png";
 
 let dp;
 export default {
@@ -632,7 +475,7 @@ export default {
               } else {
                 return h("img", {
                   attrs: {
-                    src: require("@/assets/play.png"),
+                    src: playImg,
                   },
                   style: {
                     cursor: "pointer",
@@ -833,7 +676,7 @@ export default {
               } else {
                 return h("img", {
                   attrs: {
-                    src: require("@/assets/play.png"),
+                    src: playImg,
                   },
                   style: {
                     cursor: "pointer",
@@ -918,41 +761,6 @@ export default {
       groupLoading: false,
       // 图片列表
       selectedOss: [],
-      myData: [
-        {
-          title: 'parent 1',
-          expand: true,
-          render: (h, {root, node, data}) => {
-            return h('span', {style: {display: 'inline-block', width: '100%'}}, [
-              h('span', [h("Icon", {type: 'ios-folder-outline', style: {marginRight: '8px'}}), h('span', data.title)]),
-              h('span', {style: {display: 'inline-block', float: 'right', marginRight: '32px'}},
-                [h("Button", {
-                  ...this.buttonProps,
-                  icon: 'ios-add',
-                  type: 'primary',
-                  style: {width: '64px'},
-                  onClick: () => {
-                    this.append(data)
-                  }
-                })
-                ])
-            ]);
-          },
-          children: [
-            {
-              title: 'child 1-1',
-              expand: true,
-              children: [{title: 'leaf 1-1-1', expand: true}, {title: 'leaf 1-1-2', expand: true}]
-            },
-            {
-              title: 'child 1-2',
-              expand: true,
-              children: [{title: 'leaf 1-2-1', expand: true}, {title: 'leaf 1-2-1', expand: true}]
-            }
-          ]
-        }
-      ],
-      buttonProps: {type: 'default', size: 'small',},
     };
   },
   watch: {
@@ -1104,57 +912,6 @@ export default {
       this.searchForm.pageNumber = value;
       this.getDataList();
     },
-    // 自定义tree节点显示内容和交互
-    renderContent(h, {root, node, data}) {
-      if (data.value === '0') {
-        return h('span', {style: {display: 'inline-block', width: '100%'}},
-          [
-            h('span', [h("Icon", {type: 'ios-paper-outline', style: {marginRight: '8px'}}), h('span', data.title)]),
-            h('span', {style: {display: 'inline-block', float: 'right', marginRight: '10px'}}, [])
-          ]
-        );
-      } else {
-        return h('span', {style: {display: 'inline-block', width: '100%'}},
-          [
-            h('span', [h("Icon", {type: 'ios-paper-outline', style: {marginRight: '8px'}}), h('span', data.title)]),
-            h('span', {style: {display: 'inline-block', float: 'right', marginRight: '10px'}},
-              [
-                h("Dropdown", {style: {marginLeft: "4px"}},
-                  [
-                    h("Icon", {
-                      props: {type: 'ios-more', size: "20",},
-                      style: {display: 'inline-block'},
-                      on: {
-                        click: () => {
-                        }
-                      }
-                    }),
-                    h("DropdownMenu", {
-                      slot: "list"
-                    }, [
-                      h("DropdownItem", {
-                        nativeOn: {
-                          click: () => {
-                            this.handleContextMenuEdit(root, node, data)
-                          }
-                        }
-                      }, "编辑"),
-                      h("DropdownItem", {
-                        nativeOn: {
-                          click: () => {
-                            this.handleContextMenuDelete()
-                          }
-                        }
-                      }, "删除"),
-                    ])
-                  ]),
-              ])
-          ]
-        );
-      }
-
-    },
-
 
     handleContextMenu(val) {
       console.log('handleContextMenu', val);
diff --git a/seller/src/views/shop/wap/decorate.vue b/seller/src/views/shop/wap/decorate.vue
index e55613da..a0e9eab8 100644
--- a/seller/src/views/shop/wap/decorate.vue
+++ b/seller/src/views/shop/wap/decorate.vue
@@ -247,7 +247,7 @@
                 @click="changeTextAlign('left')"
               >
                 <img
-                  :src="require('@/assets/align-text-left.png')"
+                  :src="alignTextLeftImg"
                   class="align-text"
                   alt=""
                 />
@@ -258,7 +258,7 @@
                 @click="changeTextAlign('center')"
               >
                 <img
-                  :src="require('@/assets/align-text-center.png')"
+                  :src="alignTextCenterImg"
                   class="align-text"
                   alt=""
                 />
@@ -269,7 +269,7 @@
                 @click="changeTextAlign('right')"
               >
                 <img
-                  :src="require('@/assets/align-text-right.png')"
+                  :src="alignTextRightImg"
                   class="align-text"
                   alt=""
                 />
@@ -526,6 +526,9 @@
 </template>
 <script>
 import { CircleClose } from "@element-plus/icons-vue";
+import alignTextLeftImg from "@/assets/align-text-left.png";
+import alignTextCenterImg from "@/assets/align-text-center.png";
+import alignTextRightImg from "@/assets/align-text-right.png";
 import ossManage from "@/views/sys/oss-manage/ossManage";
 import { modelData } from "./config";
 import hotzone from "@/views/shop/hotzone";
@@ -540,6 +543,9 @@ export default {
   },
   data() {
     return {
+      alignTextLeftImg,
+      alignTextCenterImg,
+      alignTextRightImg,
       ways, // 选择链接的类型
       picModelFlag: false, //图片选择器
       linkType: "goods", // dialog弹窗口类型
diff --git a/seller/src/views/statistics/order/orderDetail.vue b/seller/src/views/statistics/order/orderDetail.vue
index 0adb6f18..50e77dee 100644
--- a/seller/src/views/statistics/order/orderDetail.vue
+++ b/seller/src/views/statistics/order/orderDetail.vue
@@ -99,10 +99,14 @@ export default {
   },
   props: ["res"],
   methods: {
-    handleClickGoods(id) {
-      this.$router.push({
-        query: { id },
-        path: "/goods/goods-info/goodsDetail",
+    handleClickGoods(goodsId) {
+      if (!goodsId) {
+        this.$Message.warning("商品信息不存在");
+        return;
+      }
+      this.$filters.customRouterPush({
+        name: "goods-operation-edit",
+        query: { id: goodsId },
       });
     },
   },
diff --git a/seller/src/views/statistics/order/refundOrder.vue b/seller/src/views/statistics/order/refundOrder.vue
index d16a7db1..af5a4206 100644
--- a/seller/src/views/statistics/order/refundOrder.vue
+++ b/seller/src/views/statistics/order/refundOrder.vue
@@ -112,10 +112,14 @@ export default {
   },
   props: ["res"],
   methods: {
-    handleClickGoods(id) {
-      this.$router.push({
-        query: { id },
-        path: "/goods/goods-info/goodsDetail",
+    handleClickGoods(goodsId) {
+      if (!goodsId) {
+        this.$Message.warning("商品信息不存在");
+        return;
+      }
+      this.$filters.customRouterPush({
+        name: "goods-operation-edit",
+        query: { id: goodsId },
       });
     },
   }
diff --git a/seller/src/views/sys/oss-manage/ossManage.scss b/seller/src/views/sys/oss-manage/ossManage.scss
index 94f7376d..428a2365 100644
--- a/seller/src/views/sys/oss-manage/ossManage.scss
+++ b/seller/src/views/sys/oss-manage/ossManage.scss
@@ -35,7 +35,7 @@
 
   cursor: pointer;
 
-  .ivu-card-body {
+  .el-card__body {
     padding: 0;
   }
 
@@ -240,7 +240,7 @@
     flex-direction: row-reverse;
   }
 
-  .demo-tree-render .ivu-tree-title{
+  .demo-tree-render .el-tree-node__content {
     width: 94%;
   }
 }
diff --git a/seller/src/views/sys/oss-manage/ossManage.vue b/seller/src/views/sys/oss-manage/ossManage.vue
index b9521997..7a912689 100644
--- a/seller/src/views/sys/oss-manage/ossManage.vue
+++ b/seller/src/views/sys/oss-manage/ossManage.vue
@@ -73,10 +73,7 @@
   <div class="search">
     <el-card class="tabs-card">
       <el-tabs v-model="activeRoleTab" @tab-change="handleRoleTabChange">
-        <el-tab-pane label="管理员" name="MANAGER" />
         <el-tab-pane label="商家" name="STORE" />
-        <el-tab-pane label="用户" name="MEMBER" />
-        <el-tab-pane label="客服" name="CUSTOMER" />
       </el-tabs>
     </el-card>
     <el-row>
@@ -232,167 +229,7 @@
               </div>
             </el-col>
           </el-row>
-
-
-          <!--<div class="oss-operation padding-row">-->
-          <!--<div>-->
-          <!--<Upload-->
-          <!--ref="up"-->
-          <!--:action="commonUrl + '/common/common/upload/file'"-->
-          <!--:data="{-->
-          <!--directoryPath: searchForm.fileDirectoryId,-->
-          <!--}"-->
-          <!--:headers="accessToken"-->
-          <!--:max-size="20480"-->
-          <!--:on-error="handleError"-->
-          <!--:on-exceeded-size="handleMaxSize"-->
-          <!--:on-success="handleSuccess"-->
-          <!--:show-upload-list="false"-->
-          <!--multiple-->
-          <!--style="display: inline-block"-->
-          <!--&gt;-->
-          <!--<Button>上传图片</Button>-->
-          <!--</Upload>-->
-          <!--<Dropdown @on-click="handleDropdown" v-if="!isComponent">-->
-          <!--<Button>-->
-          <!--更多操作-->
-          <!--<Icon type="md-arrow-dropdown"/>-->
-          <!--</Button>-->
-          <!--<DropdownMenu slot="list">-->
-          <!--<DropdownItem name="refresh">刷新</DropdownItem>-->
-          <!--<DropdownItem v-show="showType == 'list'" name="removeAll"-->
-          <!--&gt;批量删除-->
-          <!--</DropdownItem>-->
-          <!--</DropdownMenu>-->
-          <!--</Dropdown>-->
-          <!--</div>-->
-          <!--</div>-->
         </div>
-
-        <!--<Alert show-icon v-if="!isComponent">-->
-        <!--已选择-->
-        <!--<span>{{ selectCount }}</span> 项-->
-        <!--<a class="select-clear" @click="clearSelectAll">清空</a>-->
-        <!--<span v-if="selectCount > 0" style="margin-left: 15px"-->
-        <!--&gt;共计 {{ totalSize }} 存储量</span-->
-        <!--&gt;-->
-        <!--</Alert>-->
-
-        <!--<div v-show="showType === 'list'" >-->
-        <!--<div class="flex">-->
-        <!--<div class="article-category mr_10">-->
-        <!--<Tree-->
-        <!--:data="treeData"-->
-        <!--@on-contextmenu="handleContextMenu"-->
-        <!--@on-select-change="handleCateChange"-->
-        <!--&gt;-->
-        <!--<template slot="contextMenu" v-if="!isComponent">-->
-        <!--<DropdownItem @click.native="handleContextMenuEdit"-->
-        <!--&gt;编辑-->
-        <!--</DropdownItem-->
-        <!--&gt;-->
-        <!--<DropdownItem-->
-        <!--style="color: #ed4014"-->
-        <!--@click.native="handleContextMenuDelete"-->
-        <!--&gt;删除-->
-        <!--</DropdownItem-->
-        <!--&gt;-->
-        <!--</template>-->
-        <!--</Tree>-->
-        <!--<Alert v-if="!isComponent">鼠标右键编辑/删除分组</Alert>-->
-        <!--<div class="group-row flex" v-if="!isComponent">-->
-        <!--<Button @click="handleClickAddGroup">添加分组</Button>-->
-        <!--</div>-->
-        <!--</div>-->
-
-        <!--<Table-->
-        <!--ref="table"-->
-        <!--:columns="isComponent ? viewColumns : columns"-->
-        <!--:data="data"-->
-        <!--:loading="loading"-->
-        <!--border-->
-        <!--class="table"-->
-        <!--sortable="custom"-->
-        <!--@on-sort-change="changeSort"-->
-        <!--@on-selection-change="changeSelect"-->
-        <!--&gt;-->
-        <!--<template slot="fileKey" slot-scope="{ row }">-->
-        <!--<a @click="copyFileUrl(row)">{{ row.fileKey }}</a>-->
-        <!--</template>-->
-        <!--</Table>-->
-        <!--</div>-->
-        <!--</div>-->
-
-        <!--<div v-show="showType === 'thumb'">-->
-        <!--<div class="oss-wrapper">-->
-        <!--<Card v-for="(item, i) in data" :key="i" class="oss-card">-->
-        <!--<div class="content">-->
-        <!--<img-->
-        <!--v-if="item.fileType.indexOf('image') >= 0"-->
-        <!--:src="item.url"-->
-        <!--class="img"-->
-        <!--@click="showPic(item)"-->
-        <!--/>-->
-        <!--<div-->
-        <!--v-else-if="item.fileType.indexOf('video') >= 0"-->
-        <!--class="video"-->
-        <!--@click="showVideo(item)"-->
-        <!--&gt;-->
-        <!--&lt;!&ndash; 文件小于5MB显示video &ndash;&gt;-->
-        <!--<video v-if="item.fileSize < 1024 * 1024 * 5" class="cover">-->
-        <!--<source :src="item.url"/>-->
-        <!--</video>-->
-        <!--<img class="play" src="@/assets/play.png"/>-->
-        <!--</div>-->
-        <!--<div v-else class="other">-->
-        <!--<div class="name">{{ item.name }}</div>-->
-        <!--<div class="key">{{ item.fileKey }}</div>-->
-        <!--<div class="info">-->
-        <!--文件类型：{{ item.fileType }} 文件大小：{{-->
-        <!--((item.fileSize * 1.0) / (1024 * 1024)).toFixed(2)-->
-        <!--}}-->
-        <!--MB 创建时间：{{ item.createTime }}-->
-        <!--</div>-->
-        <!--</div>-->
-        <!--<div class="actions">-->
-        <!--<div class="btn">-->
-        <!--<Tooltip content="下载" placement="top">-->
-        <!--<Icon-->
-        <!--size="16"-->
-        <!--type="md-download"-->
-        <!--@click="download(item)"-->
-        <!--/>-->
-        <!--</Tooltip>-->
-        <!--</div>-->
-        <!--<div class="btn">-->
-        <!--<Tooltip content="重命名" placement="top">-->
-        <!--<Icon size="16" type="md-create" @click="rename(item)"/>-->
-        <!--</Tooltip>-->
-        <!--</div>-->
-        <!--<div class="btn-no">-->
-        <!--<Tooltip content="删除" placement="top">-->
-        <!--<Icon size="16" type="md-trash" @click="remove(item)"/>-->
-        <!--</Tooltip>-->
-        <!--</div>-->
-        <!--</div>-->
-        <!--</div>-->
-        <!--</Card>-->
-        <!--</div>-->
-        <!--</div>-->
-        <!--<Row class="mt_10" justify="end" type="flex">-->
-        <!--<Page-->
-        <!--:current="searchForm.pageNumber"-->
-        <!--:page-size="searchForm.pageSize"-->
-        <!--:page-size-opts="pageSizeOpts"-->
-        <!--:total="total"-->
-        <!--show-elevator-->
-        <!--show-sizer-->
-        <!--show-total-->
-        <!--size="small"-->
-        <!--@on-change="changePage"-->
-        <!--@on-page-size-change="changePageSize"-->
-        <!--&gt;</Page>-->
-        <!--</Row>-->
       </el-card>
     </el-row>
     <el-dialog
@@ -488,7 +325,7 @@ import {
 import DPlayer from "dplayer";
 import {commonUrl} from "@/libs/axios";
 
-const config = require("@/config/index");
+import config from "@/config/index";
 
 let dp;
 export default {
@@ -553,14 +390,14 @@ export default {
       picTitle: "", // 图片title
       videoTitle: "", // 视频title
       modalTitle: "", // 添加或编辑标题
-      activeRoleTab: "MANAGER",
+      activeRoleTab: "STORE",
       searchForm: {
         // 搜索框对应data对象
         name: "",
         fileKey: "",
         fileType: "",
         fileCategory: "",
-        userEnums: "MANAGER",
+        userEnums: "STORE",
         pageNumber: 1, // 当前页数
         pageSize: 20, // 页面大小
         sort: "createTime", // 默认排序字段
@@ -585,342 +422,6 @@ export default {
       selectList: [], // 多选数据
       selectCount: 0, // 多选计数
       totalSize: "", // 文件大小统计
-      columns: [
-        // 表头
-        {
-          type: "selection",
-          width: 60,
-          align: "center",
-        },
-        {
-          title: "缩略图(点击预览)",
-          key: "url",
-          width: 300,
-          align: "center",
-          render: (h, params) => {
-            if (this.isImageFile(params.row)) {
-              return h("img", {
-                attrs: {
-                  src: params.row.url || "",
-                  alt: "加载图片失败",
-                },
-                style: {
-                  cursor: "pointer",
-                  width: "80px",
-                  height: "60px",
-                  margin: "10px 0",
-                  "object-fit": "contain",
-                },
-                on: {
-                  click: () => {
-                    this.showPic(params.row);
-                  },
-                },
-              });
-            } else if (this.isVideoFile(params.row)) {
-              // 如果视频文件大小超过5MB不予加载video
-              if (params.row.fileSize < 1024 * 1024 * 5) {
-                return h(
-                  "video",
-                  {
-                    style: {
-                      cursor: "pointer",
-                      width: "80px",
-                      height: "60px",
-                      margin: "10px 0",
-                      "object-fit": "contain",
-                    },
-                    on: {
-                      click: () => {
-                        this.showVideo(params.row);
-                      },
-                    },
-                  },
-                  [
-                    h("source", {
-                      attrs: {
-                        src: params.row.url,
-                      },
-                    }),
-                  ]
-                );
-              } else {
-                return h("img", {
-                  attrs: {
-                    src: require("@/assets/play.png"),
-                  },
-                  style: {
-                    cursor: "pointer",
-                    width: "80px",
-                    height: "60px",
-                    margin: "10px 0",
-                    "object-fit": "contain",
-                  },
-                  on: {
-                    click: () => {
-                      this.showVideo(params.row);
-                    },
-                  },
-                });
-              }
-            } else {
-              return h("span", "非多媒体类型");
-            }
-          },
-        },
-        {
-          title: "文件类型",
-          key: "fileType",
-          width: 115,
-          className: this.selectImage == true ? "none" : "",
-        },
-        {
-          title: "文件大小",
-          key: "fileSize",
-          width: 115,
-          sortable: true,
-          className: this.selectImage == true ? "none" : "",
-          render: (h, params) => {
-            let m =
-              ((params.row.fileSize * 1.0) / (1024 * 1024)).toFixed(2) + " MB";
-            return h("span", m);
-          },
-        },
-        {
-          title: "上传者",
-          key: "createBy",
-          width: 200,
-          render: (h, params) => {
-            let m = "";
-            if (params.row.userEnums == "MANAGER") {
-              m = "[管理员]";
-            } else if (params.row.userEnums == "STORE") {
-              m = "[商家]";
-            } else if (params.row.userEnums == "CUSTOMER") {
-              m = "[客服]";
-            } else {
-              m = "[用户]";
-            }
-            m += params.row.createBy;
-            return h("span", m);
-          },
-        },
-        {
-          title: "操作",
-          key: "action",
-          align: "center",
-          fixed: "right",
-          // width: 300,
-          render: (h, params) => {
-            return h("div", [
-              h(
-                "a",
-                {
-                  style: {
-                    color: "#2d8cf0",
-                    cursor: "pointer",
-                    textDecoration: "none",
-                    marginRight: "5px",
-                    display: this.selectImage === true ? "inline-block" : "none",
-                  },
-                  on: {
-                    click: () => {
-                      this.selectedParams(params.row);
-                    },
-                  },
-                },
-                "选择"
-              ),
-              h(
-                "span",
-                {
-                  style: {
-                    margin: "0 8px",
-                    color: "#dcdee2",
-                    display: this.selectImage === true ? "inline-block" : "none",
-                  },
-                },
-                "|"
-              ),
-              h(
-                "a",
-                {
-                  style: {
-                    color: "#2d8cf0",
-                    cursor: "pointer",
-                    textDecoration: "none",
-                    marginRight: "5px",
-                    display: this.selectImage == true ? "none" : "inline-block",
-                  },
-                  on: {
-                    click: () => {
-                      this.download(params.row);
-                    },
-                  },
-                },
-                "下载"
-              ),
-              h(
-                "span",
-                {
-                  style: {
-                    margin: "0 8px",
-                    color: "#dcdee2",
-                    display: this.selectImage == true ? "none" : "inline-block",
-                  },
-                },
-                "|"
-              ),
-              h(
-                "a",
-                {
-                  style: {
-                    color: "#2d8cf0",
-                    cursor: "pointer",
-                    textDecoration: "none",
-                    display: this.selectImage == true ? "none" : "inline-block",
-                  },
-                  on: {
-                    click: () => {
-                      this.remove(params.row);
-                    },
-                  },
-                },
-                "删除"
-              ),
-            ]);
-          },
-        },
-      ],
-      viewColumns: [
-        {
-          title: "缩略图(点击预览)",
-          key: "url",
-          // width: 150,
-          align: "center",
-          render: (h, params) => {
-            if (this.isImageFile(params.row)) {
-              return h("img", {
-                attrs: {
-                  src: params.row.url || "",
-                  alt: "加载图片失败",
-                },
-                style: {
-                  cursor: "pointer",
-                  width: "80px",
-                  height: "60px",
-                  margin: "10px 0",
-                  "object-fit": "contain",
-                },
-                on: {
-                  click: () => {
-                    this.showPic(params.row);
-                  },
-                },
-              });
-            } else if (this.isVideoFile(params.row)) {
-              // 如果视频文件大小超过5MB不予加载video
-              if (params.row.fileSize < 1024 * 1024 * 5) {
-                return h(
-                  "video",
-                  {
-                    style: {
-                      cursor: "pointer",
-                      width: "80px",
-                      height: "60px",
-                      margin: "10px 0",
-                      "object-fit": "contain",
-                    },
-                    on: {
-                      click: () => {
-                        this.showVideo(params.row);
-                      },
-                    },
-                  },
-                  [
-                    h("source", {
-                      attrs: {
-                        src: params.row.url,
-                      },
-                    }),
-                  ]
-                );
-              } else {
-                return h("img", {
-                  attrs: {
-                    src: require("@/assets/play.png"),
-                  },
-                  style: {
-                    cursor: "pointer",
-                    width: "80px",
-                    height: "60px",
-                    margin: "10px 0",
-                    "object-fit": "contain",
-                  },
-                  on: {
-                    click: () => {
-                      this.showVideo(params.row);
-                    },
-                  },
-                });
-              }
-            } else {
-              return h("span", "非多媒体类型");
-            }
-          },
-        },
-        {
-          title: "上传者",
-          key: "createBy",
-          width: 120,
-          sortable: true,
-          render: (h, params) => {
-            let m = "";
-            if (params.row.userEnums == "MANAGER") {
-              m = "[管理员]";
-            } else if (params.row.userEnums == "STORE") {
-              m = "[商家]";
-            } else if (params.row.userEnums == "CUSTOMER") {
-              m = "[客服]";
-            } else {
-              m = "[用户]";
-            }
-            m += params.row.createBy;
-            return h("span", m);
-          },
-        },
-        {
-          title: "操作",
-          key: "action",
-          align: "center",
-          fixed: "right",
-          width: 300,
-          render: (h, params) => {
-            return h("div", [
-              h(
-                "Button",
-                {
-                  props: {
-                    type: "default",
-                    size: "small",
-                  },
-                  style: {
-                    marginRight: "5px",
-                    display:
-                      this.selectImage === true ? "inline-block" : "none",
-                  },
-                  on: {
-                    click: () => {
-                      this.selectedParams(params.row);
-                    },
-                  },
-                },
-                "选择"
-              )
-            ]);
-          },
-        },
-      ],
       data: [], // 表单数据
       total: 0, // 表单数据总数
       pageSizeOpts: [5, 10, 20], // 页码展示项
@@ -933,41 +434,6 @@ export default {
       groupLoading: false,
       // 图片列表
       selectedOss: [],
-      myData: [
-        {
-          title: 'parent 1',
-          expand: true,
-          render: (h, {root, node, data}) => {
-            return h('span', {style: {display: 'inline-block', width: '100%'}}, [
-              h('span', [h("Icon", {type: 'ios-folder-outline', style: {marginRight: '8px'}}), h('span', data.title)]),
-              h('span', {style: {display: 'inline-block', float: 'right', marginRight: '32px'}},
-                [h("Button", {
-                  ...this.buttonProps,
-                  icon: 'ios-add',
-                  type: 'primary',
-                  style: {width: '64px'},
-                  onClick: () => {
-                    this.append(data)
-                  }
-                })
-                ])
-            ]);
-          },
-          children: [
-            {
-              title: 'child 1-1',
-              expand: true,
-              children: [{title: 'leaf 1-1-1', expand: true}, {title: 'leaf 1-1-2', expand: true}]
-            },
-            {
-              title: 'child 1-2',
-              expand: true,
-              children: [{title: 'leaf 1-2-1', expand: true}, {title: 'leaf 1-2-1', expand: true}]
-            }
-          ]
-        }
-      ],
-      buttonProps: {type: 'default', size: 'small',},
     };
   },
   watch: {
@@ -999,7 +465,7 @@ export default {
       return this.activeRoleTab === "MANAGER";
     },
     canUploadImages() {
-      return this.activeRoleTab === "MANAGER";
+      return this.activeRoleTab === "MANAGER" || this.activeRoleTab === "STORE";
     },
     uploadData() {
       return {
@@ -1125,61 +591,8 @@ export default {
       this.searchForm.pageNumber = value;
       this.getDataList();
     },
-    // 自定义tree节点显示内容和交互
-    renderContent(h, {root, node, data}) {
-      if (data.value === '0') {
-        return h('span', {style: {display: 'inline-block', width: '100%'}},
-          [
-            h('span', [h("Icon", {type: 'ios-paper-outline', style: {marginRight: '8px'}}), h('span', data.title)]),
-            h('span', {style: {display: 'inline-block', float: 'right', marginRight: '10px'}}, [])
-          ]
-        );
-      } else {
-        return h('span', {style: {display: 'inline-block', width: '100%'}},
-          [
-            h('span', [h("Icon", {type: 'ios-paper-outline', style: {marginRight: '8px'}}), h('span', data.title)]),
-            h('span', {style: {display: 'inline-block', float: 'right', marginRight: '10px'}},
-              [
-                h("Dropdown", {style: {marginLeft: "4px"}},
-                  [
-                    h("Icon", {
-                      props: {type: 'ios-more', size: "20",},
-                      style: {display: 'inline-block'},
-                      on: {
-                        click: () => {
-                        }
-                      }
-                    }),
-                    h("DropdownMenu", {
-                      slot: "list"
-                    }, [
-                      h("DropdownItem", {
-                        nativeOn: {
-                          click: () => {
-                            this.handleContextMenuEdit(root, node, data)
-                          }
-                        }
-                      }, "编辑"),
-                      h("DropdownItem", {
-                        nativeOn: {
-                          click: () => {
-                            this.handleContextMenuDelete()
-                          }
-                        }
-                      }, "删除"),
-                    ])
-                  ]),
-              ])
-          ]
-        );
-      }
-
-    },
-
-
     handleContextMenu(val) {
-      console.log('handleContextMenu', val);
-      this.selectedGroupData = val;
+this.selectedGroupData = val;
     },
     // 编辑分组
     handleContextMenuEdit(root, node, data) {