From 8d96a3c10667b6a180a813b41cb23bcac87a3389 Mon Sep 17 00:00:00 2001
From: paulGao <paulgao0831@gmail.com>
Date: Wed, 17 Nov 2021 16:39:24 +0800
Subject: [PATCH 1/8] =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=AB=AF=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E9=80=80=E5=87=BA=E7=99=BB=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manager/src/views/Main.vue | 38 +++++++++++++++++++++-----------------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/manager/src/views/Main.vue b/manager/src/views/Main.vue
index 6198d1df..984433c6 100644
--- a/manager/src/views/Main.vue
+++ b/manager/src/views/Main.vue
@@ -13,23 +13,32 @@
     <!-- 顶部标题栏主体 -->
     <div class="main-header-con">
       <div class="main-header">
-        <div :class="{'header-avator-con':navType!=4, 'header-avator-con nav4':navType == 4}">
+        <div
+          :class="{
+            'header-avator-con': navType != 4,
+            'header-avator-con nav4': navType == 4,
+          }"
+        >
           <!-- 通知消息 -->
           <message-tip v-if="tipsMessage" :res="tipsMessage"></message-tip>
           <!-- 用户头像 -->
           <div class="user-dropdown-menu-con">
-
             <Row type="flex" justify="end" align="middle" class="user-dropdown-innercon">
               <Dropdown transfer trigger="hover" @on-click="handleClickUserDropdown">
                 <div class="dropList">
                   <span class="main-user-name">{{ userInfo.nickName }}</span>
                   <Icon type="md-arrow-dropdown" />
-                  <Avatar :src="avatarPath" style="background: #fff;margin-left: 10px;"></Avatar>
+                  <Avatar
+                    :src="avatarPath"
+                    style="background: #fff; margin-left: 10px"
+                  ></Avatar>
                 </div>
                 <DropdownMenu slot="list">
-                  <DropdownItem name="personalCenter">{{ $t('userCenter') }}</DropdownItem>
-                  <DropdownItem name="changePass">{{ $t('changePass') }}</DropdownItem>
-                  <DropdownItem name="loginOut" divided>{{ $t('logout') }}</DropdownItem>
+                  <DropdownItem name="personalCenter">{{
+                    $t("userCenter")
+                  }}</DropdownItem>
+                  <DropdownItem name="changePass">{{ $t("changePass") }}</DropdownItem>
+                  <DropdownItem name="loginOut" divided>{{ $t("logout") }}</DropdownItem>
                 </DropdownMenu>
               </Dropdown>
             </Row>
@@ -60,7 +69,7 @@ import messageTip from "./main-components/message-tip.vue";
 import circleLoading from "@/views/my-components/lili/circle-loading.vue";
 import Cookies from "js-cookie";
 import util from "@/libs/util.js";
-import { getNoticePage,logout } from "@/api/index";
+import { getNoticePage, logout } from "@/api/index";
 
 var client;
 export default {
@@ -90,7 +99,7 @@ export default {
     },
     lang() {
       return this.$store.state.app.lang;
-    }
+    },
   },
 
   methods: {
@@ -131,13 +140,13 @@ export default {
       }
       // 退出登录
       else if (name === "loginOut") {
-        logout().then(res => {
+        logout().then((res) => {
           this.$store.commit("logout", this);
-          this.$store.commit('setAdded', false);
+          this.$store.commit("setAdded", false);
           this.setStore("accessToken", "");
           this.setStore("refreshToken", "");
           this.$router.push({ path: "/login" });
-        })
+        });
       }
     },
     //切换标签
@@ -149,12 +158,7 @@ export default {
       });
       if (!openpageHasTag) {
         //  解决关闭当前标签后再点击回退按钮会退到当前页时没有标签的问题
-        util.openNewPage(
-          this,
-          name,
-          this.$route.params || {},
-          this.$route.query || {}
-        );
+        util.openNewPage(this, name, this.$route.params || {}, this.$route.query || {});
       }
     },
     //宽度动态计算

From ccd5decbf794e71f6826e22d086838b4027181d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com>
Date: Thu, 18 Nov 2021 14:51:44 +0800
Subject: [PATCH 2/8] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=A5=BC=E5=B1=82?=
 =?UTF-8?q?=E8=A3=85=E4=BF=AE=20pc=E7=AB=AF=E4=B8=AD=E6=8E=A7=E5=88=B6?=
 =?UTF-8?q?=E5=8F=B0=E5=9B=A0=E7=B1=BB=E5=9E=8B=E8=BD=AC=E6=8D=A2=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E5=AF=BC=E8=87=B4=E7=9A=84=E6=8A=A5=E9=94=99=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/lili-floor-renovation/floorList.vue    |  2 +-
 .../views/lili-floor-renovation/modelForm.vue    | 16 ++++++++--------
 .../lili-floor-renovation/modelFormItem.vue      | 13 +++++--------
 .../lili-floor-renovation/modelList/carousel.vue |  8 ++++----
 .../modelList/carousel1.vue                      |  8 ++++----
 .../modelList/carousel2.vue                      |  6 +++---
 .../modelList/firstPageAdvert.vue                |  8 ++++----
 .../modelList/newGoodsSort.vue                   | 12 ++++++------
 .../modelList/notEnough.vue                      |  4 +---
 .../modelList/recommend.vue                      | 12 ++++++------
 .../views/lili-floor-renovation/renovation.vue   |  2 +-
 11 files changed, 43 insertions(+), 48 deletions(-)

diff --git a/manager/src/views/lili-floor-renovation/floorList.vue b/manager/src/views/lili-floor-renovation/floorList.vue
index 6962304e..560cf3b7 100644
--- a/manager/src/views/lili-floor-renovation/floorList.vue
+++ b/manager/src/views/lili-floor-renovation/floorList.vue
@@ -42,7 +42,7 @@
       width="600"
       :z-index="100"
       :loading="loading"
-      mask-closable="false"
+      :mask-closable="false"
       @on-ok="newTemplate"
       @on-cancel="showModal = false"
     >
diff --git a/manager/src/views/lili-floor-renovation/modelForm.vue b/manager/src/views/lili-floor-renovation/modelForm.vue
index 28cf7967..40da5323 100644
--- a/manager/src/views/lili-floor-renovation/modelForm.vue
+++ b/manager/src/views/lili-floor-renovation/modelForm.vue
@@ -22,7 +22,7 @@
             <div class="search-con">
                 <img :src="require('@/assets/logo.png')" class="logo" alt="">
                 <div class="search">
-                    <i-input v-model="searchData" size="large" placeholder="输入你想查找的商品">
+                    <i-input  size="large" placeholder="输入你想查找的商品">
                         <Button slot="append">搜索</Button>
                     </i-input>
                 </div>
@@ -58,9 +58,9 @@
             draggable
             width="800"
             :z-index="100"
-            mask-closable="false"
-            :on-ok="sureDecorate"
-            :on-cancel="cancelDecorate"
+            :mask-closable="false"
+            
+           
             >
             <!-- 顶部广告 -->
             <div class="modal-top-advert">
@@ -87,9 +87,9 @@
             draggable
             width="800"
             :z-index="100"
-            mask-closable="false"
-            :on-ok="sureDecorate"
-            :on-cancel="cancelDecorate"
+            :mask-closable="false"
+            
+          
             >
             <!-- 分类tab栏 -->
             <div class="modal-tab-bar">
@@ -121,7 +121,7 @@
         <liliDialog
             ref="liliDialog"
             @selectedLink="selectedLink"
-            @selectedGoodsData="selectedGoodsData"
+           
         ></liliDialog>
         <!-- 选择图片 -->
         <Modal width="1200px" v-model="picModelFlag" footer-hide>
diff --git a/manager/src/views/lili-floor-renovation/modelFormItem.vue b/manager/src/views/lili-floor-renovation/modelFormItem.vue
index 47452bf2..121e514a 100644
--- a/manager/src/views/lili-floor-renovation/modelFormItem.vue
+++ b/manager/src/views/lili-floor-renovation/modelFormItem.vue
@@ -147,9 +147,9 @@
       draggable
       width="800"
       :z-index="100"
-      mask-closable="false"
-      :on-ok="sureDecorate"
-      :on-cancel="cancelDecorate"
+      :mask-closable="false"
+      
+      
     >
       <div class="modal-top-advert">
         <div>
@@ -216,7 +216,7 @@
     <liliDialog
       ref="liliDialog"
       @selectedLink="selectedLink"
-      @selectedGoodsData="selectedGoodsData"
+  
     ></liliDialog>
     <!-- 选择图片 -->
     <Modal width="1200px" v-model="picModelFlag" footer-hide>
@@ -287,10 +287,7 @@ export default {
     selectedLink(val) {
       this.selected.url = this.$options.filters.formatLinkType(val);
     },
-    // 拖动结束回调
-    handleMoveEnd({ newIndex, oldIndex }) {
-      console.log("index", newIndex, oldIndex);
-    },
+    
     handleSelectImg() {
       // 选择图片
       this.$refs.ossManage.selectImage = true;
diff --git a/manager/src/views/lili-floor-renovation/modelList/carousel.vue b/manager/src/views/lili-floor-renovation/modelList/carousel.vue
index 970f57e9..cede534d 100644
--- a/manager/src/views/lili-floor-renovation/modelList/carousel.vue
+++ b/manager/src/views/lili-floor-renovation/modelList/carousel.vue
@@ -48,9 +48,9 @@
       draggable
       width="800"
       :z-index="100"
-      mask-closable="false"
-      :on-ok="sureDecorate"
-      :on-cancel="cancelDecorate"
+      :mask-closable="false"
+      
+      
     >
       <div class="modal-tab-bar">
         <Button type="primary" size="small" @click="handleAdd">添加轮播</Button>
@@ -110,7 +110,7 @@
     <liliDialog
       ref="liliDialog"
       @selectedLink="selectedLink"
-      @selectedGoodsData="selectedGoodsData"
+    
     ></liliDialog>
     <!-- 选择图片 -->
     <Modal width="1200px" v-model="picModelFlag" footer-hide>
diff --git a/manager/src/views/lili-floor-renovation/modelList/carousel1.vue b/manager/src/views/lili-floor-renovation/modelList/carousel1.vue
index 6c7396e0..3ee291f5 100644
--- a/manager/src/views/lili-floor-renovation/modelList/carousel1.vue
+++ b/manager/src/views/lili-floor-renovation/modelList/carousel1.vue
@@ -25,9 +25,9 @@
       draggable
       width="800"
       :z-index="100"
-      mask-closable="false"
-      :on-ok="sureDecorate"
-      :on-cancel="cancelDecorate"
+      :mask-closable="false"
+      
+      
     >
       <div class="modal-tab-bar">
         <Button type="primary" size="small" @click="handleAdd">添加轮播</Button>
@@ -81,7 +81,7 @@
     <liliDialog
       ref="liliDialog"
       @selectedLink="selectedLink"
-      @selectedGoodsData="selectedGoodsData"
+    
     ></liliDialog>
     <!-- 选择图片 -->
     <Modal width="1200px" v-model="picModelFlag" footer-hide>
diff --git a/manager/src/views/lili-floor-renovation/modelList/carousel2.vue b/manager/src/views/lili-floor-renovation/modelList/carousel2.vue
index 39a0606a..97c8d70b 100644
--- a/manager/src/views/lili-floor-renovation/modelList/carousel2.vue
+++ b/manager/src/views/lili-floor-renovation/modelList/carousel2.vue
@@ -70,7 +70,7 @@
       draggable
       width="800"
       :z-index="100"
-      mask-closable="false"
+      :mask-closable="false"
     >
       <div class="modal-tab-bar">
         <Button type="primary" size="small" @click="handleAdd">添加轮播</Button>
@@ -124,7 +124,7 @@
       draggable
       width="800"
       :z-index="100"
-      mask-closable="false"
+      :mask-closable="false"
     >
       <div class="modal-tab-bar">
         <Button type="primary" size="small" @click="handleAddGroup">添加组</Button>
@@ -173,7 +173,7 @@
     <liliDialog
       ref="liliDialog"
       @selectedLink="selectedLink"
-      @selectedGoodsData="selectedGoodsData"
+     
     ></liliDialog>
     <!-- 选择图片 -->
     <Modal width="1200px" v-model="picModelFlag" footer-hide>
diff --git a/manager/src/views/lili-floor-renovation/modelList/firstPageAdvert.vue b/manager/src/views/lili-floor-renovation/modelList/firstPageAdvert.vue
index 0bf56950..8f8f0f90 100644
--- a/manager/src/views/lili-floor-renovation/modelList/firstPageAdvert.vue
+++ b/manager/src/views/lili-floor-renovation/modelList/firstPageAdvert.vue
@@ -18,9 +18,9 @@
             draggable
             width="800"
             :z-index="100"
-            mask-closable="false"
-            :on-ok="sureDecorate"
-            :on-cancel="cancelDecorate"
+            :mask-closable="false"
+            
+            
             >
             <div class="modal-top-advert">
                 <div>
@@ -54,7 +54,7 @@
         <liliDialog
             ref="liliDialog"
             @selectedLink="selectedLink"
-            @selectedGoodsData="selectedGoodsData"
+          
         ></liliDialog>
         <!-- 选择图片 -->
         <Modal width="1200px" v-model="picModelFlag" footer-hide>
diff --git a/manager/src/views/lili-floor-renovation/modelList/newGoodsSort.vue b/manager/src/views/lili-floor-renovation/modelList/newGoodsSort.vue
index 88196772..2acb66e9 100644
--- a/manager/src/views/lili-floor-renovation/modelList/newGoodsSort.vue
+++ b/manager/src/views/lili-floor-renovation/modelList/newGoodsSort.vue
@@ -72,9 +72,9 @@
             draggable
             width="800"
             :z-index="100"
-            mask-closable="false"
-            :on-ok="sureDecorate"
-            :on-cancel="cancelDecorate"
+            :mask-closable="false"
+            
+            
             >
             <div class="modal-top-advert">
                 <div>
@@ -107,9 +107,9 @@
             draggable
             width="800"
             :z-index="100"
-            mask-closable="false"
-            :on-ok="sureDecorate"
-            :on-cancel="cancelDecorate"
+            :mask-closable="false"
+            
+            
             >
             <div class="modal-top-advert">
                 <div>
diff --git a/manager/src/views/lili-floor-renovation/modelList/notEnough.vue b/manager/src/views/lili-floor-renovation/modelList/notEnough.vue
index 7483e7c9..fc00097a 100644
--- a/manager/src/views/lili-floor-renovation/modelList/notEnough.vue
+++ b/manager/src/views/lili-floor-renovation/modelList/notEnough.vue
@@ -32,9 +32,7 @@
             draggable
             width="800"
             :z-index="100"
-            mask-closable="false"
-            :on-ok="sureDecorate"
-            :on-cancel="cancelDecorate"
+            :mask-closable="false"
             >
             <div class="modal-tab-bar">
                 <Button type="primary" size='small' @click="handleAddNav">添加分类</Button>
diff --git a/manager/src/views/lili-floor-renovation/modelList/recommend.vue b/manager/src/views/lili-floor-renovation/modelList/recommend.vue
index 7dddd9f3..a3847530 100644
--- a/manager/src/views/lili-floor-renovation/modelList/recommend.vue
+++ b/manager/src/views/lili-floor-renovation/modelList/recommend.vue
@@ -107,9 +107,9 @@
       draggable
       width="800"
       :z-index="100"
-      mask-closable="false"
-      :on-ok="sureDecorate"
-      :on-cancel="cancelDecorate"
+      :mask-closable="false"
+      
+      
     >
       <div class="modal-top-advert">
         <div>
@@ -169,9 +169,9 @@
       draggable
       width="800"
       :z-index="100"
-      mask-closable="false"
-      :on-ok="sureDecorate"
-      :on-cancel="cancelDecorate"
+      :mask-closable="false"
+      
+      
     >
       <div class="modal-top-advert">
         <div><span>主标题：</span><Input v-model="selected.title" /></div>
diff --git a/manager/src/views/lili-floor-renovation/renovation.vue b/manager/src/views/lili-floor-renovation/renovation.vue
index 468fd43a..59a73f9e 100644
--- a/manager/src/views/lili-floor-renovation/renovation.vue
+++ b/manager/src/views/lili-floor-renovation/renovation.vue
@@ -3,7 +3,7 @@
     <!-- 左侧模块列表 -->
     <div class="model-list">
       <div class="classification-title">基础模块</div>
-      <draggable tag="ul" :list="modelData" v-bind="{group:{ name:'model', pull:'clone',put:false},sort:false, ghostClass: 'ghost'}" @end="handleMoveEnd" @start="handleMoveStart" :move="handleMove">
+      <draggable tag="ul" :list="modelData" v-bind="{group:{ name:'model', pull:'clone',put:false},sort:false, ghostClass: 'ghost'}"   >
         <li v-for="(model, index) in modelData" :key="index" class="model-item">
           <Icon :type="model.icon" />
           <span>{{model.name}}</span>

From 6c6b89f5129527ee58e860bd9393b42f1273b12a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com>
Date: Thu, 18 Nov 2021 17:10:44 +0800
Subject: [PATCH 3/8] =?UTF-8?q?=E4=BC=98=E5=8C=96buyer=E7=AB=AF=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E4=BF=A1=E6=81=AF=E5=AE=8C=E5=96=84=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buyer/src/components/footer/Footer.vue               |  4 ++--
 .../components/indexDecorate/modelList/Carousel.vue  |  4 ++--
 .../components/indexDecorate/modelList/Carousel2.vue |  4 ++--
 buyer/src/components/map/index.vue                   |  4 ++--
 buyer/src/config/index.js                            | 12 ++----------
 buyer/src/main.js                                    |  3 ++-
 buyer/src/pages/ForgetPassword.vue                   |  4 ++--
 buyer/src/pages/Login.vue                            |  6 +++---
 buyer/src/pages/SignUp.vue                           |  4 ++--
 buyer/vue.config.js                                  |  2 ++
 .../src/views/lili-floor-renovation/modelForm.vue    |  2 --
 .../views/lili-floor-renovation/modelFormItem.vue    |  2 --
 12 files changed, 21 insertions(+), 30 deletions(-)

diff --git a/buyer/src/components/footer/Footer.vue b/buyer/src/components/footer/Footer.vue
index d39875bf..3714f189 100644
--- a/buyer/src/components/footer/Footer.vue
+++ b/buyer/src/components/footer/Footer.vue
@@ -68,12 +68,12 @@
 </template>
 
 <script>
-import config from '@/config'
+
 export default {
   name: "Footer",
   data() {
     return {
-      config,
+      config:require('@/config'),
       guideArr: [
         // 导航链接
         ["购物指南", "购物流程", "会员介绍", "生活旅行", "常见问题"],
diff --git a/buyer/src/components/indexDecorate/modelList/Carousel.vue b/buyer/src/components/indexDecorate/modelList/Carousel.vue
index bea6e5c5..a0af8f71 100644
--- a/buyer/src/components/indexDecorate/modelList/Carousel.vue
+++ b/buyer/src/components/indexDecorate/modelList/Carousel.vue
@@ -49,7 +49,7 @@
 </template>
 
 <script>
-import config from '@/config'
+
 import {articleList} from '@/api/common.js'
 import storage from '@/plugins/storage';
 export default {
@@ -57,7 +57,7 @@ export default {
   props: ['data'],
   data () {
     return {
-      config,
+      config:require('@/config'),
       userInfo: {}, // 用户信息
       articleList: [], // 常见问题
       params: { // 请求常见问题参数
diff --git a/buyer/src/components/indexDecorate/modelList/Carousel2.vue b/buyer/src/components/indexDecorate/modelList/Carousel2.vue
index cf983e4e..d9710003 100644
--- a/buyer/src/components/indexDecorate/modelList/Carousel2.vue
+++ b/buyer/src/components/indexDecorate/modelList/Carousel2.vue
@@ -57,7 +57,7 @@
 </template>
 
 <script>
-import config from '@/config'
+
 import {articleList} from '@/api/common.js'
 import storage from '@/plugins/storage';
 export default {
@@ -65,7 +65,7 @@ export default {
   props: ['data'],
   data () {
     return {
-      config,
+      config:require('@/config'),
       userInfo: {}, // 用户信息
       articleList: [], // 常见问题
       params: { // 请求常见问题参数
diff --git a/buyer/src/components/map/index.vue b/buyer/src/components/map/index.vue
index 13365bd6..f8023b2f 100644
--- a/buyer/src/components/map/index.vue
+++ b/buyer/src/components/map/index.vue
@@ -31,7 +31,7 @@
 <script>
 import AMapLoader from '@amap/amap-jsapi-loader';
 import { handleRegion } from '@/api/address.js';
-import config from '@/config'
+
 export default {
   name: 'map',
   props: {
@@ -42,7 +42,7 @@ export default {
   },
   data () {
     return {
-      config,
+      config:require('@/config'),
       showMap: false, // 展示地图
       mapSearch: '', // 地图搜索
       map: null, // 初始化地图
diff --git a/buyer/src/config/index.js b/buyer/src/config/index.js
index f471d3bd..c4ec7c50 100644
--- a/buyer/src/config/index.js
+++ b/buyer/src/config/index.js
@@ -1,4 +1,4 @@
-export default {
+module.exports = {
   /**
    * @description 配置显示在浏览器标签的title、底部信息、部分信息展示的值
    */
@@ -30,13 +30,5 @@ export default {
    * @description 高德web端申请的api key
    */
   aMapKey: "b440952723253aa9fe483e698057bf7d",
-  /**
-   * @description 需要加载的插件
-   */
-  plugin: {
-    "error-store": {
-      showInHeader: true, // 设为false后不会在顶部显示错误日志徽标
-      developmentOff: true // 设为true后在开发环境不会收集错误信息，方便开发中排查错误
-    }
-  }
+ 
 };
diff --git a/buyer/src/main.js b/buyer/src/main.js
index 023a43b9..cafbb7ef 100644
--- a/buyer/src/main.js
+++ b/buyer/src/main.js
@@ -10,6 +10,7 @@ import storage from '@/plugins/storage';
 // 全局引入封装组件
 import {InstallAll} from '@/components/global.js';
 
+let title = require('@/config').title
 Vue.use(ViewUI);
 Vue.use(InstallAll);
 Vue.config.productionTip = false;
@@ -20,7 +21,7 @@ Object.keys(filters).forEach(key => {
 
 router.beforeEach((to, from, next) => {
   ViewUI.LoadingBar.start();
-  window.document.title = to.meta.title === undefined ? 'lili shop' : to.meta.title
+  window.document.title = to.meta.title === undefined ? title : to.meta.title
   next();
 });
 
diff --git a/buyer/src/pages/ForgetPassword.vue b/buyer/src/pages/ForgetPassword.vue
index d82e458c..99ba0154 100644
--- a/buyer/src/pages/ForgetPassword.vue
+++ b/buyer/src/pages/ForgetPassword.vue
@@ -108,7 +108,7 @@
 </template>
 
 <script>
-import config from '@/config'
+
 import * as RegExp from '@/plugins/RegExp.js';
 import { md5 } from '@/plugins/md5.js';
 import * as apiLogin from '@/api/login.js';
@@ -119,7 +119,7 @@ export default {
   components: { Verify },
   data () {
     return {
-      config,
+      config:require('@/config'),
       loading: false, // 加载状态
       loading1: false, // 第二步加载状态
       formFirst: { // 手机验证码表单
diff --git a/buyer/src/pages/Login.vue b/buyer/src/pages/Login.vue
index cc83f68f..1bcfc85e 100644
--- a/buyer/src/pages/Login.vue
+++ b/buyer/src/pages/Login.vue
@@ -96,14 +96,14 @@
       <Row type="flex" justify="center" class="copyright">
         Copyright © {{year}} - Present
         <a href="https://pickmall.cn" target="_blank" style="margin: 0 5px">{{config.title}}</a>
-        版权所有
+        版权所有 
       </Row>
     </div>
   </div>
 </template>
 
 <script>
-import config from '@/config'
+
 import * as RegExp from "@/plugins/RegExp.js";
 import { md5 } from "@/plugins/md5.js";
 import * as apiLogin from "@/api/login.js";
@@ -119,7 +119,7 @@ export default {
   },
   data() {
     return {
-      config,
+      config:require('@/config'),
       type: true, // true 账号登录  false 验证码登录
       formData: {
         // 登录表单
diff --git a/buyer/src/pages/SignUp.vue b/buyer/src/pages/SignUp.vue
index 82b87d99..ae5c3fa5 100644
--- a/buyer/src/pages/SignUp.vue
+++ b/buyer/src/pages/SignUp.vue
@@ -97,7 +97,7 @@
 </template>
 
 <script>
-import config from '@/config'
+
 import * as RegExp from '@/plugins/RegExp.js';
 import { md5 } from '@/plugins/md5.js';
 import * as apiLogin from '@/api/login.js';
@@ -108,7 +108,7 @@ export default {
   components: { Verify },
   data () {
     return {
-      config,
+      config:require('@/config'),
       year: new Date().getFullYear(),
       formRegist: {
         // 注册表单
diff --git a/buyer/vue.config.js b/buyer/vue.config.js
index c7590950..a886ad78 100644
--- a/buyer/vue.config.js
+++ b/buyer/vue.config.js
@@ -4,6 +4,7 @@ const UglifyJsPlugin = require("uglifyjs-webpack-plugin");
 const resolve = dir => {
   return path.join(__dirname, dir);
 };
+const configs = require('./src/config')
 /**
  * 在项目开发的时候将生产环境以及开发环境进行判断
  * 将生产环境中的路径用cdn来进行优化处理
@@ -128,6 +129,7 @@ module.exports = {
     config.resolve.alias.set("@", resolve("src"));
     config.plugin("html").tap(args => {
       args[0].cdn = cdn;
+      args[0].title = configs.title;
       return args;
     });
   }
diff --git a/manager/src/views/lili-floor-renovation/modelForm.vue b/manager/src/views/lili-floor-renovation/modelForm.vue
index 40da5323..f2c65e68 100644
--- a/manager/src/views/lili-floor-renovation/modelForm.vue
+++ b/manager/src/views/lili-floor-renovation/modelForm.vue
@@ -88,8 +88,6 @@
             width="800"
             :z-index="100"
             :mask-closable="false"
-            
-          
             >
             <!-- 分类tab栏 -->
             <div class="modal-tab-bar">
diff --git a/manager/src/views/lili-floor-renovation/modelFormItem.vue b/manager/src/views/lili-floor-renovation/modelFormItem.vue
index 121e514a..b87d747f 100644
--- a/manager/src/views/lili-floor-renovation/modelFormItem.vue
+++ b/manager/src/views/lili-floor-renovation/modelFormItem.vue
@@ -148,8 +148,6 @@
       width="800"
       :z-index="100"
       :mask-closable="false"
-      
-      
     >
       <div class="modal-top-advert">
         <div>

From 515cd3ebbdbb5bffd1dcc859fd4008ba8d356826 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com>
Date: Thu, 18 Nov 2021 18:07:58 +0800
Subject: [PATCH 4/8] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E5=94=AE=E5=90=8E=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buyer/src/pages/home/orderCenter/OrderDetail.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buyer/src/pages/home/orderCenter/OrderDetail.vue b/buyer/src/pages/home/orderCenter/OrderDetail.vue
index 546bc09f..5e85bbd4 100644
--- a/buyer/src/pages/home/orderCenter/OrderDetail.vue
+++ b/buyer/src/pages/home/orderCenter/OrderDetail.vue
@@ -87,7 +87,7 @@
             <td>{{ goods.num }}</td>
             <td>{{ (goods.goodsPrice * goods.num) | unitPrice('￥') }}</td>
             <td>
-              <Button v-if="goods.afterSaleStatus.includes('NOT_APPLIED')" @click="applyAfterSale(goods.sn)" type="info" size="small" class="mb_5">申请售后</Button>
+              <Button v-if="goods.afterSaleStatus.includes('NOT_APPLIED') || goods.afterSaleStatus.includes('PART_AFTER_SALE')" @click="applyAfterSale(goods.sn)" type="info" size="small" class="mb_5">申请售后</Button>
               <Button v-if="goods.commentStatus == 'UNFINISHED'" @click="comment(order.order.sn, goodsIndex)" size="small" type="success" class="fontsize_12 mb_5" >评价</Button>
               <Button v-if="goods.complainStatus == 'NO_APPLY'" @click="complain(order.order.sn, goodsIndex)" type="warning" class="fontsize_12" size="small">投诉</Button>
             </td>

From 6ecb6b805502c9df350a57eb9ee29289027de64c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com>
Date: Mon, 22 Nov 2021 11:16:32 +0800
Subject: [PATCH 5/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E5=86=97=E4=BD=99=E4=BB=A3=E7=A0=81=EF=BC=8C=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=95=86=E5=AE=B6=E7=AB=AFnpmrc=E9=85=8D=E7=BD=AE=20=20?=
 =?UTF-8?q?=E5=90=8E=E7=BB=AD=E8=BF=98=E4=BC=9A=E6=96=B0=E5=A2=9Eyarnrc?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buyer/src/config/index.js                     |   6 +-
 manager/src/config/index.js                   |  28 +----
 manager/src/libs/table2excel.js               | 100 ------------------
 manager/src/libs/zh.json                      |  20 ----
 manager/src/styles/table-common.scss          |   5 +-
 manager/src/styles/tree-common.scss           |   4 -
 manager/src/views/order/order/orderDetail.vue |   4 -
 .../src/views/sys/oss-manage/ossManage.vue    |   2 +-
 seller/.npmrc                                 |   5 +
 seller/.yarnrc                                |   0
 seller/src/config/index.js                    |  21 +---
 seller/src/libs/eventBus.js                   |   3 -
 seller/src/libs/routerJson.js                 |   4 +
 seller/src/libs/zh.json                       |  20 ----
 .../views/promotion/pintuan/pintuanGoods.vue  |   2 +-
 15 files changed, 18 insertions(+), 206 deletions(-)
 delete mode 100644 manager/src/libs/table2excel.js
 delete mode 100644 manager/src/libs/zh.json
 create mode 100644 seller/.npmrc
 create mode 100644 seller/.yarnrc
 delete mode 100644 seller/src/libs/eventBus.js
 delete mode 100644 seller/src/libs/zh.json

diff --git a/buyer/src/config/index.js b/buyer/src/config/index.js
index c4ec7c50..17a6b2f3 100644
--- a/buyer/src/config/index.js
+++ b/buyer/src/config/index.js
@@ -16,11 +16,7 @@ module.exports = {
    * @description icp备案号
    */
   icpMessage: "京ICP备20009696号-1",
-  /**
-   * @description token在Cookie中存储的天数，默认1天
-   */
-  cookieExpires: 1,
-  /**
+ /**
    * @description 是否使用国际化，默认为false
    *              如果不使用，则需要在路由中给需要在菜单中展示的路由设置meta: {title: 'xxx'}
    *              用来在菜单中显示文字
diff --git a/manager/src/config/index.js b/manager/src/config/index.js
index a35d0cc8..a4299efc 100644
--- a/manager/src/config/index.js
+++ b/manager/src/config/index.js
@@ -4,33 +4,11 @@ export default {
    */
   title: "lilishop",
   /**
-   * @description token在Cookie中存储的天数，默认1天
-   */
-  cookieExpires: 1,
-  /**
-   * @description 是否使用国际化，默认为false
-   *              如果不使用，则需要在路由中给需要在菜单中展示的路由设置meta: {title: 'xxx'}
-   *              用来在菜单中显示文字
-   */
-  useI18n: true,
-  /**
-   * @description api请求基础路径
-   */
-   /**
    * @description 高德web端申请的api key
    */
-    aMapKey: "b440952723253aa9fe483e698057bf7d",
-    /**
-     * @description 官网地址
-     */
-    website: "https://www.pickmall.cn",
+  aMapKey: "b440952723253aa9fe483e698057bf7d",
   /**
-   * @description 需要加载的插件
+   * @description 官网地址
    */
-  plugin: {
-    "error-store": {
-      showInHeader: true, // 设为false后不会在顶部显示错误日志徽标
-      developmentOff: true // 设为true后在开发环境不会收集错误信息，方便开发中排查错误
-    }
-  }
+  website: "https://www.pickmall.cn",
 };
diff --git a/manager/src/libs/table2excel.js b/manager/src/libs/table2excel.js
deleted file mode 100644
index 1569a9fd..00000000
--- a/manager/src/libs/table2excel.js
+++ /dev/null
@@ -1,100 +0,0 @@
-var idTmr;
-function getExplorer () {
-    var explorer = window.navigator.userAgent;
-    if (explorer.indexOf('MSIE') >= 0) {
-        // ie
-        return 'ie';
-    } else if (explorer.indexOf('Firefox') >= 0) {
-        // firefox
-        return 'Firefox';
-    } else if (explorer.indexOf('Chrome') >= 0) {
-        // Chrome
-        return 'Chrome';
-    } else if (explorer.indexOf('Opera') >= 0) {
-        // Opera
-        return 'Opera';
-    } else if (explorer.indexOf('Safari') >= 0) {
-        // Safari
-        return 'Safari';
-    };
-};
-function tranform (table, aId, name) {
-    let tableHead = table.$children[0].$el;
-    let tableBody = table.$children[1].$el;
-    let tableInnerHTML = '<thead><tr>';
-    if (table.$children.length !== 1) {
-        let len = tableBody.rows.length;
-        let i = -1;
-        while (i < len) {
-            if (i == -1) {
-                Array.from(tableHead.rows[0].children).forEach((td) => {
-                    tableInnerHTML = tableInnerHTML + '<th>' + td.children[0].children[0].innerHTML + '</th>';
-                });
-                tableInnerHTML += '</tr><thead><tbody>';
-            } else {
-                tableInnerHTML += '<tr>';
-                Array.from(tableBody.rows[i].children).forEach((td) => {
-                    tableInnerHTML = tableInnerHTML + '<td>' + td.children[0].children[0].innerHTML + '</td>';
-                });
-                tableInnerHTML += '</tr>';
-            }
-            i++;
-        }
-        tableInnerHTML += '</tbody>';
-    }
-
-    if (getExplorer() !== 'Safari' && name.substr(-1, 4) !== '.xls') {
-        name += '.xls';
-    }
-
-    if (getExplorer() == 'ie') {
-        var curTbl = table;
-        var oXL = new ActiveXObject('Excel.Application');
-        var oWB = oXL.Workbooks.Add();
-        var xlsheet = oWB.Worksheets(1);
-        var sel = document.body.createTextRange();
-        sel.moveToElementText(curTbl);
-        sel.select();
-        sel.execCommand('Copy');
-        xlsheet.Paste();
-        oXL.Visible = true;
-
-        try {
-            var fname = oXL.Application.GetSaveAsFilename('Excel.xls', 'Excel Spreadsheets (*.xls), *.xls');
-        } catch (e) {
-            print('Nested catch caught ' + e);
-        } finally {
-            oWB.SaveAs(fname);
-            // oWB.Close(savechanges = false);
-            oXL.Quit();
-            oXL = null;
-            idTmr = setInterval(Cleanup(), 1);
-        }
-    } else {
-        tableToExcel(tableInnerHTML, aId, name);
-    }
-}
-function Cleanup () {
-    window.clearInterval(idTmr);
-    // CollectGarbage();
-}
-let tableToExcel = (function () {
-    let uri = 'data:application/vnd.ms-excel;base64,';
-    let template = '<html><head><meta charset="UTF-8"></head><body><table>{table}</table></body></html>';
-    let base64 = function (s) { return window.btoa(unescape(encodeURIComponent(s))); };
-    let format = function (s, c) {
-        return s.replace(/{(\w+)}/g, function (m, p) { return c[p]; });
-    };
-    return function (table, aId, name) {
-        let ctx = {worksheet: name || 'Worksheet', table: table};
-        document.getElementById(aId).href = uri + base64(format(template, ctx));
-        document.getElementById(aId).download = name;
-        document.getElementById(aId).click();
-    };
-})();
-
-const table2excel = {};
-
-table2excel.transform = tranform;
-
-export default table2excel;
diff --git a/manager/src/libs/zh.json b/manager/src/libs/zh.json
deleted file mode 100644
index 70dcf56b..00000000
--- a/manager/src/libs/zh.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    "name": "zh",
-    "options": {
-        "months": ["1月", "2月", "3月", "4月", "5月", "6月", "7月", "8月", "9月", "10月", "11月", "12月"],
-        "shortMonths": ["1月", "2月", "3月", "4月", "5月", "6月", "7月", "8月", "9月", "10月", "11月", "12月"],
-        "days": ["星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六"],
-        "shortDays": ["周日", "周一", "周二", "周三", "周四", "周五", "周六"],
-        "toolbar": {
-            "exportToSVG": "下载图表 SVG",
-            "exportToPNG": "下载图表 PNG",
-            "menu": "菜单",
-            "selection": "选择",
-            "selectionZoom": "区域缩放",
-            "zoomIn": "缩小",
-            "zoomOut": "放大",
-            "pan": "移动",
-            "reset": "重置缩放"
-        }
-    }
-  }
\ No newline at end of file
diff --git a/manager/src/styles/table-common.scss b/manager/src/styles/table-common.scss
index ccce9a12..2720eafe 100644
--- a/manager/src/styles/table-common.scss
+++ b/manager/src/styles/table-common.scss
@@ -3,10 +3,7 @@
     margin-bottom: 2vh;
   }
 
-  .select-count {
-    font-weight: 600;
-    color: #40a9ff;
-  }
+
 
   .select-clear {
     margin-left: 10px;
diff --git a/manager/src/styles/tree-common.scss b/manager/src/styles/tree-common.scss
index a8326c56..5605db29 100644
--- a/manager/src/styles/tree-common.scss
+++ b/manager/src/styles/tree-common.scss
@@ -3,10 +3,6 @@
         margin-bottom: 2vh;
     }
 
-    .select-title {
-        font-weight: 600;
-        color: #40a9ff;
-    }
 
     .select-clear {
         margin-left: 10px;
diff --git a/manager/src/views/order/order/orderDetail.vue b/manager/src/views/order/order/orderDetail.vue
index 1fba9dcd..b40d6bb1 100644
--- a/manager/src/views/order/order/orderDetail.vue
+++ b/manager/src/views/order/order/orderDetail.vue
@@ -657,10 +657,6 @@ export default {
     margin-bottom: 2vh;
   }
 
-  .select-count {
-    font-weight: 600;
-    color: #40a9ff;
-  }
 
   .select-clear {
     margin-left: 10px;
diff --git a/manager/src/views/sys/oss-manage/ossManage.vue b/manager/src/views/sys/oss-manage/ossManage.vue
index ff2b7a13..d8d2b09c 100644
--- a/manager/src/views/sys/oss-manage/ossManage.vue
+++ b/manager/src/views/sys/oss-manage/ossManage.vue
@@ -103,7 +103,7 @@
         <Row >
           <Alert show-icon>
             已选择
-            <span class="select-count">{{ selectCount }}</span> 项
+            <span >{{ selectCount }}</span> 项
             <a class="select-clear" @click="clearSelectAll">清空</a>
             <span v-if="selectCount > 0" style="margin-left: 15px"
             >共计 {{ totalSize }} 存储量</span
diff --git a/seller/.npmrc b/seller/.npmrc
new file mode 100644
index 00000000..c1abc22c
--- /dev/null
+++ b/seller/.npmrc
@@ -0,0 +1,5 @@
+# 默认依赖包指定淘宝源
+registry=https://registry.npm.taobao.org/
+sass_binary_site=https://npm.taobao.org/mirrors/node-sass/
+phantomjs_cdnurl=https://npm.taobao.org/mirrors/phantomjs/
+electron_mirror=https://npm.taobao.org/mirrors/electron/
\ No newline at end of file
diff --git a/seller/.yarnrc b/seller/.yarnrc
new file mode 100644
index 00000000..e69de29b
diff --git a/seller/src/config/index.js b/seller/src/config/index.js
index c68c1be4..2a51388b 100644
--- a/seller/src/config/index.js
+++ b/seller/src/config/index.js
@@ -3,16 +3,7 @@ export default {
    * @description 配置显示在浏览器标签的title
    */
   title: "lilishop",
-  /**
-   * @description token在Cookie中存储的天数，默认1天
-   */
-  cookieExpires: 1,
-  /**
-   * @description 是否使用国际化，默认为false
-   *              如果不使用，则需要在路由中给需要在菜单中展示的路由设置meta: {title: 'xxx'}
-   *              用来在菜单中显示文字
-   */
-  useI18n: true,
+ 
   /**
    * @description 高德web端申请的api key
    */
@@ -21,13 +12,5 @@ export default {
    * @description 官网地址
    */
   website: "https://www.pickmall.cn",
-  /**
-   * @description 需要加载的插件
-   */
-  plugin: {
-    "error-store": {
-      showInHeader: true, // 设为false后不会在顶部显示错误日志徽标
-      developmentOff: true // 设为true后在开发环境不会收集错误信息，方便开发中排查错误
-    }
-  }
+  
 };
diff --git a/seller/src/libs/eventBus.js b/seller/src/libs/eventBus.js
deleted file mode 100644
index 5fc63790..00000000
--- a/seller/src/libs/eventBus.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import Vue from "vue";
-
-export default new Vue;
\ No newline at end of file
diff --git a/seller/src/libs/routerJson.js b/seller/src/libs/routerJson.js
index f01c1975..8a5e1586 100644
--- a/seller/src/libs/routerJson.js
+++ b/seller/src/libs/routerJson.js
@@ -1,3 +1,7 @@
+/**
+ * 商家端左侧菜单栏静态数据
+ */
+
 export const result = [{
     name: "lili",
     level: 0,
diff --git a/seller/src/libs/zh.json b/seller/src/libs/zh.json
deleted file mode 100644
index 70dcf56b..00000000
--- a/seller/src/libs/zh.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    "name": "zh",
-    "options": {
-        "months": ["1月", "2月", "3月", "4月", "5月", "6月", "7月", "8月", "9月", "10月", "11月", "12月"],
-        "shortMonths": ["1月", "2月", "3月", "4月", "5月", "6月", "7月", "8月", "9月", "10月", "11月", "12月"],
-        "days": ["星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六"],
-        "shortDays": ["周日", "周一", "周二", "周三", "周四", "周五", "周六"],
-        "toolbar": {
-            "exportToSVG": "下载图表 SVG",
-            "exportToPNG": "下载图表 PNG",
-            "menu": "菜单",
-            "selection": "选择",
-            "selectionZoom": "区域缩放",
-            "zoomIn": "缩小",
-            "zoomOut": "放大",
-            "pan": "移动",
-            "reset": "重置缩放"
-        }
-    }
-  }
\ No newline at end of file
diff --git a/seller/src/views/promotion/pintuan/pintuanGoods.vue b/seller/src/views/promotion/pintuan/pintuanGoods.vue
index a2165a37..cf18c1e4 100644
--- a/seller/src/views/promotion/pintuan/pintuanGoods.vue
+++ b/seller/src/views/promotion/pintuan/pintuanGoods.vue
@@ -11,7 +11,7 @@
       </Row>
       <Row v-show="openTip"  v-if="status == 'manager'">
         <Alert show-icon>
-          已选择 <span class="select-count">{{ selectCount }}</span> 项
+          已选择 <span >{{ selectCount }}</span> 项
           <a class="select-clear" @click="clearSelectAll">清空</a>
         </Alert>
       </Row>

From 8c169489ebf2bd379ccae4458d5974f5ec3bff1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com>
Date: Tue, 30 Nov 2021 17:15:37 +0800
Subject: [PATCH 6/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E4=B8=AD=E5=8F=91=E7=8E=B0=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manager/src/views/statistics/order.vue | 4 ++--
 seller/src/views/statistics/order.vue  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/manager/src/views/statistics/order.vue b/manager/src/views/statistics/order.vue
index f8c39bc7..af36f139 100644
--- a/manager/src/views/statistics/order.vue
+++ b/manager/src/views/statistics/order.vue
@@ -50,11 +50,11 @@
                 </div>
                 <div class="card-item">
                   <div class="card-item-label">付款笔数</div>
-                  <div class="card-item-value">{{overViewList.paymentsNum || 0}}</div>
+                  <div class="card-item-value">{{overViewList.paymentOrderNum  || 0}}</div>
                 </div>
                 <div class="card-item">
                   <div class="card-item-label">付款人数</div>
-                  <div class="card-item-value">{{overViewList.paymentOrderNum || 0}}</div>
+                  <div class="card-item-value">{{overViewList.paymentsNum || 0}}</div>
                 </div>
                 <div class="card-item">
                   <div class="card-item-label">付款金额</div>
diff --git a/seller/src/views/statistics/order.vue b/seller/src/views/statistics/order.vue
index b393f9d3..8d9bb3de 100644
--- a/seller/src/views/statistics/order.vue
+++ b/seller/src/views/statistics/order.vue
@@ -51,11 +51,11 @@
                 </div>
                 <div class="card-item">
                   <div class="card-item-label">付款笔数</div>
-                  <div class="card-item-value">{{overViewList.paymentsNum || 0}}</div>
+                  <div class="card-item-value">{{overViewList.paymentOrderNum  || 0}}</div>
                 </div>
                 <div class="card-item">
                   <div class="card-item-label">付款人数</div>
-                  <div class="card-item-value">{{overViewList.paymentOrderNum || 0}}</div>
+                  <div class="card-item-value">{{overViewList.paymentsNum || 0}}</div>
                 </div>
                 <div class="card-item">
                   <div class="card-item-label">付款金额</div>

From fd1d32d431170764d0ba60f6c820b757c4bc06db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com>
Date: Fri, 3 Dec 2021 10:00:23 +0800
Subject: [PATCH 7/8] =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=AB=AF=E4=BC=98?=
 =?UTF-8?q?=E6=83=A0=E5=88=B8=E5=88=A4=E6=96=AD=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manager/src/views/promotion/coupon/coupon.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manager/src/views/promotion/coupon/coupon.vue b/manager/src/views/promotion/coupon/coupon.vue
index 731eb3ff..68d55220 100644
--- a/manager/src/views/promotion/coupon/coupon.vue
+++ b/manager/src/views/promotion/coupon/coupon.vue
@@ -146,7 +146,7 @@ export default {
           title: "活动时间",
           width: 150,
           render: (h, params) => {
-            if (params.row.getType === "ACTIVITY") {
+            if (params.row.getType === "ACTIVITY" && params.row.rangeDayType == 'DYNAMICTIME') {
               return h("div", "长期有效");
             } else {
               return h("div", {

From 3cb0e52ca027321ddf2862b9194cb562b91dd898 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com>
Date: Thu, 9 Dec 2021 18:32:11 +0800
Subject: [PATCH 8/8] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=A5=BC=E5=B1=82?=
 =?UTF-8?q?=E8=A3=85=E4=BF=AE=E4=B8=AD=E5=95=86=E5=93=81=E5=88=86=E7=B1=BB?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=8F=AF=E8=83=BD=E4=BC=9A=E5=87=BA=E7=8E=B0?=
 =?UTF-8?q?=E7=9A=84bug=20.=20=E5=A6=82=E6=9E=9C=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E6=AD=A4=E7=89=88=E6=9C=AC=E5=BB=BA=E8=AE=AE=E5=90=8C=E6=AD=A5?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0uni=E7=89=88=E6=9C=AC=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/lili-floor-renovation/wap/config.js | 60 ++++++-------------
 .../lili-floor-renovation/wap/decorate.vue    |  5 +-
 .../views/lili-floor-renovation/wap/index.vue |  7 +++
 .../wap/template/tpl_goods.vue                |  3 +-
 4 files changed, 31 insertions(+), 44 deletions(-)

diff --git a/manager/src/views/lili-floor-renovation/wap/config.js b/manager/src/views/lili-floor-renovation/wap/config.js
index 1ffbfdee..764a3e33 100644
--- a/manager/src/views/lili-floor-renovation/wap/config.js
+++ b/manager/src/views/lili-floor-renovation/wap/config.js
@@ -459,22 +459,32 @@ export const modelData = [
     options: {
       list: [
         {
+          /**
+           * 2021/12/9
+           * 新增索引（‘index’）判断商品归属分类
+           * 之前代码没有配置index也不会收到印象
+           * 新建的楼层将采用索引判断分类
+           */
           titleWay: [
             {
               title: "精选",
-              desc: "电子推荐"
+              desc: "电子推荐",
+              ___index:0,
             },
             {
               title: "实惠",
-              desc: "便宜好货"
+              desc: "便宜好货",
+              ___index:1,
             },
             {
               title: "进口",
-              desc: "国际自营"
+              desc: "国际自营",
+              ___index:2,
             },
             {
               title: "推荐",
-              desc: "喂奶推荐"
+              desc: "喂奶推荐",
+              ___index:3,
             }
           ],
           listWay: [
@@ -483,50 +493,18 @@ export const modelData = [
               price: "120",
               title:
                 " 微软 (Microsoft) Xbox 无线控制器/手柄 湛蓝色 | 3.5mm耳机接口蓝牙连接 Xbox主机电脑平板通用",
-              type: "精选"
+              type: "精选",
+              ___index:0
             },
             {
               img: "https://i.loli.net/2020/12/05/c9mptI5Pg8qJ6ny.png",
               title:
                 "宏碁(acer) DP高清线1.2版 2K*4KDisplayPort公对公接线笔记本电脑显卡连接显示器视频线1.5米",
               price: "190",
-              type: "精选"
+              type: "精选",
+              ___index:0
             },
-            {
-              img: "https://i.loli.net/2020/12/05/QsSYIPF743Hgf8q.png",
-              title:
-                "宏碁(acer) DP高清线1.2版 2K*4KDisplayPort公对公接线笔记本电脑显卡连接显示器视频线1.5米",
-              price: "10",
-              type: "精选"
-            },
-            {
-              img: "https://i.loli.net/2020/12/05/VTwDYcLWnukGxat.png",
-              title:
-                "宏碁(acer) DP高清线1.2版 2K*4KDisplayPort公对公接线笔记本电脑显卡连接显示器视频线1.5米",
-              price: "190",
-              type: "精选"
-            },
-            {
-              img: "https://i.loli.net/2020/12/05/SIFwaVpE4YJAuQf.png",
-              title:
-                "宏碁(acer) DP高清线1.2版 2K*4KDisplayPort公对公接线笔记本电脑显卡连接显示器视频线1.5米",
-              price: "10",
-              type: "精选"
-            },
-            {
-              img: "https://i.loli.net/2021/05/14/KTLSrOVJmEdX12A.png",
-              title:
-                "宏碁(acer) DP高清线1.2版 2K*4KDisplayPort公对公接线笔记本电脑显卡连接显示器视频线1.5米",
-              price: "190",
-              type: "精选"
-            },
-            {
-              img: "https://i.loli.net/2021/05/14/xA5FW2ubiShBdPE.jpg",
-              title:
-                "宏碁(acer) DP高清线1.2版 2K*4KDisplayPort公对公接线笔记本电脑显卡连接显示器视频线1.5米",
-              price: "10",
-              type: "精选"
-            }
+            
           ]
         }
       ]
diff --git a/manager/src/views/lili-floor-renovation/wap/decorate.vue b/manager/src/views/lili-floor-renovation/wap/decorate.vue
index dfea9350..0f968410 100644
--- a/manager/src/views/lili-floor-renovation/wap/decorate.vue
+++ b/manager/src/views/lili-floor-renovation/wap/decorate.vue
@@ -49,7 +49,7 @@
               <div class="decorate-view-link" v-if="res.options.list[0].listWay.length != 0">
 
                 <!-- 绑定商品选择器回调已选择的商品 -->
-                <div v-if="title_item.title == bindGoods.type" v-for="(bindGoods,bindGoodsIndex) in res.options.list[0].listWay" :key="bindGoodsIndex">
+                <div v-if="title_item.___index == bindGoods.___index ||  title_item.title == bindGoods.type" v-for="(bindGoods,bindGoodsIndex) in res.options.list[0].listWay" :key="bindGoodsIndex">
                   {{bindGoods.title}},
                 </div>
 
@@ -183,10 +183,13 @@ export default {
       if (!val) return false;
       let data = val.map((item) => {
         delete item.selected;
+        delete item.intro
+        delete item.mobileIntro
         return {
           img: item.thumbnail,
           title: item.goodsName,
           type: this.selectedGoods.title,
+          ___index:this.selectedGoods.___index,
           ...item
         };
       });
diff --git a/manager/src/views/lili-floor-renovation/wap/index.vue b/manager/src/views/lili-floor-renovation/wap/index.vue
index 84b59d47..b0f82171 100644
--- a/manager/src/views/lili-floor-renovation/wap/index.vue
+++ b/manager/src/views/lili-floor-renovation/wap/index.vue
@@ -108,6 +108,12 @@ export default {
   },
 
   methods: {
+
+    enableBindGoodsShow(){
+
+    },
+
+
     // 初始化数据
     init() {
       if (!this.$route.query.id) return false;
@@ -156,6 +162,7 @@ export default {
     },
     // 右侧栏回调
     handleDrawer(val) {
+    
       let newIndex = this.selected;
 
       this.decorateData = "";
diff --git a/manager/src/views/lili-floor-renovation/wap/template/tpl_goods.vue b/manager/src/views/lili-floor-renovation/wap/template/tpl_goods.vue
index a4fd074a..f1177786 100644
--- a/manager/src/views/lili-floor-renovation/wap/template/tpl_goods.vue
+++ b/manager/src/views/lili-floor-renovation/wap/template/tpl_goods.vue
@@ -7,7 +7,7 @@
       </div>
     </div>
     <div class="goods-list">
-      <div v-if="selected.val == item.type" class="goods-item" v-for="(item, item_index) in res.list[0].listWay" :key="item_index">
+      <div v-if="selected.index == item.___index || selected.val == item.type" class="goods-item" v-for="(item, item_index) in res.list[0].listWay" :key="item_index">
         <div class="goods-img">
           <Icon size="20" color="#e1251b" @click="closeGoods(item, item_index)" class="goods-icon" type="ios-close-circle" />
           <img :src="item.img" alt />
@@ -31,7 +31,6 @@ export default {
       selected: {
         // 已选数据
         index: 0,
-        val: "",
       },
     };
   },