diff --git a/buyer/src/pages/couponCenter.vue b/buyer/src/pages/couponCenter.vue
index b2da1057..3c71aa07 100644
--- a/buyer/src/pages/couponCenter.vue
+++ b/buyer/src/pages/couponCenter.vue
@@ -5,7 +5,7 @@
       <div>
         <div class="coupon-title">
           <router-link to="/">
-            <img src="../assets/images/logo1.png" width="120" alt="">
+            <img src="../assets/images/logo.png" width="120" alt="">
           </router-link>
           <p>领券中心</p>
           <Input search style="width:400px" @on-search='search' enter-button="搜索" placeholder="搜索优惠券" />
diff --git a/buyer/src/pages/home/enumeration.js b/buyer/src/pages/home/enumeration.js
index 416a30e4..ee39e556 100644
--- a/buyer/src/pages/home/enumeration.js
+++ b/buyer/src/pages/home/enumeration.js
@@ -52,10 +52,6 @@ export const afterSaleStatusList = [
     name: '买家退货，待卖家收货',
     status: 'BUYER_RETURN'
   },
-  {
-    name: '商家换货/补发',
-    status: 'SELLER_RE_DELIVERY'
-  },
   {
     name: '卖家确认收货',
     status: 'SELLER_CONFIRM'
diff --git a/buyer/src/pages/home/memberCenter/Distribution.vue b/buyer/src/pages/home/memberCenter/Distribution.vue
index 7b9288b6..3d1e56d6 100644
--- a/buyer/src/pages/home/memberCenter/Distribution.vue
+++ b/buyer/src/pages/home/memberCenter/Distribution.vue
@@ -91,11 +91,15 @@
           </TabPane>
           <TabPane label="提现记录" name="log">
             <Table stripe :columns="logColumns" :data="logData.records">
+              <template slot-scope="{ row }" slot="sn">
+                <span>{{row.sn}}</span>
+              </template>
               <template slot-scope="{ row }" slot="time">
                 <span>{{row.createTime}}</span>
               </template>
               <template slot-scope="{ row }" slot="price">
-                <span> +￥{{ row.price | unitPrice }}</span>
+                <span v-if="row.distributionCashStatus == 'REFUSE'" style="color: green"> +￥{{ row.price | unitPrice }}</span>
+                <span v-else style="color: red"> -￥{{ row.price | unitPrice }}</span>
               </template>
               <template slot-scope="{ row }" slot="status">
                 <span> {{row.distributionCashStatus == "APPLY" ? "待处理" : row.distributionCashStatus == "PASS" ? "通过" : "拒绝"}}</span>
@@ -186,6 +190,7 @@ export default {
         {title: '操作', slot: 'action', width: 120}
       ],
       logColumns: [ // 日志表头
+        {title: '编号', slot: 'sn'},
         {title: '申请时间', slot: 'time'},
         {title: '提现金额', slot: 'price'},
         {title: '提现状态', slot: 'status'}
@@ -298,7 +303,7 @@ export default {
     },
     getLog () { // 提现历史
       distCashHistory(this.logParams).then(res => {
-        if (res.success) this.goodsData = res.result
+        if (res.success) this.logData = res.result
       })
     },
     distribution () { // 获取分销商信息
diff --git a/buyer/src/pages/home/memberCenter/Favorites.vue b/buyer/src/pages/home/memberCenter/Favorites.vue
index f57a6b94..eb5f1215 100644
--- a/buyer/src/pages/home/memberCenter/Favorites.vue
+++ b/buyer/src/pages/home/memberCenter/Favorites.vue
@@ -8,8 +8,11 @@
           <div class="goodsImg hover-pointer" v-if="params.type === 'GOODS'">
             <img :src="item.image" />
           </div>
-          <div class="goodsTitle hover-pointer">
-            {{params.type === 'GOODS'? item.goodsName : item.storeName}}
+          <div class="goodsTitle hover-color" v-if="params.type === 'GOODS'" @click="buynow(item.skuId, item.goodsId)">
+            {{item.goodsName}}
+          </div>
+          <div v-else class="goodsTitle hover-pointer">
+            {{item.storeName}}
           </div>
           <div class="goodsPrice">
             <span v-if="params.type === 'GOODS'">{{item.price | unitPrice('￥')}}</span>
@@ -26,14 +29,6 @@
       <Spin size="large" fix v-if="spinShow"></Spin>
     </div>
     <empty v-else />
-    <!-- 分页 -->
-    <!-- <div class="page-size mt_10" v-if="paging">
-      <Page :total="total" @on-change="changePageNum"
-        @on-page-size-change="changePageSize"
-        :page-size="params.pageSize"
-        show-sizer>
-      </Page>
-    </div> -->
   </div>
 </template>
 
@@ -91,15 +86,6 @@ export default {
         }
       });
     },
-    changePageNum (val) { // 修改页码
-      this.params.pageNumber = val;
-      this.getList()
-    },
-    changePageSize (val) { // 修改页数
-      this.pageNumber = 1;
-      this.params.pageSize = val;
-      this.getList()
-    },
     buynow (skuId, goodsId) { // 跳转详情
       let url = this.$router.resolve({
         path: '/goodsDetail',
diff --git a/buyer/src/pages/home/orderCenter/AfterSale.vue b/buyer/src/pages/home/orderCenter/AfterSale.vue
index 826f4164..4e95fbe3 100644
--- a/buyer/src/pages/home/orderCenter/AfterSale.vue
+++ b/buyer/src/pages/home/orderCenter/AfterSale.vue
@@ -19,10 +19,7 @@
     <empty v-if="orderList.length === 0" />
     <div class="order-content" v-else>
       <template v-for="(order, onderIndex) in orderList">
-        <div
-          class="order-list"
-          :key="onderIndex"
-        >
+        <div class="order-list" :key="onderIndex">
           <div class="order-header">
             <div>
               <div v-if="order.serviceStatus">{{filterOrderStatus(order.serviceStatus)}}</div>
@@ -32,7 +29,7 @@
               </div>
             </div>
             <div>
-              <span>{{ order.applyRefundPrice | unitPrice("￥") }}</span>
+              <span>申请退款金额：<span class="global_color">{{ order.applyRefundPrice | unitPrice("￥") }}</span></span>
             </div>
           </div>
           <div class="order-body">
@@ -57,12 +54,11 @@
               <Button @click="goDetail(order.sn)" size="small">售后详情</Button>
               <Button @click="openModal(order)" v-if="order.serviceStatus == 'PASS' &&
                   order.serviceType != 'RETURN_MONEY'" size="small">提交物流</Button>
-
               <Button @click="cancel(order.sn)" v-if="order.afterSaleAllowOperationVO.cancel" size="small">取消售后</Button>
             </div>
           </div>
         </div>
-      </template>+
+      </template>
       <Spin size="large" fix v-if="spinShow"></Spin>
     </div>
     <!-- 分页 -->
diff --git a/buyer/src/pages/home/orderCenter/AfterSaleDetail.vue b/buyer/src/pages/home/orderCenter/AfterSaleDetail.vue
index 400a4bb2..1260367b 100644
--- a/buyer/src/pages/home/orderCenter/AfterSaleDetail.vue
+++ b/buyer/src/pages/home/orderCenter/AfterSaleDetail.vue
@@ -34,7 +34,10 @@
           <td>退款方式</td><td>{{afterSale.refundWay == 'ORIGINAL' ? '原路退回' : '账号退款'}}</td>
         </tr>
         <tr>
-          <td>退款金额</td><td>{{afterSale.actualRefundPrice | unitPrice('￥')}}</td>
+          <td>申请退款金额</td><td>{{afterSale.applyRefundPrice | unitPrice('￥')}}</td>
+        </tr>
+        <tr v-if="afterSale.actualRefundPrice">
+          <td>实际退款金额</td><td>{{afterSale.actualRefundPrice | unitPrice('￥')}}</td>
         </tr>
         <template v-if="afterSale.refundWay === 'OFFLINE'">
           <tr>
diff --git a/buyer/src/pages/home/userCenter/MoneyManagement.vue b/buyer/src/pages/home/userCenter/MoneyManagement.vue
index 9ebd1f13..3b424286 100644
--- a/buyer/src/pages/home/userCenter/MoneyManagement.vue
+++ b/buyer/src/pages/home/userCenter/MoneyManagement.vue
@@ -339,7 +339,7 @@ export default {
             } else if (params.row.applyStatus === 'VIA_AUDITING') {
               return h('div', [h('span', {}, '提现成功')]);
             } else {
-              return h('div', [h('span', {}, '审核未通过')]);
+              return h('div', [h('span', {}, '审核拒绝')]);
             }
           }
         },
@@ -350,7 +350,8 @@ export default {
         },
         {
           title: '审核备注',
-          key: 'inspectRemark'
+          key: 'inspectRemark',
+          tooltip: true
 
         }
       ],
diff --git a/manager/package.json b/manager/package.json
index 8c458b60..41910b3f 100644
--- a/manager/package.json
+++ b/manager/package.json
@@ -26,7 +26,6 @@
     "pinyin": "^2.9.0",
     "print-js": "^1.0.63",
     "qrcodejs2": "0.0.2",
-    "quill": "^1.3.7",
     "sass-loader": "^8.0.2",
     "sockjs-client": "^1.4.0",
     "stompjs": "^2.3.3",
diff --git a/manager/public/index.html b/manager/public/index.html
index e6d9b0ea..076d2228 100644
--- a/manager/public/index.html
+++ b/manager/public/index.html
@@ -29,8 +29,6 @@
   <script src="https://cdn.jsdelivr.net/npm/gitalk@1.5.0/dist/gitalk.min.js"></script>
   <script src="https://cdn.jsdelivr.net/npm/js-cookie@2.2.1/src/js.cookie.min.js"></script>
   <script src="https://cdn.jsdelivr.net/npm/wangeditor@3.1.1/release/wangEditor.min.js"></script>
-  <script src="https://cdn.jsdelivr.net/npm/quill@1.3.7/dist/quill.min.js"></script>
-  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/quill@1.3.7/dist/quill.snow.css">
   <script src="https://cdn.jsdelivr.net/npm/sockjs-client@1/dist/sockjs.min.js"></script>
   <script src="https://cdnjs.cloudflare.com/ajax/libs/stomp.js/2.3.3/stomp.min.js"></script>
   <script src="https://cdn.jsdelivr.net/npm/sortablejs@1.8.4/Sortable.min.js"></script>
diff --git a/manager/src/api/index.js b/manager/src/api/index.js
index 611d6849..a0af28cb 100644
--- a/manager/src/api/index.js
+++ b/manager/src/api/index.js
@@ -304,11 +304,6 @@ export const deleteMessageSend = (ids, params) => {
   return deleteRequest(`/manager/messageSend/delByIds/${ids}`, params);
 };
 
-// 通过id获取子地区
-export const getRegion = (id) => {
-  return getRequest(`/region/item/${id}`);
-};
-
 // 分页获取文件数据
 export const getFileListData = (params) => {
   return getRequest("/file", params);
@@ -389,11 +384,6 @@ export const delRegion = (ids) => {
   return deleteRequest(`/region/${ids}`);
 };
 
-// 通过id获取地区详情
-export const getRegionDetail = (id) => {
-  return getRequest(`/region/${id}`);
-};
-
 // 更新地区
 export const updateRegion = (id, params) => {
   return putRequest(`/region/${id}`, params);
diff --git a/manager/src/api/order.js b/manager/src/api/order.js
index da6f6ae7..9b37f96f 100644
--- a/manager/src/api/order.js
+++ b/manager/src/api/order.js
@@ -117,16 +117,10 @@ export const getAfterSaleOrderPage = (params) => {
 export const getAfterSaleOrderDetail = (sn) => {
   return getRequest(`/afterSale/get/${sn}`)
 }
-
 //售后单查询物流
-export const getSellerDeliveryTraces = (sn, params) => {
-  return getRequest(`/afterSale/getSellerDeliveryTraces/${sn}`, params)
+export const getAfterSaleTraces = (sn) => {
+  return getRequest(`/afterSale/getDeliveryTraces/${sn}`)
 }
-//售后单查询物流
-export const getAfterSaleTraces = (sn, params) => {
-  return getRequest(`/afterSale/getDeliveryTraces/${sn}`, params)
-}
-
 // 获取商家选中的物流公司
 export const getLogisticsChecked = () => {
   return getRequest(`/logistics/getChecked`)
@@ -157,6 +151,11 @@ export const refundLog = (params) => {
   return getRequest(`/refundLog`, params)
 }
 
+//售后单商家收货信息
+export const storeAddress = (sn) => {
+  return getRequest(`/afterSale/getStoreAfterSaleAddress/${sn}`)
+}
+
 
 
 
diff --git a/manager/src/config/index.js b/manager/src/config/index.js
index c296c0c7..ce41e786 100644
--- a/manager/src/config/index.js
+++ b/manager/src/config/index.js
@@ -21,7 +21,10 @@ export default {
     buyer: "https://buyer-api.pickmall.cn",
     seller: "https://store-api.pickmall.cn",
     manager: "https://admin-api.pickmall.cn"
-
+    // common: 'http://192.168.0.101:8890',
+    // buyer: 'http://192.168.0.101:8888',
+    // seller: 'http://192.168.0.101:8889',
+    // manager: 'http://192.168.0.101:8887'
   },
   api_prod: {
     common: "https://common-api.pickmall.cn",
diff --git a/manager/src/libs/axios.js b/manager/src/libs/axios.js
index 5d8c68ec..0f485681 100644
--- a/manager/src/libs/axios.js
+++ b/manager/src/libs/axios.js
@@ -103,6 +103,7 @@ service.interceptors.response.use(
 
       } else {
         // 其他错误处理
+        console.log(error.response.data);
         Message.error(error.response.data.message)
       }
     }
diff --git a/manager/src/libs/util.js b/manager/src/libs/util.js
index bb47b972..eb16c8ab 100644
--- a/manager/src/libs/util.js
+++ b/manager/src/libs/util.js
@@ -331,7 +331,6 @@ util.initRouter = function (vm) { // 初始化路由
       getCurrentPermissionList().then(res => {
             if (!res.success) return false;
             let menuData = res.result;
-            // let menuData = result
 
             // 格式化数据，设置 空children 为 null
             for(let i =0;i<menuData.length;i++){
@@ -340,6 +339,8 @@ util.initRouter = function (vm) { // 初始化路由
                     let tt = t[k].children;
                     for(let z = 0;z<tt.length;z++){
                         tt[z].children = null
+                        // 给所有三级路由添加字段，显示一级菜单name，方便点击页签时的选中筛选
+                        tt[z].firstRouterName = menuData[i].name
                     }
                 }
             }
@@ -395,8 +396,7 @@ util.initMenuData = function (vm, data) {
     menuData.forEach(e => {
         let nav = {
             name: e.name,
-            title: e.title,
-            icon: e.icon
+            title: e.title
         }
         navList.push(nav);
     })
@@ -460,6 +460,7 @@ util.initRouterNode = function (routers, data) {  // data为所有子菜单数
         meta.permTypes = menu.permTypes ? menu.permTypes : null;
         meta.title = menu.title ? menu.title + " - lilishop 运营后台" : null;
         meta.url = menu.url ? menu.url : null;
+        meta.firstRouterName = item.firstRouterName
         menu.meta = meta;
 
         routers.push(menu);
diff --git a/manager/src/router/router.js b/manager/src/router/router.js
index c2e36473..0f938097 100644
--- a/manager/src/router/router.js
+++ b/manager/src/router/router.js
@@ -36,12 +36,6 @@ export const otherRouter = {
       name: "change_password",
       component: () => import("@/views/change-password/change-password.vue")
     },
-    {
-      path: "message",
-      title: "消息中心",
-      name: "message_index",
-      component: () => import("@/views/message/message.vue")
-    },
     {
       path: "category",
       title: "类型列表",
@@ -72,26 +66,6 @@ export const otherRouter = {
       name: "shop-detail",
       component: () => import("@/views/seller/shop/shopDetail.vue")
     },
-    {
-      path: "add-edit-message",
-      title: "消息详情",
-      name: "add_edit_message",
-      component: () =>
-        import("@/views/member/message-manage/addOrEditMessage.vue")
-    },
-    {
-      path: "add_message",
-      title: "会员站内信",
-      name: "add_message",
-      component: () => import("@/views/member/notice/addMessage.vue")
-    },
-    {
-      path: "message-send-detail",
-      title: "消息发送详情",
-      name: "message_send_detail",
-      component: () =>
-        import("@/views/member/message-manage/messageSendDetail.vue")
-    },
     {
       path: "bill-detail",
       title: "结算单详情",
diff --git a/manager/src/views/Main.vue b/manager/src/views/Main.vue
index d073cfa6..d2860010 100644
--- a/manager/src/views/Main.vue
+++ b/manager/src/views/Main.vue
@@ -57,8 +57,6 @@
 <script>
 import shrinkableMenu from "./main-components/shrinkable-menu/shrinkable-menu.vue";
 import tagsPageOpened from "./main-components/tags-page-opened.vue";
-import breadcrumbNav from "./main-components/breadcrumb-nav.vue";
-import fullScreen from "./main-components/fullscreen.vue";
 import messageTip from "./main-components/message-tip.vue";
 import circleLoading from "@/views/my-components/lili/circle-loading.vue";
 import Cookies from "js-cookie";
@@ -70,8 +68,6 @@ export default {
   components: {
     shrinkableMenu,
     tagsPageOpened,
-    breadcrumbNav,
-    fullScreen,
     messageTip,
     circleLoading,
   },
diff --git a/manager/src/views/distribution/distributionSetting.vue b/manager/src/views/distribution/distributionSetting.vue
index 1ec1eb57..ac577650 100644
--- a/manager/src/views/distribution/distributionSetting.vue
+++ b/manager/src/views/distribution/distributionSetting.vue
@@ -5,16 +5,19 @@
 
       <Divider orientation="left">分销设置</Divider>
       <FormItem label="是否开启分销" prop="distribution">
-        <i-switch size="large" v-model="form.isOpen" :true-value="true" :false-value="false" @on-change="handleSubmit">
+        <i-switch size="large" v-model="form.isOpen" :true-value="true" :false-value="false">
           <span slot="open">开启</span>
           <span slot="close">关闭</span>
         </i-switch>
       </FormItem>
       <FormItem label="分销关系绑定天数" prop="distributionDay">
-        <InputNumber :min="1" style="width:100px;" v-model="form.distributionDay" @on-change="handleSubmit"></InputNumber>
+        <InputNumber :min="1" style="width:100px;" v-model="form.distributionDay"></InputNumber>
       </FormItem>
       <FormItem label="分销结算天数" prop="cashDay">
-        <InputNumber :min="1" style="width:100px;" v-model="form.cashDay" @on-change="handleSubmit "></InputNumber>
+        <InputNumber :min="1" style="width:100px;" v-model="form.cashDay"></InputNumber>
+      </FormItem>
+      <FormItem>
+        <Button type="primary" @click="submit">保存</Button>
       </FormItem>
     </Form>
   </div>
@@ -36,22 +39,18 @@ export default {
     };
   },
   methods: {
+    // 初始化数据
     init() {
       this.getDataList();
     },
     // 获取分销设置数据
     getDataList() {
-      // 带多条件搜索参数获取表单数据 请自行修改接口
       getSetting("DISTRIBUTION_SETTING").then((res) => {
         if (res.success) {
           this.form = res.result;
         }
       });
     },
-    // 提交数据
-    handleSubmit() {
-      this.$options.filters.debounce(this.submit(), 1500);
-    },
     // 提交api
     submit() {
       setSetting("DISTRIBUTION_SETTING", this.form).then((res) => {
diff --git a/manager/src/views/goods-unit/index.vue b/manager/src/views/goods-unit/index.vue
index e82637ae..3864f196 100644
--- a/manager/src/views/goods-unit/index.vue
+++ b/manager/src/views/goods-unit/index.vue
@@ -1,10 +1,8 @@
 <template>
   <div class="search">
     <Card>
-      <Row @keydown.enter.native="handleSearch"> </Row>
       <Row class="operation">
-        <Button @click="add" type="primary" >添加</Button>
-
+        <Button @click="add" type="primary">添加</Button>
         <Button @click="delAll">批量删除</Button>
       </Row>
       <Table
@@ -58,15 +56,13 @@ import {
   addGoodsUnit,
   getGoodsUnitPage,
   updateGoodsUnit,
-  delGoodsUnit, delSensitive,
+  delGoodsUnit
 } from "@/api/index";
 export default {
-  name: "bill",
-  components: {},
+  name: "goods-unit",
   data() {
     return {
       loading: true, // 表单加载状态
-      modalType: 0, // 添加或编辑标识
       modalVisible: false, // 添加或编辑显示
       modalTitle: "", // 添加或编辑标题
       searchForm: {
@@ -141,7 +137,7 @@ export default {
                   },
                   on: {
                     click: () => {
-                      this.detail(params.row);
+                      this.edit(params.row);
                     },
                   },
                 },
@@ -174,46 +170,37 @@ export default {
     };
   },
   methods: {
+    // 初始化数据
     init() {
       this.getDataList();
     },
+    // 分页 改变页码
     changePage(v) {
       this.searchForm.pageNumber = v;
       this.getDataList();
       this.clearSelectAll();
     },
+    // 分页 改变页数
     changePageSize(v) {
       this.searchForm.pageSize = v;
       this.getDataList();
     },
+    // 搜索
     handleSearch() {
       this.searchForm.pageNumber = 1;
       this.searchForm.pageSize = 10;
       this.getDataList();
     },
-    handleReset() {
-      this.$refs.searchForm.resetFields();
-      this.searchForm.pageNumber = 1;
-      this.searchForm.pageSize = 10;
-      // 重新加载数据
-      this.getDataList();
-    },
-    changeSort(e) {
-      this.searchForm.sort = e.key;
-      this.searchForm.order = e.order;
-      if (e.order === "normal") {
-        this.searchForm.order = "";
-      }
-      this.getDataList();
-    },
+    // 清除选中
     clearSelectAll() {
       this.$refs.table.selectAll(false);
     },
+    // 选中回调
     changeSelect(e) {
       this.selectList = e;
       this.selectCount = e.length;
     },
-
+    // 获取列表数据
     getDataList() {
       this.loading = true;
 
@@ -227,12 +214,13 @@ export default {
       this.total = this.data.length;
       this.loading = false;
     },
+    // 修改后提交
     handleSubmit() {
       this.$refs.form.validate((valid) => {
         if (valid) {
           this.submitLoading = true;
 
-          if (this.modalType == 0) {
+          if (this.modalTitle == "添加") {
             // 添加 避免编辑后传入id等数据 记得删除
             delete this.form.id;
             addGoodsUnit(this.form).then((res) => {
@@ -257,21 +245,22 @@ export default {
         }
       });
     },
+    // 添加
     add() {
-      this.modalType = 0;
       this.modalTitle = "添加";
       this.form = {};
       this.$refs.form.resetFields();
 
       this.modalVisible = true;
     },
-    detail(v) {
-      this.modalType = 1;
+    // 编辑
+    edit(v) {
       this.id = v.id;
       this.modalTitle = "修改";
       this.modalVisible = true;
       this.form.name = v.name;
     },
+    // 删除
     remove(v) {
       this.$Modal.confirm({
         title: "确认删除",
@@ -290,6 +279,7 @@ export default {
         },
       });
     },
+    // 全部删除
     delAll() {
       if (this.selectCount <= 0) {
         this.$Message.warning("您还未选择要删除的数据");
@@ -314,9 +304,9 @@ export default {
               this.getDataList();
             }
           });
-        },
+        }
       });
-    },
+    }
   },
   mounted() {
     this.init();
diff --git a/manager/src/views/goods/goods-info/goodsDetail.vue b/manager/src/views/goods/goods-info/goodsDetail.vue
index 3cdb57e4..b480b597 100644
--- a/manager/src/views/goods/goods-info/goodsDetail.vue
+++ b/manager/src/views/goods/goods-info/goodsDetail.vue
@@ -149,12 +149,8 @@ export default {
       this.previewGoodsPicture = url;
       this.goodsPictureVisible = true;
     }
-    ,
   }
-  ,
-
 }
-;
 </script>
 
 <style lang="scss" soped>
diff --git a/manager/src/views/goods/goods-manage/spec.vue b/manager/src/views/goods/goods-manage/spec.vue
index a0b5370a..913e5632 100644
--- a/manager/src/views/goods/goods-manage/spec.vue
+++ b/manager/src/views/goods/goods-manage/spec.vue
@@ -78,10 +78,7 @@
       </Form>
       <div slot="footer">
         <Button type="text" @click="modalVisible = false">取消</Button>
-        <Button type="primary" :loading="submitLoading" @click="saveSpec"
-        >提交
-        </Button
-        >
+        <Button type="primary" :loading="submitLoading" @click="saveSpec">提交</Button>
       </div>
     </Modal>
   </div>
@@ -318,7 +315,6 @@ export default {
         content: "您确认要删除 " + v.specName + " ?",
         loading: true,
         onOk: () => {
-          // 删除
           delSpec(v.id).then((res) => {
             this.$Modal.remove();
             if (res.success) {
@@ -345,7 +341,6 @@ export default {
             ids += e.id + ",";
           });
           ids = ids.substring(0, ids.length - 1);
-          // 批量删除
           delSpec(ids).then((res) => {
             this.$Modal.remove();
             if (res.success) {
diff --git a/manager/src/views/goods/goods-review/index.vue b/manager/src/views/goods/goods-review/index.vue
index f6df2ab2..4db7c2a5 100644
--- a/manager/src/views/goods/goods-review/index.vue
+++ b/manager/src/views/goods/goods-review/index.vue
@@ -9,8 +9,7 @@
           <Button @click="handleSearch" type="primary" class="search-btn" icon="ios-search">搜索</Button>
         </Form>
       </Row>
-      <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom"
-              @on-sort-change="changeSort" @on-selection-change="changeSelect">
+      <Table :loading="loading" border :columns="columns" :data="data" ref="table" class="mt_10">
         <!-- 页面展示 -->
         <template slot="shopDisableSlot" slot-scope="scope">
           <div>
@@ -39,7 +38,7 @@
           <div class="show">
             <label>页面展示：</label>
             <i-switch size="large" true-value="OPEN" false-value="CLOSE" v-model="infoData.status"
-                      @on-change="changeRadio" style="margin-top: 3px">
+                      @on-change="changeSwitchView" style="margin-top: 3px">
               <span slot="open">展示</span>
               <span slot="close">隐藏</span>
             </i-switch>
@@ -56,7 +55,7 @@
             <List>
               <ListItem>
                 <ListItemMeta :avatar="infoData.memberProfile" :title="infoData.memberName"
-                              :description="infoData.content"/>
+                  :description="infoData.content"/>
               </ListItem>
               <div class="" v-if="infoData.haveImage">
                 评价图
@@ -98,11 +97,10 @@
 import * as API_Member from "@/api/member";
 
 export default {
-  name: "shop",
-  components: {},
+  name: "goods-review", // 会员评价
   data() {
     return {
-      infoData: "", // 商品信息
+      infoData: {}, // 商品信息
       infoFlag: false, // 评价展示
       infoTitle: "", // modal名称
       loading: true, // 表单加载状态
@@ -115,9 +113,6 @@ export default {
         startDate: "", // 起始时间
         endDate: "", // 终止时间
       },
-      submitLoading: false, // 添加或编辑提交状态
-      selectList: [], // 多选数据
-      selectCount: 0, // 多选计数
       columns: [
         // 表头
         {
@@ -223,7 +218,8 @@ export default {
     };
   },
   methods: {
-    changeRadio(val) {
+    // 切换查看switch
+    changeSwitchView(val) {
       let status = val;
       API_Member.updateMemberReview(this.infoData.id, {status}).then(
         (res) => {
@@ -232,45 +228,27 @@ export default {
         }
       );
     },
+    // 初始化数据
     init() {
       this.getDataList();
     },
+    // 分页 改变页码
     changePage(v) {
       this.searchForm.pageNumber = v;
       this.getDataList();
       this.clearSelectAll();
     },
+    // 分页 改变页数
     changePageSize(v) {
       this.searchForm.pageSize = v;
       this.getDataList();
     },
+    // 搜索
     handleSearch() {
       this.searchForm.pageNumber = 1;
       this.searchForm.pageSize = 10;
       this.getDataList();
     },
-
-    changeSort(e) {
-      this.searchForm.sort = e.key;
-      this.searchForm.order = e.order;
-      if (e.order === "normal") {
-        this.searchForm.order = "";
-      }
-      this.getDataList();
-    },
-    clearSelectAll() {
-      this.$refs.table.selectAll(false);
-    },
-    changeSelect(e) {
-      this.selectList = e;
-      this.selectCount = e.length;
-    },
-    selectDateRange(v) {
-      if (v) {
-        this.searchForm.startDate = v[0];
-        this.searchForm.endDate = v[1];
-      }
-    },
     //列表直接选择页面是否展示
     changeSwitch(v) {
       let status = v.status;
@@ -278,9 +256,9 @@ export default {
         this.init();
       });
     },
+    // 获取列表
     getDataList() {
       this.loading = true;
-      // 带多条件搜索参数获取表单数据 请自行修改接口
       API_Member.getMemberReview(this.searchForm).then((res) => {
         this.loading = false;
         if (res.success) {
@@ -301,11 +279,10 @@ export default {
         }
       });
     },
-
+    // 删除评论
     remove(v) {
       this.$Modal.confirm({
         title: "确认删除",
-        // 记得确认修改此处
         content: "您确认要删除会员" + v.memberName + "的评论?",
         loading: true,
         onOk: () => {
@@ -316,33 +293,6 @@ export default {
         },
       });
     },
-    delAll() {
-      if (this.selectCount <= 0) {
-        this.$Message.warning("您还未选择要删除的数据");
-        return;
-      }
-      this.$Modal.confirm({
-        title: "确认删除",
-        content: "您确认要删除所选的 " + this.selectCount + " 条数据?",
-        loading: true,
-        onOk: () => {
-          let ids = "";
-          this.selectList.forEach(function (e) {
-            ids += e.id + ",";
-          });
-          ids = ids.substring(0, ids.length - 1);
-          // 批量删除
-          this.deleteRequest("/shop/delByIds/" + ids).then((res) => {
-            this.$Modal.remove();
-            if (res.success) {
-              this.$Message.success("操作成功");
-              this.clearSelectAll();
-              this.getDataList();
-            }
-          });
-        },
-      });
-    },
   },
   mounted() {
     this.init();
diff --git a/manager/src/views/home/home.scss b/manager/src/views/home/home.scss
index 63baefde..a4ed760a 100644
--- a/manager/src/views/home/home.scss
+++ b/manager/src/views/home/home.scss
@@ -170,8 +170,6 @@ h4 {
 .flow-box-splice:nth-last-of-type(1) {
   margin-right: 0;
 }
-.flow-splice {
-}
 
 .flow-box-splice,
 .flow-member,
diff --git a/manager/src/views/home/home.vue b/manager/src/views/home/home.vue
index f9d33996..bf697ff1 100644
--- a/manager/src/views/home/home.vue
+++ b/manager/src/views/home/home.vue
@@ -1,10 +1,8 @@
 <template>
   <div>
     <!-- 统计 -->
-
     <div class="card">
       <h4>
-
         基本信息
       </h4>
       <div class="count-list flex">
@@ -16,7 +14,6 @@
             <div class="counts">{{homeData.goodsNum ||0}}</div>
             <div>商品数量</div>
           </div>
-
         </div>
         <div class="count-item" @click="navigateTo('memberList')">
           <div>
@@ -52,7 +49,6 @@
     </div>
 
     <!-- 今日待办 -->
-
     <div class="card">
       <h4>今日待办</h4>
       <div class="todo-list flex">
@@ -88,10 +84,7 @@
       <div class="flow-list flex">
         <div class="flow-item ">
           <div class="flow-member">
-            <div>
-
-              当前在线人数
-            </div>
+            <div>当前在线人数</div>
             <span>
               {{homeData.currentNumberPeopleOnline || 0}}
             </span>
@@ -149,7 +142,6 @@
             </div>
             <div class="today-item">
               <div>今日交易额</div>
-
               <span>￥{{homeData.todayOrderPrice ? (homeData.todayOrderPrice  | unitPrice) : 0}}</span>
             </div>
             <div class="today-item">
@@ -209,15 +201,11 @@
 
 <script>
 import { homeStatistics, hotGoods, hotShops, getNoticePage } from "@/api/index";
-import show from "./show.vue";
 import * as API_Goods from "@/api/goods";
 import { Chart } from "@antv/g2";
 import * as API_Member from "@/api/member";
 export default {
   name: "home",
-  components: {
-    show,
-  },
   data() {
     return {
       tophotShopsColumns: [ // 表格表头
@@ -298,16 +286,8 @@ export default {
       },
     };
   },
-
-  computed: {
-    currNav() {
-      return this.$store.state.app.currNav;
-    },
-    avatarPath() {
-      return localStorage.avatorImgPath;
-    },
-  },
   methods: {
+    // 路由跳转
     navigateTo(name) {
       this.$router.push({
         name,
@@ -366,7 +346,7 @@ export default {
       }
     },
 
-
+    // 订单表
     initOrderChart() {
       // 默认已经加载 legend-filter 交互
       let data = this.chartList;
@@ -402,9 +382,6 @@ export default {
       this.orderChart.render();
     },
 
-
-
-
     // 浏览量统计图
     initPvChart() {
       let uv = [];
@@ -477,7 +454,8 @@ export default {
           this.initPvChart();
         }
       });
-    }, // 实例化会员流量图表
+    },
+    // 实例化会员流量图表
     async initHistoryMemberChartList() {
       const res = await API_Member.historyMemberChartList();
       if (res.success) {
@@ -495,6 +473,7 @@ export default {
         this.initHistoryMemberChart();
       }
     },
+    // 历史在线人数
     initHistoryMemberChart(){
       // 默认已经加载 legend-filter 交互
       let data = this.chartList;
diff --git a/manager/src/views/home/show.vue b/manager/src/views/home/show.vue
deleted file mode 100644
index f1e9c755..00000000
--- a/manager/src/views/home/show.vue
+++ /dev/null
@@ -1,86 +0,0 @@
-
-<template>
-  <div>
-    <Card>
-      <Row>
-        <Form
-          ref="searchForm"
-          inline
-          :label-width="70"
-
-          @keydown.enter.native="handleGo"
-        >
-          <Form-item label="链接地址" prop="url">
-            <Input type="text" v-model="url" placeholder="http://" clearable style="width: 350px" />
-          </Form-item>
-          <Form-item style="margin-left:-50px;">
-            <Button @click="handleGo" type="primary" icon="ios-send" style="margin-right:5px">前往</Button>
-            <Button @click="handleOpen" icon="md-open">新窗口中打开</Button>
-          </Form-item>
-        </Form>
-      </Row>
-      <Divider style="margin-top:-10px;margin-bottom:0px;" />
-      <Row>
-        <div style="position:relative;">
-          <iframe
-            id="iframe"
-            :src="go"
-            frameborder="0"
-            width="100%"
-            :height="height"
-            scrolling="auto"
-          ></iframe>
-          <Spin fix size="large" v-if="loading"></Spin>
-        </div>
-      </Row>
-    </Card>
-  </div>
-</template>
-
-<script>
-export default {
-  name: "show",
-  data() {
-    return {
-      loading: false, // 加载状态
-      go: "", // 跳转地址
-      url: "", // 链接地址
-      height: "525px" // iframe高度
-    };
-  },
-  computed: {
-    currNav() {
-      return this.$store.state.app.currNav;
-    }
-  },
-  methods: {
-    initUrl() {
-      let url;
-      if (this.currNav == "doc") {
-        url = "https://www.kancloud.cn/lili/lili/content";
-      }
-      if (url) {
-        this.url = url;
-        this.go = url;
-      }
-    },
-    handleGo() {
-      this.go = this.url;
-    },
-    handleOpen() {
-      window.open(this.url);
-    }
-  },
-  watch: {
-    currNav(v, oldV) {
-      this.initUrl();
-    }
-  },
-  mounted() {
-    // 计算高度
-    let height = document.documentElement.clientHeight;
-    this.height = Number(height - 217) + "px";
-    this.initUrl();
-  }
-};
-</script>
diff --git a/manager/src/views/lili-components/affix-time.vue b/manager/src/views/lili-components/affix-time.vue
index 3774a2be..7dc7d6e4 100644
--- a/manager/src/views/lili-components/affix-time.vue
+++ b/manager/src/views/lili-components/affix-time.vue
@@ -3,11 +3,8 @@
     <div class="breadcrumb">
       <span @click="clickBreadcrumb(item,index)" :class="{'active':item.selected}" v-for="(item,index) in dateList" :key="index"> {{item.title}}</span>
       <div class="date-picker">
-
         <Select @on-change="changeSelect(selectedWay)" v-model="month" placeholder="年月查询" style="width:200px;margin-left:10px;">
-
           <Option v-for="(item,index) in dates" :value="item.year+'-'+item.month" :key="index">{{ item.year+'年'+item.month+'月' }}</Option>
-
         </Select>
       </div>
       <div class="shop-list" v-if="!closeShop">
@@ -72,6 +69,7 @@ export default {
     this.getShopList();
   },
   methods: {
+    // 页面触底
     handleReachBottom() {
       setTimeout(() => {
         if (this.params.pageNumber * this.params.pageSize <= this.total) {
@@ -80,6 +78,7 @@ export default {
         }
       }, 1500);
     },
+    // 查询店铺列表
     getShopList() {
       getShopListData(this.params).then((res) => {
         if (res.success) {
@@ -92,6 +91,7 @@ export default {
         }
       });
     },
+    // 变更店铺
     changeshop(val) {
       this.selectedWay.storeId = this.storeId;
       this.$emit("selected", this.selectedWay);
@@ -118,7 +118,7 @@ export default {
       }
       this.dates = dates.reverse();
     },
-
+    // 改变已选店铺
     changeSelect() {
       console.log(this.month);
       if (this.month) {
@@ -130,11 +130,10 @@ export default {
         this.selectedWay.searchType = "";
 
         this.$emit("selected", this.selectedWay);
-        // console.log(this.$emit("selected", this.selectedWay));
       } else {
       }
     },
-
+    // 变更时间
     clickBreadcrumb(item) {
       this.dateList.forEach((res) => {
         res.selected = false;
@@ -148,7 +147,6 @@ export default {
       }
 
       this.selectedWay = item;
-      // this.month = "";
       this.selectedWay.year = new Date().getFullYear();
       this.selectedWay.month = "";
 
diff --git a/manager/src/views/lili-components/region.vue b/manager/src/views/lili-components/region.vue
index 3ede1a0f..2f627739 100644
--- a/manager/src/views/lili-components/region.vue
+++ b/manager/src/views/lili-components/region.vue
@@ -11,7 +11,7 @@
 </template>
 <script>
 
-import * as API_Setup from "@/api/index.js";
+import * as API_Setup from "@/api/common.js";
 export default {
   data() {
     return {
@@ -27,6 +27,7 @@ export default {
 
   props: ['addressId'],
   methods: {
+    // 选择地区回调
     change(val, selectedData) {
       /**
        * @returns [regionId,region]
@@ -44,9 +45,10 @@ export default {
     handleChangeOnSelect(value) {
       this.changeOnSelect = value;
     },
+    // 加载地区数据
     loadData(item, callback) {
       item.loading = true;
-      API_Setup.getRegion(item.value).then((res) => {
+      API_Setup.getChildRegion(item.value).then((res) => {
         if (res.result.length <= 0) {
           item.loading = false;
           this.selected = item;
@@ -83,8 +85,9 @@ export default {
         }
       });
     },
+    // 初始化
     init() {
-      API_Setup.getRegion(this.id).then((res) => {
+      API_Setup.getChildRegion(this.id).then((res) => {
         let way = [];
 
         res.result.forEach((item) => {
@@ -105,7 +108,6 @@ export default {
           }
           way.push(data);
         });
-
         this.data = way;
       });
     },
diff --git a/manager/src/views/lili-dialog/coupon-dialog.vue b/manager/src/views/lili-dialog/coupon-dialog.vue
deleted file mode 100644
index fb7f0be3..00000000
--- a/manager/src/views/lili-dialog/coupon-dialog.vue
+++ /dev/null
@@ -1,246 +0,0 @@
-<template>
-  <div class="wrapper">
-    <div class="wap-content">
-      <div class="query-wrapper">
-        <div class="query-item">
-          <div>搜索范围</div>
-          <Input placeholder="商品名称" @on-clear="goodsData=[]; goodsParams.goodsName=''; goodsParams.pageNumber = 1; getQueryGoodsList()" @on-enter="()=>{goodsData=[];goodsParams.pageNumber =1; getQueryGoodsList();}" icon="ios-search" clearable
-            style="width: 150px" v-model="goodsParams.goodsName" />
-        </div>
-        <div class="query-item">
-          <Cascader v-model="category" placeholder="请选择商品分类" style="width: 250px" :data="skuList"></Cascader>
-        </div>
-        <div class="query-item">
-          <Button type="primary" @click="goodsData=[]; getQueryGoodsList();" icon="ios-search">搜索</Button>
-        </div>
-      </div>
-      <div style="positon:retavle;">
-        <Scroll class="wap-content-list" :on-reach-bottom="handleReachBottom" :distance-to-edge="[3,3]">
-          <div class="wap-content-item" :class="{ active: item.selected }" @click="checkedGoods(item, index)" v-for="(item, index) in goodsData" :key="index">
-            <div>
-              <img :src="item.thumbnail" alt="" />
-            </div>
-            <div class="wap-content-desc">
-              <div class="wap-content-desc-title">{{ item.goodsName }}</div>
-              <div class="wap-sku">{{ item.goodsUnit }}</div>
-              <div class="wap-content-desc-bottom">
-                <div>￥{{ item.price | unitPrice }}</div>
-              </div>
-            </div>
-          </div>
-          <Spin size="large" fix v-if="loading"></Spin>
-
-          <div v-if="empty" class="empty">暂无商品信息</div>
-        </Scroll>
-
-      </div>
-    </div>
-  </div>
-</template>
-<script>
-import * as API_Goods from "@/api/goods";
-export default {
-  data() {
-    return {
-      type: "multiple", //单选或者多选 single  multiple
-
-      skuList: [], // 商品sku列表
-      total: "",  // 商品总数
-      goodsParams: { // 商品请求参数
-        pageNumber: 1,
-        pageSize: 18,
-        order: "desc",
-        goodsName: "",
-        sn: "",
-        categoryPath: "",
-        marketEnable: "UPPER",
-        isAuth: "PASS",
-      },
-      category: [], // 分类
-      goodsData: [], // 商品数据
-      empty: false, // 空数据
-      loading: false, // 加载状态
-    };
-  },
-  props: {
-    selectedWay: {
-      type: Array,
-      default: new Array()
-    }
-  },
-  watch: {
-    category(val) {
-      this.goodsParams.categoryPath = val[0];
-    },
-    selectedWay: {
-      handler() {
-        this.$emit("selected", this.selectedWay);
-      },
-      deep: true,
-      immediate: true
-    },
-
-    "goodsParams.categoryPath": {
-      handler: function () {
-        this.goodsData = [];
-        (this.goodsParams.pageNumber = 0), this.getQueryGoodsList();
-      },
-      deep: true,
-    },
-  },
-  mounted() {
-    this.init();
-  },
-  methods: {
-    handleReachBottom() {
-      setTimeout(() => {
-        if (
-          this.goodsParams.pageNumber * this.goodsParams.pageSize <=
-          this.total
-        ) {
-          this.goodsParams.pageNumber++;
-          this.getQueryGoodsList();
-        }
-      }, 1500);
-    },
-    getQueryGoodsList() {
-      API_Goods.getGoodsSkuData(this.goodsParams).then((res) => {
-        this.initGoods(res);
-      });
-    },
-
-    initGoods(res) {
-      if (res.result.records.length !=0) {
-        res.result.records.forEach((item) => {
-          item.selected = false;
-          item.___type = "goods"; //设置为goods让pc wap知道标识
-          
-          this.selectedWay.forEach(e => {
-            if (e.id === item.id) {
-              item.selected = true 
-            }
-          })
-        });
-        /**
-         * 解决数据请求中，滚动栏会一直上下跳动
-         */
-        this.total = res.result.total;
-        this.goodsData.push(...res.result.records);
-
-      } else {
-        this.empty = true;
-      }
-    },
-    // 查询商品
-    init() {
-      API_Goods.getGoodsSkuData(this.goodsParams).then((res) => {
-        // 商品
-        this.initGoods(res);
-      });
-      if (localStorage.getItem('category')) {
-        this.deepGroup(JSON.parse(localStorage.getItem('category')))
-      } else {
-        setTimeout(() => {
-          this.deepGroup(JSON.parse(localStorage.getItem('category')))
-        },3000)
-      }
-    },
-
-    deepGroup(val) {
-      val.forEach((item) => {
-        let childWay = []; //第二级
-        // 第二层
-        if (item.children) {
-          item.children.forEach((child) => {
-            // // 第三层
-            if (child.children) {
-              child.children.forEach((grandson, index, arr) => {
-                arr[index] = {
-                  value: grandson.id,
-                  label: grandson.name,
-                  children: "",
-                };
-              });
-            }
-            let children = {
-              value: child.id,
-              label: child.name,
-              children: child.children,
-            };
-            childWay.push(children);
-          });
-        }
-        // 第一层
-        let way = {
-          value: item.id,
-          label: item.name,
-          children: childWay,
-        };
-
-        this.skuList.push(way);
-      });
-    },
-
-    /**
-     * 点击商品
-     */
-    checkedGoods(val, index) {
-      // 如果单选的话
-      if (this.type != "multiple") {
-        this.goodsData.forEach((item) => {
-          item.selected = false;
-        });
-        this.selectedWay = [];
-        val.selected = true;
-        this.selectedWay.push(val);
-
-        return false;
-      }
-
-      if (val.selected == false) {
-        val.selected = true;
-        this.selectedWay.push(val);
-      } else {
-        val.selected = false;
-        for (let i = 0; i<this.selectedWay.length; i++ ) {
-          if (this.selectedWay[i].id===val.id) {
-            this.selectedWay.splice(i,1)
-            break;
-          }
-        }
-      }
-    },
-  },
-};
-</script>
-<style scoped lang="scss">
-@import "./style.scss";
-.wap-content {
-  width: 100%;
-}
-.empty {
-  text-align: center;
-  padding: 8px 0;
-  width: 100%;
-}
-.wap-content {
-  flex: 1;
-  padding: 0;
-}
-.wap-content-list {
-  position: relative;
-}
-.wap-content-item {
-  width: 210px;
-  margin: 10px 7px;
-  padding: 6px 0;
-}
-// .wap-content-item{
-
-// }
-.active {
-  background: url("../../assets/selected.png") no-repeat;
-  background-position: right;
-  background-size: 10%;
-}
-</style>
diff --git a/manager/src/views/lili-dialog/goods-dialog.vue b/manager/src/views/lili-dialog/goods-dialog.vue
index fb7f0be3..3231e46b 100644
--- a/manager/src/views/lili-dialog/goods-dialog.vue
+++ b/manager/src/views/lili-dialog/goods-dialog.vue
@@ -45,7 +45,7 @@ export default {
       type: "multiple", //单选或者多选 single  multiple
 
       skuList: [], // 商品sku列表
-      total: "",  // 商品总数
+      total: 0,  // 商品总数
       goodsParams: { // 商品请求参数
         pageNumber: 1,
         pageSize: 18,
@@ -79,7 +79,6 @@ export default {
       deep: true,
       immediate: true
     },
-
     "goodsParams.categoryPath": {
       handler: function () {
         this.goodsData = [];
@@ -92,6 +91,7 @@ export default {
     this.init();
   },
   methods: {
+    // 触底加载更多方法
     handleReachBottom() {
       setTimeout(() => {
         if (
@@ -103,12 +103,13 @@ export default {
         }
       }, 1500);
     },
+    // 获取商品列表
     getQueryGoodsList() {
       API_Goods.getGoodsSkuData(this.goodsParams).then((res) => {
         this.initGoods(res);
       });
     },
-
+    // 获取列表方法
     initGoods(res) {
       if (res.result.records.length !=0) {
         res.result.records.forEach((item) => {
diff --git a/manager/src/views/lili-dialog/index.vue b/manager/src/views/lili-dialog/index.vue
index bc5a47d8..8883c756 100644
--- a/manager/src/views/lili-dialog/index.vue
+++ b/manager/src/views/lili-dialog/index.vue
@@ -14,12 +14,10 @@
 <script>
 import goodsDialog from "./goods-dialog";
 import linkDialog from "./link-dialog";
-import couponDialog from "./coupon-dialog";
 export default {
   components: {
     goodsDialog,
-    linkDialog,
-    couponDialog,
+    linkDialog
   },
   data() {
     return {
@@ -44,6 +42,7 @@ export default {
         }
       }, 100);
     },
+    // 点击确认
     clickOK() {
       if (this.goodsFlag) {
         this.$emit("selectedGoodsData", this.goodsData);
@@ -52,6 +51,7 @@ export default {
       }
       this.clickClose();
     },
+    // 打开组件方法
     open(type, mutiple) {
       this.flag = true;
       if (type == "goods") {
@@ -64,6 +64,7 @@ export default {
       }
 
     },
+    // 关闭组件
     close() {
       this.flag = false;
     },
diff --git a/manager/src/views/lili-dialog/style.scss b/manager/src/views/lili-dialog/style.scss
index d1ee770e..df97c871 100644
--- a/manager/src/views/lili-dialog/style.scss
+++ b/manager/src/views/lili-dialog/style.scss
@@ -1,96 +1,112 @@
 .wrapper {
-    width: 100%;
-    height: 100%;
-    display: flex;
-    .wap-list {
-        flex: 2;
-        text-align: center;
-        overflow-y: auto;
-        height: 100%;
-    }
-    > .wap-list,
+  width: 100%;
+  height: 100%;
+  display: flex;
 
-    .wap-content {
-        flex: 8;
-    }
-}
-.wap-sku {
-    font-size: 12px;
-    color: #999;
-    overflow: hidden;
-
-    text-overflow: ellipsis;
-
-    white-space: nowrap;
-}
-.query-wrapper {
-    display: flex;
-    margin: 8px 0;
-    > .query-item {
-        display: flex;
-        align-items: center;
-        > * {
-            margin: 0 4px;
-        }
-    }
-}
-/deep/ .ivu-scroll-container {
-    width: 100% !important;
-    height: 400px !important;
-}
-/deep/ .ivu-scroll-content {
-    /* */
-    display: flex;
-    flex-wrap: wrap;
-}
-.wap-content-list {
+  .wap-list {
+    flex: 2;
+    text-align: center;
     overflow-y: auto;
+    height: 100%;
+  }
+
+  >.wap-list,
+
+  .wap-content {
+    flex: 8;
+  }
 }
+
+.wap-sku {
+  font-size: 12px;
+  color: #999;
+  overflow: hidden;
+
+  text-overflow: ellipsis;
+
+  white-space: nowrap;
+}
+
+.query-wrapper {
+  display: flex;
+  margin: 8px 0;
+
+  >.query-item {
+    display: flex;
+    align-items: center;
+
+    >* {
+      margin: 0 4px;
+    }
+  }
+}
+
+/deep/ .ivu-scroll-container {
+  width: 100% !important;
+  height: 400px !important;
+}
+
+/deep/ .ivu-scroll-content {
+  /* */
+  display: flex;
+  flex-wrap: wrap;
+}
+
+.wap-content-list {
+  overflow-y: auto;
+}
+
 .wap-item {
-    padding: 10px 0;
-    cursor: pointer;
+  padding: 10px 0;
+  cursor: pointer;
 }
+
 .wap-item:hover {
-    background: #ededed;
+  background: #ededed;
 }
 
 
 .wap-content-item {
 
-    cursor: pointer;
+  cursor: pointer;
 
-    display: flex;
-    height: 80px;
-    padding: 2px;
-    overflow: hidden;
-    align-items: center;
-    margin: 10px ;
-    /deep/ img {
-        width: 60px;
-        height: 60px;
-        text-align: center;
-    }
-    .wap-content-desc {
-        width: 180px;
-        padding: 8px;
-        > .wap-content-desc-title {
-            display: -webkit-box;
-            font-size: 12px;
-            color: #666;
+  display: flex;
+  height: 80px;
+  padding: 2px;
+  overflow: hidden;
+  align-items: center;
+  margin: 10px;
 
-            -webkit-box-orient: vertical;
-            overflow: hidden;
-            -webkit-line-clamp: 2;
-        }
-        > .wap-content-desc-bottom {
-            font-size: 12px;
-            padding: 4px 0;
-            color: #999;
-            display: flex;
-            justify-content: space-between;
-            > div:nth-of-type(1) {
-                color: $theme_color;
-            }
-        }
+  /deep/ img {
+    width: 60px;
+    height: 60px;
+    text-align: center;
+  }
+
+  .wap-content-desc {
+    width: 180px;
+    padding: 8px;
+
+    >.wap-content-desc-title {
+      display: -webkit-box;
+      font-size: 12px;
+      color: #666;
+
+      -webkit-box-orient: vertical;
+      overflow: hidden;
+      -webkit-line-clamp: 2;
     }
+
+    >.wap-content-desc-bottom {
+      font-size: 12px;
+      padding: 4px 0;
+      color: #999;
+      display: flex;
+      justify-content: space-between;
+
+      >div:nth-of-type(1) {
+        color: $theme_color;
+      }
+    }
+  }
 }
diff --git a/manager/src/views/lili-empty/index.vue b/manager/src/views/lili-empty/index.vue
deleted file mode 100644
index 413afcb2..00000000
--- a/manager/src/views/lili-empty/index.vue
+++ /dev/null
@@ -1,23 +0,0 @@
-<template>
-  <div class="empty">
-    <img  src="../../assets/empty.png" alt="">
-    暂无数据
-  </div>
-</template>
-<script>
-export default {
-
-}
-</script>
-<style lang="scss" scoped>
-.empty{
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  width: 100%;
-  >img{
-    margin-bottom: 10px;
-  }
-}
-</style>
diff --git a/manager/src/views/lili-floor-renovation/floorList.vue b/manager/src/views/lili-floor-renovation/floorList.vue
index 29d8fd47..04928b15 100644
--- a/manager/src/views/lili-floor-renovation/floorList.vue
+++ b/manager/src/views/lili-floor-renovation/floorList.vue
@@ -175,7 +175,7 @@ export default {
         }
       });
     },
-
+    // 删除模板
     delTemplate(id) {
       API_floor.removePageHome(id).then((res) => {
         if (res.success) {
@@ -184,8 +184,7 @@ export default {
         }
       });
     },
-  },
-  computed: {},
+  }
 };
 </script>
 
diff --git a/manager/src/views/lili-floor-renovation/modelForm.vue b/manager/src/views/lili-floor-renovation/modelForm.vue
index 4564094c..da0a8a80 100644
--- a/manager/src/views/lili-floor-renovation/modelForm.vue
+++ b/manager/src/views/lili-floor-renovation/modelForm.vue
@@ -25,13 +25,6 @@
                     <i-input v-model="searchData" size="large" placeholder="输入你想查找的商品">
                         <Button slot="append">搜索</Button>
                     </i-input>
-                    <!-- <Tag
-                        v-for="(item, index) in promotionTags"
-                        :key="index"
-                        class="mt_10"
-                    >
-                        {{item}}
-                    </Tag> -->
                 </div>
             </div>
             <div class="nav-con">
@@ -185,6 +178,7 @@ export default {
             if(item) this.selectedNav = item;
             this.$refs.liliDialog.open('link')
         },
+        // 已选链接
         selectedLink(val) {
             console.log(val);
             if(this.showModalNav){
@@ -202,9 +196,11 @@ export default {
             )
             console.log(this.navList.list)
         },
+        // 拖动结束回调
         handleMoveEnd ({newIndex, oldIndex}) {
             console.log('index', newIndex, oldIndex)
         },
+        // 修改顶部广告
         handleModel (type) {
             if(type == 'topAdvert'){
                 this.showModal = true;
@@ -212,6 +208,7 @@ export default {
                 this.showModalNav = true;
             }
         },
+        // 选择图片
         handleSelectImg() {
             this.$refs.ossManage.selectImage = true;
             this.picModelFlag = true;
@@ -236,9 +233,6 @@ export default {
                 model: this.data.list[newIndex].type + '_' + key
             })
         },
-    },
-    watch: {
-
     }
 }
 </script>
diff --git a/manager/src/views/lili-floor-renovation/modelFormItem.vue b/manager/src/views/lili-floor-renovation/modelFormItem.vue
index 9c834f7c..4603c14c 100644
--- a/manager/src/views/lili-floor-renovation/modelFormItem.vue
+++ b/manager/src/views/lili-floor-renovation/modelFormItem.vue
@@ -58,38 +58,6 @@
                 </div>
             </div>
         </template>
-        <!-- 首页品牌 -->
-        <!-- <template v-if="element.type == 'brand'">
-            <div class="brand">
-                <div class="brand-view">
-                    <div class="brand-view-content" v-for="(brand,index) in element.options.brandViewList" :key="index">
-                        <div class="brand-view-title">
-                            <span><span class="fontsize_18 fw_bold">{{brand.nameCn}}</span> <span class="fw_bold">{{brand.nameEn}}</span></span>
-                            <span>更多&gt;</span>
-                        </div>
-                        <div class="brand-view-img">
-                            <img :src="brand.img" alt="">
-                        </div>
-                    </div>
-                </div>
-                <ul class="brand-list">
-                    <li v-for="(sign,index) in element.options.signList" :key="index">
-                        <div class="brand-img">
-                            <img :src="sign.img" alt="">
-                        </div>
-                        <div class="brand-mash">
-                            <Icon type="ios-heart-outline" />
-                            <div>关注人数：{{ sign.follow }}</div>
-                            <div>点击进入</div>
-                        </div>
-                    </li>
-                    <li class="refresh">
-                        <Icon type="md-refresh" />
-                        <div>换一批</div>
-                    </li>
-                </ul>
-            </div>
-        </template> -->
         <!-- 好货推荐 -->
         <template v-if="element.type == 'recommend'">
             <recommend :data="element"></recommend>
@@ -188,15 +156,14 @@ export default {
             selected:{}, // 已选数据
             picModelFlag: false // 图片选择器
         }
-    },
-    mounted () {
-        
     },
     methods: {
+        // 编辑模块
         handleSelectModel (item) {
             this.selected = item;
             this.showModal = true
         },
+        // 删除模块
         handleModelDelete () {
             this.$Modal.confirm({
                 title: '提示',
@@ -212,28 +179,25 @@ export default {
         handleSelectLink(item,index) { // 调起选择链接弹窗
             this.$refs.liliDialog.open('link')
         },
+        // 确定选择链接
         selectedLink(val) {
             this.selected.url = this.$options.filters.formatLinkType(val);;
         },
+        // 拖动结束回调
         handleMoveEnd ({newIndex, oldIndex}) {
             console.log('index', newIndex, oldIndex)
         },
-        handleEditModel (type) {
-            this.showModal = true;
-        },
         handleSelectImg(){ // 选择图片
             this.$refs.ossManage.selectImage = true;
             this.picModelFlag = true;
         },
+        // 回显图片
         callbackSelected (val) {
             this.picModelFlag = false;
             this.selected.img = val.url;
         }
         
     },
-    watch: {
-        
-    }
 }
 </script>
 <style lang="scss" scoped>
diff --git a/manager/src/views/lili-floor-renovation/modelList/carousel.vue b/manager/src/views/lili-floor-renovation/modelList/carousel.vue
index 1fdfb75e..64667370 100644
--- a/manager/src/views/lili-floor-renovation/modelList/carousel.vue
+++ b/manager/src/views/lili-floor-renovation/modelList/carousel.vue
@@ -139,6 +139,7 @@ export default {
       // 编辑模块
       this.showModal = true;
     },
+    // 添加轮播图
     handleAdd () {
       this.data.options.list.push({ img: "", url: "" });
       this.$forceUpdate();
@@ -161,6 +162,7 @@ export default {
       this.selected.url = this.$options.filters.formatLinkType(val);
       console.log(this.selected.url);
     },
+    // 选择图片
     handleSelectImg(item) {
       this.selected = item;
       this.$refs.ossManage.selectImage = true;
diff --git a/manager/src/views/lili-floor-renovation/modelList/firstPageAdvert.vue b/manager/src/views/lili-floor-renovation/modelList/firstPageAdvert.vue
index 688fcbd2..71a89ec0 100644
--- a/manager/src/views/lili-floor-renovation/modelList/firstPageAdvert.vue
+++ b/manager/src/views/lili-floor-renovation/modelList/firstPageAdvert.vue
@@ -81,6 +81,7 @@ export default {
         }
     },
     methods:{
+        // 打开装修modal
         handleSelectModel (item,type) {
             this.selected = item;
             this.showModal = true
@@ -88,7 +89,7 @@ export default {
         handleSelectLink(item,index) { // 调起选择链接弹窗
             this.$refs.liliDialog.open('link')
         },
-       
+        // 选择链接回调
         selectedLink(val) {
             this.selected.url = this.$options.filters.formatLinkType(val);;
         },
@@ -96,6 +97,7 @@ export default {
             this.$refs.ossManage.selectImage = true;
             this.picModelFlag = true;
         },
+        // 选择图片回调
         callbackSelected (val) {
             this.picModelFlag = false;
             this.selected.img = val.url;
diff --git a/manager/src/views/lili-floor-renovation/modelList/newGoodsSort.vue b/manager/src/views/lili-floor-renovation/modelList/newGoodsSort.vue
index c74d4b48..25c1a013 100644
--- a/manager/src/views/lili-floor-renovation/modelList/newGoodsSort.vue
+++ b/manager/src/views/lili-floor-renovation/modelList/newGoodsSort.vue
@@ -160,6 +160,7 @@ export default {
         }
     },
     methods:{
+        // 装修modal
         handleSelectModel (item, type) {
             this.selected = item;
             console.warn(item);
@@ -181,9 +182,11 @@ export default {
                 this.$refs.liliDialog.goodsData = [this.selected]
             }, 500);
         },
+        // 选择链接回调
         selectedLink (val) {
             this.selected.url = this.$options.filters.formatLinkType(val);
         },
+        // 选择商品回调
         selectedGoodsData (val) {
             console.log(val);
             let goods = val[0]
@@ -193,17 +196,11 @@ export default {
             this.selected.name = goods.goodsName
             this.selected.url = `/goodsDetail?skuId=${goods.id}&goodsId=${goods.goodsId}`
         },
-       
-        handleMoveEnd ({newIndex, oldIndex}) {
-            console.log('index', newIndex, oldIndex)
-        },
-        handleEditModel (type) {
-            this.showModal = true;
-        },
         handleSelectImg(){ // 选择图片
             this.$refs.ossManage.selectImage = true;
             this.picModelFlag = true;
         },
+        // 选择图片回显
         callbackSelected (val) {
             this.picModelFlag = false;
             this.selected.img = val.url;
diff --git a/manager/src/views/lili-floor-renovation/modelList/notEnough.vue b/manager/src/views/lili-floor-renovation/modelList/notEnough.vue
index 11b369b6..7483e7c9 100644
--- a/manager/src/views/lili-floor-renovation/modelList/notEnough.vue
+++ b/manager/src/views/lili-floor-renovation/modelList/notEnough.vue
@@ -50,7 +50,6 @@
                         <tr v-for="(item, index) in conData.options.navList" :key="index">
                             <td><Input v-model="item.title" /></td>
                             <td><Input v-model="item.desc" /></td>
-                            <!-- <td><Input v-model="item.sort"/></td> -->
                             <td v-if="index!=0">
                                 <Button type="error" size="small" @click="handleDelNav(index)">删除</Button>
                             </td>
@@ -62,7 +61,6 @@
         <!-- 选择商品。链接 -->
         <liliDialog
             ref="liliDialog"
-            @selectedLink="selectedLink"
             @selectedGoodsData="selectedGoodsData"
         ></liliDialog>
     </div>
@@ -91,31 +89,25 @@ export default {
         conData:function(val){
             this.$emit('content',val)
         }
-    },
-    mounted() {
-
     },
     methods:{
+        // tab点击切换
         changeCurr(index){
             this.currentIndex = index;
         },
+        // 编辑
         handleSelectModel (item,type) {
             this.selected = item;
             this.showModal = true
         },
-        handleSelectLink(item,index) { // 调起选择链接弹窗
-            this.$refs.liliDialog.open('link')
-        },
-        handleSelectGoods(item) { // 调起选择链接弹窗
+        handleSelectGoods(item) { // 调起选择商品弹窗
             if(item) this.selected = item;
             this.$refs.liliDialog.open('goods', 'single')
             setTimeout(() => {
                 this.$refs.liliDialog.goodsData = [this.selected]
             }, 500);
         },
-        selectedLink(val) {
-           this.selected.url = this.$options.filters.formatLinkType(val);
-        },
+        // 选择商品回调
         selectedGoodsData(val){
             console.log(val)
             let goods = val[0]
diff --git a/manager/src/views/lili-floor-renovation/modelList/recommend.vue b/manager/src/views/lili-floor-renovation/modelList/recommend.vue
index d37a34a2..b3572370 100644
--- a/manager/src/views/lili-floor-renovation/modelList/recommend.vue
+++ b/manager/src/views/lili-floor-renovation/modelList/recommend.vue
@@ -227,6 +227,7 @@ export default {
     };
   },
   methods: {
+    // 编辑
     handleSelectModel(item, type) {
       this.selected = item;
       if (type) {
@@ -243,9 +244,11 @@ export default {
       // 调起选择商品
       this.$refs.liliDialog.open('goods', 'single')
     },
+    // 选择链接回调
     selectedLink(val) {
       this.selected.url = this.$options.filters.formatLinkType(val);
     },
+    // 选择商品回调
     selectedGoodsData(val) {
       console.log(val);
       let goods = val[0];
@@ -259,6 +262,7 @@ export default {
       this.$refs.ossManage.selectImage = true;
       this.picModelFlag = true;
     },
+    // 选择图片回调
     callbackSelected(val) {
       this.picModelFlag = false;
       this.selected.img = val.url;
diff --git a/manager/src/views/lili-floor-renovation/renovation.vue b/manager/src/views/lili-floor-renovation/renovation.vue
index a0ec292d..153def56 100644
--- a/manager/src/views/lili-floor-renovation/renovation.vue
+++ b/manager/src/views/lili-floor-renovation/renovation.vue
@@ -58,7 +58,7 @@ export default {
         if (res.success) {
           this.$Message.success("保存模板成功");
         } else {
-          this.$Message.error(res.message);
+          // this.$Message.error(res.message);
         }
       });
     },
@@ -86,9 +86,6 @@ export default {
             this.modelForm = { list: [] };
           }
         }
-
-        // this.$refs.modelForm.topAdvert = {};
-        // this.$refs.modelForm.navList = {}
       });
     },
   },
diff --git a/manager/src/views/lili-floor-renovation/wap/advertising.vue b/manager/src/views/lili-floor-renovation/wap/advertising.vue
index 38a45f09..70257cc8 100644
--- a/manager/src/views/lili-floor-renovation/wap/advertising.vue
+++ b/manager/src/views/lili-floor-renovation/wap/advertising.vue
@@ -94,19 +94,12 @@ export default {
 
       linkType: "", // 选择类型
     };
-  },
-  methods: {},
-  mounted() {
-
   },
   methods: {
-
     // 点击链接
     clickLink(item) {
       this.$refs.liliDialog.open('link')
     },
-
-
     //点击图片解析成base64
     changeFile(item, index) {
       const file = document.getElementById("files" + index).files[0];
@@ -122,7 +115,6 @@ export default {
     // 点击选择照片
     handleClickFile(item, index) {
       document.getElementById("files" + index).click();
-      // console.log(let files = files)
     },
   },
 };
diff --git a/manager/src/views/lili-floor-renovation/wap/alertAdvertising.vue b/manager/src/views/lili-floor-renovation/wap/alertAdvertising.vue
index 7143d034..cddee110 100644
--- a/manager/src/views/lili-floor-renovation/wap/alertAdvertising.vue
+++ b/manager/src/views/lili-floor-renovation/wap/alertAdvertising.vue
@@ -69,14 +69,12 @@
             </div>
           </div>
         </div>
-        <!-- <Button type="primary" @click="addDecorate()" ghost>添加</Button> -->
         <liliDialog ref="liliDialog" :types="linkType"></liliDialog>
       </div>
     </div>
   </div>
 </template>
 <script>
-
 export default {
   data() {
     return {
@@ -91,18 +89,12 @@ export default {
       ],
       linkType: "", // 选择类型
     };
-  },
-  methods: {},
-  mounted() {
-
   },
   methods: {
     // 点击链接
     clickLink(item) {
       this.$refs.liliDialog.open('link')
     },
-
-
     //点击图片解析成base64
     changeFile(item, index) {
       const file = document.getElementById("files" + index).files[0];
@@ -118,7 +110,6 @@ export default {
     // 点击选择照片
     handleClickFile(item, index) {
       document.getElementById("files" + index).click();
-      // console.log(let files = files)
     },
   },
 };
diff --git a/manager/src/views/lili-floor-renovation/wap/decorate.vue b/manager/src/views/lili-floor-renovation/wap/decorate.vue
index ae84813f..d47f53db 100644
--- a/manager/src/views/lili-floor-renovation/wap/decorate.vue
+++ b/manager/src/views/lili-floor-renovation/wap/decorate.vue
@@ -168,20 +168,15 @@ export default {
     },
   },
   props: ["res"],
-  mounted() {},
   methods: {
     // 选择风格
     selectStyle() {
       this.styleFlag = !this.styleFlag;
     },
-
     // 回调选择的链接
     selectedLink(val) {
       this.selectedLinks.url = val;
-
-      console.log(this.selectedLinks);
     },
-
     // 回调的商品信息
     selectedGoodsData(val) {
       if (!val) return false;
@@ -194,10 +189,8 @@ export default {
       this.res.options.list[0].listWay = this.res.options.list[0].listWay.concat(
         val
       );
-
       this.linkType = "";
     },
-
     // 绑定商品
     bindGoodsId(val) {
       this.selectedGoods = val;
@@ -208,7 +201,7 @@ export default {
       this.$emit("handleDrawer", item);
       this.styleFlag = false;
     },
-
+    // 打开图片选择器
     liliDialogFlag(flag) {
       this.$refs.liliDialog.goodsFlag = flag;
       this.$refs.liliDialog.flag = true;
@@ -216,14 +209,9 @@ export default {
 
     // 点击链接赋值一个唯一值，并将当前选择的模块赋值
     clickLink(val, index) {
-      // this.selectedLinkIndex = index
-      // val.___only = new Date().getTime(), //赋值当前时间戳 唯一
       this.selectedLinks = val;
-
-      console.log(this.selectedLinks);
       this.liliDialogFlag(false);
     },
-
     //点击图片解析成base64
     changeFile(item, index) {
       const file = document.getElementById("files" + index).files[0];
@@ -247,21 +235,17 @@ export default {
       };
       this.res.options.list.push(way);
     },
-
+    // 图片选择器回显
     callbackSelected(val) {
       this.picModelFlag = false;
       this.selectedGoods.img = val.url;
     },
-
-    // 点击选择照片
+    // 点击选择图片
     handleClickFile(item, index) {
       this.$refs.ossManage.selectImage = true;
       this.selectedGoods = item;
       this.picModelFlag = true;
-
-      // console.log(let files = files)
     },
-
     // 关闭
     closeDecorate(index) {
       this.$nextTick(() => {
diff --git a/manager/src/views/lili-floor-renovation/wap/index.vue b/manager/src/views/lili-floor-renovation/wap/index.vue
index 32acfb5f..84b59d47 100644
--- a/manager/src/views/lili-floor-renovation/wap/index.vue
+++ b/manager/src/views/lili-floor-renovation/wap/index.vue
@@ -108,6 +108,7 @@ export default {
   },
 
   methods: {
+    // 初始化数据
     init() {
       if (!this.$route.query.id) return false;
       API_Other.getHomeData(this.$route.query.id).then(res=>{
@@ -117,12 +118,6 @@ export default {
          this.handleComponent( this.contentData.list[0], 0)
       })
     },
-    handleSpinShow() {
-      this.$Spin.show();
-      setTimeout(() => {
-        this.$Spin.hide();
-      }, 3000);
-    },
 
     // 中间组件拖动，右侧数据绑定不变
     handleContentlEnd(evt) {
@@ -159,7 +154,7 @@ export default {
       this.selected = index;
       this.$set(this, "decorateData", val);
     },
-
+    // 右侧栏回调
     handleDrawer(val) {
       let newIndex = this.selected;
 
diff --git a/manager/src/views/lili-floor-renovation/wap/main.vue b/manager/src/views/lili-floor-renovation/wap/main.vue
index 76bcfaa9..62bd675e 100644
--- a/manager/src/views/lili-floor-renovation/wap/main.vue
+++ b/manager/src/views/lili-floor-renovation/wap/main.vue
@@ -18,17 +18,12 @@ export default {
       layout, // 装修模块
       name: "index", // 装修的页面
     };
-  },
-  mounted() {
-
   },
   methods: {
-    selected(val) {
+    selected(val) { // 顶部栏点击切换
       this.name = val;
-    },
-
-
-  },
+    }
+  }
 };
 </script>
 <style scoped lang="scss">
diff --git a/manager/src/views/lili-floor-renovation/wap/template/tpl_banner.vue b/manager/src/views/lili-floor-renovation/wap/template/tpl_banner.vue
index 25cbc218..479b4f3e 100644
--- a/manager/src/views/lili-floor-renovation/wap/template/tpl_banner.vue
+++ b/manager/src/views/lili-floor-renovation/wap/template/tpl_banner.vue
@@ -20,9 +20,6 @@ export default {
       },
       deep: true
     }
-  },
-  mounted() {
-    console.log(this.res);
   }
 };
 </script>
diff --git a/manager/src/views/lili-floor-renovation/wap/template/tpl_flex_two.vue b/manager/src/views/lili-floor-renovation/wap/template/tpl_flex_two.vue
index dd9266b8..8c84872f 100644
--- a/manager/src/views/lili-floor-renovation/wap/template/tpl_flex_two.vue
+++ b/manager/src/views/lili-floor-renovation/wap/template/tpl_flex_two.vue
@@ -14,9 +14,6 @@
 export default {
   title: "两张横图",
   props: ["res"],
-  mounted () {
-
-  }
 };
 </script>
 <style lang="scss" scoped>
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 7220aae2..c1913e5e 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
@@ -52,11 +52,12 @@ export default {
     };
   },
   props: ["res"],
-  mounted() {},
   methods: {
+    // 删除商品
     closeGoods(val, index) {
       this.res.list[0].listWay.splice(index,1)
     },
+    // 切换商品列表
     handleClickTitle(val, index) {
       this.selected.index = index;
       this.selected.val = val.title;
diff --git a/manager/src/views/lili-floor-renovation/wap/template/tpl_group.vue b/manager/src/views/lili-floor-renovation/wap/template/tpl_group.vue
index d927369e..c3abd591 100644
--- a/manager/src/views/lili-floor-renovation/wap/template/tpl_group.vue
+++ b/manager/src/views/lili-floor-renovation/wap/template/tpl_group.vue
@@ -29,7 +29,7 @@
 </template>
 <script>
 export default {
-  props: ["res"],
+  props: ["res"]
 };
 </script>
 <style lang="scss" scoped>
diff --git a/manager/src/views/lili-floor-renovation/wap/template/tpl_integral.vue b/manager/src/views/lili-floor-renovation/wap/template/tpl_integral.vue
index f8833d81..53eb17a6 100644
--- a/manager/src/views/lili-floor-renovation/wap/template/tpl_integral.vue
+++ b/manager/src/views/lili-floor-renovation/wap/template/tpl_integral.vue
@@ -29,7 +29,7 @@
 </template>
 <script>
 export default {
-  props: ["res"],
+  props: ["res"]
 };
 </script>
 <style lang="scss" scoped>
diff --git a/manager/src/views/lili-floor-renovation/wap/template/tpl_join_group.vue b/manager/src/views/lili-floor-renovation/wap/template/tpl_join_group.vue
index b9095fc4..3b60a09f 100644
--- a/manager/src/views/lili-floor-renovation/wap/template/tpl_join_group.vue
+++ b/manager/src/views/lili-floor-renovation/wap/template/tpl_join_group.vue
@@ -29,7 +29,7 @@
 </template>
 <script>
 export default {
-  props: ["res"],
+  props: ["res"]
 };
 </script>
 <style lang="scss" scoped>
diff --git a/manager/src/views/lili-floor-renovation/wap/template/tpl_left_one_right_two.vue b/manager/src/views/lili-floor-renovation/wap/template/tpl_left_one_right_two.vue
index fcf0936f..07ee3c05 100644
--- a/manager/src/views/lili-floor-renovation/wap/template/tpl_left_one_right_two.vue
+++ b/manager/src/views/lili-floor-renovation/wap/template/tpl_left_one_right_two.vue
@@ -18,10 +18,7 @@
 <script>
 export default {
   title: "左一右二",
-  props: ["res"],
-  mounted() {
-
-  }
+  props: ["res"]
 };
 </script>
 <style lang="scss" scoped>
diff --git a/manager/src/views/lili-floor-renovation/wap/template/tpl_left_two_right_one.vue b/manager/src/views/lili-floor-renovation/wap/template/tpl_left_two_right_one.vue
index e77470cf..a7adb408 100644
--- a/manager/src/views/lili-floor-renovation/wap/template/tpl_left_two_right_one.vue
+++ b/manager/src/views/lili-floor-renovation/wap/template/tpl_left_two_right_one.vue
@@ -18,10 +18,7 @@
 <script>
 export default {
   title: "左二右一",
-  props: ["res"],
-  mounted() {
-    console.log(this.res);
-  },
+  props: ["res"]
 };
 </script>
 <style lang="scss" scoped>
diff --git a/manager/src/views/lili-floor-renovation/wap/template/tpl_spike.vue b/manager/src/views/lili-floor-renovation/wap/template/tpl_spike.vue
index d927369e..c3abd591 100644
--- a/manager/src/views/lili-floor-renovation/wap/template/tpl_spike.vue
+++ b/manager/src/views/lili-floor-renovation/wap/template/tpl_spike.vue
@@ -29,7 +29,7 @@
 </template>
 <script>
 export default {
-  props: ["res"],
+  props: ["res"]
 };
 </script>
 <style lang="scss" scoped>
diff --git a/manager/src/views/lili-floor-renovation/wap/template/tpl_text_picture.vue b/manager/src/views/lili-floor-renovation/wap/template/tpl_text_picture.vue
index d4970d37..add2784f 100644
--- a/manager/src/views/lili-floor-renovation/wap/template/tpl_text_picture.vue
+++ b/manager/src/views/lili-floor-renovation/wap/template/tpl_text_picture.vue
@@ -35,10 +35,7 @@
 <script>
 export default {
   title: "文字图片模板",
-  props: ["res"],
-  mounted() {
-    console.log(this.res);
-  }
+  props: ["res"]
 };
 </script>
 <style lang="scss" scoped>
diff --git a/manager/src/views/lili-floor-renovation/wap/template/tpl_title.vue b/manager/src/views/lili-floor-renovation/wap/template/tpl_title.vue
index c835fbdc..5fce25ff 100644
--- a/manager/src/views/lili-floor-renovation/wap/template/tpl_title.vue
+++ b/manager/src/views/lili-floor-renovation/wap/template/tpl_title.vue
@@ -11,10 +11,7 @@
 <script>
 export default {
   title: "标题栏",
-  props: ["res"],
-  mounted() {
-    console.log(this.res);
-  },
+  props: ["res"]
 };
 </script>
 <style lang="scss" scoped>
diff --git a/manager/src/views/lili-floor-renovation/wap/template/tpl_top_one_bottom_two.vue b/manager/src/views/lili-floor-renovation/wap/template/tpl_top_one_bottom_two.vue
index e6841ddd..3eae5ffc 100644
--- a/manager/src/views/lili-floor-renovation/wap/template/tpl_top_one_bottom_two.vue
+++ b/manager/src/views/lili-floor-renovation/wap/template/tpl_top_one_bottom_two.vue
@@ -18,10 +18,7 @@
 <script>
 export default {
   title: "上一下二",
-  props: ["res"],
-  mounted() {
-    console.log(this.res);
-  }
+  props: ["res"]
 };
 </script>
 <style lang="scss" scoped>
diff --git a/manager/src/views/lili-floor-renovation/wap/template/tpl_top_two_bottom_one.vue b/manager/src/views/lili-floor-renovation/wap/template/tpl_top_two_bottom_one.vue
index 796016a1..e8732162 100644
--- a/manager/src/views/lili-floor-renovation/wap/template/tpl_top_two_bottom_one.vue
+++ b/manager/src/views/lili-floor-renovation/wap/template/tpl_top_two_bottom_one.vue
@@ -18,9 +18,6 @@
 export default {
   title: "上二下一",
   props: ["res"],
-  mounted() {
-    console.log(this.res);
-  }
 };
 </script>
 <style lang="scss" scoped>
diff --git a/manager/src/views/lili-floor-renovation/wap/template/tpl_view_list.vue b/manager/src/views/lili-floor-renovation/wap/template/tpl_view_list.vue
index cc529839..acd4568e 100644
--- a/manager/src/views/lili-floor-renovation/wap/template/tpl_view_list.vue
+++ b/manager/src/views/lili-floor-renovation/wap/template/tpl_view_list.vue
@@ -3,9 +3,6 @@
 </template>
 <script>
 export default {
-    destroyed(){
-       
-    }
 }
 </script>
 <style scoped lang="scss">
diff --git a/manager/src/views/lili-floor-renovation/wap/wapList.vue b/manager/src/views/lili-floor-renovation/wap/wapList.vue
index d07a59fe..daef307b 100644
--- a/manager/src/views/lili-floor-renovation/wap/wapList.vue
+++ b/manager/src/views/lili-floor-renovation/wap/wapList.vue
@@ -96,11 +96,13 @@ export default {
     this.init();
   },
   methods: {
+    // 切换tab
     clickType(val,index) {
       this.params.pageNumber = 1
       this.selectedIndex = index
       this.params.pageType = val;
     },
+    // 是否发布
     changeSwitch(item) {
       this.loading = true;
       API_Other.releasePageHome(item.id).then((res) => {
@@ -115,6 +117,7 @@ export default {
         this.loading = false;
       });
     },
+    // 初始化数据
     init() {
       this.loading = true;
       API_Other.getHomeList(this.params).then((res) => {
@@ -132,20 +135,20 @@ export default {
         this.total = res.result.total;
       });
     },
-
+    // 装修楼层
     handleEdit(val) {
       this.$router.push({
         path: "/floorList/main",
         query: { id: val.id, name: val.name, type: val.pageShow },
       });
     },
-
+    // 添加模板
     handleAdd() {
       this.$router.push({
         path: "/floorList/main",
       });
     },
-
+    // 删除模板
     handleDel(val) {
       this.loading = true;
       API_Other.removePageHome(val.id).then((res) => {
diff --git a/manager/src/views/login.vue b/manager/src/views/login.vue
index 46c80c11..5e474d03 100644
--- a/manager/src/views/login.vue
+++ b/manager/src/views/login.vue
@@ -24,9 +24,6 @@
       </Row>
       <!-- 拼图验证码 -->
       <verify ref="verify" class="verify-con" verifyType="LOGIN" @change="verifyChange"></verify>
-      <div v-if="socialLogining">
-        <RectLoading />
-      </div>
       <Footer />
       </Col>
       <!-- <LangSwitch /> -->
@@ -40,15 +37,11 @@ import Cookies from "js-cookie";
 import Header from "@/views/main-components/header";
 import Footer from "@/views/main-components/footer";
 import LangSwitch from "@/views/main-components/lang-switch";
-import RectLoading from "@/views/my-components/lili/rect-loading";
-import CountDownButton from "@/views/my-components/lili/count-down-button";
 import util from "@/libs/util.js";
 import verify from "@/views/my-components/verify";
 
 export default {
   components: {
-    CountDownButton,
-    RectLoading,
     LangSwitch,
     Header,
     Footer,
diff --git a/manager/src/views/logistics/index.vue b/manager/src/views/logistics/index.vue
index 01ca03de..6ef76ae8 100644
--- a/manager/src/views/logistics/index.vue
+++ b/manager/src/views/logistics/index.vue
@@ -10,9 +10,6 @@
         :columns="columns"
         :data="data"
         ref="table"
-        sortable="custom"
-        @on-sort-change="changeSort"
-        @on-selection-change="changeSelect"
       >
         <!-- 页面展示 -->
         <template slot="disableSlot" slot-scope="{row}">
@@ -90,13 +87,12 @@
     data() {
       return {
         loading: true, // 表单加载状态
-        modalType: 0, // 添加或编辑标识
         modalVisible: false, // 添加或编辑显示
         modalTitle: "", // 添加或编辑标题
         searchForm: {
           // 搜索框初始化对象
           pageNumber: 1, // 当前页数
-          pageSize: 10, // 页面大小
+          pageSize: 20, // 页面大小
           sort: "createTime", // 默认排序字段
           order: "desc", // 默认排序方式
           name: "",
@@ -245,7 +241,7 @@
           if (valid) {
             this.submitLoading = true;
             this.form.disabled = this.form.disabled == true ? "OPEN" : "CLOSE"
-            if (this.modalType == 0) {
+            if (this.modalTitle == "添加") {
               // 添加 避免编辑后传入id等数据 记得删除
               delete this.form.id;
 
@@ -276,7 +272,6 @@
       },
       // 添加信息
       add() {
-        this.modalType = 0;
         this.modalTitle = "添加";
         this.form = {};
         this.$refs.form.resetFields();
@@ -285,7 +280,6 @@
       },
       // 编辑
       detail(v) {
-        this.modalType = 1;
         this.id = v.id;
         this.modalTitle = "修改";
         this.modalVisible = true;
diff --git a/manager/src/views/main-components/breadcrumb-nav.vue b/manager/src/views/main-components/breadcrumb-nav.vue
deleted file mode 100644
index bdc5ca19..00000000
--- a/manager/src/views/main-components/breadcrumb-nav.vue
+++ /dev/null
@@ -1,28 +0,0 @@
-<template>
-    <Breadcrumb>
-        <BreadcrumbItem 
-            v-for="item in currentPath" 
-            :to="item.path" 
-            :key="item.name"
-        >{{ itemTitle(item) }}</BreadcrumbItem>
-    </Breadcrumb>
-</template>
-
-<script>
-export default {
-    name: 'breadcrumbNav',
-    props: {
-        currentPath: Array
-    },
-    methods: {
-        itemTitle (item) {
-            if (typeof item.title == 'object') {
-                return this.$t(item.title.i18n);
-            } else {
-                return item.title;
-            }
-        }
-    }
-};
-</script>
-
diff --git a/manager/src/views/main-components/fullscreen.vue b/manager/src/views/main-components/fullscreen.vue
deleted file mode 100644
index 63c3a1dd..00000000
--- a/manager/src/views/main-components/fullscreen.vue
+++ /dev/null
@@ -1,80 +0,0 @@
-<template>
-    <div @click="handleChange" v-if="showFullScreenBtn" class="full-screen-btn-con">
-        <Tooltip :content="value ? '退出全屏' : '全屏'" placement="bottom">
-            <Icon :type="value ? 'ios-contract' : 'ios-expand'" :size="24"></Icon>
-        </Tooltip>
-    </div>
-</template>
-
-<script>
-export default {
-  name: "fullScreen",
-  props: {
-    value: {
-      type: Boolean,
-      default: false
-    }
-  },
-  computed: {
-    showFullScreenBtn() {
-      return window.navigator.userAgent.indexOf("MSIE") < 0;
-    }
-  },
-  methods: {
-    handleFullscreen() {
-      let main = document.body;
-      if (this.value) {
-        if (document.exitFullscreen) {
-          document.exitFullscreen();
-        } else if (document.mozCancelFullScreen) {
-          document.mozCancelFullScreen();
-        } else if (document.webkitCancelFullScreen) {
-          document.webkitCancelFullScreen();
-        } else if (document.msExitFullscreen) {
-          document.msExitFullscreen();
-        }
-      } else {
-        if (main.requestFullscreen) {
-          main.requestFullscreen();
-        } else if (main.mozRequestFullScreen) {
-          main.mozRequestFullScreen();
-        } else if (main.webkitRequestFullScreen) {
-          main.webkitRequestFullScreen();
-        } else if (main.msRequestFullscreen) {
-          main.msRequestFullscreen();
-        }
-      }
-    },
-    handleChange() {
-      this.handleFullscreen();
-    }
-  },
-  created() {
-    let isFullscreen =
-      document.fullscreenElement ||
-      document.mozFullScreenElement ||
-      document.webkitFullscreenElement ||
-      document.fullScreen ||
-      document.mozFullScreen ||
-      document.webkitIsFullScreen;
-    isFullscreen = !!isFullscreen;
-    document.addEventListener("fullscreenchange", () => {
-      this.$emit("input", !this.value);
-      this.$emit("on-change", !this.value);
-    });
-    document.addEventListener("mozfullscreenchange", () => {
-      this.$emit("input", !this.value);
-      this.$emit("on-change", !this.value);
-    });
-    document.addEventListener("webkitfullscreenchange", () => {
-      this.$emit("input", !this.value);
-      this.$emit("on-change", !this.value);
-    });
-    document.addEventListener("msfullscreenchange", () => {
-      this.$emit("input", !this.value);
-      this.$emit("on-change", !this.value);
-    });
-    this.$emit("input", isFullscreen);
-  }
-};
-</script>
diff --git a/manager/src/views/main-components/message-tip.vue b/manager/src/views/main-components/message-tip.vue
index 19671a4d..58705af0 100644
--- a/manager/src/views/main-components/message-tip.vue
+++ b/manager/src/views/main-components/message-tip.vue
@@ -28,7 +28,6 @@
         <DropdownItem v-if="res.waitPayBill" @click.native="navigateTo('accountStatementBill')">
           <Badge :count="res.waitPayBill">待与商家对账</Badge>
         </DropdownItem>
-
         <div></div>
       </DropdownMenu>
     </Dropdown>
diff --git a/manager/src/views/main-components/shrinkable-menu/shrinkable-menu.vue b/manager/src/views/main-components/shrinkable-menu/shrinkable-menu.vue
index dbe7e4ec..01afa6c9 100644
--- a/manager/src/views/main-components/shrinkable-menu/shrinkable-menu.vue
+++ b/manager/src/views/main-components/shrinkable-menu/shrinkable-menu.vue
@@ -27,6 +27,7 @@
 
 <script>
 import util from "@/libs/util.js";
+
 export default {
   name: "shrinkableMenu",
   computed: {
@@ -45,6 +46,9 @@ export default {
     $route: {
       handler: function (val, oldVal) {
         console.log(val);
+        if (val.meta.firstRouterName && val.meta.firstRouterName !== this.currNav) {
+          this.selectNav(val.meta.firstRouterName)
+        }
       }
     } 
   },
@@ -58,10 +62,38 @@ export default {
       this.$store.commit("setCurrNav", name);
       this.setStore("currNav", name);
       util.initRouter(this);
+      this.$nextTick(()=>{
+        this.$refs.childrenMenu.updateActiveName()
+      })
     },
   }
 };
 </script>
 <style lang="scss" scoped>
-@import "./styles/menu.scss";
+.ivu-shrinkable-menu{
+    height: calc(100% - 60px);
+    width: 180px;
+    display: flex;
+}
+
+.ivu-btn-text:hover {
+    background-color: rgba(255,255,255,.2) !important;
+}
+.ivu-menu-dark.ivu-menu-vertical .ivu-menu-item-active:not(.ivu-menu-submenu), .ivu-menu-dark.ivu-menu-vertical .ivu-menu-submenu-title-active:not(.ivu-menu-submenu){
+    background-color: #fff;
+    &:hover{
+        background-color: #fff;
+    }
+}
+.ivu-menu-vertical{
+  overflow-y: auto;
+}
+.ivu-menu-dark.ivu-menu-vertical .ivu-menu-item-active:not(.ivu-menu-submenu), .ivu-menu-dark.ivu-menu-vertical .ivu-menu-submenu-title-active:not(.ivu-menu-submenu){
+    color: #ed3f14;
+}
+/deep/.ivu-menu-vertical .ivu-menu-item-group-title {
+    height: 40px;
+    line-height: 40px;
+    padding-left: 20px;
+}
 </style>
diff --git a/manager/src/views/main-components/shrinkable-menu/styles/menu.scss b/manager/src/views/main-components/shrinkable-menu/styles/menu.scss
deleted file mode 100644
index bfc7cf9b..00000000
--- a/manager/src/views/main-components/shrinkable-menu/styles/menu.scss
+++ /dev/null
@@ -1,26 +0,0 @@
-.ivu-shrinkable-menu{
-    height: calc(100% - 60px);
-    width: 180px;
-    display: flex;
-}
-
-.ivu-btn-text:hover {
-    background-color: rgba(255,255,255,.2) !important;
-}
-.ivu-menu-dark.ivu-menu-vertical .ivu-menu-item-active:not(.ivu-menu-submenu), .ivu-menu-dark.ivu-menu-vertical .ivu-menu-submenu-title-active:not(.ivu-menu-submenu){
-    background-color: #fff;
-    &:hover{
-        background-color: #fff;
-    }
-}
-.ivu-menu-vertical{
-  overflow-y: auto;
-}
-.ivu-menu-dark.ivu-menu-vertical .ivu-menu-item-active:not(.ivu-menu-submenu), .ivu-menu-dark.ivu-menu-vertical .ivu-menu-submenu-title-active:not(.ivu-menu-submenu){
-    color: #ed3f14;
-}
-/deep/.ivu-menu-vertical .ivu-menu-item-group-title {
-    height: 40px;
-    line-height: 40px;
-    padding-left: 20px;
-}
\ No newline at end of file
diff --git a/manager/src/views/member/advance/recharge.vue b/manager/src/views/member/advance/recharge.vue
index f1cb3dcd..f4ffbec5 100644
--- a/manager/src/views/member/advance/recharge.vue
+++ b/manager/src/views/member/advance/recharge.vue
@@ -47,9 +47,7 @@
         :columns="columns"
         :data="data"
         ref="table"
-        sortable="custom"
-        @on-sort-change="changeSort"
-        @on-selection-change="changeSelect"
+        class="mt_10"
       ></Table>
       <Row type="flex" justify="end" class="mt_10">
         <Page
@@ -75,7 +73,6 @@
   } from "@/api/member";
   export default {
     name: "recharge",
-    components: {},
     data() {
       return {
         loading: true, // 表单加载状态
@@ -90,9 +87,6 @@
           memberName:""
         },
         selectDate: null, // 选择区间时间
-        submitLoading: false, // 添加或编辑提交状态
-        selectList: [], // 多选数据
-        selectCount: 0, // 多选计数
         columns: [
           {
             title: "会员名称",
@@ -168,58 +162,37 @@
       };
     },
     methods: {
+      // 初始化数据
       init() {
         this.getDataList();
       },
+      // 分页 改变页码
       changePage(v) {
         this.searchForm.pageNumber = v;
         this.getDataList();
-        this.clearSelectAll();
       },
+      // 分页 改变页数
       changePageSize(v) {
+        this.searchForm.pageNumber = 1;
         this.searchForm.pageSize = v;
         this.getDataList();
       },
+      // 搜索
       handleSearch() {
         this.searchForm.pageNumber = 1;
         this.searchForm.pageSize = 10;
         this.getDataList();
       },
-      handleReset() {
-        this.$refs.searchForm.resetFields();
-        this.searchForm.pageNumber = 1;
-        this.searchForm.pageSize = 10;
-        this.selectDate = null;
-        this.searchForm.startDate = "";
-        this.searchForm.endDate = "";
-        this.searchForm.memberName = "";
-        // 重新加载数据
-        this.getDataList();
-      },
-      changeSort(e) {
-        this.searchForm.sort = e.key;
-        this.searchForm.order = e.order;
-        if (e.order === "normal") {
-          this.searchForm.order = "";
-        }
-        this.getDataList();
-      },
-      clearSelectAll() {
-        this.$refs.table.selectAll(false);
-      },
-      changeSelect(e) {
-        this.selectList = e;
-        this.selectCount = e.length;
-      },
+      // 时间段赋值
       selectDateRange(v) {
         if (v) {
           this.searchForm.startDate = v[0];
           this.searchForm.endDate = v[1];
         }
       },
+      // 获取列表数据
       getDataList() {
         this.loading = true;
-        // 带多条件搜索参数获取表单数据 请自行修改接口
         getUserRecharge(this.searchForm).then((res) => {
           this.loading = false;
           if (res.success) {
diff --git a/manager/src/views/member/advance/walletLog.vue b/manager/src/views/member/advance/walletLog.vue
index a2fc76c1..5354ad0a 100644
--- a/manager/src/views/member/advance/walletLog.vue
+++ b/manager/src/views/member/advance/walletLog.vue
@@ -13,7 +13,7 @@
           <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
         </Form>
       </Row>
-        <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect"></Table>
+        <Table class="mt_10" :loading="loading" border :columns="columns" :data="data" ref="table"></Table>
       <Row type="flex" justify="end" class="mt_10">
         <Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]"
           size="small" show-total show-elevator show-sizer></Page>
@@ -26,7 +26,6 @@
 import { getUserWallet } from "@/api/member";
 export default {
   name: "walletLog",
-  components: {},
   data() {
     return {
       loading: true, // 表单加载状态
@@ -41,10 +40,6 @@ export default {
         memberName: "",
       },
       selectDate: null, // 选择时间段
-      // 表单验证规则
-      formValidate: {},
-      selectList: [], // 多选数据
-      selectCount: 0, // 多选计数
       columns: [
         // 表头
         {
@@ -120,58 +115,36 @@ export default {
     };
   },
   methods: {
+    // 初始化数据
     init() {
       this.getDataList();
     },
+    // 分页 改变页码
     changePage(v) {
       this.searchForm.pageNumber = v;
       this.getDataList();
-      this.clearSelectAll();
     },
+    // 分页 改变页数
     changePageSize(v) {
+      this.searchForm.pageNumber = 1;
       this.searchForm.pageSize = v;
       this.getDataList();
     },
+    // 搜索
     handleSearch() {
       this.searchForm.pageNumber = 1;
       this.searchForm.pageSize = 10;
       this.getDataList();
     },
-    handleReset() {
-      this.$refs.searchForm.resetFields();
-      this.searchForm.pageNumber = 1;
-      this.searchForm.pageSize = 10;
-      this.selectDate = null;
-      this.searchForm.startDate = "";
-      this.searchForm.endDate = "";
-      this.searchForm.memberName = "";
-      // 重新加载数据
-      this.getDataList();
-    },
-    changeSort(e) {
-      this.searchForm.sort = e.key;
-      this.searchForm.order = e.order;
-      if (e.order === "normal") {
-        this.searchForm.order = "";
-      }
-      this.getDataList();
-    },
-    clearSelectAll() {
-      this.$refs.table.selectAll(false);
-    },
-    changeSelect(e) {
-      this.selectList = e;
-      this.selectCount = e.length;
-    },
+    // 时间段赋值
     selectDateRange(v) {
       if (v) {
         this.searchForm.startDate = v[0];
         this.searchForm.endDate = v[1];
       }
     },
+    // 获取列表数据
     getDataList() {
-      this.loading = true;
-      // 带多条件搜索参数获取表单数据 请自行修改接口
       getUserWallet(this.searchForm).then((res) => {
         this.loading = false;
         if (res.success) {
diff --git a/manager/src/views/member/advance/withdrawApply.vue b/manager/src/views/member/advance/withdrawApply.vue
index 894bbc1a..eb5ea3c2 100644
--- a/manager/src/views/member/advance/withdrawApply.vue
+++ b/manager/src/views/member/advance/withdrawApply.vue
@@ -22,7 +22,7 @@
           </Form-item>
         </Form>
       </Row>
-      <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect"></Table>
+      <Table class="mt_10" :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect"></Table>
       <Row type="flex" justify="end" class="mt_10">
         <Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]" size="small"
           show-total show-elevator show-sizer></Page>
@@ -59,24 +59,27 @@
 
     <Modal :title="modalTitle" v-model="queryModalVisible" :mask-closable="false" :width="500">
       <Form :label-width="80">
-        <FormItem label="申请编号">
+        <FormItem label="申请编号：">
           <span>{{showList.sn}}</span>
         </FormItem>
-        <FormItem label="用户名称">
+        <FormItem label="用户名称：">
           <span>{{showList.memberName}}</span>
         </FormItem>
-        <FormItem label="申请金额">
+        <FormItem label="申请金额：">
           <span>{{showList.applyMoney}}</span>
         </FormItem>
-        <FormItem label="提现状态">
+        <FormItem label="提现状态：">
           <span>{{showList.applyStatus | paramTypeFilter}}</span>
         </FormItem>
-        <FormItem label="申请时间">
+        <FormItem label="申请时间：">
           <span>{{showList.createTime}}</span>
         </FormItem>
-        <FormItem label="审核时间">
+        <FormItem label="审核时间：">
           <span>{{showList.inspectTime}}</span>
         </FormItem>
+        <FormItem label="审核备注：">
+          <span>{{showList.inspectRemark}}</span>
+        </FormItem>
 
       </Form>
       <div slot="footer" v-if="showList.applyStatus == 'APPLY'">
@@ -202,6 +205,7 @@ export default {
                       this.showList = {};
                       this.roleModalVisible = true;
                       this.showList = params.row;
+                      this.audit =""
                     },
                   },
                 },
diff --git a/manager/src/views/member/list/index.vue b/manager/src/views/member/list/index.vue
index 9f19bf41..09945e30 100644
--- a/manager/src/views/member/list/index.vue
+++ b/manager/src/views/member/list/index.vue
@@ -21,7 +21,7 @@
         <Button @click="addMember" type="primary">添加会员</Button>
       </Row>
 
-      <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect">
+      <Table :loading="loading" border :columns="columns" :data="data" ref="table">
       </Table>
       <Row type="flex" justify="end" class="mt_10">
         <Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]" size="small"
@@ -56,9 +56,9 @@
 
     <!-- 修改模态框 -->
     <Modal v-model="descFlag" :title="descTitle" @on-ok="handleSubmitModal" width="500">
-      <Form ref="formValidate" :model="formValidate" :rules="ruleValidate" :label-width="80">
+      <Form ref="form" :model="form" :rules="ruleValidate" :label-width="80">
         <FormItem label="头像">
-          <img :src="formValidate.face" class="face" />
+          <img :src="form.face" class="face" />
           <Button type="text" class="upload" @click="
               () => {
                 this.picModelFlag = true;
@@ -69,13 +69,13 @@
           <input type="file" style="display: none" id="file" />
         </FormItem>
         <FormItem label="用户名" prop="name">
-          <Input v-model="formValidate.username" style="width: 200px" disabled />
+          <Input v-model="form.username" style="width: 200px" disabled />
         </FormItem>
         <FormItem label="用户昵称" prop="name">
-          <Input v-model="formValidate.nickName" style="width: 200px" />
+          <Input v-model="form.nickName" style="width: 200px" />
         </FormItem>
         <FormItem label="性别" prop="sex">
-          <RadioGroup type="button" button-style="solid" v-model="formValidate.sex">
+          <RadioGroup type="button" button-style="solid" v-model="form.sex">
             <Radio :label="1">
               <span>男</span>
             </Radio>
@@ -85,14 +85,14 @@
           </RadioGroup>
         </FormItem>
         <FormItem label="修改密码" prop="password">
-          <Input type="password" style="width: 220px" password v-model="formValidate.newPassword" />
+          <Input type="password" style="width: 220px" password v-model="form.newPassword" />
         </FormItem>
         <FormItem label="生日" prop="birthday">
-          <DatePicker type="date" format="yyyy-MM-dd" v-model="formValidate.birthday" style="width: 220px"></DatePicker>
+          <DatePicker type="date" format="yyyy-MM-dd" v-model="form.birthday" style="width: 220px"></DatePicker>
         </FormItem>
         <FormItem label="所在地" prop="mail">
           <div class="form-item" v-if="!updateRegion">
-            <Input disabled style="width: 250px" :value="formValidate.region" />
+            <Input disabled style="width: 250px" :value="form.region" />
             <Button type="text" @click="
                 () => {
                   this.updateRegion = !this.updateRegion;
@@ -122,14 +122,13 @@ export default {
   name: "member",
   components: {
     region,
-    ossManage,
+    ossManage
   },
   data() {
     return {
       selectedMember: false, //是否是其他组件调用
       descTitle: "", // modal标题
       descFlag: false, //编辑查看框
-      openSearch: true, // 显示搜索
       loading: true, // 表单加载状态
       addFlag: false, // modal显隐控制
       updateRegion: false, // 地区
@@ -149,7 +148,7 @@ export default {
         disabled: "OPEN",
       },
       picModelFlag: false, // 选择图片
-      formValidate: {}, // 表单数据
+      form: {}, // 表单数据
       addRule: {
         // 验证规则
         mobile: [
@@ -163,9 +162,6 @@ export default {
         password: [{ required: true, message: "请输入密码" }],
       },
       ruleValidate: {}, //修改验证
-      submitLoading: false, // 添加或编辑提交状态
-      selectList: [], // 多选数据
-      selectCount: 0, // 多选计数
       columns: [
         {
           title: "会员名称",
@@ -373,6 +369,7 @@ export default {
       });
       this.data = data;
     },
+    // 分页 改变页码
     changePage(v) {
       this.searchForm.pageNumber = v;
       // 此处如果是父子级传值的时候需要做一下处理
@@ -380,34 +377,18 @@ export default {
 
       this.getData();
     },
+    // 分页 改变页数
     changePageSize(v) {
       this.searchForm.pageSize = v;
+      this.searchForm.pageNumber = 1;
       this.getData();
     },
+    // 搜索
     handleSearch() {
       this.searchForm.pageNumber = 1;
       this.searchForm.pageSize = 10;
       this.getData();
     },
-
-    changeSort(e) {
-      this.searchForm.sort = e.key;
-      this.searchForm.order = e.order;
-      if (e.order === "normal") {
-        this.searchForm.order = "";
-      }
-      this.getData();
-    },
-    changeSelect(e) {
-      this.selectList = e;
-      this.selectCount = e.length;
-    },
-    selectDateRange(v) {
-      if (v) {
-        this.searchForm.startDate = v[0];
-        this.searchForm.endDate = v[1];
-      }
-    },
     //查看详情修改
     editPerm(val) {
       this.descTitle = `查看用户 ${val.username}`;
@@ -425,7 +406,7 @@ export default {
     getMemberInfo(id) {
       API_Member.getMemberInfoData(id).then((res) => {
         if (res.result) {
-          this.$set(this, "formValidate", res.result);
+          this.$set(this, "form", res.result);
         }
       });
     },
@@ -443,7 +424,7 @@ export default {
     // 选中的图片
     callbackSelected(val) {
       this.picModelFlag = false;
-      this.formValidate.face = val.url;
+      this.form.face = val.url;
     },
     //添加会员提交
     addMemberSubmit() {
@@ -487,7 +468,7 @@ export default {
               this.$Message.success("禁用成功");
               this.getData();
             } else {
-              this.$Message.error(res.message);
+              // this.$Message.error(res.message);
             }
           });
         },
@@ -496,13 +477,13 @@ export default {
 
     // 提交修改数据
     handleSubmitModal() {
-      const { nickName, sex, username, face, newPassword } = this.formValidate;
-      let time = new Date(this.formValidate.birthday);
+      const { nickName, sex, username, face, newPassword } = this.form;
+      let time = new Date(this.form.birthday);
       let birthday =
         time.getFullYear() + "-" + (time.getMonth() + 1) + "-" + time.getDate();
       let submit = {
-        regionId: this.formValidate.regionId,
-        region: this.formValidate.region,
+        regionId: this.form.regionId,
+        region: this.form.region,
         nickName,
         username,
         sex,
diff --git a/manager/src/views/member/list/memberDetail.scss b/manager/src/views/member/list/memberDetail.scss
index 151a6599..1e309146 100644
--- a/manager/src/views/member/list/memberDetail.scss
+++ b/manager/src/views/member/list/memberDetail.scss
@@ -119,6 +119,3 @@
     line-height: 16px;
   }
 }
-.point-data{
-
-}
diff --git a/manager/src/views/member/list/memberDetail.vue b/manager/src/views/member/list/memberDetail.vue
index 70a95d7d..bf7cef94 100644
--- a/manager/src/views/member/list/memberDetail.vue
+++ b/manager/src/views/member/list/memberDetail.vue
@@ -64,13 +64,13 @@
       </div>
     </Card>
 
-    <Card>
+    <Card class="mt_10">
       <Tabs type="point" @on-click="memberInfoChange">
         <TabPane label="TA的积分" name="point">
           <div class="pointsTitle" style="justify-content: flex-start; text-align: left;">
             <div style="width: 120px;">
               <div class="points-top-title">
-                积分余额
+                剩余积分
               </div>
               <div class="points-top-text">
                 {{memberInfo.point?memberInfo.point:0}}
@@ -83,9 +83,8 @@
                 border
                 :columns="pointsColumns"
                 :data="pointData"
+                class="mt_10"
                 ref="table"
-                sortable="custom"
-                @on-sort-change="pointChangeSort"
               >
               </Table>
 
@@ -172,8 +171,7 @@
               :columns="orderColumns"
               :data="orderData"
               ref="table"
-              sortable="custom"
-              @on-sort-change="orderChangeSort"
+              class="mt_10"
             >
             </Table>
 
@@ -203,6 +201,7 @@
             :columns="addressColumns"
             :data="addressData"
             ref="table"
+            class="mt_10"
             sortable="custom"
             @on-sort-change="addressChangeSort"
           >
@@ -249,8 +248,7 @@
             :columns="walletColumns"
             :data="walletData"
             ref="table"
-            sortable="custom"
-            @on-sort-change="walletChangeSort"
+            class="mt_10"
           >
           </Table>
 
@@ -289,9 +287,8 @@
             border
             :columns="receiptRecordColumns"
             :data="receiptRecordData"
+            class="mt_10"
             ref="table"
-            sortable="custom"
-            @on-sort-change="walletChangeSort"
           >
             <template slot="orderSnSlot" slot-scope="scope">
 
@@ -365,7 +362,7 @@
   import * as API_Order from "@/api/order.js";
 
   export default {
-    name: "member",
+    name: "memberDetail",
     components: {
       region,
       ossManage,
@@ -423,7 +420,7 @@
             key: "point",
             width: 150,
             render: (h, params) => {
-              if (params.row.pointType == 1) {
+              if (params.row.pointType == 'INCREASE') {
                 return h('div', [
                   h('span', {
                     style: {
@@ -1074,6 +1071,7 @@
       ,
       //积分记录页数变化
       pointChangePageSize(v) {
+        this.pointSearchForm.pageNumber = 1;
         this.pointSearchForm.pageSize = v;
         this.getPointData();
       }
@@ -1086,6 +1084,7 @@
       ,
       //会员地址记录页数变化
       addressChangePageSize(v) {
+        this.addressSearchForm.pageNumber = 1;
         this.addressSearchForm.pageSize = v;
         this.getPointData();
       },
@@ -1098,6 +1097,7 @@
       ,
       //余额记录页数变化
       walletChangePageSize(v) {
+        this.walletSearchForm.pageNumber = 1;
         this.walletSearchForm.pageSize = v;
         this.getDepositLogData();
       },
@@ -1110,31 +1110,11 @@
       ,
       //订单记录页数变化
       orderChangePageSize(v) {
+        this.orderSearchForm.pageNumber = 1;
         this.orderSearchForm.pageSize = v;
         this.getOrderData();
       },
-      orderChangeSort(e) {
-        this.orderSearchForm.sort = e.key;
-        this.orderSearchForm.order = e.order;
-        this.getOrderData();
-      },
-      addressChangeSort(e) {
-        this.addressSearchForm.sort = e.key;
-        this.addressSearchForm.order = e.order;
-        this.getPointData();
-      }
-
-      ,
-      walletChangeSort(e) {
-        this.walletSearchForm.sort = e.key;
-        this.walletSearchForm.order = e.order;
-        this.getDepositLogData();
-      },
-      pointChangeSort(e) {
-        this.pointSearchForm.sort = e.key;
-        this.pointSearchForm.order = e.order;
-        this.getPointData();
-      },
+      // 起止时间从新赋值
       selectDateRange(v) {
         if (v) {
           this.orderSearchForm.startDate = v[0];
diff --git a/manager/src/views/member/list/memberRecycle.vue b/manager/src/views/member/list/memberRecycle.vue
index 5af21c76..c9ff9850 100644
--- a/manager/src/views/member/list/memberRecycle.vue
+++ b/manager/src/views/member/list/memberRecycle.vue
@@ -38,6 +38,7 @@
           :columns="columns"
           :data="data"
           ref="table"
+          class="mt_10"
           sortable="custom"
           @on-sort-change="changeSort"
           @on-selection-change="changeSelect"
@@ -181,9 +182,6 @@
         picModelFlag: false, // 选择图片
         formValidate: {}, // 表单数据
         ruleValidate: {}, //修改验证
-        submitLoading: false, // 添加或编辑提交状态
-        selectList: [], // 多选数据
-        selectCount: 0, // 多选计数
         columns: [
           {
             title: "会员名称",
@@ -332,41 +330,27 @@
       callback(val) {
         this.$emit("callback", val);
       },
+      // 初始化数据
       init() {
         this.getData();
       },
+      // 分页 修改页码
       changePage(v) {
         this.searchForm.pageNumber = v;
         this.getData();
       },
+      // 分页 修改页数
       changePageSize(v) {
+        this.searchForm.pageNumber = 1;
         this.searchForm.pageSize = v;
         this.getData();
       },
+      // 搜索
       handleSearch() {
         this.searchForm.pageNumber = 1;
         this.searchForm.pageSize = 10;
         this.getData();
       },
-
-      changeSort(e) {
-        this.searchForm.sort = e.key;
-        this.searchForm.order = e.order;
-        if (e.order === "normal") {
-          this.searchForm.order = "";
-        }
-        this.getData();
-      },
-      changeSelect(e) {
-        this.selectList = e;
-        this.selectCount = e.length;
-      },
-      selectDateRange(v) {
-        if (v) {
-          this.searchForm.startDate = v[0];
-          this.searchForm.endDate = v[1];
-        }
-      },
       //查看详情修改
       editPerm(val) {
         this.descTitle = `查看用户 ${val.username}`;
@@ -406,28 +390,6 @@
         this.regionId = val[0];
       },
 
-
-      //禁用会员
-      disabled(v) {
-        let params = {
-          memberIds: [v.id],
-          disabled: "CLOSE"
-        }
-        this.$Modal.confirm({
-          title: '提示',
-          content: '<p>确认禁用此会员？</p>',
-          onOk: () => {
-            API_Member.updateMemberStatus(params).then(res => {
-              if (res.success) {
-                this.$Message.success('禁用成功');
-                this.getData()
-              } else {
-                this.$Message.error(res.message);
-              }
-            });
-          }
-        });
-      },
       //详细
       detail(row){
         this.$router.push({ name: "member-detail", query: { id: row.id } });
@@ -447,7 +409,7 @@
                 this.$Message.success('禁用成功');
                 this.getData()
               } else {
-                this.$Message.error(res.message);
+                // this.$Message.error(res.message);
               }
             });
           }
diff --git a/manager/src/views/member/message-manage/addOrEditMessage.vue b/manager/src/views/member/message-manage/addOrEditMessage.vue
deleted file mode 100644
index 8dc212d5..00000000
--- a/manager/src/views/member/message-manage/addOrEditMessage.vue
+++ /dev/null
@@ -1,201 +0,0 @@
-<style lang="scss">
-@import "./messageManage.scss";
-</style>
-<template>
-  <div>
-    <Card>
-      <p slot="title">
-        <span v-if="type==0">发送新消息</span>
-        <span v-else>编辑消息</span>
-      </p>
-      <Row>
-        <Form
-          ref="form"
-          :model="form"
-          :label-width="90"
-          :rules="formValidate"
-          style="position:relative"
-        >
-          <FormItem label="消息类型" prop="type">
-            <Select v-model="form.type" placeholder="请选择" style="width:250px">
-              <Option
-                v-for="(item, i) in dictMessageType"
-                :key="i"
-                :value="item.value"
-              >{{item.title}}</Option>
-            </Select>
-          </FormItem>
-          <FormItem label="标题" prop="title">
-            <Input v-model="form.title" style="width:600px" />
-          </FormItem>
-          <FormItem label="内容" prop="content" class="wangEditor">
-            <editor v-model="form.content"></editor>
-          </FormItem>
-          <FormItem label="新创建账号也推送" prop="createSend">
-            <i-switch size="large" v-model="form.createSend">
-              <span slot="open">开启</span>
-              <span slot="close">关闭</span>
-            </i-switch>
-          </FormItem>
-          <div v-if="type==0">
-            <FormItem label="发送范围">
-              <RadioGroup type="button" button-style="solid" v-model="form.range">
-                <Radio :label="0">全体用户</Radio>
-                <Radio :label="1">指定用户成员</Radio>
-              </RadioGroup>
-            </FormItem>
-            <div>
-              <FormItem label="选择用户" v-if="form.range==1">
-                <user-choose text="选择发送用户" @on-change="handleSelectUser" ref="user"></user-choose>
-              </FormItem>
-            </div>
-          </div>
-          <Form-item class="br">
-            <Button
-              type="primary"
-              :loading="submitLoading"
-              @click="handelSubmit"
-              style="width:100px"
-            >提交</Button>
-            <Button @click="handelCancel">取消</Button>
-          </Form-item>
-          <Spin size="large" fix v-if="loading"></Spin>
-        </Form>
-      </Row>
-    </Card>
-  </div>
-</template>
-
-<script>
-import { getMessageDataById, addMessage, editMessage } from "@/api/index";
-import editor from "@/views/my-components/lili/editor";
-import userChoose from "@/views/my-components/lili/user-choose";
-export default {
-  name: "add_edit_message",
-  components: {
-    userChoose,
-    editor
-  },
-  data() {
-    return {
-      type: 0, // 消息类型
-      loading: false, // 表单加载状态
-      selectUsers: [], // 已选用户
-      modalTitle: "", // 添加或编辑标题
-      form: { // 表单
-        // 添加或编辑表单对象初始化数据
-        title: "",
-        content: "",
-        type: "",
-        range: 0
-      },
-      formValidate: {
-        // 表单验证规则
-       /* type: [
-          { required: true, message: "消息类型不能为空", trigger: "blur" }
-        ],*/
-        title: [{ required: true, message: "标题不能为空", trigger: "blur" }],
-        content: [{ required: true, message: "内容不能为空", trigger: "blur" }]
-      },
-      submitLoading: false, // 添加或编辑提交状态
-      dictMessageType: this.$store.state.dict.messageType, // 消息类型
-      backRoute: "" // 上一个页面路由
-    };
-  },
-  methods: {
-    init() {
-      this.type = this.$route.query.type;
-      this.backRoute = this.$route.query.backRoute;
-      if (this.type == 1) {
-        this.form.id = this.$route.query.id;
-        this.getData();
-      }
-    },
-    getData() {
-      this.loading = true;
-      getMessageDataById(this.form.id).then(res => {
-        this.loading = false;
-        if (res.success) {
-          // 转换null为""
-          let v = res.result;
-          for (let attr in v) {
-            if (v[attr] == null) {
-              v[attr] = "";
-            }
-          }
-          let str = JSON.stringify(v);
-          let data = JSON.parse(str);
-          this.form = data;
-        }
-      });
-    },
-    handelSubmit() {
-      this.$refs.form.validate(valid => {
-        if (valid) {
-          this.submitLoading = true;
-          if (this.type == 0) {
-            // 添加 避免编辑后传入id等数据 记得删除
-            delete this.form.id;
-            // 用户id数据
-            let ids = [];
-            this.selectUsers.forEach(e => {
-              ids += e.id + ",";
-            });
-            if (ids.length > 0) {
-              ids = ids.substring(0, ids.length - 1);
-            }
-            this.form.userIds = ids;
-            addMessage(this.form).then(res => {
-              this.submitLoading = false;
-              if (res.success) {
-                this.$Message.success("操作成功");
-                this.closeCurrentPage();
-              }
-            });
-          } else if (this.type == 1) {
-            // 编辑
-            editMessage(this.form).then(res => {
-              this.submitLoading = false;
-              if (res.success) {
-                this.$Message.success("操作成功");
-                this.closeCurrentPage();
-              }
-            });
-          }
-        }
-      });
-    },
-    handleSelectUser(v) {
-      this.selectUsers = v;
-    },
-    handelCancel() {
-      this.closeCurrentPage();
-    },
-    // 关闭当前页面
-    closeCurrentPage() {
-      this.$store.commit("removeTag", "add_edit_message");
-      localStorage.pageOpenedList = JSON.stringify(
-        this.$store.state.app.pageOpenedList
-      );
-      this.$router.push({
-        name: this.backRoute
-      });
-    }
-  },
-  mounted() {
-    this.init();
-  },
-  watch: {
-    // 监听路由变化
-    $route(to, from) {
-      if (to.name == "add_edit_message") {
-        this.type = this.$route.query.type;
-        if (this.type == 1) {
-          this.form.id = this.$route.query.id;
-          this.getData();
-        }
-      }
-    }
-  }
-};
-</script>
diff --git a/manager/src/views/member/message-manage/memberMessageManager.vue b/manager/src/views/member/message-manage/memberMessageManager.vue
deleted file mode 100644
index f7a55fda..00000000
--- a/manager/src/views/member/message-manage/memberMessageManager.vue
+++ /dev/null
@@ -1,719 +0,0 @@
-
-<template>
-  <div>
-    <!--短信-->
-    <Modal v-model="smsModal" width="530">
-      <p slot="header">
-        <Icon type="edit"></Icon>
-        <span>短信设置</span>
-      </p>
-      <div>
-        <Form ref="smsFormData" :model="smsFormData" label-position="left" :label-width="100" :rules="smsFormValidate">
-          <FormItem label="模板名称" prop="templateName">
-            <Input v-model="templateName" size="large" maxlength="9" disabled></Input>
-          </FormItem>
-          <FormItem label="模板代码" prop="smsCode">
-            <Input v-model="smsFormData.smsCode" size="large" maxlength="30"></Input>
-          </FormItem>
-          <FormItem label="模板名称" prop="smsContent">
-            <Input class='textarea' :rows="5" :autosize="{maxRows:5,minRows: 5}" v-model="smsFormData.smsContent" type="textarea" maxlength="150"/>
-          </FormItem>
-          <FormItem label="是否开启" prop="smsState">
-            <i-switch v-model="smsFormData.smsState" size="large" :value="smsFormData.smsState">
-              <span slot="open">开启</span>
-              <span slot="close">关闭</span>
-            </i-switch>
-          </FormItem>
-        </Form>
-
-      </div>
-      <div slot="footer" style="text-align: right">
-        <Button type="success" size="large"  @click="smsFormDataEdit">设置</Button>
-      </div>
-    </Modal>
-    <!--站内信-->
-    <Modal v-model="noticeModal" width="530">
-      <p slot="header">
-        <Icon type="edit"></Icon>
-        <span>站内信设置</span>
-      </p>
-      <div>
-        <Form ref="noticeFormData" :model="noticeFormData" label-position="left" :label-width="100" :rules="noticeFormValidate">
-          <FormItem label="模板名称" prop="templateName">
-            <Input v-model="templateName" size="large" maxlength="9" disabled></Input>
-          </FormItem>
-          <FormItem label="模板名称" prop="smsContent">
-            <Input class='textarea' :rows="5" :autosize="{maxRows:5,minRows: 5}" v-model="noticeFormData.noticeContent" type="textarea" maxlength="150"/>
-          </FormItem>
-        </Form>
-
-      </div>
-      <div slot="footer" style="text-align: right">
-        <Button type="success" size="large"  @click="noticeFormDataEdit">设置</Button>
-      </div>
-    </Modal>
-
-    <!--微信模板-->
-    <Modal v-model="wechatModal" width="530">
-      <p slot="header">
-        <Icon type="edit"></Icon>
-        <span>微信设置</span>
-      </p>
-      <div>
-        <Form ref="wechatFormData" :model="wechatFormData" label-position="left" :label-width="100" :rules="wechatFormValidate">
-          <FormItem label="模板名称" prop="templateName">
-            <Input v-model="templateName" size="large" maxlength="9" disabled></Input>
-          </FormItem>
-          <FormItem label="头部信息" prop="first">
-            <Input v-model="wechatFormData.first" size="large" maxlength="50"></Input>
-          </FormItem>
-          <FormItem label="备注" prop="remark">
-            <Input class='textarea' :rows="5" :autosize="{maxRows:5,minRows: 5}" v-model="wechatFormData.remark" type="textarea" maxlength="150"/>
-          </FormItem>
-          <FormItem label="是否开启" prop="enable">
-            <i-switch v-model="wechatFormData.enable" size="large" :value="smsFormData.enable">
-              <span slot="open">开启</span>
-              <span slot="close">关闭</span>
-            </i-switch>
-          </FormItem>
-        </Form>
-
-      </div>
-      <div slot="footer" style="text-align: right">
-        <Button type="success" size="large"  @click="wechatFormDataEdit">设置</Button>
-      </div>
-    </Modal>
-    <Tabs value="log" @on-click="tabPaneChange" v-model="tab">
-      <TabPane label="会员消息" name="MEMBER">
-        <div class="search">
-          <Card>
-
-            <Row class="operation">
-              <Button @click="getDataList" icon="md-refresh">刷新</Button>
-              <Button type="dashed" @click="openTip=!openTip">{{openTip ? "关闭提示" : "开启提示"}}</Button>
-            </Row>
-            <Row v-show="openTip">
-              <Alert show-icon>
-                已选择
-                <span class="select-count">{{selectCount}}</span> 项
-                <a class="select-clear" @click="clearSelectAll">清空</a>
-              </Alert>
-            </Row>
-            <Table
-              :loading="loading"
-              border
-              :columns="columns"
-              :data="data"
-              sortable="custom"
-              @on-sort-change="changeSort"
-              @on-selection-change="showSelect"
-              ref="memberTable"
-            ></Table>
-            <Row type="flex" justify="end" class="mt_10">
-              <Page
-                :current="searchForm.pageNumber"
-                :total="total"
-                :page-size="searchForm.pageSize"
-                @on-change="changePage"
-                @on-page-size-change="changePageSize"
-                :page-size-opts="[10,20,50]"
-                size="small"
-                show-total
-                show-elevator
-                show-sizer
-              ></Page>
-            </Row>
-          </Card>
-        </div>
-      </TabPane>
-      <TabPane label="店铺消息" name="SHOP">
-        <div class="search">
-          <Card>
-
-            <Row class="operation">
-              <Button @click="getDataList" icon="md-refresh">刷新</Button>
-              <Button type="dashed" @click="openTip=!openTip">{{openTip ? "关闭提示" : "开启提示"}}</Button>
-            </Row>
-            <Row v-show="openTip">
-              <Alert show-icon>
-                已选择
-                <span class="select-count">{{selectCount}}</span> 项
-                <a class="select-clear" @click="clearSelectAll">清空</a>
-              </Alert>
-            </Row>
-            <Table
-              :loading="loading"
-              border
-              :columns="columns"
-              :data="data"
-              sortable="custom"
-              @on-sort-change="changeSort"
-              @on-selection-change="showSelect"
-              ref="shopTable"
-            ></Table>
-            <Row type="flex" justify="end" class="mt_10">
-              <Page
-                :current="searchForm.pageNumber"
-                :total="total"
-                :page-size="searchForm.pageSize"
-                @on-change="changePage"
-                @on-page-size-change="changePageSize"
-                :page-size-opts="[10,20,50]"
-                size="small"
-                show-total
-                show-elevator
-                show-sizer
-              ></Page>
-            </Row>
-          </Card>
-        </div>
-      </TabPane>
-
-      <TabPane label="微信消息" name="WECHAT">
-        <div class="search">
-          <Card>
-
-            <Row class="operation">
-              <Button @click="weChatSync" type="primary" icon="md-add">同步微信消息</Button>
-              <Button @click="getDataList" icon="md-refresh">刷新</Button>
-              <Button type="dashed" @click="openTip=!openTip">{{openTip ? "关闭提示" : "开启提示"}}</Button>
-            </Row>
-            <Row v-show="openTip">
-              <Alert show-icon>
-                已选择
-                <span class="select-count">{{selectCount}}</span> 项
-                <a class="select-clear" @click="clearSelectAll">清空</a>
-              </Alert>
-            </Row>
-            <Table
-              :loading="loading"
-              border
-              :columns="weChatColumns"
-              :data="weChatData"
-              sortable="custom"
-              @on-sort-change="changeSort"
-              @on-selection-change="showSelect"
-              ref="weChatTable"
-            ></Table>
-            <Row type="flex" justify="end" class="mt_10">
-              <Page
-                :current="weChatSearchForm.pageNumber"
-                :total="weChatTotal"
-                :page-size="weChatSearchForm.pageSize"
-                @on-change="changePage"
-                @on-page-size-change="changePageSize"
-                :page-size-opts="[10,20,50]"
-                size="small"
-                show-total
-                show-elevator
-                show-sizer
-              ></Page>
-            </Row>
-          </Card>
-        </div>
-      </TabPane>
-
-      <TabPane label="其他消息" name="OTHER">
-        <div class="search">
-          <Card>
-
-            <Row class="operation">
-              <Button @click="getDataList" icon="md-refresh">刷新</Button>
-              <Button type="dashed" @click="openTip=!openTip">{{openTip ? "关闭提示" : "开启提示"}}</Button>
-            </Row>
-            <Row v-show="openTip">
-              <Alert show-icon>
-                已选择
-                <span class="select-count">{{selectCount}}</span> 项
-                <a class="select-clear" @click="clearSelectAll">清空</a>
-              </Alert>
-            </Row>
-            <Table
-              :loading="loading"
-              border
-              :columns="columns"
-              :data="data"
-              sortable="custom"
-              @on-sort-change="changeSort"
-              @on-selection-change="showSelect"
-              ref="otherTable"
-            ></Table>
-            <Row type="flex" justify="end" class="mt_10">
-              <Page
-                :current="searchForm.pageNumber"
-                :total="total"
-                :page-size="searchForm.pageSize"
-                @on-change="changePage"
-                @on-page-size-change="changePageSize"
-                :page-size-opts="[10,20,50]"
-                size="small"
-                show-total
-                show-elevator
-                show-sizer
-              ></Page>
-            </Row>
-          </Card>
-        </div>
-      </TabPane>
-    </Tabs>
-  </div>
-
-
-</template>
-
-<script>
-  import {
-    getMessageData,
-    editSmsMessageTemplate,
-    editNoticeMessage,
-    wechatMessageSync,
-    getWechatMessagePage,
-    editWechatMessageTemplate,
-    delWechatMessageTemplate
-  } from "@/api/setting";
-
-  export default {
-    title: "message-manage",
-    data() {
-      return {
-        messageTemplate:'',// 当前消息模板
-        messageTemplateId:'', // 当前消息模板id
-        templateName:'', // 模板名称
-        smsModal: false,//短信
-        smsFormData:{ // 模板表单数据
-          smsState:'',
-          smsContent:'',
-          smsCode: ''
-        },
-        smsFormValidate:{ // 验证规则
-          smsCode: [{ required: true, message: '请输入短信编码'}],
-          smsContent: [{ required: true, message: '请输入短信内容'}],
-        },
-        noticeModal: false, // 站内信
-        noticeFormData:{ // 站内信表单
-          noticeContent:''
-        },
-        noticeFormValidate:{ // 验证规则
-          noticeContent: [{ required: true, message: '请输入站内信内容'}],
-        },
-        wechatModal:false,//微信消息
-        wechatFormData:{ // 微信表单
-          remark:'',
-          first:'',
-          enable:'',
-        },
-        wechatFormValidate:{ // 验证规则
-          remark: [{ required: true, message: '请输入站内信内容'}],
-          first: [{ required: true, message: '请输入头部文字信息'}],
-        },
-        tab: "MEMBER", // tabName
-        openTip: true,  // 提示展示
-        loading: true, // 表单加载状态
-        selectCount: 0, // 多选计数
-        selectList: [], // 多选数据
-        drop: false, // 更多搜索项
-        dropDownContent: "展开", // drop显示内容
-        dropDownIcon: "ios-arrow-down", // drop图标
-        searchForm: {
-          // 搜索框对应data对象
-          type: "MEMBER",
-          pageNumber: 1, // 当前页数
-          pageSize: 10, // 页面大小
-          sort: "createTime", // 默认排序字段
-          order: "desc", // 默认排序方式
-          startDate: "", // 起始时间
-          endDate: "" // 终止时间
-        },
-        //微信消息查询
-        weChatSearchForm: {
-          // 搜索框对应data对象
-          pageNumber: 1, // 当前页数
-          pageSize: 10, // 页面大小
-          sort: "createTime", // 默认排序字段
-          order: "desc", // 默认排序方式
-        },
-        selectDate: null, // 选择日期绑定modal
-        columns: [
-          // 表头
-          {
-            type: "selection",
-            width: 60,
-            align: "center"
-          },
-          {
-            title: "ID",
-            key: "id",
-            width: 180,
-            sortable: true
-          },
-          {
-            title: "模板名称",
-            key: "name",
-            width: 300,
-            sortable: true
-          },
-          {
-            title: "创建时间",
-            key: "createTime",
-            sortable: true,
-            sortType: "desc"
-          },
-          {
-            title: "操作",
-            key: "action",
-            width: 280,
-            align: "center",
-            fixed: "right",
-            render: (h, params) => {
-              return h("div", [
-                h(
-                  "Button",
-                  {
-                    props: {
-                      size: "small"
-                    },
-                    style: {
-                      marginRight: "5px"
-                    },
-                    on: {
-                      click: () => {
-                        this.smsSettingAlert(params.row);
-                      }
-                    }
-                  },
-                  "短信设置"
-                ),
-                h(
-                  "Button",
-                  {
-                    props: {
-                      type: "primary",
-                      size: "small"
-                    },
-                    style: {
-                      marginRight: "5px"
-                    },
-                    on: {
-                      click: () => {
-                        this.noticeSettingAlert(params.row);
-                      }
-                    }
-                  },
-                  "站内信设置"
-                )
-              ]);
-            }
-          }
-        ],
-        data: [], // 表单数据
-        total: 0, // 表单数据总数
-        weChatColumns: [
-          // 表头
-          {
-            type: "selection",
-            width: 60,
-            align: "center"
-          },
-          {
-            title: "模板编号",
-            key: "code",
-            width: 500,
-            sortable: true
-          },
-          {
-            title: "是否开启",
-            key: "enable",
-            sortable: true,
-            width: 150,
-            render: (h, params) => {
-              if (params.row.enable == true) {
-                return h('div', [
-                  h('span', {
-                  }, '开启'),
-                ]);
-              }  else {
-                return h('div', [
-                  h('span', {
-                  }, '关闭'),
-                ]);
-              }
-            },
-          },
-          {
-            title: "模板名称",
-            key: "name",
-            width: 200,
-            sortable: true
-          },
-          {
-            title: "创建时间",
-            key: "createTime",
-            sortable: true,
-            sortType: "desc",
-          },
-          {
-            title: "操作",
-            key: "action",
-            width: 200,
-            align: "center",
-            fixed: "right",
-            render: (h, params) => {
-              return h("div", [
-                h(
-                  "Button",
-                  {
-                    props: {
-                      type: "primary",
-                      size: "small"
-                    },
-                    style: {
-                      marginRight: "5px"
-                    },
-                    on: {
-                      click: () => {
-                        this.wechatSettingAlert(params.row);
-                      }
-                    }
-                  },
-                  "编辑"
-                ),
-                h(
-                  "Button",
-                  {
-                    props: {
-                      type: "error",
-                      size: "small"
-                    },
-                    style: {
-                      marginRight: "5px"
-                    },
-                    on: {
-                      click: () => {
-                        this.delWeChat(params.row);
-                      }
-                    }
-                  },
-                  "删除"
-                )
-              ]);
-            }
-          }
-        ],
-        weChatData: [], // 表单数据
-        weChatTotal: 0, // 表单数据总数
-      };
-    },
-    methods: {
-      init() {
-        this.getDataList();
-      },
-      dropDown() {
-        if (this.drop) {
-          this.dropDownContent = "展开";
-          this.dropDownIcon = "ios-arrow-down";
-        } else {
-          this.dropDownContent = "收起";
-          this.dropDownIcon = "ios-arrow-up";
-        }
-        this.drop = !this.drop;
-      },
-      changePage(v) {
-        this.searchForm.type = this.tab;
-        this.searchForm.pageNumber = v;
-        this.getDataList();
-        this.clearSelectAll();
-      },
-      changePageSize(v) {
-        this.searchForm.type = this.tab;
-        this.searchForm.pageSize = v;
-        this.getDataList();
-      },
-      //短信设置弹出框
-      smsSettingAlert(v){
-        this.smsFormData.smsState = v.smsState == 'OPEN' ? true:false
-        this.smsFormData.smsContent = v.smsContent
-        this.smsFormData.smsCode = v.smsCode
-        this.templateName = v.name
-        this.messageTemplateId = v.id
-        this.smsModal = true
-      },
-      //站内信弹出框
-      noticeSettingAlert(v){
-        this.noticeFormData.noticeContent = v.noticeContent
-        this.templateName = v.name
-        this.messageTemplateId = v.id
-        this.noticeModal = true
-      },
-      //微信弹出框
-      wechatSettingAlert(v){
-        this.wechatFormData.remark = v.remark
-        this.wechatFormData.first = v.first
-        this.wechatFormData.enable = v.enable
-        this.templateName = v.name
-        this.messageTemplateId = v.id
-        this.wechatModal = true
-      },
-      //短信设置保存
-      smsFormDataEdit(){
-        this.$refs['smsFormData'].validate((valid) => {
-          if (valid) {
-             if(this.smsFormData.smsState){
-               this.smsFormData.smsState = "OPEN"
-             }else{
-               this.smsFormData.smsState = "CLOSE"
-             }
-            editSmsMessageTemplate(this.messageTemplateId,this.smsFormData).then(res => {
-              if(res.message === 'success') {
-                this.$Message.success('短信模板修改成功');
-                this.smsModal = false;
-                this.getDataList();
-              }
-            });
-          }
-        })
-      },
-      //微信设置保存
-      wechatFormDataEdit(){
-        this.$refs['wechatFormData'].validate((valid) => {
-          if (valid) {
-            editWechatMessageTemplate(this.messageTemplateId,this.wechatFormData).then(res => {
-              if(res.message === 'success') {
-                this.$Message.success('微信模板修改成功');
-                this.wechatModal = false;
-                this.getWechatMessagePage();
-              }
-            });
-          }
-        })
-      },
-      //站内信设置保存
-      noticeFormDataEdit(){
-        this.$refs['noticeFormData'].validate((valid) => {
-          if (valid) {
-            editNoticeMessage(this.messageTemplateId,this.noticeFormData).then(res => {
-              if(res.message === 'success') {
-                this.$Message.success('站内信修改成功');
-                this.noticeModal = false;
-                this.getDataList();
-              }
-            });
-          }
-        })
-      },
-      //同步微信消息
-      weChatSync(){
-        this.$Modal.confirm({
-          title: "提示",
-          // 记得确认修改此处
-          content: "确认要同步微信消息模板?",
-          loading: true,
-          onOk: () => {
-            // 同步微信消息模板
-            wechatMessageSync().then(res => {
-              this.$Modal.remove();
-              if(res.success) {
-                this.$Message.success('微信消息模板同步成功');
-              }
-            });
-          }
-        });
-
-      },
-      //删除微信模消息
-      delWeChat(v){
-        this.$Modal.confirm({
-          title: "提示",
-          content: "确定删除此模板?",
-          loading: true,
-          onOk: () => {
-            // 删除微信消息模板
-            delWechatMessageTemplate(v.id).then(res => {
-              if(res.success) {
-                this.$Modal.remove();
-                this.$Message.success('微信模板删除成功');
-                this.getWechatMessagePage()
-              }
-            });
-          }
-        });
-
-      },
-      selectDateRange(v) {
-        if (v) {
-          this.searchForm.startDate = v[0];
-          this.searchForm.endDate = v[1];
-        }
-      },
-      getDataList() {
-        this.loading = true;
-        getMessageData(this.searchForm).then(res => {
-          this.loading = false;
-          if (res.success) {
-            this.data = res.result.records;
-            this.total = res.result.total;
-          }
-        });
-      },
-      //分页获取微信消息
-      getWechatMessagePage(){
-        getWechatMessagePage(this.weChatSearchForm).then(res => {
-          this.loading = false;
-          if (res.success) {
-            this.weChatData = res.result.records;
-            this.weChatTotal = res.result.total;
-          }
-        });
-      },
-      //tab切换事件
-      tabPaneChange(v) {
-        this.searchForm.pageNumber = 1;
-        this.searchForm.pageSize = 10;
-        this.searchForm.type = v;
-        //如果是微信消息则走单独的接口
-        if(v === "WECHAT"){
-          this.getWechatMessagePage();
-        }else{
-          this.getDataList();
-        }
-
-      },
-      handleSearch() {
-        this.searchForm.pageNumber = 1;
-        this.searchForm.pageSize = 10;
-        this.getDataList();
-      },
-      handleReset() {
-        this.$refs.searchForm.resetFields();
-        this.searchForm.pageNumber = 1;
-        this.searchForm.pageSize = 10;
-        this.selectDate = null;
-        this.searchForm.startDate = "";
-        this.searchForm.endDate = "";
-        // 重新加载数据
-        this.getDataList();
-      },
-      changeSort(e) {
-        this.searchForm.sort = e.key;
-        this.searchForm.order = e.order;
-        if (e.order == "normal") {
-          this.searchForm.order = "";
-        }
-        this.getDataList();
-      },
-      showSelect(e) {
-        this.selectList = e;
-        this.selectCount = e.length;
-      },
-      clearSelectAll() {
-        this.$refs.memberTable.selectAll(false);
-        this.$refs.weChatTable.selectAll(false);
-        this.$refs.shopTable.selectAll(false);
-        this.$refs.otherTable.selectAll(false);
-
-      }
-    },
-    mounted() {
-      this.init();
-    }
-  };
-</script>
diff --git a/manager/src/views/member/message-manage/messageManage.scss b/manager/src/views/member/message-manage/messageManage.scss
deleted file mode 100644
index f3ff14f7..00000000
--- a/manager/src/views/member/message-manage/messageManage.scss
+++ /dev/null
@@ -1,5 +0,0 @@
-.wangEditor {
-    .ivu-form-item-content {
-        line-height: unset !important;
-    }
-}
\ No newline at end of file
diff --git a/manager/src/views/member/message-manage/messageManage.vue b/manager/src/views/member/message-manage/messageManage.vue
deleted file mode 100644
index 3bc962a3..00000000
--- a/manager/src/views/member/message-manage/messageManage.vue
+++ /dev/null
@@ -1,412 +0,0 @@
-<template>
-  <div class="search">
-    <Card>
-      <Row v-show="openSearch" @keydown.enter.native="handleSearch">
-        <Form ref="searchForm" :model="searchForm" inline :label-width="70">
-          <Form-item label="消息标题" prop="title">
-            <Input
-              type="text"
-              v-model="searchForm.title"
-              placeholder="请输入消息标题"
-              clearable
-              style="width: 200px"
-            />
-          </Form-item>
-          <Form-item label="消息内容" prop="content">
-            <Input
-              type="text"
-              v-model="searchForm.content"
-              placeholder="请输入消息内容"
-              clearable
-              style="width: 200px"
-            />
-          </Form-item>
-          <span v-if="drop">
-            <Form-item label="消息类型" prop="type">
-              <Select
-                v-model="searchForm.type"
-                placeholder="请选择消息类型"
-                clearable
-                style="width: 200px"
-              >
-                <Option
-                  v-for="(item, i) in dictMessageType"
-                  :key="i"
-                  :value="item.value"
-                >{{item.title}}</Option>
-              </Select>
-            </Form-item>
-            <Form-item label="创建时间">
-              <DatePicker
-                v-model="selectDate"
-                type="daterange"
-                format="yyyy-MM-dd"
-                clearable
-                @on-change="selectDateRange"
-                placeholder="选择起始时间"
-                style="width: 200px"
-              ></DatePicker>
-            </Form-item>
-          </span>
-          <Form-item style="margin-left:-35px;" class="br">
-            <Button @click="handleSearch" type="primary" icon="ios-search">搜索</Button>
-            <Button @click="handleReset">重置</Button>
-            <a class="drop-down" @click="dropDown">
-              {{dropDownContent}}
-              <Icon :type="dropDownIcon"></Icon>
-            </a>
-          </Form-item>
-        </Form>
-      </Row>
-      <Row class="operation">
-        <Button @click="add" type="primary" icon="md-add">发送新消息</Button>
-        <Button @click="delAll" icon="md-trash">批量删除撤回</Button>
-        <Button @click="getDataList" icon="md-refresh">刷新</Button>
-        <Button type="dashed" @click="openSearch=!openSearch">{{openSearch ? "关闭搜索" : "开启搜索"}}</Button>
-        <Button type="dashed" @click="openTip=!openTip">{{openTip ? "关闭提示" : "开启提示"}}</Button>
-      </Row>
-      <Row v-show="openTip">
-        <Alert show-icon>
-          已选择
-          <span class="select-count">{{selectCount}}</span> 项
-          <a class="select-clear" @click="clearSelectAll">清空</a>
-        </Alert>
-      </Row>
-      <Table
-        :loading="loading"
-        border
-        :columns="columns"
-        :data="data"
-        sortable="custom"
-        @on-sort-change="changeSort"
-        @on-selection-change="showSelect"
-        ref="table"
-      ></Table>
-      <Row type="flex" justify="end" class="mt_10">
-        <Page
-          :current="searchForm.pageNumber"
-          :total="total"
-          :page-size="searchForm.pageSize"
-          @on-change="changePage"
-          @on-page-size-change="changePageSize"
-          :page-size-opts="[10,20,50]"
-          size="small"
-          show-total
-          show-elevator
-          show-sizer
-        ></Page>
-      </Row>
-    </Card>
-  </div>
-</template>
-
-<script>
-import {
-  getMessageData,
-  addMessage,
-  editMessage,
-  deleteMessage
-} from "@/api/index";
-export default {
-  title: "message-manage",
-  data() {
-    return {
-      openSearch: true, // 显示搜索
-      openTip: true, // 显示提示
-      loading: true, // 表单加载状态
-      userLoading: true,
-      selectCount: 0, // 多选计数
-      selectList: [], // 多选数据
-      drop: false, // 展开搜索
-      dropDownContent: "展开",
-      dropDownIcon: "ios-arrow-down",
-      searchForm: {
-        // 搜索框对应data对象
-        title: "",
-        content: "",
-        pageNumber: 1, // 当前页数
-        pageSize: 10, // 页面大小
-        sort: "createTime", // 默认排序字段
-        order: "desc", // 默认排序方式
-        startDate: "", // 起始时间
-        endDate: "" // 终止时间
-      },
-      selectDate: null, // 选择日期绑定modal
-      columns: [
-        // 表头
-        {
-          type: "selection",
-          width: 60,
-          align: "center"
-        },
-        {
-          type: "index",
-          width: 60,
-          align: "center"
-        },
-        {
-          title: "消息标题",
-          key: "title",
-          width: 200,
-          sortable: true
-        },
-        {
-          title: "消息内容",
-          key: "content",
-          minWidth: 275,
-          tooltip: true
-        },
-        {
-          title: "类型",
-          key: "type",
-          width: 120,
-          align: "center"
-        },
-        {
-          title: "新创建账号推送",
-          key: "createSend",
-          align: "center",
-          width: 135,
-          render: (h, params) => {
-            if (params.row.createSend) {
-              return h("div", [
-                h(
-                  "Tag",
-                  {
-                    props: {
-                      color: "blue"
-                    }
-                  },
-                  "开启"
-                )
-              ]);
-            } else {
-              return h("div", [
-                h(
-                  "Tag",
-                  {
-                    props: {
-                      color: "default"
-                    }
-                  },
-                  "关闭"
-                )
-              ]);
-            }
-          }
-        },
-        {
-          title: "创建时间",
-          key: "createTime",
-          width: 180,
-          sortable: true,
-          sortType: "desc"
-        },
-        {
-          title: "操作",
-          key: "action",
-          width: 280,
-          align: "center",
-          fixed: "right",
-          render: (h, params) => {
-            return h("div", [
-              h(
-                "Button",
-                {
-                  props: {
-                    size: "small"
-                  },
-                  style: {
-                    marginRight: "5px"
-                  },
-                  on: {
-                    click: () => {
-                      this.edit(params.row);
-                    }
-                  }
-                },
-                "编辑"
-              ),
-              h(
-                "Button",
-                {
-                  props: {
-                    type: "primary",
-                    size: "small"
-                  },
-                  style: {
-                    marginRight: "5px"
-                  },
-                  on: {
-                    click: () => {
-                      this.sendDetail(params.row);
-                    }
-                  }
-                },
-                "查看发送详情"
-              ),
-              h(
-                "Button",
-                {
-                  props: {
-                    type: "error",
-                    size: "small"
-                  },
-                  on: {
-                    click: () => {
-                      this.remove(params.row);
-                    }
-                  }
-                },
-                "删除撤回"
-              )
-            ]);
-          }
-        }
-      ],
-      data: [], // 表单数据
-      total: 0, // 表单数据总数
-      dictMessageType: this.$store.state.dict.messageType
-    };
-  },
-  methods: {
-    init() {
-      this.getDataList();
-    },
-    dropDown() {
-      if (this.drop) {
-        this.dropDownContent = "展开";
-        this.dropDownIcon = "ios-arrow-down";
-      } else {
-        this.dropDownContent = "收起";
-        this.dropDownIcon = "ios-arrow-up";
-      }
-      this.drop = !this.drop;
-    },
-    changePage(v) {
-      this.searchForm.pageNumber = v;
-      this.getDataList();
-      this.clearSelectAll();
-    },
-    changePageSize(v) {
-      this.searchForm.pageSize = v;
-      this.getDataList();
-    },
-    selectDateRange(v) {
-      if (v) {
-        this.searchForm.startDate = v[0];
-        this.searchForm.endDate = v[1];
-      }
-    },
-    getDataList() {
-      this.loading = true;
-      getMessageData(this.searchForm).then(res => {
-        this.loading = false;
-        if (res.success) {
-          this.data = res.result.records;
-          this.total = res.result.total;
-        }
-      });
-    },
-    handleSearch() {
-      this.searchForm.pageNumber = 1;
-      this.searchForm.pageSize = 10;
-      this.getDataList();
-    },
-    handleReset() {
-      this.$refs.searchForm.resetFields();
-      this.searchForm.pageNumber = 1;
-      this.searchForm.pageSize = 10;
-      this.selectDate = null;
-      this.searchForm.startDate = "";
-      this.searchForm.endDate = "";
-      // 重新加载数据
-      this.getDataList();
-    },
-    changeSort(e) {
-      this.searchForm.sort = e.key;
-      this.searchForm.order = e.order;
-      if (e.order == "normal") {
-        this.searchForm.order = "";
-      }
-      this.getDataList();
-    },
-    add() {
-      let query = { type: 0, backRoute: this.$route.name };
-      this.$router.push({
-        name: "add_edit_message",
-        query: query
-      });
-    },
-    edit(v) {
-      let query = { type: 1, id: v.id, backRoute: this.$route.name };
-      this.$router.push({
-        name: "add_edit_message",
-        query: query
-      });
-    },
-    sendDetail(v) {
-      let query = { id: v.id };
-      this.$router.push({
-        name: "message_send_detail",
-        query: query
-      });
-    },
-    remove(v) {
-      this.$Modal.confirm({
-        title: "确认删除",
-        // 记得确认修改此处
-        content: "您确认要删除 " + v.title + " ?",
-        loading: true,
-        onOk: () => {
-          // 删除
-          deleteMessage(v.id).then(res => {
-            this.$Modal.remove();
-            if (res.success) {
-              this.$Message.success("操作成功");
-              this.getDataList();
-            }
-          });
-        }
-      });
-    },
-    showSelect(e) {
-      this.selectList = e;
-      this.selectCount = e.length;
-    },
-    clearSelectAll() {
-      this.$refs.table.selectAll(false);
-    },
-    delAll() {
-      if (this.selectCount <= 0) {
-        this.$Message.warning("您还未选择要删除的数据");
-        return;
-      }
-      this.$Modal.confirm({
-        title: "确认删除",
-        content: "您确认要删除所选的 " + this.selectCount + " 条数据?",
-        loading: true,
-        onOk: () => {
-          let ids = "";
-          this.selectList.forEach(function(e) {
-            ids += e.id + ",";
-          });
-          ids = ids.substring(0, ids.length - 1);
-          // 批量删除
-          deleteMessage(ids).then(res => {
-            this.$Modal.remove();
-            if (res.success) {
-              this.$Message.success("操作成功");
-              this.clearSelectAll();
-              this.getDataList();
-            }
-          });
-        }
-      });
-    }
-  },
-  mounted() {
-    this.init();
-  }
-};
-</script>
diff --git a/manager/src/views/member/message-manage/messageSendDetail.vue b/manager/src/views/member/message-manage/messageSendDetail.vue
deleted file mode 100644
index 69ac6bda..00000000
--- a/manager/src/views/member/message-manage/messageSendDetail.vue
+++ /dev/null
@@ -1,322 +0,0 @@
-<template>
-  <div class="search">
-    <Card>
-      <Row v-show="openSearch" @keydown.enter.native="handleSearch">
-        <Form ref="searchForm" inline :label-width="90">
-          <Form-item label="发送用户ID" prop="userId">
-            <Input
-              type="text"
-              v-model="userId"
-              placeholder="请输入发送用户完整ID"
-              clearable
-              style="width: 200px"
-            />
-          </Form-item>
-          <Form-item label="发送状态" prop="status">
-            <Select v-model="status" placeholder="请选择" style="width: 200px" clearable>
-              <Option value="0">未读</Option>
-              <Option value="1">已读</Option>
-              <Option value="2">回收站</Option>
-            </Select>
-          </Form-item>
-          <Form-item style="margin-left:-35px;" class="br">
-            <Button @click="getDataList" type="primary" icon="ios-search">搜索</Button>
-            <Button @click="handleReset">重置</Button>
-          </Form-item>
-        </Form>
-      </Row>
-      <Row class="operation">
-        <Button v-hasRole="'ROLE_ADMIN'" @click="delAll" icon="md-trash">批量删除</Button>
-        <Button @click="getDataList" icon="md-refresh">刷新</Button>
-        <Button type="dashed" @click="openSearch=!openSearch">{{openSearch ? "关闭搜索" : "开启搜索"}}</Button>
-        <Button type="dashed" @click="openTip=!openTip">{{openTip ? "关闭提示" : "开启提示"}}</Button>
-      </Row>
-      <Row v-show="openTip">
-        <Alert show-icon>
-          已选择
-          <span class="select-count">{{selectCount}}</span> 项
-          <a class="select-clear" @click="clearSelectAll">清空</a>
-        </Alert>
-      </Row>
-      <Table
-        :loading="loading"
-        border
-        :columns="columns"
-        :data="data"
-        ref="table"
-        sortable="custom"
-        @on-sort-change="changeSort"
-        @on-selection-change="changeSelect"
-      ></Table>
-      <Row type="flex" justify="end" class="mt_10">
-        <Page
-          :current="pageNumber"
-          :total="total"
-          :page-size="pageSize"
-          @on-change="changePage"
-          @on-page-size-change="changePageSize"
-          :page-size-opts="[10,20,50]"
-          size="small"
-          show-total
-          show-elevator
-          show-sizer
-        ></Page>
-      </Row>
-    </Card>
-  </div>
-</template>
-
-<script>
-import { getMessageSendData, deleteMessageSend } from "@/api/index";
-export default {
-  name: "message_send_detail",
-  data() {
-    return {
-      openSearch: true, // 显示搜索项
-      openTip: true, // 显示提示
-      loading: true, // 表单加载状态
-      messageId: "", // 信息id
-      sortColumn: "createTime", // 排序字段
-      sortType: "desc", // 排序方式
-      status: "", // 发送状态
-      selectList: [], // 多选数据
-      selectCount: 0, // 多选计数
-      columns: [
-        // 表头
-        {
-          type: "selection",
-          width: 60,
-          align: "center"
-        },
-        {
-          type: "index",
-          width: 60,
-          align: "center"
-        },
-        {
-          title: "发送消息标题",
-          key: "title"
-        },
-        {
-          title: "发送用户",
-          key: "username",
-          sortable: true
-        },
-        {
-          title: "状态",
-          key: "status",
-          align: "center",
-          sortable: true,
-          render: (h, params) => {
-            if (params.row.status == 0) {
-              return h("div", [
-                h(
-                  "Tag",
-                  {
-                    props: {
-                      color: "default"
-                    }
-                  },
-                  "未读"
-                )
-              ]);
-            } else if (params.row.status == 1) {
-              return h("div", [
-                h(
-                  "Tag",
-                  {
-                    props: {
-                      color: "green"
-                    }
-                  },
-                  "已读"
-                )
-              ]);
-            } else if (params.row.status == 2) {
-              return h("div", [
-                h(
-                  "Tag",
-                  {
-                    props: {
-                      color: "orange"
-                    }
-                  },
-                  "回收站"
-                )
-              ]);
-            }
-          }
-        },
-        {
-          title: "创建时间",
-          key: "createTime",
-          sortable: true,
-          sortType: "desc"
-        },
-        {
-          title: "更新时间",
-          key: "updateTime",
-          sortable: true
-        },
-        {
-          title: "操作",
-          key: "action",
-          align: "center",
-          render: (h, params) => {
-              return h("div", [
-                h(
-                  "Button",
-                  {
-                    props: {
-                      type: "error",
-                      size: "small",
-                      icon: "md-trash"
-                    },
-                    on: {
-                      click: () => {
-                        this.remove(params.row);
-                      }
-                    }
-                  },
-                  "删除"
-                )
-              ]);
-            }
-        }
-      ],
-      data: [], // 表单数据
-      pageNumber: 1, // 当前页数
-      pageSize: 10, // 页面大小
-      total: 0, // 表单数据总数
-      userId: ""
-    };
-  },
-  methods: {
-    init() {
-      this.messageId = this.$route.query.id;
-      this.getDataList();
-    },
-    changePage(v) {
-      this.pageNumber = v;
-      this.getDataList();
-      this.clearSelectAll();
-    },
-    changePageSize(v) {
-      this.pageSize = v;
-      this.getDataList();
-    },
-    changeSort(e) {
-      this.sortColumn = e.key;
-      this.sortType = e.order;
-      if (e.order == "normal") {
-        this.sortType = "";
-      }
-      this.getDataList();
-    },
-    handleSearch() {
-      this.searchForm.pageNumber = 1;
-      this.searchForm.pageSize = 10;
-      this.getDataList();
-    },
-    getDataList(v) {
-      this.loading = true;
-      if (v == 0) {
-        this.userId = "";
-      }
-      let params = {
-        pageNumber: this.pageNumber,
-        pageSize: this.pageSize,
-        sort: this.sortColumn,
-        order: this.sortType,
-        messageId: this.messageId,
-        status: this.status,
-        userId: this.userId
-      };
-      // 避免后台默认值
-      if (!params.status) {
-        params.status = "";
-      }
-      getMessageSendData(params).then(res => {
-        this.loading = false;
-        if (res.success) {
-          this.data = res.result.records;
-          this.total = res.result.total;
-        }
-      });
-    },
-    handleReset() {
-      this.userId = "";
-      this.status = "";
-      this.getDataList();
-    },
-    remove(v) {
-      this.$Modal.confirm({
-        title: "确认删除",
-        // 记得确认修改此处
-        content: "您确认要删除该条数据?",
-        loading: true,
-        onOk: () => {
-          // 删除
-          deleteMessageSend(v.id).then(res => {
-            this.$Modal.remove();
-            if (res.success) {
-              this.$Message.success("操作成功");
-              this.getDataList();
-            }
-          });
-        }
-      });
-    },
-    clearSelectAll() {
-      this.$refs.table.selectAll(false);
-    },
-    changeSelect(e) {
-      this.selectList = e;
-      this.selectCount = e.length;
-    },
-    delAll() {
-      if (this.selectCount <= 0) {
-        this.$Message.warning("您还未选择要删除的数据");
-        return;
-      }
-      this.$Modal.confirm({
-        title: "确认删除",
-        content: "您确认要删除所选的 " + this.selectCount + " 条数据?",
-        loading: true,
-        onOk: () => {
-          let ids = "";
-          this.selectList.forEach(function(e) {
-            ids += e.id + ",";
-          });
-          ids = ids.substring(0, ids.length - 1);
-          // 批量删除
-          deleteMessageSend(ids).then(res => {
-            this.$Modal.remove();
-            if (res.success) {
-              this.$Message.success("操作成功");
-              this.clearSelectAll();
-              this.getDataList();
-            }
-          });
-        }
-      });
-    }
-  },
-  watch: {
-    // 监听路由变化通过id获取数据
-    $route(to, from) {
-      if (to.name == "message_send_detail") {
-        this.messageId = this.$route.query.id;
-        this.getDataList();
-      }
-    }
-  },
-  mounted() {
-    this.init();
-    this.$Modal.info({
-      title: "提示",
-      content: "该页面已根据用户角色隐藏操作按钮"
-    });
-  }
-};
-</script>
diff --git a/manager/src/views/member/message-manage/weChatMessageManager.vue b/manager/src/views/member/message-manage/weChatMessageManager.vue
index 8bde8061..4d9e2a59 100644
--- a/manager/src/views/member/message-manage/weChatMessageManager.vue
+++ b/manager/src/views/member/message-manage/weChatMessageManager.vue
@@ -40,7 +40,7 @@
         <div class="search">
           <Card>
 
-            <Row class="operation">
+            <Row class="operation mt_10">
               <Button @click="weChatSync" type="primary">同步微信消息</Button>
             </Row>
             <Table
@@ -69,7 +69,7 @@
         <div class="search">
           <Card>
 
-            <Row class="operation">
+            <Row class="operation mt_10">
               <Button @click="weChatSync('mp')" type="primary">同步微信小程序订阅消息</Button>
             </Row>
             <Table
@@ -120,7 +120,6 @@ export default {
 
       wechatModal: false,// modal展示
       wechatFormData: {}, // 微信数据
-      wechatMPModal: false,//微信消息
       wechatMPFormData: {}, // 微信订阅消息
       tab: "WECHAT", // tab栏分类
       searchForm: { // 请求参数
@@ -128,8 +127,6 @@ export default {
       },
       loading: true, // 表单加载状态
       id: '', // 模板id
-      selectCount: 0, // 多选计数
-      selectList: [], // 多选数据
       //微信消息查询
       weChatSearchForm: {
         // 搜索框对应data对象
@@ -232,6 +229,7 @@ export default {
     };
   },
   methods: {
+    // 初始化数据
     init() {
       this.getDataList();
     },
diff --git a/manager/src/views/member/notice/addMessage.vue b/manager/src/views/member/notice/addMessage.vue
deleted file mode 100644
index f3cd9b8b..00000000
--- a/manager/src/views/member/notice/addMessage.vue
+++ /dev/null
@@ -1,211 +0,0 @@
-<style lang="scss"  scoped>
-@import "../message-manage/messageManage.scss";
-</style>
-<template>
-  <div>
-    <Card>
-      <p slot="title">
-        <span v-if="type==0">发送新消息</span>
-        <span v-else>编辑消息</span>
-      </p>
-      <Row>
-        <Form
-          ref="form"
-          :model="form"
-          :label-width="90"
-          :rules="formValidate"
-          style="position:relative"
-        >
-          <FormItem label="标题" prop="title">
-            <Input v-model="form.title" style="width:600px" />
-          </FormItem>
-          <FormItem label="内容" prop="content" class="wangEditor">
-            <editor v-model="form.content"></editor>
-          </FormItem>
-          <div v-if="type==0">
-            <FormItem label="发送范围">
-              <RadioGroup type="button" button-style="solid" v-model="form.sendType" >
-                <Radio label="ALL">全部会员</Radio>
-                <Radio label="SELECT">指定会员</Radio>
-              </RadioGroup>
-            </FormItem>
-            <div>
-              <FormItem label="选择用户" v-if="form.sendType==='SELECT'">
-                <member-choose text="选择发送用户" @on-change="handleSelectUser"></member-choose>
-              </FormItem>
-            </div>
-          </div>
-          <Form-item class="br">
-            <Button
-              type="primary"
-              :loading="submitLoading"
-              @click="handleSubmit"
-              style="width:100px"
-            >提交</Button>
-            <Button @click="handelCancel">取消</Button>
-          </Form-item>
-          <Spin size="large" fix v-if="loading"></Spin>
-        </Form>
-      </Row>
-    </Card>
-  </div>
-</template>
-
-<script>
-import editor from "@/views/my-components/lili/editor";
-import memberChoose from "@/views/my-components/lili/member-choose";
-export default {
-  name: "add_message",
-  components: {
-    memberChoose,
-    editor
-  },
-  data() {
-    return {
-      type: 0, // 0 发送新消息 1 编辑消息
-      loading: false, // 表单加载状态
-      selectUsers: [], // 选择用户
-      modalTitle: "", // 添加或编辑标题
-      form: {
-        // 添加或编辑表单对象初始化数据
-        title: "",
-        content: "",
-        sendType: "ALL",
-        memberIds: ""
-      },
-      formValidate: {
-        // 表单验证规则
-        title: [{ required: true, message: "标题不能为空", trigger: "blur" }],
-        content: [{ required: true, message: "内容不能为空", trigger: "blur" }]
-      },
-      submitLoading: false, // 添加或编辑提交状态
-      backRoute: "" // back路由路径
-    };
-  },
-  methods: {
-    init() {
-      this.type = this.$route.query.type;
-      this.backRoute = this.$route.query.backRoute;
-      if (this.type == 1) {
-        this.form.id = this.$route.query.id;
-        this.getData();
-      }
-    },
-    getData() {
-      this.loading = true;
-      getMessageDataById(this.form.id).then(res => {
-        this.loading = false;
-        if (res.success) {
-          // 转换null为""
-          let v = res.result;
-          for (let attr in v) {
-            if (v[attr] == null) {
-              v[attr] = "";
-            }
-          }
-          let str = JSON.stringify(v);
-          let data = JSON.parse(str);
-          this.form = data;
-        }
-      });
-    },
-    handleSubmit() {
-      this.$refs.form.validate(valid => {
-
-        let ids = [];
-        this.selectUsers.forEach(e => {
-          ids += e.id + ",";
-        });
-        if (ids.length > 0) {
-          ids = ids.substring(0, ids.length - 1);
-        }
-        this.form.memberIds = ids;
-
-        if (valid) {
-          this.submitLoading = true;
-          if (this.modalType === 0) {
-            // 添加 避免编辑后传入id等数据 记得删除
-            this.postRequest("/memberNoticeSenter/insertOrUpdate", this.form).then(res => {
-              this.submitLoading = false;
-              if (res.success) {
-                this.$Message.success("操作成功");
-                this.modalVisible = false;
-              }
-            });
-          } else {
-            // 编辑
-            this.postRequest("/memberNoticeSenter/insertOrUpdate", this.form).then(res => {
-              this.submitLoading = false;
-              if (res.success) {
-                this.$Message.success("操作成功");
-                this.modalVisible = false;
-              }
-            });
-          }
-        }
-      });
-    },
-    handelSubmit() {
-      console.log()
-      this.$refs.form.validate(valid => {
-        if (valid) {
-          this.submitLoading = true;
-          if (this.type == 0) {
-            // 添加 避免编辑后传入id等数据 记得删除
-            delete this.form.id;
-            // 用户id数据
-
-            addMessage(this.form).then(res => {
-              this.submitLoading = false;
-              if (res.success) {
-                this.$Message.success("操作成功");
-                this.closeCurrentPage();
-              }
-            });
-          } else if (this.type == 1) {
-            // 编辑
-            editMessage(this.form).then(res => {
-              this.submitLoading = false;
-              if (res.success) {
-                this.$Message.success("操作成功");
-                this.closeCurrentPage();
-              }
-            });
-          }
-        }
-      });
-    },
-    handleSelectUser(v) {
-      this.selectUsers = v;
-    },
-    handelCancel() {
-      this.closeCurrentPage();
-    },
-    // 关闭当前页面
-    closeCurrentPage() {
-      this.$store.commit("removeTag", "add_message");
-      localStorage.pageOpenedList = JSON.stringify(
-        this.$store.state.app.pageOpenedList
-      );
-      this.$router.push({
-        name: this.backRoute
-      });
-    }
-  },
-  mounted() {
-    this.init();
-  },
-  watch: {
-    // 监听路由变化
-    $route(to, from) {
-      if (to.name == "member-notice-sender") {
-        this.type = this.$route.query.type;
-        if (this.type == 1) {
-          this.form.id = this.$route.query.id;
-          this.getData();
-        }
-      }
-    }
-  }
-};
-</script>
diff --git a/manager/src/views/member/notice/sender.vue b/manager/src/views/member/notice/sender.vue
deleted file mode 100644
index eeb1a3e6..00000000
--- a/manager/src/views/member/notice/sender.vue
+++ /dev/null
@@ -1,370 +0,0 @@
-<template>
-  <div class="search">
-    <Card>
-      <Row @keydown.enter.native="handleSearch">
-        <Form
-          ref="searchForm"
-          :model="searchForm"
-          inline
-          :label-width="70"
-          class="search-form"
-        >
-          <Form-item label="标题" prop="title">
-            <Input
-              type="text"
-              v-model="searchForm.title"
-              placeholder="请输入标题"
-              clearable
-              style="width: 200px"
-            />
-          </Form-item>
-          <Form-item label="消息内容" prop="content">
-            <Input
-              type="text"
-              v-model="searchForm.content"
-              placeholder="请输入消息内容"
-              clearable
-              style="width: 200px"
-            />
-          </Form-item>
-          <span v-if="drop">
-            <Form-item label="发送类型" prop="sendType">
-              <Select
-                v-model="searchForm.sendType"
-                placeholder="请选择"
-                clearable
-                style="width: 200px"
-              >
-                <Option value="ALL">全站会员</Option>
-                <Option value="SELECT">指定会员</Option>
-              </Select>
-            </Form-item>
-            <Form-item label="创建人" prop="createBy">
-              <Input
-                type="text"
-                v-model="searchForm.createBy"
-                placeholder="请输入创建人"
-                clearable
-                style="width: 200px"
-              />
-            </Form-item>
-          </span>
-          <Form-item style="margin-left: -35px" class="br">
-            <Button @click="handleSearch" type="primary" icon="ios-search"
-              >搜索</Button
-            >
-            <Button @click="handleReset">重置</Button>
-            <a class="drop-down" @click="dropDown">
-              {{ dropDownContent }}
-              <Icon :type="dropDownIcon"></Icon>
-            </a>
-          </Form-item>
-        </Form>
-      </Row>
-      <Row class="operation">
-        <Button @click="add" type="primary" icon="md-add">发送新消息</Button>
-        <Button @click="delAll" icon="md-trash">批量删除</Button>
-        <Button @click="getDataList" icon="md-refresh">刷新</Button>
-      </Row>
-      <Row v-show="openTip">
-        <Alert show-icon>
-          已选择 <span class="select-count">{{ selectCount }}</span> 项
-          <a class="select-clear" @click="clearSelectAll">清空</a>
-        </Alert>
-      </Row>
-      <Table
-        :loading="loading"
-        border
-        :columns="columns"
-        :data="data"
-        ref="table"
-        sortable="custom"
-        @on-sort-change="changeSort"
-        @on-selection-change="changeSelect"
-      ></Table>
-      <Row type="flex" justify="end" class="mt_10">
-        <Page
-          :current="searchForm.pageNumber"
-          :total="total"
-          :page-size="searchForm.pageSize"
-          @on-change="changePage"
-          @on-page-size-change="changePageSize"
-          :page-size-opts="[10, 20, 50]"
-          size="small"
-          show-total
-          show-elevator
-          show-sizer
-        ></Page>
-      </Row>
-    </Card>
-  </div>
-</template>
-
-<script>
-export default {
-  name: "member-notice-sender",
-  components: {},
-  data() {
-    return {
-      openSearch: true, // 显示搜索
-      openTip: true, // 显示提示
-      loading: true, // 表单加载状态
-      modalType: 0, // 添加或编辑标识
-      modalVisible: false, // 添加或编辑显示
-      modalTitle: "", // 添加或编辑标题
-      drop: false, // 更多搜索项
-      dropDownContent: "展开", // drop中文提示
-      dropDownIcon: "ios-arrow-down", // drop图标
-      searchForm: {
-        // 搜索框初始化对象
-        pageNumber: 1, // 当前页数
-        pageSize: 10, // 页面大小
-        sort: "createTime", // 默认排序字段
-        order: "desc", // 默认排序方式
-      },
-      submitLoading: false, // 添加或编辑提交状态
-      selectList: [], // 多选数据
-      selectCount: 0, // 多选计数
-      columns: [
-        // 表头
-        {
-          type: "selection",
-          width: 60,
-          align: "center",
-        },
-        {
-          type: "index",
-          width: 60,
-          align: "center",
-        },
-        {
-          title: "标题",
-          key: "title",
-          minWidth: 120,
-          sortable: false,
-        },
-        {
-          title: "发送类型",
-          key: "sendType",
-          minWidth: 120,
-          sortable: false,
-
-          render: (h, params) => {
-            if (params.row.sendType == "ALL") {
-              return h("div", [
-                h("Badge", {
-                  props: {
-                    status: "success",
-                    text: "全部会员",
-                  },
-                }),
-              ]);
-            } else {
-              return h("div", [
-                h("Badge", {
-                  props: {
-                    status: "success",
-                    text: "指定会员",
-                  },
-                }),
-              ]);
-            }
-          },
-        },
-        {
-          title: "创建人",
-          key: "createBy",
-          minWidth: 120,
-          sortable: false,
-        },
-        {
-          title: "创建时间",
-          key: "createTime",
-          minWidth: 120,
-          sortable: true,
-        },
-        {
-          title: "操作",
-          key: "action",
-          align: "center",
-          width: 200,
-          render: (h, params) => {
-            return h("div", [
-              h(
-                "Button",
-                {
-                  props: {
-                    type: "error",
-                    size: "small",
-                    icon: "md-trash",
-                  },
-                  on: {
-                    click: () => {
-                      this.remove(params.row);
-                    },
-                  },
-                },
-                "删除"
-              ),
-            ]);
-          },
-        },
-      ],
-      data: [], // 表单数据
-      total: 0, // 表单数据总数
-    };
-  },
-  methods: {
-    init() {
-      this.getDataList();
-    },
-    changePage(v) {
-      this.searchForm.pageNumber = v;
-      this.getDataList();
-      this.clearSelectAll();
-    },
-    changePageSize(v) {
-      this.searchForm.pageSize = v;
-      this.getDataList();
-    },
-    handleSearch() {
-      this.searchForm.pageNumber = 1;
-      this.searchForm.pageSize = 10;
-      this.getDataList();
-    },
-    handleReset() {
-      this.$refs.searchForm.resetFields();
-      this.searchForm.pageNumber = 1;
-      this.searchForm.pageSize = 10;
-      // 重新加载数据
-      this.getDataList();
-    },
-    changeSort(e) {
-      this.searchForm.sort = e.key;
-      this.searchForm.order = e.order;
-      if (e.order === "normal") {
-        this.searchForm.order = "";
-      }
-      this.getDataList();
-    },
-    clearSelectAll() {
-      this.$refs.table.selectAll(false);
-    },
-    changeSelect(e) {
-      this.selectList = e;
-      this.selectCount = e.length;
-    },
-    dropDown() {
-      if (this.drop) {
-        this.dropDownContent = "展开";
-        this.dropDownIcon = "ios-arrow-down";
-      } else {
-        this.dropDownContent = "收起";
-        this.dropDownIcon = "ios-arrow-up";
-      }
-      this.drop = !this.drop;
-    },
-    getDataList() {
-      this.loading = true;
-      // 带多条件搜索参数获取表单数据 请自行修改接口
-      this.getRequest("/memberNoticeSenter/getByPage", this.searchForm).then(
-        (res) => {
-          this.loading = false;
-          if (res.success) {
-            this.data = res.result.records;
-            this.total = res.result.total;
-          }
-        }
-      );
-      // 以下为模拟数据
-      //this.data = [
-      //];
-      this.total = this.data.length;
-      this.loading = false;
-    },
-    add() {
-      let query = { type: 0, backRoute: this.$route.name };
-      this.$router.push({
-        name: "add_message",
-        query: query,
-      });
-    },
-    edit(v) {
-      this.modalType = 1;
-      this.modalTitle = "编辑";
-      this.$refs.form.resetFields();
-      // 转换null为""
-      for (let attr in v) {
-        if (v[attr] === null) {
-          v[attr] = "";
-        }
-      }
-      let str = JSON.stringify(v);
-      let data = JSON.parse(str);
-      this.form = data;
-      this.modalVisible = true;
-    },
-    remove(v) {
-      this.$Modal.confirm({
-        title: "确认删除",
-        // 记得确认修改此处
-        content: "您确认要删除么?",
-        loading: true,
-        onOk: () => {
-          // 删除
-          this.deleteRequest("/memberNoticeSenter/delByIds/" + v.id).then(
-            (res) => {
-              this.$Modal.remove();
-              if (res.success) {
-                this.$Message.success("操作成功");
-                this.getDataList();
-              }
-            }
-          );
-          // 模拟请求成功
-          //this.$Message.success("操作成功");
-          //this.$Modal.remove();
-          //this.getDataList();
-        },
-      });
-    },
-    delAll() {
-      if (this.selectCount <= 0) {
-        this.$Message.warning("您还未选择要删除的数据");
-        return;
-      }
-      this.$Modal.confirm({
-        title: "确认删除",
-        content: "您确认要删除所选的 " + this.selectCount + " 条数据?",
-        loading: true,
-        onOk: () => {
-          let ids = "";
-          this.selectList.forEach(function (e) {
-            ids += e.id + ",";
-          });
-          ids = ids.substring(0, ids.length - 1);
-          // 批量删除
-          this.deleteRequest("/memberNoticeSenter/delByIds/" + ids).then(
-            (res) => {
-              this.$Modal.remove();
-              if (res.success) {
-                this.$Message.success("操作成功");
-                this.clearSelectAll();
-                this.getDataList();
-              }
-            }
-          );
-          // 模拟请求成功
-          //this.$Message.success("操作成功");
-          //this.$Modal.remove();
-          //this.clearSelectAll();
-          //this.getDataList();
-        },
-      });
-    },
-  },
-  mounted() {
-    this.init();
-  },
-};
-</script>
diff --git a/manager/src/views/member/point/point.vue b/manager/src/views/member/point/point.vue
index 4da33602..dd661153 100644
--- a/manager/src/views/member/point/point.vue
+++ b/manager/src/views/member/point/point.vue
@@ -1,55 +1,50 @@
 <template>
   <div class="search">
-    <Row>
-      <Card>
-        <Row @keydown.enter.native="handleSearch">
-          <Form
-            ref="searchForm"
-            :model="searchForm"
-            inline
-            :label-width="70"
-            class="search-form"
-          >
-            <Form-item label="会员名称" prop="username">
-              <Input
-                type="text"
-                v-model="searchForm.memberName"
-                placeholder="请输入会员名称"
-                clearable
-                style="width: 200px"
-              />
-              </Form-item>
-            <Button @click="handleSearch" class="search-btn" type="primary" icon="ios-search">搜索</Button >
-          </Form>
-        </Row>
-        <Table
-          :loading="loading"
-          border
-          :columns="columns"
-          :data="data"
-          ref="table"
-          sortable="custom"
-          @on-sort-change="changeSort"
-          @on-selection-change="changeSelect"
-        >
-        </Table>
-        <Row type="flex" justify="end" class="mt_10">
-          <Page
-            :current="searchForm.pageNumber"
-            :total="total"
-            :page-size="searchForm.pageSize"
-            @on-change="changePage"
-            @on-page-size-change="changePageSize"
-            :page-size-opts="[10, 20, 50]"
-            size="small"
-            show-total
-            show-elevator
-            show-sizer
-          ></Page>
-        </Row>
-      </Card>
-    </Row>
-
+    <Card style="padding:0 10px 10px 0">
+      <Form
+        @keydown.enter.native="handleSearch"
+        ref="searchForm"
+        :model="searchForm"
+        inline
+        style="margin-top:10px"
+        :label-width="70"
+        class="search-form"
+      >
+        <Form-item label="会员名称" prop="username">
+          <Input
+            type="text"
+            v-model="searchForm.memberName"
+            placeholder="请输入会员名称"
+            clearable
+            style="width: 200px"
+          />
+          </Form-item>
+        <Button @click="handleSearch" class="search-btn" type="primary" icon="ios-search">搜索</Button >
+      </Form>
+      <Table
+        :loading="loading"
+        border
+        :columns="columns"
+        :data="data"
+        ref="table"
+        class="mt_10"
+      >
+      </Table>
+      <Row type="flex" justify="end" class="mt_10">
+        <Page
+          :current="searchForm.pageNumber"
+          :total="total"
+          :page-size="searchForm.pageSize"
+          @on-change="changePage"
+          @on-page-size-change="changePageSize"
+          :page-size-opts="[10, 20, 50]"
+          size="small"
+          show-total
+          show-elevator
+          show-sizer
+        ></Page>
+      </Row>
+    </Card>
   </div>
 </template>
 
@@ -57,9 +52,9 @@
   import region from "@/views/lili-components/region";
   import * as API_Member from "@/api/member.js";
   import ossManage from "@/views/sys/oss-manage/ossManage";
-  import * as RegExp from '@/libs/RegExp.js';
 
   export default {
+    // 积分历史页面
     name: "point",
     components: {
       region,
@@ -67,14 +62,11 @@
     },
     data() {
       return {
-        descFlag: false, //编辑查看框
         loading: true, // 表单加载状态
         searchForm: { // 请求参数
           pageNumber: 1,
           pageSize: 10,
         },
-        selectList: [], // 多选数据
-        selectCount: 0, // 多选计数
         columns: [
           {
             title: "会员名称",
@@ -141,41 +133,27 @@
       callback(val) {
         this.$emit("callback", val);
       },
+      // 初始化数据
       init() {
         this.getData();
       },
+      // 分页 改变页码
       changePage(v) {
         this.searchForm.pageNumber = v;
         this.getData();
       },
+      // 分页 改变页数
       changePageSize(v) {
+        this.searchForm.pageNumber = 1;
         this.searchForm.pageSize = v;
         this.getData();
       },
+      // 搜索
       handleSearch() {
         this.searchForm.pageNumber = 1;
         this.searchForm.pageSize = 10;
         this.getData();
       },
-
-      changeSort(e) {
-        this.searchForm.sort = e.key;
-        this.searchForm.order = e.order;
-        if (e.order === "normal") {
-          this.searchForm.order = "";
-        }
-        this.getData();
-      },
-      changeSelect(e) {
-        this.selectList = e;
-        this.selectCount = e.length;
-      },
-      selectDateRange(v) {
-        if (v) {
-          this.searchForm.startDate = v[0];
-          this.searchForm.endDate = v[1];
-        }
-      },
       //查新积分列表
       getData() {
         this.loading = true;
diff --git a/manager/src/views/message/message.scss b/manager/src/views/message/message.scss
deleted file mode 100644
index 2050bbb5..00000000
--- a/manager/src/views/message/message.scss
+++ /dev/null
@@ -1,161 +0,0 @@
-.message {
-    &-main-con {
-        position: absolute;
-        left: 0px;
-        top: 0px;
-        right: 0px;
-        bottom: 0px;
-    }
-    &-mainlist-con {
-        position: absolute;
-        left: 0;
-        top: 10px;
-        width: 300px;
-        bottom: 0;
-        padding: 10px 0;
-        div {
-            padding: 10px;
-            margin: 0 20px;
-            border-bottom: 1px dashed #d2d3d2;
-            &:last-child {
-                border: none;
-            }
-            .mes-wrap {
-                display: flex;
-                align-items: center;
-                justify-content: center;
-            }
-            .message-count-badge-outer {
-                margin-left: 5px;
-            }
-            .message-count-badge {
-                background: #d2d3d2;
-            }
-            .message-count-badge-red {
-                background: #ed3f14;
-            }
-            .mes-type-btn-text {
-                margin-left: 10px;
-            }
-        }
-    }
-    &-content-con {
-        position: absolute;
-        top: 10px;
-        right: 10px;
-        bottom: 10px;
-        left: 300px;
-        background: white;
-        border-radius: 3px;
-        box-shadow: 2px 2px 10px 2px rgba(0, 0, 0, .1);
-        overflow: auto;
-        .message-title-list-con {
-            width: 100%;
-            height: 100%;
-        }
-        .message-content-top-bar {
-            height: 40px;
-            width: 100%;
-            background: white;
-            position: absolute;
-            left: 0;
-            top: 0;
-            border-bottom: 1px solid #dededb;
-            .mes-back-btn-con {
-                position: absolute;
-                width: 70px;
-                height: 30px;
-                left: 0;
-                top: 5px;
-            }
-            .mes-title {
-                position: absolute;
-                top: 0;
-                right: 70px;
-                bottom: 0;
-                left: 70px;
-                line-height: 40px;
-                padding: 0 30px;
-                white-space: nowrap;
-                overflow: hidden;
-                text-overflow: ellipsis;
-                text-align: center;
-            }
-        }
-        .mes-time-con {
-            position: absolute;
-            width: 100%;
-            top: 40px;
-            left: 0;
-            padding: 20px 0;
-            text-align: center;
-            font-size: 14px;
-            color: #b7b7b5;
-        }
-        .message-content-body {
-            position: absolute;
-            top: 90px;
-            right: 0;
-            bottom: 0;
-            left: 0;
-            overflow: auto;
-            .message-content {
-                padding: 10px 20px;
-            }
-        }
-    }
-}
-
-.page-fix {
-    position: fixed;
-    right: 2vw;
-    bottom: 3vh;
-}
-
-.back-message-list-enter,
-    .back-message-list-leave-to {
-        opacity: 0;
-    }
-    
-    .back-message-list-enter-active,
-    .back-message-list-leave-active {
-        transition: all .5s;
-    }
-    
-    .back-message-list-enter-to,
-    .back-message-list-leave {
-        opacity: 1;
-    }
-    
-    .view-message-enter,
-    .view-message-leave-to {
-        opacity: 0;
-    }
-    
-    .view-message-enter-active,
-    .view-message-leave-active {
-        transition: all .5s;
-    }
-    
-    .view-message-enter-to,
-    .view-message-leave {
-        opacity: 1;
-    }
-    
-    .mes-current-type-btn-enter,
-    .mes-current-type-btn-leave-to {
-        opacity: 0;
-        width: 0;
-    }
-    
-    .mes-current-type-btn-enter-active,
-    .mes-current-type-btn-leave-active {
-        transition: all .3s;
-    }
-    
-    .mes-current-type-btn-enter-to,
-    .mes-current-type-btn-leave {
-        opacity: 1;
-        width: 12px;
-    }
-
diff --git a/manager/src/views/message/message.vue b/manager/src/views/message/message.vue
deleted file mode 100644
index fa2511e8..00000000
--- a/manager/src/views/message/message.vue
+++ /dev/null
@@ -1,464 +0,0 @@
-<style lang="scss" scoped>
-@import "./message.scss";
-</style>
-
-<template>
-  <div class="message-main-con">
-    <div class="message-mainlist-con">
-      <div>
-        <Button @click="setCurrentMesType('unread')" size="large" long type="text">
-          <div class="mes-wrap">
-            <transition name="mes-current-type-btn">
-              <Icon v-show="currentMessageType == 'unread'" type="md-checkmark"></Icon>
-            </transition>
-            <span class="mes-type-btn-text">未读消息</span>
-            <Badge
-              class="message-count-badge-outer"
-              class-name="message-count-badge-red"
-              :count="unreadCount"
-            ></Badge>
-          </div>
-        </Button>
-      </div>
-      <div>
-        <Button @click="setCurrentMesType('hasread')" size="large" long type="text">
-          <div class="mes-wrap">
-            <transition name="mes-current-type-btn">
-              <Icon v-show="currentMessageType == 'hasread'" type="md-checkmark"></Icon>
-            </transition>
-            <span class="mes-type-btn-text">已读消息</span>
-            <Badge
-              class="message-count-badge-outer"
-              class-name="message-count-badge"
-              :count="hasreadCount"
-            ></Badge>
-          </div>
-        </Button>
-      </div>
-      <div>
-        <Button @click="setCurrentMesType('recyclebin')" size="large" long type="text">
-          <div class="mes-wrap">
-            <transition name="mes-current-type-btn">
-              <Icon v-show="currentMessageType == 'recyclebin'" type="md-checkmark"></Icon>
-            </transition>
-            <span class="mes-type-btn-text">回收站</span>
-            <Badge
-              class="message-count-badge-outer"
-              class-name="message-count-badge"
-              :count="recyclebinCount"
-            ></Badge>
-          </div>
-        </Button>
-      </div>
-    </div>
-    <div class="message-content-con">
-      <transition name="view-message">
-        <div v-if="showMesTitleList" class="message-title-list-con">
-          <Table
-            ref="messageList"
-            :loading="loading"
-            :columns="mesTitleColumns"
-            :data="currentMesList"
-            :no-data-text="noDataText"
-          ></Table>
-          <Page
-            :current="params.pageNumber"
-            :total="total"
-            :page-size="params.pageSize"
-            @on-change="changePage"
-            @on-page-size-change="changePageSize"
-            :page-size-opts="[5,10]"
-            size="small"
-            show-total
-            show-elevator
-            show-sizer
-            class="page-fix"
-          ></Page>
-        </div>
-      </transition>
-      <transition name="back-message-list">
-        <div v-if="!showMesTitleList" class="message-view-content-con">
-          <div class="message-content-top-bar">
-            <span class="mes-back-btn-con">
-              <Button type="text" @click="backMesTitleList">
-                <Icon type="ios-arrow-back"></Icon>&nbsp;&nbsp;返回
-              </Button>
-            </span>
-            <h3 class="mes-title">{{ mes.title }}</h3>
-          </div>
-          <p class="mes-time-con">
-            <Icon type="android-time"></Icon>
-            &nbsp;&nbsp;{{ mes.time }}
-          </p>
-          <div class="message-content-body">
-            <p class="message-content" v-html="mes.content">{{ mes.content }}</p>
-          </div>
-        </div>
-      </transition>
-    </div>
-  </div>
-</template>
-
-<script>
-import Cookies from "js-cookie";
-import {
-  getMessageSendData,
-  editMessageSend,
-  deleteMessageSend
-} from "@/api/index";
-export default {
-  name: "message_index",
-  data() {
-    const markAsreadBtn = (h, params) => {
-      return h(
-        "Button",
-        {
-          props: {
-            icon: "md-eye-off",
-            size: "small"
-          },
-          on: {
-            click: () => {
-              // 标记已读
-              let v = params.row;
-              // 转换null为""
-              for (let attr in v) {
-                if (v[attr] == null) {
-                  v[attr] = "";
-                }
-              }
-              let str = JSON.stringify(v);
-              let data = JSON.parse(str);
-              data.status = 1;
-              this.loading = true;
-              editMessageSend(data).then(res => {
-                this.loading = false;
-                if (res.success) {
-                  this.$Message.success("操作成功");
-                  this.unreadCount -= 1;
-                  this.hasreadCount += 1;
-                  this.$store.commit("setMessageCount", this.unreadCount);
-                  this.refreshMessage();
-                }
-              });
-            }
-          }
-        },
-        "标为已读"
-      );
-    };
-    const deleteMesBtn = (h, params) => {
-      return h(
-        "Button",
-        {
-          props: {
-            icon: "md-trash",
-            size: "small",
-            type: "error"
-          },
-          on: {
-            click: () => {
-              // 移除
-              let v = params.row;
-              // 转换null为""
-              for (let attr in v) {
-                if (v[attr] == null) {
-                  v[attr] = "";
-                }
-              }
-              let str = JSON.stringify(v);
-              let data = JSON.parse(str);
-              data.status = 2;
-              this.loading = true;
-              editMessageSend(data).then(res => {
-                this.loading = false;
-                if (res.success) {
-                  this.$Message.success("操作成功");
-                  this.hasreadCount -= 1;
-                  this.recyclebinCount += 1;
-                  this.refreshMessage();
-                }
-              });
-            }
-          }
-        },
-        "删除"
-      );
-    };
-    const restoreBtn = (h, params) => {
-      return h(
-        "Button",
-        {
-          props: {
-            icon: "md-redo",
-            size: "small"
-          },
-          style: {
-            margin: "0 5px 0 0"
-          },
-          on: {
-            click: () => {
-              // 还原
-              let v = params.row;
-              // 转换null为""
-              for (let attr in v) {
-                if (v[attr] == null) {
-                  v[attr] = "";
-                }
-              }
-              let str = JSON.stringify(v);
-              let data = JSON.parse(str);
-              data.status = 1;
-              this.loading = true;
-              editMessageSend(data).then(res => {
-                this.loading = false;
-                if (res.success) {
-                  this.$Message.success("操作成功");
-                  this.recyclebinCount -= 1;
-                  this.hasreadCount += 1;
-                  this.refreshMessage();
-                }
-              });
-            }
-          }
-        },
-        "还原"
-      );
-    };
-    const deleteRealBtn = (h, params) => {
-      return h(
-        "Button",
-        {
-          props: {
-            icon: "md-trash",
-            size: "small",
-            type: "error"
-          },
-          on: {
-            click: () => {
-              // 彻底删除
-              let v = params.row;
-              this.loading = true;
-              deleteMessageSend(v.id).then(res => {
-                this.loading = false;
-                if (res.success) {
-                  this.$Message.success("操作成功");
-                  this.recyclebinCount -= 1;
-                  this.refreshMessage();
-                }
-              });
-            }
-          }
-        },
-        "彻底删除"
-      );
-    };
-    return {
-      loading: true, // 加载状态
-      params: { // 请求参数
-        userId: JSON.parse(Cookies.get("userInfo")).id,
-        status: 0,
-        pageNumber: 1, // 当前页数
-        pageSize: 10, // 页面大小
-        sort: "createTime", // 默认排序字段
-        order: "desc" // 默认排序方式
-      },
-      total: 0, // 消息总数
-      totalUnread: 0, // 所有未读消息数
-      totalRead: 0, // 所有已读消息数
-      totalRemove: 0, // 所有回收站消息数
-      currentMesList: [], // 当前消息列表
-      unreadMesList: [], // 未读消息列表
-      hasreadMesList: [], // 已读消息列表
-      recyclebinList: [], // 回收站消息
-      currentMessageType: "unread", // 展示消息类型
-      showMesTitleList: true, // 展示消息列表
-      unreadCount: 0, // 未读数
-      hasreadCount: 0, // 已读数
-      recyclebinCount: 0, // 回收站消息数量
-      noDataText: "暂无未读消息", // 无消息提示
-      mes: { // 信息表单
-        title: "",
-        time: "",
-        content: ""
-      },
-      mesTitleColumns: [
-        {
-          type: "index",
-          width: 50,
-          align: "center"
-        },
-        {
-          title: " ",
-          key: "title",
-          align: "left",
-          ellipsis: true,
-          render: (h, params) => {
-            return h("span", [
-              h(
-                "a",
-                {
-                  style: {
-                    margin: "0 30px 0 0"
-                  },
-                  on: {
-                    click: () => {
-                      this.showMesTitleList = false;
-                      this.mes.title = params.row.title;
-                      this.mes.time = params.row.createTime;
-                      this.getContent(params.row);
-                    }
-                  }
-                },
-                "【" + params.row.type + "】 " + params.row.title
-              )
-            ]);
-          }
-        },
-        {
-          title: " ",
-          key: "time",
-          align: "center",
-          width: 190,
-          render: (h, params) => {
-            return h("span", [
-              h("Icon", {
-                props: {
-                  type: "md-time",
-                  size: 16
-                },
-                style: {
-                  margin: "0 5px 3px 0"
-                }
-              }),
-              h("span", params.row.createTime)
-            ]);
-          }
-        },
-        {
-          title: " ",
-          key: "asread",
-          align: "center",
-          width: 210,
-          render: (h, params) => {
-            if (this.currentMessageType == "unread") {
-              return h("div", [markAsreadBtn(h, params)]);
-            } else if (this.currentMessageType == "hasread") {
-              return h("div", [deleteMesBtn(h, params)]);
-            } else {
-              return h("div", [
-                restoreBtn(h, params),
-                deleteRealBtn(h, params)
-              ]);
-            }
-          }
-        }
-      ]
-    };
-  },
-  methods: {
-    changePage(v) {
-      this.params.pageNumber = v;
-      this.refreshMessage();
-    },
-    changePageSize(v) {
-      this.params.pageSize = v;
-      this.refreshMessage();
-    },
-    refreshMessage() {
-      let status = 0;
-      let type = this.currentMessageType;
-      if (type == "unread") {
-        status = 0;
-      } else if (type == "hasread") {
-        status = 1;
-      } else {
-        status = 2;
-      }
-      this.params.status = status;
-      this.loading = true;
-      getMessageSendData(this.params).then(res => {
-        this.loading = false;
-        if (res.success) {
-          this.currentMesList = res.result.records;
-          this.total = res.result.total;
-        }
-      });
-    },
-    initMessage() {
-      this.params.status = 0;
-      getMessageSendData(this.params).then(res => {
-        if (res.success) {
-          this.unreadCount = res.result.total;
-          this.initReadMessage();
-        }
-      });
-    },
-    initReadMessage() {
-      this.params.status = 1;
-      getMessageSendData(this.params).then(res => {
-        if (res.success) {
-          this.hasreadCount = res.result.total;
-          this.initRemoveMessage();
-        }
-      });
-    },
-    initRemoveMessage() {
-      this.params.status = 2;
-      getMessageSendData(this.params).then(res => {
-        if (res.success) {
-          this.recyclebinCount = res.result.total;
-          this.setCurrentMesType("unread");
-        }
-      });
-    },
-    editMessage(status) {
-      editMessageSend().then(res => {
-        if (res.success) {
-          this.$Message.success("操作成功");
-        }
-      });
-    },
-    deleteMessage(id) {
-      deleteMessageSend(id).then(res => {
-        if (res.success) {
-          this.$Message.success("删除成功");
-        }
-      });
-    },
-    backMesTitleList() {
-      this.showMesTitleList = true;
-    },
-    setCurrentMesType(type) {
-      if (this.currentMessageType !== type) {
-        this.showMesTitleList = true;
-      }
-      this.currentMessageType = type;
-      if (type == "unread") {
-        this.noDataText = "暂无未读消息";
-      } else if (type == "hasread") {
-        this.noDataText = "暂无已读消息";
-      } else {
-        this.noDataText = "回收站无消息";
-      }
-      this.params.pageNumber = 1;
-      this.refreshMessage();
-    },
-    getContent(v) {
-      this.mes.content = v.content;
-    }
-  },
-  mounted() {
-    this.initMessage();
-  },
-  watch: {
-    // 监听路由变化通过id获取数据
-    $route(to, from) {
-      if (to.name == "message_index") {
-        this.initMessage();
-      }
-    }
-  }
-};
-</script>
-
diff --git a/manager/src/views/my-components/goodsSkuSelector/goodsSku.vue b/manager/src/views/my-components/goodsSkuSelector/goodsSku.vue
deleted file mode 100644
index 9473674c..00000000
--- a/manager/src/views/my-components/goodsSkuSelector/goodsSku.vue
+++ /dev/null
@@ -1,633 +0,0 @@
-<template>
-  <Collapse v-model="open_panel">
-    <Panel name="1">
-      规格名称
-      <div slot="content" class="sku-item-content">
-        <Form :model="skuForm" @submit.native.prevent style="width:100%;">
-          <div v-for="(item, $index) in skuInfo" :key="$index" class="sku_value">
-            <Card :bordered="true" style="margin: 15px 0;">
-              <FormItem label="规格名：" class="sku-item-content-name">
-                <AutoComplete
-                  style="width: 150px;"
-                  v-model="item.name"
-                  :maxlength="30"
-                  :data="skuKey"
-                  placeholder="请输入规格项名称"
-                  :filter-method="filterMethod"
-                  @on-change="skuItemChange(item.name,$index)"
-                  @keyup.enter.native="editSkuItem(item, $index)"
-                >
-                   <!-- @on-focus="getActiveSkuItem(index, $index ,item, val)"
-                   @on-blur="editSkuItem(item, $index)"
-                   on-change 变更
-                   on-focus	聚焦时触发	event
-                   on-blur	失焦时触发
-                   keyup.enter.native 回车时 -->
-                </AutoComplete>
-                <Button
-                  type="error"
-                  style="margin-left: 10px;"
-                  @click="handleCloseSkuItem($index)"
-                >删除</Button>
-                <Checkbox
-                  v-if="$index === 0"
-                  style="padding: 0px 0px 0px 30px;"
-                  v-model="checkedImage"
-                  @on-change="handleChangeImage"
-                >规格图片</Checkbox>
-              </FormItem>
-
-              <FormItem label="规格值：" class="sku-item-content-value">
-                <!--规格值文本列表-->
-                <div
-                  v-for="(val, index) in item.spec_values"
-                  :key="index"
-                  style="padding: 0px 20px 10px 0px;float: left"
-                >
-                  <div style="display:inline-block;">
-                    <AutoComplete
-                      style="width: 150px; float: left"
-                      v-model="val.value"
-                      :maxlength="30"
-                      :data="skuValue"
-                      placeholder="请输入规格值名称"
-                      :filter-method="filterMethod"
-                      @on-change="skuValueChange(val.value,$index)"
-                      @on-focus="editSkuIValue($index)"
-                      @keyup.enter.native="editSkuIValue(item, val, $index, index)"
-                    ></AutoComplete>
-                    <Button
-                      type="error"
-                      style="float: left;margin-left: 10px"
-                      @click="handleCloseSkuValue($index, index)"
-                    >删除</Button>
-                  </div>
-                  <div>
-                    <upload-pic-thumb
-                        style="text-align: left;"
-                        v-show="$index === 0 && checkedImage"
-                        v-model="val.spec_image" v-on:change="thumbChange" :multiple="false" v-on:uploadchange="uploadchange"
-                    />
-                  </div>
-                </div>
-                <div style="float: left">
-                  <Button type="primary" @click="addSpec($index, item)">添加规格值</Button>
-                </div>
-              </FormItem>
-            </Card>
-          </div>
-        </Form>
-        <Button type="primary" size="mini" @click="addSkuItem">添加规格项目</Button>
-      </div>
-    </Panel>
-    <Panel name="2">
-      规格详细
-      <div slot="content">
-        <div slot="content">
-          <Table
-            :columns="skuTableColumn"
-            :data="skuTableData"
-            style="width: 100%;.ivu-table-overflowX{ overflow-x: hidden;}"
-            :span-method="handleSpan"
-          >
-            <template slot-scope="{ row }" slot="sn">
-              <Input
-                v-model="row.sn"
-                placeholder="请输入货号"
-                @on-change="updateSkuTable(row,'sn')"
-                @on-focus="updateSkuTable(row,'sn')"
-                @on-blur="updateSkuTable(row,'sn')"
-              />
-            </template>
-
-            <template slot-scope="{ row }" slot="weight">
-              <Input
-                v-model="row.weight"
-                placeholder="请输入重量"
-                @on-change="updateSkuTable(row,'weight')"
-              />
-            </template>
-
-            <template slot-scope="{ row }" slot="quantity">
-              <Input
-                v-model="row.quantity"
-                placeholder="请输入库存"
-                @on-change="updateSkuTable(row,'quantity')"
-              />
-            </template>
-
-            <template slot-scope="{ row }" slot="cost">
-              <Input
-                v-model="row.cost"
-                placeholder="请输入成本价"
-                @on-change="updateSkuTable(row,'cost')"
-              />
-            </template>
-
-            <template slot-scope="{ row }" slot="price">
-              <Input
-                v-model="row.price"
-                placeholder="请输入成本价"
-                @on-change="updateSkuTable(row,'price')"
-              />
-            </template>
-          </Table>
-        </div>
-      </div>
-    </Panel>
-  </Collapse>
-</template>
-<script>
-  import { regular } from "@/utils";
-  import uploadPicThumb from "../lili/upload-pic-thumb.vue";
-  import cloneObj from "@/utils/index";
-export default {
-  name: "goodsSku",
-  components: {
-    uploadPicThumb
-  },
-  props: {
-    open_panel: {
-      type: [String, Number],
-      default: false
-    },
-    /** 是否自动生成货号 */
-    productSn: {
-      type: Boolean,
-      default: false
-    },
-    /** 当前商品编号 */
-    goodsSn: {
-      type: [String, Number],
-      default: ['', 0]
-    }
-  },
-  data() {
-    return {
-      /** 请求数据*/
-      skuData: [],
-
-      /** 当前可选择的 规格名称*/
-      skuKey: [],
-
-      /** 当前可选择的 规格值*/
-      skuValue: [],
-
-      /** 表单数据*/
-      skuForm: {},
-      /** 表格头 */
-      skuTableColumn: [],
-      /** 表格数据 */
-      skuTableData: [
-        {
-          sn: '',
-          weight: '',
-          quantity: '',
-          cost: '',
-          price: ''
-        }
-      ],
-      /** 要提交的规格数据*/
-      skuInfo: [],
-
-      /** 当前规格项下的规格值列表*/
-      specList: [],
-
-      /** 当前规格项索引 */
-      activeSkuItemIndex: 0,
-
-      /** 当前规格项 */
-      activeSkuItem: {},
-
-      /** 规格图片 */
-      images: [],
-      /** 当前规格值索引 */
-      activeSkuValIndex: 0,
-
-      /** 当前规格值 */
-      activeSkuVal: {},
-      /** 存储未通过校验的单元格位置  */
-      validateError: [],
-      //规格照片
-      checkedImage:false
-    };
-  },
-  mounted(){
-
-  },
-  watch: {
-    /** 自动生成货号 */
-    productSn() {
-      if (this.productSn && this.skuTableData.length > 0) {
-        let count = 1
-        this.skuTableData.forEach(key => {
-          key.sn = this.goodsSn + '-00000' + count
-          count++
-        })
-        /** 异步更新skuTableData数据 */
-        this.$emit("getTableData", this.skuTableData);
-      }
-    }
-  },
-  methods: {
-    uploadchange(url){
-      /**
-       * 渲染规格详细表格
-       */
-      this.renderTableData();
-    },
-    /** 添加规格项 */
-    addSkuItem() {
-      // 写入对象，下标，具体对象
-      this.$set(this.skuInfo, this.skuInfo.length, {
-        spec_values: []
-      });
-      /**
-       * 渲染规格详细表格
-       */
-      this.renderTableData();
-    },
-
-    /** 移除当前规格项 进行数据变化*/
-    handleCloseSkuItem($index) {
-      this.skuInfo.splice($index, 1);
-      /**
-       * 渲染规格详细表格
-       */
-      this.renderTableData();
-    },
-
-    /** 规格变更  */
-    skuItemChange(value, $index) {
-      this.activeSkuItemIndex = $index;
-      //判定是否存在这个规格分组
-      let item = this.findSpec(value);
-      /** 更新skuInfo数据 */
-      this.$set(this.skuInfo[this.activeSkuItemIndex], "name", item.name);
-      this.$set(this.skuInfo[this.activeSkuItemIndex], "spec_values", []);
-      /**
-       * 渲染规格详细表格
-       */
-      this.renderTableData();
-    },
-    /**
-     * 根据规格项名称，搜索对应的规格对象（如果是服务器设置过的话）
-     */
-    findSpec(name) {
-      let spec = { name: name };
-      this.skuData.forEach(item => {
-        if (item.name === name) {
-          spec = item;
-        }
-      });
-      return spec;
-    },
-
-    /** 选中/不选中 添加规格图片 是否显示上传组件*/
-    handleChangeImage(val) {
-      this.$set(this.skuInfo, this.skuInfo.length, {});
-      this.skuInfo.splice(this.skuInfo.length - 1, 1);
-      this.checkedImage = val;
-      /** 如果 图片按钮不显示 则置空图片列表中的所有图片数据 并且spec_type设置为0 */
-      if (!val) {
-        this.skuInfo.forEach(key => {
-          if (key.spec_values) {
-            key.spec_values.forEach(item => {
-              item.spec_image = "";
-            });
-          }
-        });
-      }
-       /**
-        * 渲染规格详细表格
-        */
-      this.renderTableData();
-
-
-    },
-
-    /** 规格值 */
-
-    /** 添加当前规格项的规格值*/
-    addSpec($index, item) {
-      this.activeSkuItemIndex = $index;
-      this.$set(
-        this.skuInfo[$index].spec_values,
-        this.skuInfo[$index].spec_values.length,
-        {
-          name: item.name
-        }
-      );
-      /**
-       * 渲染规格详细表格
-       */
-      this.renderTableData();
-    },
-
-    /** 移除当前规格值 */
-    handleCloseSkuValue($index, index) {
-      this.skuInfo[$index].spec_values.splice(index, 1);
-      /**
-       * 渲染规格详细表格
-       */
-      this.renderTableData();
-    },
-
-    /** 选择规格值时触发 */
-    skuValueChange(val) {
-      /** 更新skuInfo数据 */
-      let _arr = cloneObj(this.skuInfo[this.activeSkuItemIndex]);
-      this.$set(_arr.spec_values[this.activeSkuValIndex], "name", _arr.name);
-      this.$set(this.skuInfo, this.activeSkuItemIndex, _arr);
-      /**
-       * 渲染规格详细表格
-       */
-      this.renderTableData();
-    },
-
-    /** 编辑规格值时触发 */
-    editSkuIValue($index) {
-      if (this.skuInfo.length >= $index) {
-        let data = this.findSpec(this.skuInfo[$index].name);
-        this.skuValue = data.value;
-      }
-      /**
-       * 渲染规格详细表格
-       */
-      this.renderTableData();
-    },
-    /** 获取编辑时的skuInfo信息 */
-    getSkuInfo() {
-      /** 下拉列表数据(skuData)存在时 检测productSkuInfo中对应的规格(spec_id)项 并且赋值于skuInfo中对应的规格项信息（描述 + 名称） */
-      if (this.categoryId) {
-        API_spec.getSpecValuesListData(this.categoryId, {}).then(response => {
-          this.skuData = response;
-          if (
-            this.skuData.length > 0 &&
-            Array.isArray(this.productSkuInfo) &&
-            this.productSkuInfo.length > 0
-          ) {
-            this.skuInfo = cloneObj(this.productSkuInfo);
-            if (this.skuInfo.length > 0) {
-              this.skuInfo.forEach(key => {
-                this.skuData.forEach(item => {
-                  if (key.spec_id === item.spec_id) {
-                    key.name = item.name;
-                    key.spec_memo = item.spec_memo;
-                  }
-                });
-              });
-            }
-            /** 如果存在图片则进行显示 */
-            if (this.skuInfo[0].spec_values[0].spec_type === 1) {
-              this.checkedImage = true;
-            }
-            /** 触发一次数据转换（规格选择数据=> 规格表格数据） */
-          }
-        });
-      }
-      /**
-       * 渲染规格详细表格
-       */
-      this.renderTableData();
-    },
-    /**
-     * 渲染table所需要的column 和 data
-     */
-    renderTableData() {
-      this.skuTableColumn = [];
-      this.skuTableData = [];
-
-      //渲染头部
-
-      this.skuInfo.forEach(sku => {
-        //列名称
-        let columnName = sku.name;
-        this.skuTableColumn.push({
-          title: columnName,
-          key: columnName
-        });
-      });
-      this.skuTableColumn.push(
-        {
-          title: "货号",
-          slot: "sn"
-        },
-        {
-          title: "重量",
-          slot: "weight"
-        },
-        {
-          title: "库存",
-          slot: "quantity"
-        },
-        {
-          title: "成本价",
-          slot: "cost"
-        },
-        {
-          title: "价格",
-          slot: "price"
-        }
-      );
-
-      //克隆所有渲染的数据
-      let cloneTemp = cloneObj(this.skuInfo);
-
-      //数据清空一次
-      this.skuTableData = [];
-      //判定 是否存在规格分组
-      if (cloneTemp[0]) {
-        //存放最终结果
-        let result = [];
-
-        //记录存放表格的 key
-        //循环选中的 sku 数据
-        if(this.checkedImage===false){
-         cloneTemp[0].spec_values.forEach(specItem => {
-           result.push({
-             [specItem.name]: specItem.value
-           });
-         });
-        }else{
-          cloneTemp[0].spec_values.forEach(specItem => {
-            result.push({
-              [specItem.name]: specItem.value,
-              images: specItem.spec_image
-            });
-          });
-        }
-
-        cloneTemp.splice(0, 1);
-
-        result = this.specIterator(result, cloneTemp);
-        result = this.defaultParams(result);
-        this.skuTableData = result;
-      }
-      this.$emit("getTableData", this.skuTableData);
-    },
-
-    /** 自动完成表单所需方法*/
-    filterMethod(value, option) {
-      return option.toUpperCase().indexOf(value.toUpperCase()) !== -1;
-    },
-
-    /** 根据分类id获取系统设置规格信息*/
-    Get_SkuInfoByCategory() {
-      if (this.baseInfoForm.categoryId) {
-        getGoodsSpecInfo(this.baseInfoForm.categoryId, {}).then(response => {
-          this.skuData = response;
-          if (this.skuData.length > 0) {
-            this.skuData.forEach(spec => {
-              this.skuKey.push(spec.name);
-            });
-          }
-        });
-      }
-    },
-    /** 检测是否未通过0-99999999之间的数字校验 */
-    isValidate(index, scope) {
-      return this.validateError.some(key => {
-        return key[0] === index && key[1] === scope.$index
-      })
-    },
-    /** 数据改变之后 抛出数据 */
-    updateSkuTable(row, item) {
-      let index = row._index;
-      this.skuTableData[index][item] = row[item];
-      /** 进行自定义校验 判断是否是数字（小数也能通过）重量 */
-      if (
-        (!/^[+]{0,1}(\d+)$|^[+]{0,1}(\d+\.\d+)$/.test(row[item]) &&
-          item === "weight") ||
-        parseInt(row[item]) < 0 ||
-        parseInt(row[item]) > 99999999
-      ) {
-        this.$Message.error("请输入0~99999999之间的数字值");
-        return;
-      } else if (
-        (item === "quantity" && !/^[0-9]\d*$/.test(row[item])) ||
-        parseInt(row[item]) < 0 ||
-        parseInt(row[item]) > 99999999
-      ) {
-        // 库存
-        this.$Message.error("请输入0~99999999之间的整数");
-        return;
-      } else if (
-        ((item === "cost" || item === "price") &&
-          !regular.money.test(row[item])) ||
-        parseInt(row[item]) < 0 ||
-        parseInt(row[item]) > 99999999
-      ) {
-        // 成本价 价格
-        this.$Message.error("请输入0~99999999之间的价格");
-        return;
-      }
-      this.skuTableData[index][item] = row[item];
-      this.$emit("getTableData", this.skuTableData);
-      // console.log(999, this.skuTableData)
-    },
-    /**
-     * 迭代属性，形成表格
-     * result 渲染的数据
-     * array spec数据
-     */
-    specIterator(result, cloneTemp) {
-      //是否还可以循环
-      if (cloneTemp.length > 0) {
-        let table = [];
-        result.forEach(resItem => {
-          let tableItem = [];
-          cloneTemp[0].spec_values.forEach(valItem => {
-            let obj = cloneObj(resItem);
-            obj[valItem.name] = valItem.value;
-            table.push(obj);
-          });
-        });
-        result = [];
-        table.forEach(t => {
-          result.push(t);
-        });
-        //清除当前循环的分组
-        cloneTemp.splice(0, 1);
-      } else {
-        return result;
-      }
-      return this.specIterator(result, cloneTemp);
-    },
-    showData() {
-      // console.log(JSON.stringify(this.skuTableData));
-      // console.warn(this.specList);
-    },
-    /**
-     * 添加固有属性
-     */
-    defaultParams(tableData) {
-      return tableData;
-    },
-
-    handleSpan({ row, column, rowIndex, columnIndex }) {},
-
-    thumbChange(){
-      this.$emit("getTableData", this.skuTableData);
-    }
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-.layout {
-    margin-bottom: 20px;
-
-    .sku-item-content {
-        display: flex;
-        flex-direction: column;
-        align-items: flex-start;
-        justify-content: center;
-        width: 100%;
-
-        .sku-item-content-name {
-            margin-top: 24px;
-            display: flex;
-            align-items: flex-start;
-            width: 100%;
-        }
-    }
-    .demo-upload-list{
-        display: inline-block;
-        width: 60px;
-        height: 60px;
-        text-align: center;
-        line-height: 60px;
-        border: 1px solid transparent;
-        border-radius: 4px;
-        overflow: hidden;
-        background: #fff;
-        position: relative;
-        box-shadow: 0 1px 1px rgba(0,0,0,.2);
-        margin-right: 4px;
-    }
-    .demo-upload-list img{
-        width: 100%;
-        height: 100%;
-    }
-    .demo-upload-list-cover{
-        display: none;
-        position: absolute;
-        top: 0;
-        bottom: 0;
-        left: 0;
-        right: 0;
-        background: rgba(0,0,0,.6);
-    }
-    .demo-upload-list:hover .demo-upload-list-cover{
-        display: block;
-    }
-    .demo-upload-list-cover i{
-        color: #fff;
-        font-size: 20px;
-        cursor: pointer;
-        margin: 0 2px;
-    }
-
-}
-</style>
diff --git a/manager/src/views/my-components/lili/count-down-button.vue b/manager/src/views/my-components/lili/count-down-button.vue
deleted file mode 100644
index d4ccbd1c..00000000
--- a/manager/src/views/my-components/lili/count-down-button.vue
+++ /dev/null
@@ -1,114 +0,0 @@
-<template>
-  <div>
-    <Button
-      :countTime="countTime"
-      :loading="loading"
-      :type="type"
-      :size="size"
-      :ghost="ghost"
-      :disabled="disabled||clicked"
-      :icon="icon"
-      :shape="shape"
-      :long="long"
-      @click="handleClick"
-    >{{buttonText}}</Button>
-  </div>
-</template>
-
-<script>
-export default {
-  name: "iconChoose",
-  props: {
-    text: {
-      type: String,
-      default: "提交"
-    },
-    autoCountDown: {
-      type: Boolean,
-      default: true
-    },
-    countTime: {
-      type: [Number, String],
-      default: 60
-    },
-    suffixText: {
-      type: String,
-      default: "后重试"
-    },
-    type: String,
-    size: String,
-    loading: {
-      type: Boolean,
-      default: false
-    },
-    ghost: {
-      type: Boolean,
-      default: false
-    },
-    disabled: {
-      type: Boolean,
-      default: false
-    },
-    icon: String,
-    shape: String,
-    long: {
-      type: Boolean,
-      default: false
-    }
-  },
-  data() {
-    return {
-      buttonText: this.text, // 按钮文字
-      count: Number(this.countTime), // 计时时间
-      clicked: false // 是否可点击
-    };
-  },
-  methods: {
-    init() {},
-    handleClick() {
-      if (this.autoCountDown) {
-        this.clicked = true;
-        this.countDown();
-      }
-      this.$emit("on-click", true);
-    },
-    startCountDown() {
-      this.clicked = true;
-      this.countDown();
-    },
-    countDown() {
-      let that = this;
-      if (this.count == 0) {
-        this.clicked = false;
-        this.count = this.countTime;
-        this.buttonText = this.text;
-        return;
-      } else {
-        this.buttonText = this.count + " 秒" + this.suffixText;
-        this.count--;
-      }
-      setTimeout(function() {
-        that.countDown();
-      }, 1000);
-    },
-    setText(value) {
-      if (value === this.buttonText) {
-        return;
-      }
-      this.buttonText = value;
-    },
-  },
-  watch: {
-    text(val) {
-      this.setText(val);
-    }
-  },
-  mounted() {
-    this.init();
-  }
-};
-</script>
-
-<style lang="scss">
-</style>
-
diff --git a/manager/src/views/my-components/lili/coupon-choose.vue b/manager/src/views/my-components/lili/coupon-choose.vue
deleted file mode 100644
index 2f84c134..00000000
--- a/manager/src/views/my-components/lili/coupon-choose.vue
+++ /dev/null
@@ -1,346 +0,0 @@
-<template>
-  <div class="sku-choose">
-    <Button @click="showDrawer=true" :icon="icon">{{ text }}</Button>
-    <span @click="clearSelectData" class="clear">清空已选</span>
-    <Collapse simple class="collapse">
-      <Panel name="1">
-        已选择
-        <span class="select-count">{{ selectObj.length }}</span> 件
-        <p slot="content">
-          <Tag
-            v-for="(item, i) in selectObj"
-            :key="i"
-            :name="item.id"
-            color="default"
-            closable
-            @on-close="handleCancelObj"
-          >{{ createName(item) }}
-          </Tag>
-        </p>
-      </Panel>
-    </Collapse>
-    <Drawer title="选择活动优惠券" closable v-model="showDrawer" :width="width" draggable>
-      <Table
-        :loading="showLoading"
-        border
-        :columns="tableColumns"
-        :data="tableData"
-        :height="height"
-        ref="tableData"
-      ></Table>
-      <Row type="flex" justify="end" style="margin: 10px 0;">
-        <Page
-          :current="searchForm.pageNumber"
-          :total="tableTotal"
-          :page-size="searchForm.pageSize"
-          @on-change="changeDataPage"
-          @on-page-size-change="changeDataPageSize"
-          :page-size-opts="[10,20,50]"
-          size="small"
-          show-total
-          show-elevator
-          show-sizer
-        ></Page>
-      </Row>
-      <div class="my-drawer-footer">
-        已选择
-        <span class="select-count">{{ selectObj.length }}</span> 件
-        <Button @click="clearSelectData" style="margin-left:10px">清空已选</Button>
-        <Button @click="showDrawer=false" type="primary" style="margin-left:10px">关闭</Button>
-      </div>
-    </Drawer>
-  </div>
-</template>
-
-<script>
-import {
-  getPlatformCouponList
-} from "@/api/promotion";
-
-export default {
-  name: "userChoose",
-  props: {
-    text: {
-      type: String,
-      default: "选择SKU"
-    },
-    icon: {
-      type: String,
-      default: "md-basket"
-    },
-    initData: {
-      type: Array,
-      default: []
-    },
-    createName: {
-      type: Function,
-      default: function (item) {
-        return item.goodsName
-      }
-    }
-  },
-  mounted() {
-    this.selectObj = this.initData
-    console.log(JSON.stringify(this.initData))
-  },
-  data() {
-    return {
-      //默认值后续计算
-      height: 500,
-      width: 500,
-      //加载状态
-      showLoading: true,
-      //展示抽屉
-      showDrawer: false,
-      selectObj: [], // 选择数据
-      searchForm: { // 请求参数
-        getType: "ACTIVITY",// 活动优惠券
-        pageNumber: 1, // 当前页数
-        pageSize: 10, // 页面大小
-        sort: "createTime", // 默认排序字段
-        order: "desc", // 默认排序方式
-
-      },
-      tableColumns: [ // 表头
-        {
-          type: "index",
-          width: 60,
-          align: "center"
-        },
-        {
-          title: "商品名称",
-          key: "goodsName",
-          minWidth: 140
-        },
-        {
-          title: "规格",
-          key: "specName",
-          minWidth: 140,
-        },
-        {
-          title: "图片",
-          key: "thumbnail",
-          width: 80,
-          align: "center",
-          render: (h, params) => {
-            return h("Avatar", {
-              props: {
-                src: params.row.face
-              }
-            });
-          }
-        },
-        {
-          title: "状态",
-          key: "status",
-          align: "center",
-          width: 120,
-          render: (h, params) => {
-            if (params.row.delFlag == 0) {
-              return h("div", [
-                h("Badge", {
-                  props: {
-                    status: "success",
-                    text: "正常"
-                  }
-                })
-              ]);
-            } else if (params.row.delFlag == -1) {
-              return h("div", [
-                h("Badge", {
-                  props: {
-                    status: "error",
-                    text: "禁用"
-                  }
-                })
-              ]);
-            }
-          }
-        },
-        {
-          title: "创建时间",
-          key: "createTime",
-          sortable: true,
-          sortType: "desc",
-          width: 170
-        },
-        {
-          title: "操作",
-          key: "action",
-          width: 130,
-          align: "center",
-          fixed: "right",
-          render: (h, params) => {
-            let select;
-            this.selectObj.forEach(item => {
-              if (item.id === params.row.id) {
-                select = params.row
-              }
-            });
-
-            if (select) {
-              return h("div", [
-                h(
-                  "Button",
-                  {
-                    props: {
-                      type: "info",
-                      size: "small"
-                    },
-                    on: {
-                      click: () => {
-                        this.chooseCancel(params.row);
-                      }
-                    }
-                  },
-                  "取消选择"
-                )
-              ]);
-            } else {
-              return h("div", [
-                h(
-                  "Button",
-                  {
-                    props: {
-                      type: "info",
-                      size: "small"
-                    },
-                    on: {
-                      click: () => {
-                        this.chooseObj(params.row);
-                      }
-                    }
-                  },
-                  "选择"
-                )
-              ]);
-            }
-          }
-        }
-      ],
-      tableData: [], // 表格数据
-      tableTotal: 0 // 总数
-    };
-  },
-  methods: {
-    changeDataPage(v) {
-      this.searchForm.pageNumber = v;
-      this.searchData();
-    },
-    changeDataPageSize(v) {
-      this.searchForm.pageSize = v;
-      this.searchData();
-    },
-    searchData() {
-      this.showLoading = true;
-      getPlatformCouponList(this.searchForm).then(res => {
-        this.showLoading = false;
-        if (res.success) {
-          this.tableData = res.result.records;
-          this.tableTotal = res.result.total;
-        }
-      });
-
-    },
-    handleSearchData() {
-      this.searchForm.pageNumber = 1;
-      this.searchForm.pageSize = 10;
-      this.searchData();
-    },
-    handleResetObj() {
-      this.$refs.searchForm.resetFields();
-      this.searchForm.pageNumber = 1;
-      this.searchForm.pageSize = 9;
-      this.searchForm.departmentId = "";
-      // 重新加载数据
-      this.searchData();
-    },
-    setData(v) {
-      this.selectObj = v;
-      this.$emit("on-change", this.selectObj);
-    },
-    chooseCancel(v) {
-      let _index;
-      this.selectObj.forEach((e, index) => {
-        if (v.id == e.id) {
-          _index = index;
-        }
-      });
-
-      if (_index || _index == 0) {
-        this.selectObj.splice(_index, 1);
-        this.$emit("on-change", this.selectObj);
-      }
-    },
-    chooseObj(v) {
-      // 去重
-      let that = this;
-      let flag = true;
-      this.selectObj.forEach(e => {
-        if (v.id == e.id) {
-          flag = false;
-        }
-      });
-      if (flag) {
-        this.selectObj.push(v);
-        this.$emit("on-change", this.selectObj);
-      }
-    },
-    clearSelectData() {
-      this.selectObj = [];
-      this.$emit("on-change", this.selectObj);
-    },
-    handleCancelObj(e, id) {
-      // 删除所选用户
-      let newArray = [];
-      this.selectObj.forEach(e => {
-        if (id != e.id) {
-          newArray.push(e);
-        }
-      });
-      this.selectObj = newArray;
-      this.$emit("on-change", this.selectObj);
-    }
-  },
-  created() {
-    // 计算高度
-    this.height = Number(document.documentElement.clientHeight - 230);
-    this.width = Number(document.documentElement.clientWidth / 2) > 900 ? 900 : Number(document.documentElement.clientWidth / 2)
-    this.searchData();
-
-  }
-};
-</script>
-
-<style lang="scss" scoped>
-.sku-choose {
-  .clear {
-    font-size: 12px;
-    margin-left: 15px;
-    color: #40a9ff;
-    cursor: pointer;
-  }
-
-  .collapse {
-    font-size: 12px;
-    margin-top: 15px;
-  }
-
-  .select-count {
-    font-weight: 600;
-    color: #40a9ff;
-  }
-}
-
-.my-drawer-footer {
-  z-index: 10;
-  width: 100%;
-  position: absolute;
-  bottom: 0;
-  left: 0;
-  border-top: 1px solid #e8e8e8;
-  padding: 10px 16px;
-  text-align: right;
-  background: #fff;
-}
-</style>
diff --git a/manager/src/views/my-components/lili/department-choose.vue b/manager/src/views/my-components/lili/department-choose.vue
index 56012086..ffc07bb1 100644
--- a/manager/src/views/my-components/lili/department-choose.vue
+++ b/manager/src/views/my-components/lili/department-choose.vue
@@ -14,7 +14,7 @@
 </template>
 
 <script>
-import { initDepartment, loadDepartment } from "@/api/index";
+import { initDepartment } from "@/api/index";
 export default {
   name: "departmentChoose",
   props: {
@@ -27,50 +27,13 @@ export default {
     };
   },
   methods: {
+    // 获取部门数据
     initDepartmentData() {
       initDepartment().then(res => {
         if (res.success) {
-          res.result.forEach(function(e) {
-            if (e.isParent) {
-              e.value = e.id;
-              e.label = e.title;
-              e.loading = false;
-              e.children = [];
-            } else {
-              e.value = e.id;
-              e.label = e.title;
-            }
-            if (e.status == -1) {
-              e.label = "[已禁用] " + e.label;
-              e.disabled = true;
-            }
-          });
-          this.department = res.result;
-        }
-      });
-    },
-    loadData(item, callback) {
-      item.loading = true;
-      loadDepartment(item.value).then(res => {
-        item.loading = false;
-        if (res.success) {
-          res.result.forEach(function(e) {
-            if (e.isParent) {
-              e.value = e.id;
-              e.label = e.title;
-              e.loading = false;
-              e.children = [];
-            } else {
-              e.value = e.id;
-              e.label = e.title;
-            }
-            if (e.status == -1) {
-              e.label = "[已禁用] " + e.label;
-              e.disabled = true;
-            }
-          });
-          item.children = res.result;
-          callback();
+          const arr = res.result;
+          this.filterData(arr)
+          this.department = arr
         }
       });
     },
@@ -82,8 +45,21 @@ export default {
       }
       this.$emit("on-change", departmentId);
     },
+    // 清空已选列表
     clearSelect() {
       this.selectDep = [];
+    },
+    // 处理部门数据
+    filterData (data) {
+      data.forEach(e => {
+        e.value = e.id;
+        e.label = e.title;
+        if (e.children) {
+          this.filterData(e.children)
+        } else {
+          return
+        }
+      })
     }
   },
   created() {
diff --git a/manager/src/views/my-components/lili/department-tree-choose.vue b/manager/src/views/my-components/lili/department-tree-choose.vue
index be98d667..34200c70 100644
--- a/manager/src/views/my-components/lili/department-tree-choose.vue
+++ b/manager/src/views/my-components/lili/department-tree-choose.vue
@@ -22,7 +22,6 @@
           <div class="dep-tree-bar">
             <Tree
               :data="dataDep"
-              :load-data="loadData"
               @on-select-change="selectTree"
             ></Tree>
             <Spin size="large" fix v-if="depLoading"></Spin>
@@ -34,7 +33,7 @@
 </template>
 
 <script>
-import {initDepartment, loadDepartment, searchDepartment} from "@/api/index";
+import {initDepartment, searchDepartment} from "@/api/index";
 
 export default {
   name: "departmentTreeChoose",
@@ -63,40 +62,14 @@ export default {
     };
   },
   methods: {
+    // 获取部门数据
     initDepartmentData() {
       initDepartment().then(res => {
         if (res.success) {
-          res.result.forEach(function (e) {
-            if (e.isParent) {
-              e.loading = false;
-              e.children = [];
-            }
-            if (e.status == -1) {
-              e.title = "[已禁用] " + e.title;
-              e.disabled = true;
-            }
-          });
           this.dataDep = res.result;
         }
       });
     },
-    loadData(item, callback) {
-      loadDepartment(item.id).then(res => {
-        if (res.success) {
-          res.result.forEach(function (e) {
-            if (e.isParent) {
-              e.loading = false;
-              e.children = [];
-            }
-            if (e.status == -1) {
-              e.title = "[已禁用] " + e.title;
-              e.disabled = true;
-            }
-          });
-          callback(res.result);
-        }
-      });
-    },
     searchDep() {
       // 搜索部门
       if (this.searchKey) {
@@ -117,6 +90,7 @@ export default {
         this.initDepartmentData();
       }
     },
+    // 选择回调
     selectTree(v) {
       if (v.length === 0) {
         this.$emit("on-change", null);
@@ -132,6 +106,7 @@ export default {
       }
       this.$emit("on-change", department);
     },
+    // 清除选中方法
     clearSelect() {
       this.departmentId = [];
       this.departmentTitle = "";
@@ -143,6 +118,7 @@ export default {
       }
       this.$emit("on-clear");
     },
+    // 设置数据 回显用
     setData(ids, title) {
       this.departmentTitle = title;
       if (this.multiple) {
@@ -151,7 +127,6 @@ export default {
         this.departmentId = [];
         this.departmentId.push(ids);
       }
-      // this.$emit("on-change", this.departmentId);
     }
   },
   created() {
diff --git a/manager/src/views/my-components/lili/editor.vue b/manager/src/views/my-components/lili/editor.vue
index cc064388..7c2c7aef 100644
--- a/manager/src/views/my-components/lili/editor.vue
+++ b/manager/src/views/my-components/lili/editor.vue
@@ -159,16 +159,19 @@ export default {
         }
       }
     },
+    // 编辑html
     editHTML() {
       this.dataEdit = this.data;
       this.showHTMLModal = true;
     },
+    // 保存
     editHTMLOk() {
       editor.txt.html(this.dataEdit);
       this.$emit("input", this.data);
       this.$emit("on-change", this.data);
       this.showHTMLModal = false;
     },
+    // 清空编辑器
     clear() {
       this.$Modal.confirm({
         title: "确认清空",
@@ -181,6 +184,7 @@ export default {
         },
       });
     },
+    // 回显数据
     setData(value) {
       if (!editor) {
         this.initEditor();
diff --git a/manager/src/views/my-components/lili/member-choose.vue b/manager/src/views/my-components/lili/member-choose.vue
deleted file mode 100644
index ca0dd6b0..00000000
--- a/manager/src/views/my-components/lili/member-choose.vue
+++ /dev/null
@@ -1,346 +0,0 @@
-<template>
-  <div class="member-choose">
-    <Button @click="userModalVisible=true" :icon="icon">{{text}}</Button>
-    <span @click="clearSelectData" class="clear">清空已选</span>
-    <Collapse simple class="collapse">
-      <Panel name="1">
-        已选择
-        <span class="select-count">{{selectUsers.length}}</span> 人
-        <p slot="content">
-          <Tag
-            v-for="(item, i) in selectUsers"
-            :key="i"
-            :name="item.id"
-            color="default"
-            closable
-            @on-close="handleCancelUser"
-          >{{item.username}}
-          </Tag>
-        </p>
-      </Panel>
-    </Collapse>
-    <Drawer title="选择用户" closable v-model="userModalVisible" width="800" draggable>
-      <Form ref="searchUserForm" :model="searchUserForm" inline :label-width="55">
-        <Form-item label="用户名" prop="username">
-          <Input
-            type="text"
-            v-model="searchUserForm.username"
-            clearable
-            placeholder="请输入用户名"
-            style="width: 200px"
-          />
-        </Form-item>
-        <Form-item style="margin-left:-35px;" class="br">
-          <Button @click="handleSearchUser" type="primary" icon="ios-search">搜索</Button>
-          <Button @click="handleResetUser">重置</Button>
-        </Form-item>
-      </Form>
-      <Table
-        :loading="userLoading"
-        border
-        :columns="userColumns"
-        :data="userData"
-        :height="height"
-        ref="userTable"
-      ></Table>
-      <Row type="flex" justify="end" style="margin: 10px 0;">
-        <Page
-          :current="searchUserForm.pageNumber"
-          :total="totalUser"
-          :page-size="searchUserForm.pageSize"
-          @on-change="changeUserPage"
-          @on-page-size-change="changeUserPageSize"
-          :page-size-opts="[10,20,50]"
-          size="small"
-          show-total
-          show-elevator
-          show-sizer
-        ></Page>
-      </Row>
-      <div class="my-drawer-footer">
-        已选择
-        <span class="select-count">{{selectUsers.length}}</span> 人
-        <Button @click="clearSelectData" style="margin-left:10px">清空已选</Button>
-        <Button @click="userModalVisible=false" type="primary" style="margin-left:10px">关闭</Button>
-      </div>
-    </Drawer>
-  </div>
-</template>
-
-<script>
-  import {getMember} from "@/api/member";
-
-  export default {
-    name: "userChoose",
-    props: {
-      text: {
-        type: String,
-        default: "选择会员"
-      },
-      icon: {
-        type: String,
-        default: "md-person-add"
-      }
-    },
-    data() {
-      return {
-        height: 500, // 表格高度
-        userLoading: true, // 加载状态
-        userModalVisible: false, // modal显隐
-        selectUsers: [], // 已选用户
-        searchUserForm: { // 请求参数
-          username: "",
-          pageNumber: 1, // 当前页数
-          pageSize: 10, // 页面大小
-          sort: "createTime", // 默认排序字段
-          order: "desc" // 默认排序方式
-        },
-        userColumns: [ // 表头
-          {
-            type: "index",
-            width: 60,
-            align: "center"
-          },
-          {
-            title: "用户名",
-            key: "username",
-            minWidth: 140,
-            sortable: true
-          },
-          {
-            title: "头像",
-            key: "face",
-            width: 80,
-            align: "center",
-            render: (h, params) => {
-              return h("Avatar", {
-                props: {
-                  src: params.row.face
-                }
-              });
-            }
-          },
-          {
-            title: "手机",
-            key: "mobile",
-            width: 125,
-            sortable: true
-          },
-          {
-            title: "状态",
-            key: "status",
-            align: "center",
-            width: 120,
-            render: (h, params) => {
-              if (params.row.delFlag == 0) {
-                return h("div", [
-                  h("Badge", {
-                    props: {
-                      status: "success",
-                      text: "正常启用"
-                    }
-                  })
-                ]);
-              } else if (params.row.delFlag == -1) {
-                return h("div", [
-                  h("Badge", {
-                    props: {
-                      status: "error",
-                      text: "禁用"
-                    }
-                  })
-                ]);
-              }
-            }
-          },
-          {
-            title: "创建时间",
-            key: "createTime",
-            sortable: true,
-            sortType: "desc",
-            width: 170
-          },
-          {
-            title: "操作",
-            key: "action",
-            width: 130,
-            align: "center",
-            fixed: "right",
-            render: (h, params) => {
-              let select;
-              this.selectUsers.forEach(item => {
-                if (item.id === params.row.id) {
-                  select = params.row
-                }
-              });
-
-              if (select) {
-                return h("div", [
-                  h(
-                  "Button",
-                  {
-                    props: {
-                      type: "info",
-                      size: "small"
-                    },
-                    on: {
-                      click: () => {
-                        this.chooseCancel(params.row);
-                      }
-                    }
-                  },
-                  "取消选择"
-                  )
-                ]);
-              } else {
-                return h("div", [
-                  h(
-                  "Button",
-                  {
-                    props: {
-                      type: "info",
-                      size: "small"
-                    },
-                    on: {
-                      click: () => {
-                        this.chooseUser(params.row);
-                      }
-                    }
-                  },
-                  "选择"
-                  )
-                ]);
-              }
-            }
-          }
-        ],
-        userData: [], // 用户数据
-        totalUser: 0 // 数量
-      };
-    },
-    methods: {
-      changeUserPage(v) {
-        this.searchUserForm.pageNumber = v;
-        this.getUserDataList();
-      },
-      changeUserPageSize(v) {
-        this.searchUserForm.pageSize = v;
-        this.getUserDataList();
-      },
-      getUserDataList() {
-        this.userLoading = true;
-        getMember(this.searchUserForm).then(res => {
-          this.userLoading = false;
-          if (res.success) {
-            this.userData = res.result.records;
-            this.totalUser = res.result.total;
-          }
-        });
-      },
-      handleSearchUser() {
-        this.searchUserForm.pageNumber = 1;
-        this.searchUserForm.pageSize = 10;
-        this.getUserDataList();
-      },
-      handleResetUser() {
-        this.$refs.searchUserForm.resetFields();
-        this.searchUserForm.pageNumber = 1;
-        this.searchUserForm.pageSize = 9;
-        this.$refs.dep.clearSelect();
-        this.searchUserForm.departmentId = "";
-        // 重新加载数据
-        this.getUserDataList();
-      },
-      setData(v) {
-        this.selectUsers = v;
-        this.$emit("on-change", this.selectUsers);
-      },
-      chooseCancel(v){
-        let _index;
-        this.selectUsers.forEach((e,index) => {
-          if (v.id == e.id) {
-            _index = index;
-          }
-        });
-
-        if(_index||_index==0){
-          this.selectUsers.splice(_index,1);
-          this.$emit("on-change", this.selectUsers);
-        }
-      },
-      chooseUser(v) {
-        // 去重
-        let that = this;
-        let flag = true;
-        this.selectUsers.forEach(e => {
-          if (v.id == e.id) {
-            flag = false;
-          }
-        });
-        if (flag) {
-          let u = {
-            id: v.id,
-            username: v.username
-          };
-          this.selectUsers.push(u);
-          this.$emit("on-change", this.selectUsers);
-        }
-      },
-      clearSelectData() {
-        this.selectUsers = [];
-        this.$emit("on-change", this.selectUsers);
-      },
-      handleCancelUser(e, id) {
-        // 删除所选用户
-        let newArray = [];
-        this.selectUsers.forEach(e => {
-          if (id != e.id) {
-            newArray.push(e);
-          }
-        });
-        this.selectUsers = newArray;
-        this.$emit("on-change", this.selectUsers);
-        this.$Message.success("删除所选用户成功");
-      }
-    },
-    created() {
-      // 计算高度
-      this.height = Number(document.documentElement.clientHeight - 230);
-      this.getUserDataList();
-    }
-  };
-</script>
-
-<style lang="scss" scoped>
-  .member-choose {
-    .clear {
-      font-size: 12px;
-      margin-left: 15px;
-      color: #40a9ff;
-      cursor: pointer;
-    }
-
-    .collapse {
-      font-size: 12px;
-      margin-top: 15px;
-      width: 500px;
-    }
-
-    .select-count {
-      font-weight: 600;
-      color: #40a9ff;
-    }
-  }
-
-  .my-drawer-footer {
-    z-index: 10;
-    width: 100%;
-    position: absolute;
-    bottom: 0;
-    left: 0;
-    border-top: 1px solid #e8e8e8;
-    padding: 10px 16px;
-    text-align: right;
-    background: #fff;
-  }
-</style>
diff --git a/manager/src/views/my-components/lili/quill.vue b/manager/src/views/my-components/lili/quill.vue
deleted file mode 100644
index 738bcd9e..00000000
--- a/manager/src/views/my-components/lili/quill.vue
+++ /dev/null
@@ -1,284 +0,0 @@
-<template>
-  <div>
-    <div id="toolbar">
-      <button class="ql-bold" title="粗体"></button>
-      <button class="ql-italic" title="斜体"></button>
-      <button class="ql-underline" title="下划线"></button>
-      <button class="ql-strike" title="删除线"></button>
-      <select class="ql-size" title="字体大小">
-        <option value="small"></option>
-        <option selected></option>
-        <option value="large"></option>
-        <option value="huge"></option>
-      </select>
-      <select class="ql-header" title="标题大小">
-        <option value="1"></option>
-        <option value="2"></option>
-        <option value="3"></option>
-        <option value="4"></option>
-        <option value="5"></option>
-        <option value="6"></option>
-        <option selected></option>
-      </select>
-      <select class="ql-font" title="字体"></select>
-      <select class="ql-align" title="对齐方式"></select>
-      <select class="ql-color" title="字体颜色"></select>
-      <select class="ql-background" title="背景颜色"></select>
-      <button class="ql-blockquote" title="引用"></button>
-      <button class="ql-code-block" title="代码块"></button>
-      <button class="ql-list" value="ordered" title="数字列表"></button>
-      <button class="ql-list" value="bullet" title="点列表"></button>
-      <button class="ql-script" value="sub" title="右下标"></button>
-      <button class="ql-script" value="super" title="右上标"></button>
-      <button class="ql-indent" value="-1" title="向左缩进"></button>
-      <button class="ql-indent" value="+1" title="向右缩进"></button>
-      <button class="ql-clean" title="清空样式"></button>
-
-      <button class="ql-link" title="链接"></button>
-      <button class="ql-image" title="插入图片" v-if="base64"></button>
-      <div class="q-menu" title="插入图片" v-if="!base64">
-        <Upload
-          :action="uploadFileUrl"
-          :headers="accessToken"
-          :on-success="handleSuccess"
-          :on-error="handleError"
-          :format="['jpg','jpeg','png','gif','bmp']"
-          accept=".jpg, .jpeg, .png, .gif, .bmp"
-          :max-size="5120"
-          :on-format-error="handleFormatError"
-          :on-exceeded-size="handleMaxSize"
-          :before-upload="beforeUpload"
-          :show-upload-list="false"
-          ref="qup"
-        >
-          <Icon type="md-images" size="20" />
-        </Upload>
-      </div>
-      <button class="ql-video" title="插入视频链接"></button>
-      <div class="q-menu" title="编辑HTML代码" @click="editHTML" v-if="expandHtml">
-        <Icon type="md-code-working" size="22" />
-      </div>
-      <div class="q-menu" title="预览" @click="fullscreenModal=true" v-if="expandPreview">
-        <Icon type="ios-eye" size="24" />
-      </div>
-      <div class="q-menu q-trash" title="清空" @click="clear" v-if="expandClear">
-        <Icon type="md-trash" size="18" style="display: block;" />
-      </div>
-    </div>
-
-    <div :id="id" :style="{minHeight: minHeight}"></div>
-
-    <Modal
-      title="编辑html代码"
-      v-model="showHTMLModal"
-      :mask-closable="false"
-      :width="900"
-      :fullscreen="full"
-    >
-      <Input
-        v-if="!full"
-        v-model="dataEdit"
-        :rows="15"
-        type="textarea"
-        style="max-height:60vh;overflow:auto;"
-      />
-      <Input v-if="full" v-model="dataEdit" :rows="32" type="textarea" />
-      <div slot="footer">
-        <Button @click="full=!full" icon="md-expand">全屏开/关</Button>
-        <Button @click="editHTMLOk" type="primary" icon="md-checkmark-circle-outline">确定保存</Button>
-      </div>
-    </Modal>
-    <Modal title="预览" v-model="fullscreenModal" fullscreen>
-      <div v-html="data">{{data}}</div>
-      <div slot="footer">
-        <Button @click="fullscreenModal=false">关闭</Button>
-      </div>
-    </Modal>
-  </div>
-</template>
-
-<script>
-import { uploadFile } from "@/api/index";
-import Quill from "quill";
-import "quill/dist/quill.snow.css";
-import xss from "xss";
-var editor = null;
-export default {
-  name: "editor",
-  props: {
-    id: {
-      type: String,
-      default: "quill"
-    },
-    value: String,
-    base64: {
-      type: Boolean,
-      default: false
-    },
-    minHeight: {
-      type: String,
-      default: "300px"
-    },
-    expandHtml: {
-      type: Boolean,
-      default: true
-    },
-    expandPreview: {
-      type: Boolean,
-      default: true
-    },
-    expandClear: {
-      type: Boolean,
-      default: true
-    },
-    openXss: {
-      type: Boolean,
-      default: false
-    }
-  },
-  data() {
-    return {
-      accessToken: {}, // 验证token
-      uploadFileUrl: uploadFile, // 上传地址
-      editor: null, // 富文本初始化
-      options: { // 富文本配置
-        theme: "snow",
-        modules: {
-          toolbar: "#toolbar"
-        },
-        placeholder: "在这输入内容 ..."
-      },
-      data: this.value, // 富文本数据
-      dataEdit: "", // 编辑数据
-      showHTMLModal: false, // 显示html
-      full: false, // html全屏开关
-      fullscreenModal: false // 显示全屏预览
-    };
-  },
-  methods: {
-    initEditor() {
-      this.accessToken = {
-        accessToken: this.getStore("accessToken")
-      };
-      editor = new Quill(`#${this.id}`, this.options);
-      let that = this;
-      if (this.value) {
-        editor.pasteHTML(this.value);
-      }
-      editor.on("text-change", function(delta, oldDelta, source) {
-        let html = editor.container.firstChild.innerHTML;
-        if (that.openXss) {
-          that.data = xss(html);
-        } else {
-          that.data = html;
-        }
-        that.$emit("input", that.data);
-        that.$emit("on-change", that.data);
-      });
-    },
-    handleFormatError(file) {
-      this.$Notice.warning({
-        title: "不支持的文件格式",
-        desc:
-          "所选文件‘ " +
-          file.name +
-          " ’格式不正确, 请选择 .jpg .jpeg .png .gif .bmp格式文件"
-      });
-    },
-    handleMaxSize(file) {
-      this.$Notice.warning({
-        title: "文件大小过大",
-        desc: "所选文件‘ " + file.name + " ’大小过大, 不得超过 5M."
-      });
-    },
-    beforeUpload() {
-      return true;
-    },
-    handleSuccess(res, file) {
-      if (res.success) {
-        let url = res.result;
-        // 获取光标位置
-        let range = editor.getSelection(true);
-        // 总元素
-        let delta = editor.getContents().length;
-        let index;
-        if (range) {
-          index = range.index;
-        } else {
-          index = delta;
-        }
-        // 插入元素
-        editor.insertEmbed(index, "image", url);
-        editor.setSelection(index + 1, 0);
-      } else {
-        this.$Message.error(res.message);
-      }
-    },
-    handleError(error, file, fileList) {
-      this.$Message.error(error.toString());
-    },
-    editHTML() {
-      this.dataEdit = this.data;
-      this.showHTMLModal = true;
-    },
-    editHTMLOk() {
-      editor.pasteHTML(this.dataEdit);
-      this.$emit("input", this.data);
-      this.$emit("on-change", this.data);
-      this.showHTMLModal = false;
-    },
-    clear() {
-      this.$Modal.confirm({
-        title: "确认清空",
-        content: "确认要清空编辑器内容？清空后不能撤回",
-        onOk: () => {
-          this.data = "";
-          editor.pasteHTML(this.data);
-          this.$emit("input", this.data);
-          this.$emit("on-change", this.data);
-        }
-      });
-    },
-    setData(value) {
-      if (!editor) {
-        this.initEditor();
-      }
-      if (value && value != this.data) {
-        this.data = value;
-        let index = editor.selection.savedRange.index;
-        editor.pasteHTML(this.data);
-        editor.setSelection(index, 0);
-        this.$emit("input", this.data);
-        this.$emit("on-change", this.data);
-      }
-    }
-  },
-  watch: {
-    value(val) {
-      this.setData(val);
-    }
-  },
-  mounted() {
-    this.initEditor();
-  }
-};
-</script>
-
-<style lang="scss" scoped>
-.q-menu {
-  margin: 0 3px;
-  display: inline-block;
-  cursor: pointer;
-  color: #444;
-  :hover {
-    color: #06c;
-  }
-}
-.q-trash {
-  margin-bottom: 3px;
-}
-.ql-tooltip {
-  left: 30% !important;
-}
-</style>
-
diff --git a/manager/src/views/my-components/lili/rect-loading.vue b/manager/src/views/my-components/lili/rect-loading.vue
deleted file mode 100644
index 761607a2..00000000
--- a/manager/src/views/my-components/lili/rect-loading.vue
+++ /dev/null
@@ -1,81 +0,0 @@
-<template>
-  <div class="spinner">
-    <div class="rect1"></div>
-    <div class="rect2"></div>
-    <div class="rect3"></div>
-    <div class="rect4"></div>
-    <div class="rect5"></div>
-  </div>
-</template>
-
-<script>
-export default {
-  name: "rectLoading"
-};
-</script>
-
-<style lang="scss" scoped>
-.spinner {
-  margin-top: 20vh;
-  margin-bottom: 30vh;
-  height: 60px;
-  text-align: center;
-  font-size: 10px;
-  span {
-    display: block;
-    font-size: 12px;
-    color: rgba(0, 0, 0, 0.45);
-    margin-top: 1vh;
-  }
-  div {
-    margin-right: 4px;
-    background-color: #4e9ff5;
-    height: 100%;
-    width: 6px;
-    display: inline-block;
-    -webkit-animation: stretchdelay 1.2s infinite ease-in-out;
-    animation: stretchdelay 1.2s infinite ease-in-out;
-  }
-  .rect2 {
-    -webkit-animation-delay: -1.1s;
-    animation-delay: -1.1s;
-  }
-  .rect3 {
-    -webkit-animation-delay: -1s;
-    animation-delay: -1s;
-  }
-  .rect4 {
-    -webkit-animation-delay: -0.9s;
-    animation-delay: -0.9s;
-  }
-  .rect5 {
-    -webkit-animation-delay: -0.8s;
-    animation-delay: -0.8s;
-  }
-}
-
-@-webkit-keyframes stretchdelay {
-  0%,
-  40%,
-  100% {
-    -webkit-transform: scaleY(0.4);
-  }
-  20% {
-    -webkit-transform: scaleY(1);
-  }
-}
-
-@keyframes stretchdelay {
-  0%,
-  40%,
-  100% {
-    transform: scaleY(0.4);
-    -webkit-transform: scaleY(0.4);
-  }
-  20% {
-    transform: scaleY(1);
-    -webkit-transform: scaleY(1);
-  }
-}
-</style>
-
diff --git a/manager/src/views/my-components/lili/set-password.vue b/manager/src/views/my-components/lili/set-password.vue
index b1902b7b..25f46dd6 100644
--- a/manager/src/views/my-components/lili/set-password.vue
+++ b/manager/src/views/my-components/lili/set-password.vue
@@ -108,11 +108,13 @@ export default {
         this.strengthValue = 100;
       }
     },
+    // 密码变动后回调
     handleChange(v) {
       this.strengthChange();
       this.$emit("input", this.currentValue);
       this.$emit("on-change", this.currentValue, this.grade, this.strength);
     },
+    // 监听密码变动，实时回显密码强度
     setCurrentValue(value) {
       if (value === this.currentValue) {
         return;
diff --git a/manager/src/views/my-components/lili/sku-choose.vue b/manager/src/views/my-components/lili/sku-choose.vue
deleted file mode 100644
index 2b705278..00000000
--- a/manager/src/views/my-components/lili/sku-choose.vue
+++ /dev/null
@@ -1,358 +0,0 @@
-<template>
-  <div class="sku-choose">
-    <Button @click="showDrawer=true" :icon="icon">{{text}}</Button>
-    <span @click="clearSelectData" class="clear">清空已选</span>
-    <Collapse simple class="collapse">
-      <Panel name="1">
-        已选择
-        <span class="select-count">{{selectObj.length}}</span> 件
-        <p slot="content">
-          <Tag
-            v-for="(item, i) in selectObj"
-            :key="i"
-            :name="item.id"
-            color="default"
-            closable
-            @on-close="handleCancelObj"
-          >{{createName(item)}}
-          </Tag>
-        </p>
-      </Panel>
-    </Collapse>
-    <Drawer title="选择SKU" closable v-model="showDrawer" :width="width" draggable>
-      <Form ref="searchForm" :model="searchForm" inline :label-width="55">
-        <Form-item label="名称" prop="goodsName">
-          <Input
-            type="text"
-            v-model="searchForm.goodsName"
-            clearable
-            placeholder="输入商品名称"
-            style="width: 200px"
-          />
-        </Form-item>
-        <Form-item style="margin-left:-35px;" class="br">
-          <Button @click="handleSearchData" type="primary" icon="ios-search">搜索</Button>
-          <Button @click="handleResetObj">重置</Button>
-        </Form-item>
-      </Form>
-      <Table
-        :loading="showLoading"
-        border
-        :columns="tableColumns"
-        :data="tableData"
-        :height="height"
-        ref="tableData"
-      ></Table>
-      <Row type="flex" justify="end" style="margin: 10px 0;">
-        <Page
-          :current="searchForm.pageNumber"
-          :total="tableTotal"
-          :page-size="searchForm.pageSize"
-          @on-change="changeDataPage"
-          @on-page-size-change="changeDataPageSize"
-          :page-size-opts="[10,20,50]"
-          size="small"
-          show-total
-          show-elevator
-          show-sizer
-        ></Page>
-      </Row>
-      <div class="my-drawer-footer">
-        已选择
-        <span class="select-count">{{selectObj.length}}</span> 件
-        <Button @click="clearSelectData" style="margin-left:10px">清空已选</Button>
-        <Button @click="showDrawer=false" type="primary" style="margin-left:10px">关闭</Button>
-      </div>
-    </Drawer>
-  </div>
-</template>
-
-<script>
-  import {getSkuPage} from "@/api/goods";
-
-  export default {
-    name: "userChoose",
-    props: {
-      text: {
-        type: String,
-        default: "选择SKU"
-      },
-      icon: {
-        type: String,
-        default: "md-basket"
-      },
-      initData: {
-        type: Array,
-        default: []
-      },
-      createName: {
-        type: Function,
-        default: function (item) {
-          return item.goodsName
-        }
-      }
-    },
-    mounted(){
-      this.selectObj = this.initData
-      console.log(JSON.stringify(this.initData))
-    },
-    data() {
-      return {
-        //默认值后续计算
-        height: 500,
-        width: 500,
-        //加载状态
-        showLoading: true,
-        //展示抽屉
-        showDrawer: false,
-        selectObj: [], // 选择数据
-        searchForm: { // 请求参数
-          goodsName: "",
-          pageNumber: 1, // 当前页数
-          pageSize: 10, // 页面大小
-          sort: "createTime", // 默认排序字段
-          order: "desc" // 默认排序方式
-        },
-        tableColumns: [ // 表头
-          {
-            type: "index",
-            width: 60,
-            align: "center"
-          },
-          {
-            title: "商品名称",
-            key: "goodsName",
-            minWidth: 140
-          },
-          {
-            title: "规格",
-            key: "specName",
-            minWidth: 140,
-          },
-          {
-            title: "图片",
-            key: "thumbnail",
-            width: 80,
-            align: "center",
-            render: (h, params) => {
-              return h("Avatar", {
-                props: {
-                  src: params.row.face
-                }
-              });
-            }
-          },
-          {
-            title: "状态",
-            key: "status",
-            align: "center",
-            width: 120,
-            render: (h, params) => {
-              if (params.row.delFlag == 0) {
-                return h("div", [
-                  h("Badge", {
-                    props: {
-                      status: "success",
-                      text: "正常"
-                    }
-                  })
-                ]);
-              } else if (params.row.delFlag == -1) {
-                return h("div", [
-                  h("Badge", {
-                    props: {
-                      status: "error",
-                      text: "禁用"
-                    }
-                  })
-                ]);
-              }
-            }
-          },
-          {
-            title: "创建时间",
-            key: "createTime",
-            sortable: true,
-            sortType: "desc",
-            width: 170
-          },
-          {
-            title: "操作",
-            key: "action",
-            width: 130,
-            align: "center",
-            fixed: "right",
-            render: (h, params) => {
-              let select;
-              this.selectObj.forEach(item => {
-                if (item.id === params.row.id) {
-                  select = params.row
-                }
-              });
-
-              if (select) {
-                return h("div", [
-                  h(
-                  "Button",
-                  {
-                    props: {
-                      type: "info",
-                      size: "small"
-                    },
-                    on: {
-                      click: () => {
-                        this.chooseCancel(params.row);
-                      }
-                    }
-                  },
-                  "取消选择"
-                  )
-                ]);
-              } else {
-                return h("div", [
-                  h(
-                  "Button",
-                  {
-                    props: {
-                      type: "info",
-                      size: "small"
-                    },
-                    on: {
-                      click: () => {
-                        this.chooseObj(params.row);
-                      }
-                    }
-                  },
-                  "选择"
-                  )
-                ]);
-              }
-            }
-          }
-        ],
-        tableData: [], // 表格数据
-        tableTotal: 0 // 总数
-      };
-    },
-    methods: {
-      changeDataPage(v) {
-        this.searchForm.pageNumber = v;
-        this.searchData();
-      },
-      changeDataPageSize(v) {
-        this.searchForm.pageSize = v;
-        this.searchData();
-      },
-      searchData() {
-        this.showLoading = true;
-        getSkuPage(this.searchForm).then(res => {
-          this.showLoading = false;
-          if (res.success) {
-            this.tableData = res.result.records;
-            this.tableTotal = res.result.total;
-          }
-        });
-
-      },
-      handleSearchData() {
-        this.searchForm.pageNumber = 1;
-        this.searchForm.pageSize = 10;
-        this.searchData();
-      },
-      handleResetObj() {
-        this.$refs.searchForm.resetFields();
-        this.searchForm.pageNumber = 1;
-        this.searchForm.pageSize = 9;
-        this.searchForm.departmentId = "";
-        // 重新加载数据
-        this.searchData();
-      },
-      setData(v) {
-        this.selectObj = v;
-        this.$emit("on-change", this.selectObj);
-      },
-      chooseCancel(v) {
-        let _index;
-        this.selectObj.forEach((e, index) => {
-          if (v.id == e.id) {
-            _index = index;
-          }
-        });
-
-        if (_index || _index == 0) {
-          this.selectObj.splice(_index, 1);
-          this.$emit("on-change", this.selectObj);
-        }
-      },
-      chooseObj(v) {
-        // 去重
-        let that = this;
-        let flag = true;
-        this.selectObj.forEach(e => {
-          if (v.id == e.id) {
-            flag = false;
-          }
-        });
-        if (flag) {
-          this.selectObj.push(v);
-          this.$emit("on-change", this.selectObj);
-        }
-      },
-      clearSelectData() {
-        this.selectObj = [];
-        this.$emit("on-change", this.selectObj);
-      },
-      handleCancelObj(e, id) {
-        // 删除所选用户
-        let newArray = [];
-        this.selectObj.forEach(e => {
-          if (id != e.id) {
-            newArray.push(e);
-          }
-        });
-        this.selectObj = newArray;
-        this.$emit("on-change", this.selectObj);
-      }
-    },
-    created() {
-      // 计算高度
-      this.height = Number(document.documentElement.clientHeight - 230);
-      this.width = Number(document.documentElement.clientWidth/2)>900?900:Number(document.documentElement.clientWidth/2)
-      this.searchData();
-
-    }
-  };
-</script>
-
-<style lang="scss" scoped>
-  .sku-choose {
-    .clear {
-      font-size: 12px;
-      margin-left: 15px;
-      color: #40a9ff;
-      cursor: pointer;
-    }
-
-    .collapse {
-      font-size: 12px;
-      margin-top: 15px;
-    }
-
-    .select-count {
-      font-weight: 600;
-      color: #40a9ff;
-    }
-  }
-
-  .my-drawer-footer {
-    z-index: 10;
-    width: 100%;
-    position: absolute;
-    bottom: 0;
-    left: 0;
-    border-top: 1px solid #e8e8e8;
-    padding: 10px 16px;
-    text-align: right;
-    background: #fff;
-  }
-</style>
diff --git a/manager/src/views/my-components/lili/upload-pic-input.vue b/manager/src/views/my-components/lili/upload-pic-input.vue
index 894bcf95..2db882e0 100644
--- a/manager/src/views/my-components/lili/upload-pic-input.vue
+++ b/manager/src/views/my-components/lili/upload-pic-input.vue
@@ -132,7 +132,7 @@ export default {
         this.$emit("input", this.currentValue);
         this.$emit("on-change", this.currentValue);
       } else {
-        this.$Message.error(res.message);
+        // this.$Message.error(res.message);
       }
     },
     // 上传失败
diff --git a/manager/src/views/my-components/lili/upload-pic-thumb.vue b/manager/src/views/my-components/lili/upload-pic-thumb.vue
index 03ec4086..467c054b 100644
--- a/manager/src/views/my-components/lili/upload-pic-thumb.vue
+++ b/manager/src/views/my-components/lili/upload-pic-thumb.vue
@@ -91,27 +91,30 @@ export default {
     };
   },
   methods: {
+    // 拖拽结束事件
     onEnd() {
       this.returnValue();
     },
+    // 初始化方法
     init() {
       this.setData(this.value, true);
       this.accessToken = {
         accessToken: this.getStore("accessToken")
       };
     },
+    // 预览图片
     handleView(imgUrl) {
       this.imgUrl = imgUrl;
       this.viewImage = true;
     },
+    // 移除图片
     handleRemove(file) {
       this.uploadList = this.uploadList.filter(i => i.url !== file.url);
       this.returnValue();
     },
+    // 上传成功
     handleSuccess(res, file) {
       if (res.success) {
-
-
         file.url = res.result;
         // 单张图片处理
         if (!this.multiple && this.uploadList.length > 0) {
@@ -125,9 +128,11 @@ export default {
         this.$Message.error(res.message);
       }
     },
+    // 上传失败
     handleError(error, file, fileList) {
       this.$Message.error(error.toString());
     },
+    // 格式校验
     handleFormatError(file) {
       this.$Notice.warning({
         title: "不支持的文件格式",
@@ -137,6 +142,7 @@ export default {
           " ’格式不正确, 请选择 .jpg .jpeg .png .gif图片格式文件"
       });
     },
+    // 上传文件大小校验
     handleMaxSize(file) {
       this.$Notice.warning({
         title: "文件大小过大",
@@ -148,6 +154,7 @@ export default {
           "M."
       });
     },
+    // 上传之前钩子
     handleBeforeUpload() {
       if (this.multiple && this.uploadList.length >= this.limit) {
         this.$Message.warning("最多只能上传" + this.limit + "张图片");
@@ -155,6 +162,7 @@ export default {
       }
       return true;
     },
+    // 返回组件值
     returnValue() {
       if (!this.uploadList || this.uploadList.length < 1) {
         if (!this.multiple) {
@@ -180,6 +188,7 @@ export default {
         this.$emit("on-change", v);
       }
     },
+    // 传入值变化时改变值
     setData(v, init) {
       if (typeof v == "string") {
         // 单张
diff --git a/manager/src/views/my-components/lili/user-choose.vue b/manager/src/views/my-components/lili/user-choose.vue
deleted file mode 100644
index 29cb74dc..00000000
--- a/manager/src/views/my-components/lili/user-choose.vue
+++ /dev/null
@@ -1,352 +0,0 @@
-<template>
-  <div class="user-choose">
-    <Button @click="userModalVisible=true" :icon="icon">{{text}}</Button>
-    <span @click="clearSelectData" class="clear">清空已选</span>
-    <Collapse simple class="collapse">
-      <Panel name="1">
-        已选择
-        <span class="select-count">{{selectUsers.length}}</span> 人
-        <p slot="content">
-          <Tag
-            v-for="(item, i) in selectUsers"
-            :key="i"
-            :name="item.id"
-            color="default"
-            closable
-            @on-close="handleCancelUser"
-          >{{item.username}}</Tag>
-        </p>
-      </Panel>
-    </Collapse>
-    <Drawer title="选择用户" closable v-model="userModalVisible" width="800" draggable>
-      <Form ref="searchUserForm" :model="searchUserForm" inline :label-width="55">
-        <Form-item label="用户名" prop="username">
-          <Input
-            type="text"
-            v-model="searchUserForm.username"
-            clearable
-            placeholder="请输入用户名"
-            style="width: 200px"
-          />
-        </Form-item>
-        <Form-item label="部门" prop="department">
-          <department-choose @on-change="handleSelectDep" style="width: 200px" ref="dep"></department-choose>
-        </Form-item>
-        <Form-item style="margin-left:-35px;" class="br">
-          <Button @click="handleSearchUser" type="primary" icon="ios-search">搜索</Button>
-          <Button @click="handleResetUser">重置</Button>
-        </Form-item>
-      </Form>
-      <Table
-        :loading="userLoading"
-        border
-        :columns="userColumns"
-        :data="userData"
-        :height="height"
-        ref="userTable"
-      ></Table>
-      <Row type="flex" justify="end" style="margin: 10px 0;">
-        <Page
-          :current="searchUserForm.pageNumber"
-          :total="totalUser"
-          :page-size="searchUserForm.pageSize"
-          @on-change="changeUserPage"
-          @on-page-size-change="changeUserPageSize"
-          :page-size-opts="[10,20,50]"
-          size="small"
-          show-total
-          show-elevator
-          show-sizer
-        ></Page>
-      </Row>
-      <div class="my-drawer-footer">
-        已选择
-        <span class="select-count">{{selectUsers.length}}</span> 人
-        <Button @click="clearSelectData" style="margin-left:10px">清空已选</Button>
-        <Button @click="userModalVisible=false" type="primary" style="margin-left:10px">关闭</Button>
-      </div>
-    </Drawer>
-  </div>
-</template>
-
-<script>
-import { getUserListData } from "@/api/index";
-import departmentChoose from "./department-choose";
-export default {
-  name: "userChoose",
-  components: {
-    departmentChoose
-  },
-  props: {
-    text: {
-      type: String,
-      default: "选择用户"
-    },
-    icon: {
-      type: String,
-      default: "md-person-add"
-    }
-  },
-  data() {
-    return {
-      //高度 下方已重新计算
-      height: 500,
-      //加载
-      userLoading: true,
-      //显示选择器
-      userModalVisible: false,
-      //选择的对象
-      selectUsers: [],
-      //搜索参数
-      searchUserForm: {
-        username: "",
-        type: "",
-        status: "",
-        pageNumber: 1, // 当前页数
-        pageSize: 10, // 页面大小
-        sort: "createTime", // 默认排序字段
-        order: "desc" // 默认排序方式
-      },
-      userColumns: [
-        {
-          type: "index",
-          width: 60,
-          align: "center"
-        },
-        {
-          title: "用户名",
-          key: "username",
-          minWidth: 140,
-          sortable: true
-        },
-        {
-          title: "头像",
-          key: "avatar",
-          width: 80,
-          align: "center",
-          render: (h, params) => {
-            return h("Avatar", {
-              props: {
-                src: params.row.avatar
-              }
-            });
-          }
-        },
-        {
-          title: "所属部门",
-          key: "departmentTitle",
-          width: 120
-        },
-        {
-          title: "手机",
-          key: "mobile",
-          width: 125,
-          sortable: true
-        },
-        {
-          title: "邮箱",
-          key: "email",
-          width: 180,
-          sortable: true
-        },
-        {
-          title: "性别",
-          key: "sex",
-          width: 70,
-          align: "center"
-        },
-        {
-          title: "用户类型",
-          key: "type",
-          align: "center",
-          width: 100,
-          render: (h, params) => {
-            let re = "";
-            if (params.row.type == 1) {
-              re = "管理员";
-            } else if (params.row.type == 0) {
-              re = "普通用户";
-            }
-            return h("div", re);
-          }
-        },
-        {
-          title: "状态",
-          key: "status",
-          align: "center",
-          width: 120,
-          render: (h, params) => {
-            if (params.row.status == 0) {
-              return h("div", [
-                h("Badge", {
-                  props: {
-                    status: "success",
-                    text: "正常启用"
-                  }
-                })
-              ]);
-            } else if (params.row.status == -1) {
-              return h("div", [
-                h("Badge", {
-                  props: {
-                    status: "error",
-                    text: "禁用"
-                  }
-                })
-              ]);
-            }
-          }
-        },
-        {
-          title: "创建时间",
-          key: "createTime",
-          sortable: true,
-          sortType: "desc",
-          width: 170
-        },
-        {
-          title: "操作",
-          key: "action",
-          width: 130,
-          align: "center",
-          fixed: "right",
-          render: (h, params) => {
-            return h("div", [
-              h(
-                "Button",
-                {
-                  props: {
-                    type: "info",
-                    size: "small"
-                  },
-                  on: {
-                    click: () => {
-                      this.chooseUser(params.row);
-                    }
-                  }
-                },
-                "添加该用户"
-              )
-            ]);
-          }
-        }
-      ],
-      userData: [], // 表格数据
-      totalUser: 0 // 总数
-    };
-  },
-  methods: {
-    handleSelectDep(v) {
-      this.searchUserForm.departmentId = v;
-    },
-    changeUserPage(v) {
-      this.searchUserForm.pageNumber = v;
-      this.getUserDataList();
-    },
-    changeUserPageSize(v) {
-      this.searchUserForm.pageSize = v;
-      this.getUserDataList();
-    },
-    getUserDataList() {
-      this.userLoading = true;
-      getUserListData(this.searchUserForm).then(res => {
-        this.userLoading = false;
-        if (res.success) {
-          this.userData = res.result.records;
-          this.totalUser = res.result.total;
-        }
-      });
-    },
-    handleSearchUser() {
-      this.searchUserForm.pageNumber = 1;
-      this.searchUserForm.pageSize = 9;
-      this.getUserDataList();
-    },
-    handleResetUser() {
-      this.$refs.searchUserForm.resetFields();
-      this.searchUserForm.pageNumber = 1;
-      this.searchUserForm.pageSize = 9;
-      this.$refs.dep.clearSelect();
-      this.searchUserForm.departmentId = "";
-      // 重新加载数据
-      this.getUserDataList();
-    },
-    setData(v) {
-      this.selectUsers = v;
-      this.$emit("on-change", this.selectUsers);
-    },
-    chooseUser(v) {
-      // 去重
-      let that = this;
-      let flag = true;
-      this.selectUsers.forEach(e => {
-        if (v.id == e.id) {
-          that.$Message.warning("已经添加过啦，请勿重复选择");
-          flag = false;
-        }
-      });
-      if (flag) {
-        let u = {
-          id: v.id,
-          username: v.username
-        };
-        this.selectUsers.push(u);
-        this.$emit("on-change", this.selectUsers);
-        this.$Message.success(`添加用户 ${v.username} 成功`);
-      }
-    },
-    clearSelectData() {
-      this.selectUsers = [];
-      this.$emit("on-change", this.selectUsers);
-    },
-    handleCancelUser(e, id) {
-      // 删除所选用户
-      let newArray = [];
-      this.selectUsers.forEach(e => {
-        if (id != e.id) {
-          newArray.push(e);
-        }
-      });
-      this.selectUsers = newArray;
-      this.$emit("on-change", this.selectUsers);
-      this.$Message.success("删除所选用户成功");
-    }
-  },
-  created() {
-    // 计算高度
-    this.height = Number(document.documentElement.clientHeight - 230);
-    this.getUserDataList();
-  }
-};
-</script>
-
-<style lang="scss" scoped>
-.user-choose {
-  .clear {
-    font-size: 12px;
-    margin-left: 15px;
-    color: #40a9ff;
-    cursor: pointer;
-  }
-  .collapse {
-    font-size: 12px;
-    margin-top: 15px;
-    width: 500px;
-  }
-  .select-count {
-    font-weight: 600;
-    color: #40a9ff;
-  }
-}
-.my-drawer-footer {
-  z-index: 10;
-  width: 100%;
-  position: absolute;
-  bottom: 0;
-  left: 0;
-  border-top: 1px solid #e8e8e8;
-  padding: 10px 16px;
-  text-align: right;
-  background: #fff;
-}
-</style>
diff --git a/manager/src/views/my-components/map/index.vue b/manager/src/views/my-components/map/index.vue
index c68b1f3e..2443bf0a 100644
--- a/manager/src/views/my-components/map/index.vue
+++ b/manager/src/views/my-components/map/index.vue
@@ -1,184 +1,184 @@
 <template>
   <div class="map">
-    <Modal
-        v-model="showMap"
-        title="选择地址"
-        width="800"
-        >
-        <div class="address">{{addrContent.address}}</div>
-        <div id="map-container"></div>
+    <Modal v-model="showMap" title="选择地址" width="800">
+      <div class="address">{{ addrContent.address }}</div>
+      <div id="map-container"></div>
 
-        <div class="search-con">
-            <Input placeholder="输入关键字搜索" id="input-map" v-model="mapSearch"/>
-            <ul>
-                <li v-for="(tip, index) in tips" :key="index" @click="selectAddr(tip.location)">
-                    <p>{{tip.name}}</p>
-                    <p>{{tip.district + tip.address}}</p>
-                </li>
-            </ul>
-        </div>
-        <div slot="footer">
-            <Button type="default" @click="showMap = false">取消</Button>
-            <Button type="primary" :loading="loading" @click="ok">确定</Button>
-        </div>
+      <div class="search-con">
+        <Input
+          placeholder="输入关键字搜索"
+          id="input-map"
+          v-model="mapSearch"
+        />
+        <ul>
+          <li
+            v-for="(tip, index) in tips"
+            :key="index"
+            @click="selectAddr(tip.location)"
+          >
+            <p>{{ tip.name }}</p>
+            <p>{{ tip.district + tip.address }}</p>
+          </li>
+        </ul>
+      </div>
+      <div slot="footer">
+        <Button type="default" @click="showMap = false">取消</Button>
+        <Button type="primary" :loading="loading" @click="ok">确定</Button>
+      </div>
     </Modal>
   </div>
 </template>
 <script>
-import AMapLoader from '@amap/amap-jsapi-loader';
-import {getRegion} from '@/api/common.js'
+import AMapLoader from "@amap/amap-jsapi-loader";
+import { getRegion } from "@/api/common.js";
 export default {
-name:'map',
-data() {
+  name: "map",
+  data() {
     return {
-        showMap:false, // modal显隐
-        mapSearch:'', // 地图搜索
-        map:null, // 初始化地图
-        autoComplete:null, // 初始化搜索方法
-        geocoder:null, // 初始化地理、坐标转化
-        positionPicker:null, // 地图拖拽选点
-        tips:[], //搜索关键字列表
-        addrContent:{}, // 回显地址信息
-        loading:false, // 加载状态
+      showMap: false, // modal显隐
+      mapSearch: "", // 地图搜索
+      map: null, // 初始化地图
+      autoComplete: null, // 初始化搜索方法
+      geocoder: null, // 初始化地理、坐标转化
+      positionPicker: null, // 地图拖拽选点
+      tips: [], //搜索关键字列表
+      addrContent: {}, // 回显地址信息
+      loading: false, // 加载状态
     };
-},
-watch:{
-    mapSearch:function(val){
-        this.searchOfMap(val)
-    }
-},
-methods: {
-    ok(){ // 确定选择
-
-         this.loading = true
-
-         const codeObj = {}
-         const params = {
-             cityCode: this.addrContent.regeocode.addressComponent.citycode,
-             townName: this.addrContent.regeocode.addressComponent.township
-         }
-      getRegion(params).then(res=>{
-             if(res.success) {
-                  this.addrContent.addr = res.result.name.replace(/,/g," ")
-                  this.addrContent.addrId = res.result.id
-                  this.loading = false
-                  this.showMap = false;
-                  this.$emit('getAddress',this.addrContent);
-
-             }
-         })
-
+  },
+  watch: {
+    mapSearch: function (val) {
+      this.searchOfMap(val);
     },
-    init() {
-        AMapLoader.load({
-            key: "b440952723253aa9fe483e698057bf7d", // 申请好的Web端开发者Key，首次调用 load 时必填
-            version: "", // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
-            plugins: [
-            "AMap.ToolBar",
-            "AMap.Autocomplete",
-            "AMap.PlaceSearch",
-            "AMap.Geolocation",
-            'AMap.Geocoder'
-            ], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
-            "AMapUI": {             // 是否加载 AMapUI，缺省不加载
-                "version": '1.1',   // AMapUI 缺省 1.1
-                "plugins":['misc/PositionPicker'],       // 需要加载的 AMapUI ui插件
-            },
-        })
-        .then((AMap) => {
-            let that = this;
-            this.map = new AMap.Map("map-container",{
-                zoom:12
-            });
-            that.map.addControl(new AMap.ToolBar());
-            that.map.addControl(new AMap.Autocomplete());
-            that.map.addControl(new AMap.PlaceSearch());
-            that.map.addControl(new AMap.Geocoder());
-
-            // 实例化Autocomplete
-            let autoOptions = {
-                city: "全国"
-            };
-            that.autoComplete = new AMap.Autocomplete(autoOptions); // 搜索
-            that.geocoder = new AMap.Geocoder(autoOptions)
-
-
-            that.positionPicker = new AMapUI.PositionPicker({ // 拖拽选点
-                mode: 'dragMap',
-                map:that.map
-            });
-            that.positionPicker.start()
-            /**
-             *
-             * 所有回显数据，都在positionResult里面
-             * 需要字段可以查找
-             *
-             */
-            that.positionPicker.on('success', function(positionResult) {
-
-                that.addrContent = positionResult;
-            });
-
-        })
-        .catch((e) => {});
-    },
-    searchOfMap(val) { // 地图搜索
-        let that = this;
-        this.autoComplete.search(val, function (status, result) {
-            // 搜索成功时，result即是对应的匹配数据
-            if(status == 'complete' && result.info == 'OK'){
-                that.tips = result.tips;
-            }else {
-                that.tips = []
-            }
-        });
-    },
-    selectAddr(location) { // 选择坐标
-        if(!location){
-            this.$Message.warning('请选择正确点位')
-            return false;
+  },
+  methods: {
+    ok() {
+      // 确定选择
+      this.loading = true;
+      const params = {
+        cityCode: this.addrContent.regeocode.addressComponent.citycode,
+        townName: this.addrContent.regeocode.addressComponent.township,
+      };
+      getRegion(params).then((res) => {
+        if (res.success) {
+          this.addrContent.addr = res.result.name.replace(/,/g, " ");
+          this.addrContent.addrId = res.result.id;
+          this.loading = false;
+          this.showMap = false;
+          this.$emit("getAddress", this.addrContent);
         }
-        const lnglat = [location.lng,location.lat]
-        this.positionPicker.start(lnglat)
-    }
-},
-mounted() {
-    this.init()
-},
+      });
+    },
+    // 初始化地图组件
+    init() {
+      AMapLoader.load({
+        key: "b440952723253aa9fe483e698057bf7d", // 申请好的Web端开发者Key，首次调用 load 时必填
+        version: "", // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
+        plugins: [
+          "AMap.ToolBar",
+          "AMap.Autocomplete",
+          "AMap.PlaceSearch",
+          "AMap.Geolocation",
+          "AMap.Geocoder",
+        ], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
+        AMapUI: {
+          // 是否加载 AMapUI，缺省不加载
+          version: "1.1", // AMapUI 缺省 1.1
+          plugins: ["misc/PositionPicker"], // 需要加载的 AMapUI ui插件
+        },
+      }).then((AMap) => {
+          let that = this;
+          this.map = new AMap.Map("map-container", {
+            zoom: 12,
+          });
+          that.map.addControl(new AMap.ToolBar());
+          that.map.addControl(new AMap.Autocomplete());
+          that.map.addControl(new AMap.PlaceSearch());
+          that.map.addControl(new AMap.Geocoder());
+
+          // 实例化Autocomplete
+          let autoOptions = {
+            city: "全国",
+          };
+          that.autoComplete = new AMap.Autocomplete(autoOptions); // 搜索
+          that.geocoder = new AMap.Geocoder(autoOptions);
+
+          that.positionPicker = new AMapUI.PositionPicker({
+            // 拖拽选点
+            mode: "dragMap",
+            map: that.map,
+          });
+          that.positionPicker.start();
+          /**
+           *
+           * 所有回显数据，都在positionResult里面
+           * 需要字段可以查找
+           *
+           */
+          that.positionPicker.on("success", function (positionResult) {
+            that.addrContent = positionResult;
+          });
+        }).catch((e) => {});
+    },
+    searchOfMap(val) {
+      // 地图搜索
+      let that = this;
+      this.autoComplete.search(val, function (status, result) {
+        // 搜索成功时，result即是对应的匹配数据
+        if (status == "complete" && result.info == "OK") {
+          that.tips = result.tips;
+        } else {
+          that.tips = [];
+        }
+      });
+    },
+    selectAddr(location) {
+      // 选择坐标
+      if (!location) {
+        this.$Message.warning("请选择正确点位");
+        return false;
+      }
+      const lnglat = [location.lng, location.lat];
+      this.positionPicker.start(lnglat);
+    },
+  },
+  mounted() {
+    this.init();
+  },
 };
 </script>
 <style lang="scss" scoped>
-    #map-container{
-        width: 500px;
-        height: 400px;
-    }
+#map-container {
+  width: 500px;
+  height: 400px;
+}
 
-    .search-con{
-        position: absolute;
-        right: 20px;
-        top: 64px;
-        width: 260px;
-        ul{
-            width: 260px;
-            height: 400px;
-            overflow: scroll;
-            li{
-                padding: 5px;
-                p:nth-child(2){
-                    color: #999;
-                    font-size: 12px;
-                }
-                &:hover{
-                    background-color:#eee;
-                    cursor: pointer;
-                }
-            }
-        }
+.search-con {
+  position: absolute;
+  right: 20px;
+  top: 64px;
+  width: 260px;
+  ul {
+    width: 260px;
+    height: 400px;
+    overflow: scroll;
+    li {
+      padding: 5px;
+      p:nth-child(2) {
+        color: #999;
+        font-size: 12px;
+      }
+      &:hover {
+        background-color: #eee;
+        cursor: pointer;
+      }
     }
+  }
+}
 
-    .address{
-        margin-bottom: 10px;
-        // color: $theme_color;
-        font-weight: bold;
-    }
+.address {
+  margin-bottom: 10px;
+  // color: $theme_color;
+  font-weight: bold;
+}
 </style>
diff --git a/manager/src/views/order/after-order/afterSale.vue b/manager/src/views/order/after-order/afterSale.vue
index 7899bb2e..ea4523da 100644
--- a/manager/src/views/order/after-order/afterSale.vue
+++ b/manager/src/views/order/after-order/afterSale.vue
@@ -1,146 +1,114 @@
 <template>
   <div class="search">
-    <Row>
-      <Col>
-        <Card>
-          <Tabs value="RETURN_MONEY" @on-click="handleClickType">
-            <TabPane label="退款" name="RETURN_MONEY">
-              <Row>
-                <Col>
-                  <Row class="operation" style="margin-bottom: 10px">
-                    <Button @click="add"  type="primary" >添加</Button>
-                  </Row>
-                  <Table
-                    :loading="loading"
-                    border
-                    :columns="columns"
-                    :data="data"
-                    ref="table"
-                    sortable="custom"
-                    @on-sort-change="changeSort"
-                    @on-selection-change="changeSelect"
-                  ></Table>
-                  <Row type="flex" justify="end" class="mt_10">
-                    <Page
-                      :current="searchForm.pageNumber"
-                      :total="total"
-                      :page-size="searchForm.pageSize"
-                      @on-change="changePage"
-                      @on-page-size-change="changePageSize"
-                      :page-size-opts="[10, 20, 50]"
-                      size="small"
-                      show-total
-                      show-elevator
-                      show-sizer
-                    ></Page>
-                  </Row>
-                </Col>
-              </Row>
-            </TabPane>
-            <TabPane label="取消" name="CANCEL">
-              <Row>
-                <Col>
-                  <Row class="operation" style="margin-bottom: 10px">
-                    <Button @click="add" type="primary" icon="md-add">添加</Button>
-                  </Row>
-                  <Table
-                    :loading="loading"
-                    border
-                    :columns="columns"
-                    :data="data"
-                    ref="table"
-                    sortable="custom"
-                    @on-sort-change="changeSort"
-                    @on-selection-change="changeSelect"
-                  ></Table>
-                  <Row type="flex" justify="end" class="mt_10">
-                    <Page
-                      :current="searchForm.pageNumber"
-                      :total="total"
-                      :page-size="searchForm.pageSize"
-                      @on-change="changePage"
-                      @on-page-size-change="changePageSize"
-                      :page-size-opts="[10, 20, 50]"
-                      size="small"
-                      show-total
-                      show-elevator
-                      show-sizer
-                    ></Page>
-                  </Row>
-                </Col>
-              </Row>
-            </TabPane>
-            <TabPane label="退货" name="RETURN_GOODS">
-              <Row>
-                <Col>
-                  <Row class="operation" style="margin-bottom: 10px">
-                    <Button @click="add" type="primary" icon="md-add">添加</Button>
-                  </Row>
-                  <Table
-                    :loading="loading"
-                    border
-                    :columns="columns"
-                    :data="data"
-                    ref="table"
-                    sortable="custom"
-                    @on-sort-change="changeSort"
-                    @on-selection-change="changeSelect"
-                  ></Table>
-                  <Row type="flex" justify="end" class="mt_10">
-                    <Page
-                      :current="searchForm.pageNumber"
-                      :total="total"
-                      :page-size="searchForm.pageSize"
-                      @on-change="changePage"
-                      @on-page-size-change="changePageSize"
-                      :page-size-opts="[10, 20, 50]"
-                      size="small"
-                      show-total
-                      show-elevator
-                      show-sizer
-                    ></Page>
-                  </Row>
-                </Col>
-              </Row>
-            </TabPane>
-            <TabPane label="投诉" name="COMPLAIN">
-              <Row>
-                <Col>
-                  <Row class="operation" style="margin-bottom: 10px">
-                    <Button @click="add" type="primary" icon="md-add">添加</Button>
-                    <Button @click="getDataList" icon="md-refresh">刷新</Button>
-                  </Row>
-                  <Table
-                    :loading="loading"
-                    border
-                    :columns="columns"
-                    :data="data"
-                    ref="table"
-                    sortable="custom"
-                    @on-sort-change="changeSort"
-                    @on-selection-change="changeSelect"
-                  ></Table>
-                  <Row type="flex" justify="end" class="mt_10">
-                    <Page
-                      :current="searchForm.pageNumber"
-                      :total="total"
-                      :page-size="searchForm.pageSize"
-                      @on-change="changePage"
-                      @on-page-size-change="changePageSize"
-                      :page-size-opts="[10, 20, 50]"
-                      size="small"
-                      show-total
-                      show-elevator
-                      show-sizer
-                    ></Page>
-                  </Row>
-                </Col>
-              </Row>
-            </TabPane>
-          </Tabs>
-        </Card>
-      </Col>
-    </Row>
+    <Card>
+      <Tabs value="RETURN_MONEY" @on-click="handleClickType">
+        <TabPane label="退款" name="RETURN_MONEY">
+          <Row class="operation" style="margin-bottom: 10px">
+            <Button @click="add"  type="primary" >添加</Button>
+          </Row>
+          <Table
+            :loading="loading"
+            border
+            :columns="columns"
+            :data="data"
+            ref="table"
+          ></Table>
+          <Row type="flex" justify="end" class="mt_10">
+            <Page
+              :current="searchForm.pageNumber"
+              :total="total"
+              :page-size="searchForm.pageSize"
+              @on-change="changePage"
+              @on-page-size-change="changePageSize"
+              :page-size-opts="[10, 20, 50]"
+              size="small"
+              show-total
+              show-elevator
+              show-sizer
+            ></Page>
+          </Row>
+        </TabPane>
+        <TabPane label="取消" name="CANCEL">
+          <Row class="operation" style="margin-bottom: 10px">
+            <Button @click="add" type="primary" icon="md-add">添加</Button>
+          </Row>
+          <Table
+            :loading="loading"
+            border
+            :columns="columns"
+            :data="data"
+            ref="table"
+          ></Table>
+          <Row type="flex" justify="end" class="mt_10">
+            <Page
+              :current="searchForm.pageNumber"
+              :total="total"
+              :page-size="searchForm.pageSize"
+              @on-change="changePage"
+              @on-page-size-change="changePageSize"
+              :page-size-opts="[10, 20, 50]"
+              size="small"
+              show-total
+              show-elevator
+              show-sizer
+            ></Page>
+          </Row>
+        </TabPane>
+        <TabPane label="退货" name="RETURN_GOODS">
+          <Row class="operation" style="margin-bottom: 10px">
+            <Button @click="add" type="primary" icon="md-add">添加</Button>
+          </Row>
+          <Table
+            :loading="loading"
+            border
+            :columns="columns"
+            :data="data"
+            ref="table"
+          ></Table>
+          <Row type="flex" justify="end" class="mt_10">
+            <Page
+              :current="searchForm.pageNumber"
+              :total="total"
+              :page-size="searchForm.pageSize"
+              @on-change="changePage"
+              @on-page-size-change="changePageSize"
+              :page-size-opts="[10, 20, 50]"
+              size="small"
+              show-total
+              show-elevator
+              show-sizer
+            ></Page>
+          </Row>
+        </TabPane>
+        <TabPane label="投诉" name="COMPLAIN">
+          <Row class="operation" style="margin-bottom: 10px">
+            <Button @click="add" type="primary" icon="md-add">添加</Button>
+            <Button @click="getDataList" icon="md-refresh">刷新</Button>
+          </Row>
+          <Table
+            :loading="loading"
+            border
+            :columns="columns"
+            :data="data"
+            ref="table"
+          ></Table>
+          <Row type="flex" justify="end" class="mt_10">
+            <Page
+              :current="searchForm.pageNumber"
+              :total="total"
+              :page-size="searchForm.pageSize"
+              @on-change="changePage"
+              @on-page-size-change="changePageSize"
+              :page-size-opts="[10, 20, 50]"
+              size="small"
+              show-total
+              show-elevator
+              show-sizer
+            ></Page>
+          </Row>
+        </TabPane>
+      </Tabs>
+    </Card>
     <Modal
       :title="modalTitle"
       v-model="modalVisible"
@@ -171,9 +139,6 @@
         modalVisible: false,//添加售后原因弹出框
         modalTitle: "", //添加售后原因弹出框标题
         loading: true, // 表单加载状态
-        selectList: [], // 多选数据
-        selectCount: 0, // 多选计数
-        modalType: 0, // 添加或编辑标识
         submitLoading: false, // 添加或编辑提交状态
         form: {
           reason: ""
@@ -261,20 +226,18 @@
     },
 
     methods: {
+      // 分页 修改页码
       changePage(v) {
         this.searchForm.pageNumber = v;
         this.getDataList();
         this.clearSelectAll();
       },
+      // 分页 修改页数
       changePageSize(v) {
+        this.searchForm.pageNumber = 1;
         this.searchForm.pageSize = v;
         this.getDataList();
       },
-      changeSort(e) {
-        this.searchForm.sort = e.key;
-        this.searchForm.order = e.order;
-        this.getDataList();
-      },
       //切换tab
       handleClickType(v) {
         this.searchForm.pageNumber = 1 // 当前页数
@@ -309,10 +272,6 @@
         });
         this.loading = false;
       },
-      changeSelect(e) {
-        this.selectList = e;
-        this.selectCount = e.length;
-      },
       //添加售后原因
       add() {
         this.form.reason = ""
@@ -331,7 +290,7 @@
         this.$refs.form.validate((valid) => {
           if (valid) {
             this.submitLoading = true;
-            if (this.modalType == 0) {
+            if (this.modalTitle == '添加售后原因') {
               // 添加
               delete this.form.id;
               API_Order.addAfterSaleReason(this.form).then((res) => {
diff --git a/manager/src/views/order/after-order/afterSaleOrder.vue b/manager/src/views/order/after-order/afterSaleOrder.vue
index b3896336..f807bbaf 100644
--- a/manager/src/views/order/after-order/afterSaleOrder.vue
+++ b/manager/src/views/order/after-order/afterSaleOrder.vue
@@ -1,127 +1,121 @@
 <template>
   <div class="search">
-    <Row>
-      <Col>
-        <Card>
-          <Row @keydown.enter.native="handleSearch">
-            <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
-              <Form-item label="订单编号" prop="orderSn">
-                <Input
-                  type="text"
-                  v-model="searchForm.orderSn"
-                  placeholder="请输入订单编号"
-                  clearable
-                  style="width: 200px"
-                />
-              </Form-item>
-              <Form-item label="售后单号" prop="sn">
-                <Input
-                  type="text"
-                  v-model="searchForm.sn"
-                  placeholder="请输入售后单号"
-                  clearable
-                  style="width: 200px"
-                />
-              </Form-item>
-              <Form-item label="售后状态">
-                <Select v-model="searchForm.serviceStatus" placeholder="全部" clearable style="width: 200px">
-                  <Option value="APPLY">申请售后</Option>
-                  <Option value="PASS">通过售后</Option>
-                  <Option value="REFUSE">拒绝售后</Option>
-                  <Option value="BUYER_RETURN">买家退货，待卖家收货</Option>
-                  <Option value="SELLER_CONFIRM">卖家确认收货</Option>
-                  <Option value="SELLER_TERMINATION">卖家终止售后</Option>
-                  <Option value="BUYER_CANCEL">买家取消售后</Option>
-                  <Option value="COMPLETE">完成售后</Option>
-                </Select>
-              </Form-item>
-              <Form-item label="申请时间">
-                <DatePicker
-                  v-model="selectDate"
-                  type="datetimerange"
-                  format="yyyy-MM-dd HH:mm:ss"
-                  clearable
-                  @on-change="selectDateRange"
-                  placeholder="选择起始时间"
-                  style="width: 200px"
-                ></DatePicker>
-              </Form-item>
-              <Form-item label="商家名称" prop="storeName">
-                <Input
-                  type="text"
-                  v-model="searchForm.storeName"
-                  placeholder="请输入商家名称"
-                  clearable
-                  style="width: 200px"
-                />
-              </Form-item>
-              <Form-item label="会员名称" prop="memberName">
-                <Input
-                  type="text"
-                  v-model="searchForm.memberName"
-                  placeholder="请输入会员名称"
-                  clearable
-                  style="width: 200px"
-                />
-              </Form-item>
-              <Form-item label="售后类型">
-                <Select v-model="searchForm.serviceType" placeholder="全部" clearable style="width: 200px">
-                  <Option value="RETURN_MONEY">退款</Option>
-                  <Option value="RETURN_GOODS">退货</Option>
-                </Select>
-              </Form-item>
-              <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
-            </Form>
-          </Row>
-          <Table
-            :loading="loading"
-            border
-            :columns="columns"
-            :data="data"
-            ref="table"
-            sortable="custom"
-            @on-sort-change="changeSort"
-            @on-selection-change="changeSelect"
-          >
-            <!-- 商品栏目格式化 -->
-            <template slot="goodsSlot" slot-scope="{row}">
-              <div style="margin-top: 5px;height: 80px; display: flex;">
-                <div style="">
-                  <img :src="row.goodsImage" style="height: 60px;margin-top: 3px">
-                </div>
+    <Card>
+      <Row @keydown.enter.native="handleSearch">
+        <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
+          <Form-item label="订单编号" prop="orderSn">
+            <Input
+              type="text"
+              v-model="searchForm.orderSn"
+              placeholder="请输入订单编号"
+              clearable
+              style="width: 200px"
+            />
+          </Form-item>
+          <Form-item label="售后单号" prop="sn">
+            <Input
+              type="text"
+              v-model="searchForm.sn"
+              placeholder="请输入售后单号"
+              clearable
+              style="width: 200px"
+            />
+          </Form-item>
+          <Form-item label="售后状态">
+            <Select v-model="searchForm.serviceStatus" placeholder="全部" clearable style="width: 200px">
+              <Option value="APPLY">申请售后</Option>
+              <Option value="PASS">通过售后</Option>
+              <Option value="REFUSE">拒绝售后</Option>
+              <Option value="BUYER_RETURN">买家退货，待卖家收货</Option>
+              <Option value="SELLER_CONFIRM">卖家确认收货</Option>
+              <Option value="SELLER_TERMINATION">卖家终止售后</Option>
+              <Option value="BUYER_CANCEL">买家取消售后</Option>
+              <Option value="COMPLETE">完成售后</Option>
+            </Select>
+          </Form-item>
+          <Form-item label="申请时间">
+            <DatePicker
+              v-model="selectDate"
+              type="datetimerange"
+              format="yyyy-MM-dd HH:mm:ss"
+              clearable
+              @on-change="selectDateRange"
+              placeholder="选择起始时间"
+              style="width: 200px"
+            ></DatePicker>
+          </Form-item>
+          <Form-item label="商家名称" prop="storeName">
+            <Input
+              type="text"
+              v-model="searchForm.storeName"
+              placeholder="请输入商家名称"
+              clearable
+              style="width: 200px"
+            />
+          </Form-item>
+          <Form-item label="会员名称" prop="memberName">
+            <Input
+              type="text"
+              v-model="searchForm.memberName"
+              placeholder="请输入会员名称"
+              clearable
+              style="width: 200px"
+            />
+          </Form-item>
+          <Form-item label="售后类型">
+            <Select v-model="searchForm.serviceType" placeholder="全部" clearable style="width: 200px">
+              <Option value="RETURN_MONEY">退款</Option>
+              <Option value="RETURN_GOODS">退货</Option>
+            </Select>
+          </Form-item>
+          <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
+        </Form>
+      </Row>
+      <Table
+        :loading="loading"
+        border
+        :columns="columns"
+        :data="data"
+        ref="table"
+        class="mt_10"
+      >
+        <!-- 商品栏目格式化 -->
+        <template slot="goodsSlot" slot-scope="{row}">
+          <div style="margin-top: 5px;height: 80px; display: flex;">
+            <div style="">
+              <img :src="row.goodsImage" style="height: 60px;margin-top: 3px">
+            </div>
 
-                <div style="margin-left: 13px;">
-                  <div class="div-zoom">
-                    <a @click="linkTo(row.goodsId,row.skuId)">{{row.goodsName}}</a>
-                  </div>
-                  <Poptip trigger="hover" title="扫码在手机中查看" transfer>
-                    <div slot="content">
-                      <vue-qr :text="wapLinkTo(row.goodsId,row.skuId)"  :margin="0" colorDark="#000" colorLight="#fff" :size="150"></vue-qr>
-                    </div>
-                    <img src="../../../assets/qrcode.svg" class="hover-pointer" width="20" height="20" alt="">
-                  </Poptip>
-                </div>
+            <div style="margin-left: 13px;">
+              <div class="div-zoom">
+                <a @click="linkTo(row.goodsId,row.skuId)">{{row.goodsName}}</a>
               </div>
+              <Poptip trigger="hover" title="扫码在手机中查看" transfer>
+                <div slot="content">
+                  <vue-qr :text="wapLinkTo(row.goodsId,row.skuId)"  :margin="0" colorDark="#000" colorLight="#fff" :size="150"></vue-qr>
+                </div>
+                <img src="../../../assets/qrcode.svg" class="hover-pointer" width="20" height="20" alt="">
+              </Poptip>
+            </div>
+          </div>
 
-            </template>
-          </Table>
-          <Row type="flex" justify="end" class="mt_10">
-            <Page
-              :current="searchForm.pageNumber"
-              :total="total"
-              :page-size="searchForm.pageSize"
-              @on-change="changePage"
-              @on-page-size-change="changePageSize"
-              :page-size-opts="[10, 20, 50]"
-              size="small"
-              show-total
-              show-elevator
-              show-sizer
-            ></Page>
-          </Row>
-        </Card>
-      </Col>
-    </Row>
+        </template>
+      </Table>
+      <Row type="flex" justify="end" class="mt_10">
+        <Page
+          :current="searchForm.pageNumber"
+          :total="total"
+          :page-size="searchForm.pageSize"
+          @on-change="changePage"
+          @on-page-size-change="changePageSize"
+          :page-size-opts="[10, 20, 50]"
+          size="small"
+          show-total
+          show-elevator
+          show-sizer
+        ></Page>
+      </Row>
+    </Card>
   </div>
 </template>
 
@@ -130,7 +124,6 @@
 
   export default {
     name: "orderList",
-    components: {},
     data() {
       return {
         loading: true, // 表单加载状态
@@ -158,8 +151,6 @@
           endTime: "",
           billPrice: "",
         },
-        selectList: [], // 多选数据
-        selectCount: 0, // 多选计数
         columns: [
           {
             title: "售后服务单号",
@@ -287,44 +278,35 @@
       };
     },
     methods: {
+      // 初始化数据
       init() {
         this.getDataList();
       },
+      // 分页 改变页码
       changePage(v) {
         this.searchForm.pageNumber = v;
         this.getDataList();
-        this.clearSelectAll();
       },
+      // 分页 改变页数
       changePageSize(v) {
+        this.searchForm.pageNumber = 1;
         this.searchForm.pageSize = v;
         this.getDataList();
       },
+      // 搜索
       handleSearch() {
         this.searchForm.pageNumber = 1;
         this.searchForm.pageSize = 10;
         this.getDataList();
       },
-      changeSort(e) {
-        this.searchForm.sort = e.key;
-        this.searchForm.order = e.order;
-        if (e.order === "normal") {
-          this.searchForm.order = "";
-        }
-        this.getDataList();
-      },
-      clearSelectAll() {
-        this.$refs.table.selectAll(false);
-      },
-      changeSelect(e) {
-        this.selectList = e;
-        this.selectCount = e.length;
-      },
+      // 开始结束时间分别赋值
       selectDateRange(v) {
         if (v) {
           this.searchForm.startDate = v[0];
           this.searchForm.endDate = v[1];
         }
       },
+      // 获取列表数据
       getDataList() {
         this.loading = true;
         API_Order.getAfterSaleOrderPage(this.searchForm).then((res) => {
@@ -337,25 +319,7 @@
         this.total = this.data.length;
         this.loading = false;
       },
-      //确认收款
-      confirmPrice(v) {
-        this.$Modal.confirm({
-          title: "确认收款",
-          content: "您确定要收款吗？",
-          loading: true,
-          onOk: () => {
-            API_Order.orderPay(v.sn).then(res => {
-              if (res.success) {
-                this.$Message.success("收款成功")
-                this.getDataList()
-              }
-              this.$Modal.remove();
-            })
-          },
-        });
-
-      },
-
+      // 跳转订单详情
       detail(v) {
         let sn = v.sn;
         this.$router.push({
diff --git a/manager/src/views/order/after-order/afterSaleOrderDetail.vue b/manager/src/views/order/after-order/afterSaleOrderDetail.vue
index 5ae41ffe..1a2bb4dd 100644
--- a/manager/src/views/order/after-order/afterSaleOrderDetail.vue
+++ b/manager/src/views/order/after-order/afterSaleOrderDetail.vue
@@ -1,389 +1,269 @@
 <template>
   <div class="search">
-    <Row>
-      <Col>
-      <Card>
-        <div class="main-content">
-          <div class="div-flow-left">
-            <div class="div-form-default">
-              <h3>退货申请</h3>
-              <dl>
-                <dt>退货状态</dt>
-                <dd v-if="afterSaleInfo.serviceStatus =='APPLY'">申请退货</dd>
-                <dd v-if="afterSaleInfo.serviceStatus =='PASS'">申请通过</dd>
-                <dd v-if="afterSaleInfo.serviceStatus =='REFUSE'">申请拒绝</dd>
-                <dd v-if="afterSaleInfo.serviceStatus =='BUYER_RETURN'">买家退货，待卖家收货</dd>
-                <dd v-if="afterSaleInfo.serviceStatus =='SELLER_RE_DELIVERY'">商家换货</dd>
-                <dd v-if="afterSaleInfo.serviceStatus =='SELLER_CONFIRM'">卖家确认收货</dd>
-                <dd v-if="afterSaleInfo.serviceStatus =='SELLER_TERMINATION'">卖家终止售后</dd>
-                <dd v-if="afterSaleInfo.serviceStatus =='BUYER_CONFIRM'">买家确认收货</dd>
-                <dd v-if="afterSaleInfo.serviceStatus =='BUYER_CANCEL'">买家取消售后</dd>
-                <dd v-if="afterSaleInfo.serviceStatus =='WAIT_REFUND'">等待平台退款</dd>
-                <dd v-if="afterSaleInfo.serviceStatus =='COMPLETE'">已完成</dd>
-              </dl>
-              <dl>
-                <dt>退货退款编号</dt>
-                <dd>{{afterSaleInfo.sn}}</dd>
-              </dl>
-              <dl>
-                <dt>退货退款原因</dt>
-                <dd>{{afterSaleInfo.reason}}</dd>
-              </dl>
-              <dl>
-                <dt>申请退款金额</dt>
-                <dd>￥{{afterSaleInfo.applyRefundPrice | unitPrice}}</dd>
-              </dl>
-              <dl v-if="afterSaleInfo.actualRefundPrice">
-                <dt>实际退款金额</dt>
-                <dd>{{afterSaleInfo.actualRefundPrice}}</dd>
-              </dl>
-              <dl v-if="afterSaleInfo.refundPoint">
-                <dt>退还积分</dt>
-                <dd>{{afterSaleInfo.refundPoint}}</dd>
-              </dl>
-              <dl>
-                <dt>退货数量</dt>
-                <dd>{{afterSaleInfo.num}}</dd>
-              </dl>
-              <dl>
-                <dt>问题描述</dt>
-                <dd>{{afterSaleInfo.problemDesc}}</dd>
-              </dl>
-              <dl>
-                <dt>凭证</dt>
-                <dd v-if="afterSaleImage == ''">
-                  暂无凭证
-                </dd>
-                <dd v-else>
-                  <div class="div-img" v-for="(item, index) in afterSaleImage">
-                    <img class="complain-img" :src=item>
-                  </div>
-                </dd>
-              </dl>
-            </div>
-
-            <div class="div-form-default" v-if="afterSaleInfo.serviceStatus=='APPLY'">
-              <h3>处理意见</h3>
-              <dl>
-                <dt>商家</dt>
-                <dd>
-                  <div class="div-content">
-                    {{afterSaleInfo.storeName}}
-                  </div>
-                </dd>
-              </dl>
-              <dl>
-                <dt>是否同意</dt>
-                <dd>
-                  <div class="div-content">
-                    <RadioGroup type="button" button-style="solid" v-model="params.serviceStatus">
-                      <Radio label="PASS">
-                        <span>同意</span>
-                      </Radio>
-                      <Radio label="REFUSE">
-                        <span>拒绝</span>
-                      </Radio>
-                    </RadioGroup>
-                  </div>
-                </dd>
-              </dl>
-              <dl>
-                <dt>申请退款金额</dt>
-                <dd>{{ afterSaleInfo.applyRefundPrice | unitPrice('￥') }}</dd>
-              </dl>
-              <dl>
-                <dt>实际退款金额</dt>
-                <dd>
-                  <Input v-model="params.actualRefundPrice" style="width:260px" />
-                </dd>
-              </dl>
-              <dl>
-                <dt>备注信息</dt>
-                <dd>
-                  <Input v-model="params.remark" type="textarea" maxlength="200" :rows="4" clearable style="width:260px" />
-                </dd>
-              </dl>
-              <dl>
-                <dd>
-                  <div style="text-align: right;width: 45%;margin-top: 10px">
-                    <Button type="primary" :loading="submitLoading" @click="handleSubmit" style="margin-left: 5px">
-                      确定
-                    </Button>
-                  </div>
-                </dd>
-              </dl>
-            </div>
-            <div class="div-form-default" v-if="afterSaleInfo.serviceStatus !='APPLY'">
-              <h3>商家处理</h3>
-              <dl>
-                <dt>商家</dt>
-                <dd>
-                  <div class="div-content">
-                    {{afterSaleInfo.storeName}}
-                  </div>
-
-                </dd>
-              </dl>
-              <dl>
-                <dt>审核结果</dt>
-                <dd>
-                  <div class="div-content">
-                    <span v-if="params.serviceStatus=='PASS'">
-                      审核通过
-                    </span>
-                    <span v-else>
-                      审核拒绝
-                    </span>
-                  </div>
-
-                </dd>
-              </dl>
-              <dl>
-                <dt>备注信息</dt>
-                <dd>
-                  {{afterSaleInfo.auditRemark}}
-                </dd>
-              </dl>
-            </div>
+    <Card>
+      <div class="main-content">
+        <div class="div-flow-left">
+          <div class="div-form-default">
+            <h3>退货申请</h3>
+            <dl>
+              <dt>退货状态</dt>
+              <dd>{{afterSaleInfo.serviceName}}</dd>
+            </dl>
+            <dl>
+              <dt>退货退款编号</dt>
+              <dd>{{afterSaleInfo.sn}}</dd>
+            </dl>
+            <dl>
+              <dt>退货退款原因</dt>
+              <dd>{{afterSaleInfo.reason}}</dd>
+            </dl>
+            <dl>
+              <dt>申请退款金额</dt>
+              <dd>￥{{afterSaleInfo.applyRefundPrice | unitPrice}}</dd>
+            </dl>
+            <dl v-if="afterSaleInfo.actualRefundPrice">
+              <dt>实际退款金额</dt>
+              <dd>￥{{afterSaleInfo.actualRefundPrice | unitPrice}}</dd>
+            </dl>
+            <dl v-if="afterSaleInfo.refundPoint">
+              <dt>退还积分</dt>
+              <dd>{{afterSaleInfo.refundPoint}}</dd>
+            </dl>
+            <dl>
+              <dt>退货数量</dt>
+              <dd>{{afterSaleInfo.num}}</dd>
+            </dl>
+            <dl>
+              <dt>问题描述</dt>
+              <dd>{{afterSaleInfo.problemDesc}}</dd>
+            </dl>
+            <dl>
+              <dt>凭证</dt>
+              <dd v-if="afterSaleImage == ''">
+                暂无凭证
+              </dd>
+              <dd v-else>
+                <div class="div-img" v-for="(item, index) in afterSaleImage" :key="index">
+                  <img class="complain-img" :src=item>
+                </div>
+              </dd>
+            </dl>
           </div>
-          <div class="div-flow-center">
 
-          </div>
-          <div class="div-flow-right">
-            <div class="div-form-default">
-              <h3>相关商品交易信息</h3>
-              <dl>
-                <dt>
-                  <img :src="afterSaleInfo.goodsImage" height="60px">
-                </dt>
-                <dd>
-                  <a>{{afterSaleInfo.goodsName}}</a><br>
-                  <span>{{afterSaleInfo.num}}(数量)</span><br>
-
-                </dd>
-              </dl>
-
-            </div>
-            <div class="div-form-default">
-              <h3>订单相关信息</h3>
-              <dl>
-                <dt>
-                  订单编号
-                </dt>
-                <dd>
-                  {{afterSaleInfo.orderSn}}
-                </dd>
-              </dl>
-              <dl v-if="afterSaleInfo.bankDepositName">
-                <dt>银行开户行</dt>
-                <dd>
-                  {{afterSaleInfo.bankDepositName}}
-                </dd>
-              </dl>
-              <dl v-if="afterSaleInfo.bankAccountName">
-                <dt>银行开户名</dt>
-                <dd>
-                  {{afterSaleInfo.bankAccountName}}
-                </dd>
-              </dl>
-              <dl v-if="afterSaleInfo.bankAccountNumber">
-                <dt>银行卡号</dt>
-                <dd>
-                  {{afterSaleInfo.bankAccountNumber}}
-                </dd>
-              </dl>
-
-            </div>
-            <!--"-->
-            <div class="div-form-default" v-if="afterSaleInfo.afterSaleAllowOperationVO && afterSaleInfo.afterSaleAllowOperationVO.refund">
-              <h3>平台退款</h3>
-              <dl>
-                <dt>银行开户行</dt>
-                <dd>
-                  {{afterSaleInfo.bankDepositName}}
-                </dd>
-              </dl>
-              <dl>
-                <dt>银行开户名</dt>
-                <dd>
-                  {{afterSaleInfo.bankAccountName}}
-                </dd>
-              </dl>
-              <dl>
-                <dt>银行卡号</dt>
-                <dd>
-                  {{afterSaleInfo.bankAccountNumber}}
-                </dd>
-              </dl>
-              <dl>
-                <dt>备注信息</dt>
-                <dd>
-                  <Input v-model="refundPriceForm.remark" type="textarea" maxlength="200" :rows="4" clearable style="width:260px" />
-                </dd>
-              </dl>
-              <dl>
-                <dt>操作</dt>
-                <dd>
-                  <Button type="primary" :loading="submitLoading" @click="refundPriceSubmit" style="margin-left: 5px">
-                    退款
-                  </Button>
-                </dd>
-              </dl>
-
-            </div>
-            <div class="div-form-default" v-if="afterSaleInfo.serviceStatus =='BUYER_RETURN'">
-              <h3>物流信息</h3>
-              <dl>
-                <dt>
-                  收货商家
-                </dt>
-                <dd>
+          <div class="div-form-default" v-if="afterSaleInfo.serviceStatus=='APPLY'">
+            <h3>处理意见</h3>
+            <dl>
+              <dt>商家</dt>
+              <dd>
+                <div class="div-content">
                   {{afterSaleInfo.storeName}}
-                </dd>
-              </dl>
-              <dl>
-                <dt>
-                  收货商家手机
-                </dt>
-                <dd>
-                  {{afterSaleInfo.sconsigneeMobile}}
-                </dd>
-              </dl>
-              <dl>
-                <dt>
-                  收货地址
-                </dt>
-                <dd>
-                  {{afterSaleInfo.sconsigneeAddressPath}} {{afterSaleInfo.sconsigneeDetail}}
-                </dd>
-              </dl>
-              <dl>
-                <dt>
-                  物流公司
-                </dt>
-                <dd>
-                  {{afterSaleInfo.mlogisticsName}}
-                </dd>
-              </dl>
-              <dl>
-                <dt>
-                  物流单号
-                </dt>
-                <dd>
-                  {{afterSaleInfo.mlogisticsNo}}
-                </dd>
-              </dl>
-              <dl>
-                <dt>操作</dt>
-                <dd>
-                  <Button type="primary" :loading="submitLoading" @click="sellerConfirmSubmit" style="margin-left: 5px">
-                    确认收货
+                </div>
+              </dd>
+            </dl>
+            <dl>
+              <dt>是否同意</dt>
+              <dd>
+                <div class="div-content">
+                  <RadioGroup type="button" button-style="solid" v-model="params.serviceStatus">
+                    <Radio label="PASS">
+                      <span>同意</span>
+                    </Radio>
+                    <Radio label="REFUSE">
+                      <span>拒绝</span>
+                    </Radio>
+                  </RadioGroup>
+                </div>
+              </dd>
+            </dl>
+            <dl>
+              <dt>申请退款金额</dt>
+              <dd>{{ afterSaleInfo.applyRefundPrice | unitPrice('￥') }}</dd>
+            </dl>
+            <dl>
+              <dt>实际退款金额</dt>
+              <dd>
+                <Input v-model="params.actualRefundPrice" style="width:260px" />
+              </dd>
+            </dl>
+            <dl>
+              <dt>备注信息</dt>
+              <dd>
+                <Input v-model="params.remark" type="textarea" maxlength="200" :rows="4" clearable style="width:260px" />
+              </dd>
+            </dl>
+            <dl>
+              <dd>
+                <div style="text-align: right;width: 45%;margin-top: 10px">
+                  <Button type="primary" :loading="submitLoading" @click="handleSubmit" style="margin-left: 5px">
+                    确定
                   </Button>
-                  <Button type="primary" :loading="submitLoading" @click="logisticsSeller()" style="margin-left: 5px">
-                    查询物流
-                  </Button>
-                </dd>
-              </dl>
-
-            </div>
-            <div class="div-form-default" v-if="afterSaleInfo.serviceStatus =='PASS' && afterSaleInfo.serviceType == 'EXCHANGE_GOODS'">
-              <h3>换货</h3>
-              <dl>
-                <dt>
-                  换货
-                </dt>
-                <dd>
-                  <Button type="primary" :loading="submitLoading" @click="exchangeGoods" style="margin-left: 5px">
-                    换货
-                  </Button>
-                </dd>
-              </dl>
-            </div>
-            <div class="div-form-default" v-if="afterSaleInfo.serviceStatus =='SELLER_RE_DELIVERY'">
-              <h3>物流信息</h3>
-              <dl>
-                <dt>
-                  收货人
-                </dt>
-                <dd>
-                  {{afterSaleInfo.mconsigneeName}}
-                </dd>
-              </dl>
-              <dl>
-                <dt>
-                  收货人手机
-                </dt>
-                <dd>
-                  {{afterSaleInfo.mconsigneeMobile}}
-                </dd>
-              </dl>
-              <dl>
-                <dt>
-                  收货地址
-                </dt>
-                <dd>
-                  {{afterSaleInfo.mconsigneeAddressPath}} {{afterSaleInfo.mconsigneeDetail}}
-                </dd>
-              </dl>
-              <dl>
-                <dt>
-                  物流公司
-                </dt>
-                <dd>
-                  {{afterSaleInfo.mlogisticsName}}
-                </dd>
-              </dl>
-              <dl>
-                <dt>
-                  物流单号
-                </dt>
-                <dd>
-                  {{afterSaleInfo.mlogisticsNo}}
-                </dd>
-              </dl>
-              <dl>
-                <dt>操作</dt>
-                <dd>
-                  <Button type="primary" :loading="submitLoading" @click="logisticsBuyer()" style="margin-left: 5px">
-                    查询物流
-                  </Button>
-                </dd>
-              </dl>
-
-            </div>
+                </div>
+              </dd>
+            </dl>
+          </div>
+          <div class="div-form-default" v-if="afterSaleInfo.serviceStatus !='APPLY'">
+            <h3>商家处理</h3>
+            <dl>
+              <dt>商家</dt>
+              <dd>
+                <div class="div-content">
+                  {{afterSaleInfo.storeName}}
+                </div>
+              </dd>
+            </dl>
+            <!-- <dl>
+              <dt>审核结果</dt>
+              <dd>
+                <div class="div-content">
+                  <span v-if="params.serviceStatus=='PASS'">
+                    审核通过
+                  </span>
+                  <span v-else>
+                    审核拒绝
+                  </span>
+                </div>
 
+              </dd>
+            </dl> -->
+            <dl>
+              <dt>备注信息</dt>
+              <dd>
+                {{afterSaleInfo.auditRemark || '暂无备注信息'}}
+              </dd>
+            </dl>
           </div>
         </div>
+        <div class="div-flow-center">
 
-      </Card>
-      </Col>
-    </Row>
-    <!-- 订单发货 -->
-    <Modal v-model="modalVisible" width="500px">
-      <p slot="header">
-        <span>订单发货</span>
-      </p>
-      <div>
-        <Form ref="form" :model="form" :label-width="90" :rules="formValidate" style="position:relative">
-          <FormItem label="物流公司" prop="logisticsId">
-            <Select v-model="form.logisticsId" placeholder="请选择" style="width:250px">
-              <Option v-for="(item, i) in checkedLogistics" :key="i" :value="item.id">{{item.name}}
-              </Option>
-            </Select>
-          </FormItem>
-          <FormItem label="物流单号" prop="logisticsNo">
-            <Input v-model="form.logisticsNo" style="width:250px" />
-          </FormItem>
-        </Form>
+        </div>
+        <div class="div-flow-right">
+          <div class="div-form-default">
+            <h3>相关商品交易信息</h3>
+            <dl>
+              <dt>
+                <img :src="afterSaleInfo.goodsImage" height="60px">
+              </dt>
+              <dd>
+                <div class="div-zoom">
+                  <a @click="linkTo(afterSaleInfo.goodsId,afterSaleInfo.skuId)">{{afterSaleInfo.goodsName}}</a>
+                  <Poptip trigger="hover" title="扫码在手机中查看" transfer>
+                    <div slot="content">
+                      <vue-qr :text="wapLinkTo(afterSaleInfo.goodsId,afterSaleInfo.skuId)"  :margin="0" colorDark="#000" colorLight="#fff" :size="150"></vue-qr>
+                    </div>
+                    <img src="../../../assets/qrcode.svg" style="vertical-align:middle" class="hover-pointer ml_10" width="20" height="20" alt="">
+                  </Poptip>
+                </div>
+                <div style="color:#999;font-size:10px">数量：x{{afterSaleInfo.num}}</div>
+                
+              </dd>
+            </dl>
 
+          </div>
+          <div class="div-form-default">
+            <h3>订单相关信息</h3>
+            <dl>
+              <dt>
+                订单编号
+              </dt>
+              <dd>
+                {{afterSaleInfo.orderSn}}
+              </dd>
+            </dl>
+            <dl v-if="afterSaleInfo.bankDepositName">
+              <dt>银行开户行</dt>
+              <dd>
+                {{afterSaleInfo.bankDepositName}}
+              </dd>
+            </dl>
+            <dl v-if="afterSaleInfo.bankAccountName">
+              <dt>银行开户名</dt>
+              <dd>
+                {{afterSaleInfo.bankAccountName}}
+              </dd>
+            </dl>
+            <dl v-if="afterSaleInfo.bankAccountNumber">
+              <dt>银行卡号</dt>
+              <dd>
+                {{afterSaleInfo.bankAccountNumber}}
+              </dd>
+            </dl>
+
+          </div>
+          <div class="div-form-default" v-if="afterSaleInfo.afterSaleAllowOperationVO && afterSaleInfo.afterSaleAllowOperationVO.refund">
+            <h3>平台退款</h3>
+            <dl>
+              <dt>银行开户行</dt>
+              <dd>
+                {{afterSaleInfo.bankDepositName}}
+              </dd>
+            </dl>
+            <dl>
+              <dt>银行开户名</dt>
+              <dd>
+                {{afterSaleInfo.bankAccountName}}
+              </dd>
+            </dl>
+            <dl>
+              <dt>银行卡号</dt>
+              <dd>
+                {{afterSaleInfo.bankAccountNumber}}
+              </dd>
+            </dl>
+            <dl>
+              <dt>备注信息</dt>
+              <dd>
+                <Input v-model="refundPriceForm.remark" type="textarea" maxlength="200" :rows="4" clearable style="width:260px" />
+              </dd>
+            </dl>
+            <dl>
+              <dt>操作</dt>
+              <dd>
+                <Button type="primary" :loading="submitLoading" @click="refundPriceSubmit" style="margin-left: 5px">
+                  退款
+                </Button>
+              </dd>
+            </dl>
+          </div>
+          <div class="div-form-default" v-if="afterSaleInfo.showDelivery && afterSaleInfo.serviceType ==='RETURN_GOODS'">
+            <h3>物流信息</h3>
+            <dl>
+              <dt>收货商家</dt>
+              <dd>{{afterSaleInfo.storeName}}</dd>
+            </dl>
+            <dl>
+              <dt>收货商家手机</dt>
+              <dd>{{storeMsg.salesConsigneeMobile}}</dd>
+            </dl>
+            <dl>
+              <dt>收货地址</dt>
+              <dd>{{storeMsg.salesConsigneeAddressPath}} {{storeMsg.salesConsigneeDetail}}</dd>
+            </dl>
+            <dl>
+              <dt>物流公司</dt>
+              <dd>{{afterSaleInfo.mlogisticsName}}</dd>
+            </dl>
+            <dl>
+              <dt>
+                物流单号
+              </dt>
+              <dd>
+                {{afterSaleInfo.mlogisticsNo}}
+              </dd>
+            </dl>
+            <dl>
+              <dt>操作</dt>
+              <dd>
+                <Button type="info" :loading="submitLoading" @click="logisticsSeller()" style="margin-left: 5px">
+                  查询物流
+                </Button>
+              </dd>
+            </dl>
+
+          </div>
+          
+        </div>
       </div>
-
-      <div slot="footer" style="text-align: right">
-        <Button size="large" @click="orderDeliverCancel">取消</Button>
-        <Button type="success" size="large" @click="orderDeliverySubmit">发货</Button>
-
-      </div>
-    </Modal>
+    </Card>
     <!-- 查询物流 -->
     <Modal v-model="logisticsModal" width="40">
       <p slot="header">
@@ -399,26 +279,30 @@
         <dl>
           <dt>物流公司：</dt>
           <dd>
-            <div class="text-box">{{logisticsInfo.shipper}}</div>
+            <div class="text-box">{{afterSaleInfo.mlogisticsName}}</div>
           </dd>
         </dl>
         <dl>
           <dt>快递单号：</dt>
           <dd>
-            <div nctype="ordersSn" class="text-box">{{logisticsInfo.logisticCode}}</div>
+            <div class="text-box">{{afterSaleInfo.mlogisticsNo}}</div>
           </dd>
         </dl>
         <div class="div-express-log">
           <ul class="express-log">
-            <li v-for="(item,index) in logisticsInfo.traces">
-              <span class="time">{{item.AcceptTime}}</span>
-              <span class="detail">{{item.AcceptStation}}</span>
-            </li>
+            <template v-if="Object.keys(logisticsInfo).length">
+              <li v-for="(item,index) in logisticsInfo.traces" :key="index">
+                <span class="time">{{item.AcceptTime}}</span>
+                <span class="detail">{{item.AcceptStation}}</span>
+              </li>
+            </template>
+            <template v-else>
+              <li style="text-align:center;">暂无物流信息</li>
+            </template>
+            
           </ul>
         </div>
-
       </div>
-
       <div slot="footer" style="text-align: right">
         <Button @click="logisticsClose">取消</Button>
       </div>
@@ -428,36 +312,19 @@
 
 <script>
 import * as API_Order from "@/api/order";
-import uploadPicThumb from "@/views/my-components/lili/upload-pic-thumb";
 
 export default {
-  name: "orderComplaint",
-  components: {
-    uploadPicThumb,
-  },
+  name: "orderDetail",
   data() {
     return {
       sn: "", // 订单号
       logisticsModal: false, //查询物流模态框
+      
       logisticsInfo: {}, //物流信息
-      form: {
-        logisticsNo: "",
-        logisticsId: "",
-      }, //换货发货form
-      formValidate: {
-        logisticsNo: [
-          { required: true, message: "发货单号不能为空", trigger: "change" },
-        ],
-        logisticsId: [
-          { required: true, message: "请选择物流公司", trigger: "blur" },
-        ],
-      },
-      modalVisible: false, // 添加或编辑显示
       afterSaleInfo: {}, // 售后信息
       afterSaleImage: [], //会员申诉图片
-      appealImages: [], //商家申诉的图片
       submitLoading: false, // 添加或编辑提交状态
-      checkedLogistics: [], //选中的物流公司集合
+      storeMsg: {}, // 商家地址信息
       //商家处理意见
       params: {
         serviceStatus: "PASS",
@@ -467,18 +334,56 @@ export default {
       refundPriceForm: {
         remark: "",
       },
+      afterSaleStatusList: [ // 售后状态列表
+        {
+          name: '申请中',
+          status: 'APPLY'
+        },
+        {
+          name: '通过',
+          status: 'PASS'
+        },
+        {
+          name: '拒绝',
+          status: 'REFUSE'
+        },
+        {
+          name: '买家退货，待卖家收货',
+          status: 'BUYER_RETURN'
+        },
+        {
+          name: '卖家确认收货',
+          status: 'SELLER_CONFIRM'
+        },
+        {
+          name: '卖家终止售后',
+          status: 'SELLER_TERMINATION'
+        },
+        {
+          name: '买家取消售后',
+          status: 'BUYER_CANCEL'
+        },
+        {
+          name: '完成售后',
+          status: 'COMPLETE'
+        },
+        {
+          name: '等待平台退款',
+          status: 'WAIT_REFUND'
+        }
+      ]
     };
   },
-  watch: {
-    $route(to, from) {},
-  },
   methods: {
+    // 获取售后详情
     getDetail() {
       this.loading = true;
       API_Order.getAfterSaleOrderDetail(this.sn).then((res) => {
         this.loading = false;
         if (res.success) {
           this.afterSaleInfo = res.result;
+          this.afterSaleInfo.showDelivery = this.showDelivery(this.afterSaleInfo.serviceStatus)
+          this.afterSaleInfo.serviceName = this.filterOrderStatus(this.afterSaleInfo.serviceStatus)
           this.afterSaleImage = (res.result.afterSaleImage || "").split(",");
           //退货地址去掉逗号
           if (this.afterSaleInfo.mconsigneeAddressPath)
@@ -490,38 +395,20 @@ export default {
             "actualRefundPrice",
             this.afterSaleInfo.applyRefundPrice
           );
+          // 如果显示物流信息，展示商家地址
+          if (this.afterSaleInfo.showDelivery) {
+            API_Order.storeAddress(this.sn).then(resu => {
+              if(resu.success) {
+                const obj = resu.result
+                obj.salesConsigneeAddressPath = obj.salesConsigneeAddressPath.replaceAll(',', '')
+                this.storeMsg = obj;
+              }
+            })
+          }
+          
         }
       });
     },
-    //换货弹出框
-    exchangeGoods() {
-      API_Order.getLogisticsChecked().then((res) => {
-        if (res.success) {
-          this.checkedLogistics = res.result;
-          this.modalVisible = true;
-        }
-      });
-    },
-    orderDeliverCancel() {
-      this.modalVisible = false;
-    },
-    //商家确认收货
-    sellerConfirmSubmit() {
-      this.$Modal.confirm({
-        title: "确认收货",
-        content: "请确认已经收到退货货物？",
-        loading: true,
-        onOk: () => {
-          API_Order.afterSaleSellerConfirm(this.sn, this.params).then((res) => {
-            this.$Modal.remove();
-            if (res.success) {
-              this.$Message.success("收货成功");
-              this.getDetail();
-            }
-          });
-        },
-      });
-    },
     //平台退款
     refundPriceSubmit() {
       if (this.refundPriceForm.remark == "") {
@@ -545,15 +432,6 @@ export default {
     },
     //查询物流
     logisticsSeller() {
-      this.logisticsModal = true;
-      API_Order.getSellerDeliveryTraces(this.sn).then((res) => {
-        if (res.success && res.result != null) {
-          this.logisticsInfo = res.result;
-        }
-      });
-    },
-    //查询物流
-    logisticsBuyer() {
       this.logisticsModal = true;
       API_Order.getAfterSaleTraces(this.sn).then((res) => {
         if (res.success && res.result != null) {
@@ -565,21 +443,6 @@ export default {
     logisticsClose() {
       this.logisticsModal = false;
     },
-
-    //换货发货
-    orderDeliverySubmit() {
-      this.$refs.form.validate((valid) => {
-        if (valid) {
-          API_Order.afterSaleSellerDelivery(this.sn, this.form).then((res) => {
-            if (res.success) {
-              this.$Message.success("订单发货成功");
-              this.modalVisible = false;
-              this.getDataDetail();
-            }
-          });
-        }
-      });
-    },
     //回复
     handleSubmit() {
       if (this.params.remark == "") {
@@ -599,8 +462,22 @@ export default {
         }
       });
     },
+    filterOrderStatus (status) { // 获取订单状态中文
+      const ob = this.afterSaleStatusList.filter(e => { return e.status === status });
+      return ob[0].name
+    },
+    // 根据订单状态判断是否显示物流信息
+    showDelivery (status) {
+      let flag = false;
+      this.afterSaleStatusList.forEach((e,index) => {
+        // 订单为买家退货，待卖家收货之后的状态，并且不是买家取消售后，展示物流信息
+        if(e.status === status && index>=3 && index !==6) {
+          flag = true
+        }
+      })
+      return flag
+    }
   },
-
   mounted() {
     this.sn = this.$route.query.sn;
     this.getDetail();
diff --git a/manager/src/views/order/after-order/orderComplaint.vue b/manager/src/views/order/after-order/orderComplaint.vue
index 3a50c9df..93752bd1 100644
--- a/manager/src/views/order/after-order/orderComplaint.vue
+++ b/manager/src/views/order/after-order/orderComplaint.vue
@@ -40,9 +40,7 @@
         :columns="columns"
         :data="data"
         ref="table"
-        sortable="custom"
-        @on-sort-change="changeSort"
-        @on-selection-change="changeSelect"
+        class="mt_10"
       >
         <template slot-scope="{row}" slot="goodsName">
           <a class="mr_10" @click="linkTo(row.goodsId,row.skuId)">{{row.goodsName}}</a>
@@ -69,56 +67,6 @@
         ></Page>
       </Row>
     </Card>
-    <Modal
-      :title="modalTitle"
-      v-model="modalVisible"
-      :mask-closable="false"
-      :width="500"
-    >
-      <Form ref="form" :model="form" :label-width="100" :rules="formValidate">
-        <FormItem label="评价内容">
-          <span v-if="content == ''">暂无评价</span>
-          <span v-else>{{content}}</span>
-        </FormItem>
-        <FormItem label="评价图片">
-          <upload-pic-thumb
-                            v-model="image"
-                            :disable="true"
-                            :remove="false"
-          ></upload-pic-thumb>
-        </FormItem>
-        <FormItem label="回复内容" prop="reply">
-          <Input v-if="replyStatus == false"
-            v-model="form.reply"
-            type="textarea"
-            maxlength="200"
-            :rows="4"
-            clearable
-            style="width:260px"
-          />
-          <span v-else>
-            {{form.reply}}
-          </span>
-        </FormItem>
-        <FormItem label="回复图片" prop="replyImage">
-          <upload-pic-thumb v-if="replyStatus == false"
-            v-model="form.replyImage"
-            :limit="5"
-          ></upload-pic-thumb>
-          <upload-pic-thumb v-else
-            v-model="form.replyImage"
-            :disable="true"
-             :remove="false"
-          ></upload-pic-thumb>
-        </FormItem>
-      </Form>
-      <div slot="footer">
-        <Button type="text" @click="modalVisible = false">取消</Button>
-        <Button v-if="replyStatus == false" type="primary" :loading="submitLoading" @click="handleSubmit" >回复
-        </Button
-        >
-      </div>
-    </Modal>
   </div>
 </template>
 
@@ -133,15 +81,7 @@
     },
     data() {
       return {
-        image:[],//评价图片
-        replyStatus:false,//回复状态
-        modalType: 0, // 添加或编辑标识
-        modalVisible: false, // 添加或编辑显示
-        modalTitle: "", // 添加或编辑标题
         loading: true, // 表单加载状态
-        content: "",//评价内容
-        drop: false, // 更多搜索项
-        dropDownIcon: "ios-arrow-down", // drop 图标
         searchForm: {
           // 搜索框初始化对象
           pageNumber: 1, // 当前页数
@@ -149,10 +89,6 @@
           sort: "createTime", // 默认排序字段
           order: "desc", // 默认排序方式
         },
-        form: {}, // 表单
-        submitLoading: false, // 添加或编辑提交状态
-        selectList: [], // 多选数据
-        selectCount: 0, // 多选计数
         columns: [
           // 表头
           {
@@ -271,54 +207,28 @@
       }
     },
     methods: {
+      // 初始化数据
       init() {
         this.getDataList();
       },
+      // 分页 改变页码
       changePage(v) {
         this.searchForm.pageNumber = v;
         this.getDataList();
-        this.clearSelectAll();
       },
+      // 分页 改变页数
       changePageSize(v) {
+        this.searchForm.pageNumber = 1;
         this.searchForm.pageSize = v;
         this.getDataList();
       },
+      // 搜索
       handleSearch() {
         this.searchForm.pageNumber = 1;
         this.searchForm.pageSize = 10;
         this.getDataList();
       },
-      changeSort(e) {
-        this.searchForm.sort = e.key;
-        this.searchForm.order = e.order;
-        if (e.order === "normal") {
-          this.searchForm.order = "";
-        }
-        this.getDataList();
-      },
-      clearSelectAll() {
-        this.$refs.table.selectAll(false);
-      },
-      changeSelect(e) {
-        this.selectList = e;
-        this.selectCount = e.length;
-      },
-      selectDateRange(v) {
-        if (v) {
-          this.searchForm.startDate = v[0];
-          this.searchForm.endDate = v[1];
-        }
-      },
-      dropDown() {
-        if (this.drop) {
-          this.dropDownContent = "展开";
-          this.dropDownIcon = "ios-arrow-down";
-        } else {
-          this.dropDownContent = "收起";
-          this.dropDownIcon = "ios-arrow-up";
-        }
-        this.drop = !this.drop;
-      },
+      // 获取列表数据
       getDataList() {
         this.loading = true;
         API_Order.getOrderComplain(this.searchForm).then((res) => {
diff --git a/manager/src/views/order/after-order/orderComplaintDetail.vue b/manager/src/views/order/after-order/orderComplaintDetail.vue
index 848522d3..0bf29732 100644
--- a/manager/src/views/order/after-order/orderComplaintDetail.vue
+++ b/manager/src/views/order/after-order/orderComplaintDetail.vue
@@ -1,238 +1,228 @@
 <template>
   <div class="search">
-    <Row>
-      <Col style="width:100%;">
-      <Card>
-        <div class="main-content">
-          <div class="div-flow-left">
+    <Card>
+      <div class="main-content">
+        <div class="div-flow-left">
+          <div class="div-form-default">
+            <h3>投诉信息</h3>
+            <dl>
+              <dt>投诉商品</dt>
+              <dd>{{complaintInfo.goodsName}}</dd>
+            </dl>
+            <dl>
+              <dt>投诉状态</dt>
+              <dd v-if="complaintInfo.complainStatus =='NEW'">新投诉</dd>
+              <dd v-if="complaintInfo.complainStatus =='CANCEL'">已撤销</dd>
+              <dd v-if="complaintInfo.complainStatus =='WAIT_APPEAL'">待申诉</dd>
+              <dd v-if="complaintInfo.complainStatus =='COMMUNICATION'">对话中</dd>
+              <dd v-if="complaintInfo.complainStatus =='WAIT_ARBITRATION'">等待仲裁</dd>
+              <dd v-if="complaintInfo.complainStatus =='COMPLETE'">已完成</dd>
+            </dl>
+            <dl>
+              <dt>投诉时间</dt>
+              <dd>{{complaintInfo.createTime}}</dd>
+            </dl>
+            <dl>
+              <dt>投诉主题</dt>
+              <dd>{{complaintInfo.complainTopic}}</dd>
+            </dl>
+            <dl>
+              <dt>投诉内容</dt>
+              <dd>{{complaintInfo.content}}</dd>
+            </dl>
+            <dl>
+              <dt>投诉凭证</dt>
+              <dd v-if="images == ''">
+                暂无投诉凭证
+              </dd>
+              <dd v-else>
+                <div class="div-img" v-for="(item, index) in images" :key="index">
+                  <img class="complain-img" :src=item>
+                </div>
+              </dd>
+            </dl>
+          </div>
+          <div class="div-form-default" v-if="complaintInfo.appealContent">
+            <h3>商家申诉信息</h3>
+            <dl>
+              <dt>申诉时间</dt>
+              <dd>{{complaintInfo.appealTime}}</dd>
+            </dl>
+            <dl>
+              <dt>申诉内容</dt>
+              <dd>{{complaintInfo.appealContent}}</dd>
+            </dl>
+            <dl>
+              <dt>申诉凭证</dt>
+              <dd v-if="complaintInfo.appealImagesList.length == 0">
+                暂无申诉凭证
+              </dd>
+              <dd v-else>
+                <div class="div-img" v-for="(item, index) in complaintInfo.appealImagesList" :key="index">
+                  <img class="complain-img" :src="item">
+                </div>
+              </dd>
+            </dl>
+          </div>
             <div class="div-form-default">
-              <h3>投诉信息</h3>
+              <h3>对话详情</h3>
               <dl>
-                <dt>投诉商品</dt>
-                <dd>{{complaintInfo.goodsName}}</dd>
-              </dl>
-              <dl>
-                <dt>投诉状态</dt>
-                <dd v-if="complaintInfo.complainStatus =='NEW'">新投诉</dd>
-                <dd v-if="complaintInfo.complainStatus =='CANCEL'">已撤销</dd>
-                <dd v-if="complaintInfo.complainStatus =='WAIT_APPEAL'">待申诉</dd>
-                <dd v-if="complaintInfo.complainStatus =='COMMUNICATION'">对话中</dd>
-                <dd v-if="complaintInfo.complainStatus =='WAIT_ARBITRATION'">等待仲裁</dd>
-                <dd v-if="complaintInfo.complainStatus =='COMPLETE'">已完成</dd>
-              </dl>
-              <dl>
-                <dt>投诉时间</dt>
-                <dd>{{complaintInfo.createTime}}</dd>
-              </dl>
-              <dl>
-                <dt>投诉主题</dt>
-                <dd>{{complaintInfo.complainTopic}}</dd>
-              </dl>
-              <dl>
-                <dt>投诉内容</dt>
-                <dd>{{complaintInfo.content}}</dd>
-              </dl>
-              <dl>
-                <dt>投诉凭证</dt>
-                <dd v-if="images == ''">
-                  暂无投诉凭证
-                </dd>
-                <dd v-else>
-                  <div class="div-img" v-for="(item, index) in images">
-                    <img class="complain-img" :src=item>
+                <dt>对话记录</dt>
+                <dd>
+                  <div class="div-content">
+                    <p v-for="(item, index) in complaintInfo.orderComplaintCommunications" :key="index">
+                      <span v-if="item.owner == 'STORE'">商家[{{ item.createTime }}]</span>
+                      <span v-if="item.owner == 'BUYER'">买家[{{ item.createTime }}]</span>
+                      <span v-if="item.owner == 'PLATFORM'">平台[{{ item.createTime }}]</span>
+                      {{ item.content }}
+                    </p>
                   </div>
-                </dd>
-              </dl>
-            </div>
-            <div class="div-form-default" v-if="complaintInfo.appealContent">
-              <h3>商家申诉信息</h3>
-              <dl>
-                <dt>申诉时间</dt>
-                <dd>{{complaintInfo.appealTime}}</dd>
-              </dl>
-              <dl>
-                <dt>申诉内容</dt>
-                <dd>{{complaintInfo.appealContent}}</dd>
-              </dl>
-              <dl>
-                <dt>申诉凭证</dt>
-                <dd v-if="complaintInfo.appealImagesList.length == 0">
-                  暂无申诉凭证
-                </dd>
-                <dd v-else>
-                  <div class="div-img" v-for="(item, index) in complaintInfo.appealImagesList">
-                    <img class="complain-img" :src="item">
-                  </div>
-                </dd>
-              </dl>
-            </div>
-              <div class="div-form-default">
-                <h3>对话详情</h3>
-                <dl>
-                  <dt>对话记录</dt>
-                  <dd>
-                    <div class="div-content">
-                      <p v-for="(item, index) in complaintInfo.orderComplaintCommunications">
-                        <span v-if="item.owner == 'STORE'">商家[{{ item.createTime }}]</span>
-                        <span v-if="item.owner == 'BUYER'">买家[{{ item.createTime }}]</span>
-                        <span v-if="item.owner == 'PLATFORM'">平台[{{ item.createTime }}]</span>
-                        {{ item.content }}
-                      </p>
-                    </div>
 
-                  </dd>
-                </dl>
-                <dl v-if="complaintInfo.complainStatus!='COMPLETE'">
-                  <dt>发送对话</dt>
-                  <dd>
-                    <Input
-                      v-model="params.content"
-                      type="textarea"
-                      maxlength="200"
-                      :rows="4"
-                      clearable
-                      style="width:260px"
-                    />
-                  </dd>
-                </dl>
-                <dl v-if="complaintInfo.complainStatus != 'COMPLETE'">
-                  <dt></dt>
-                  <dd>
-                    <div style="text-align: right;width: 45%;margin-top: 10px">
-                      <Button type="primary" :loading="submitLoading" @click="handleSubmit" style="margin-left: 5px">
-                        回复
-                      </Button>
-                      <Button type="primary" :loading="submitLoading" @click="returnDataList" style="margin-left: 5px">
-                        返回列表
-                      </Button>
-                    </div>
-                  </dd>
-                </dl>
-              </div>
-            <div class="div-form-default" v-if="complaintInfo.complainStatus == 'COMPLETE'">
-              <h3>仲裁结果</h3>
-              <dl>
-                <dt>仲裁意见</dt>
-                <dd>
-                  {{complaintInfo.arbitrationResult}}
                 </dd>
               </dl>
-            </div>
-            <div class="div-form-default" v-if="complaintInfo.complainStatus != 'COMPLETE'">
-              <h3>平台仲裁</h3>
-              <dl v-if="arbitrationResultShow == true">
-                <dt>仲裁</dt>
+              <dl v-if="complaintInfo.complainStatus!='COMPLETE'">
+                <dt>发送对话</dt>
                 <dd>
-                  <Input v-model="arbitrationParams.arbitrationResult" type="textarea" maxlength="200" :rows="4" clearable style="width:260px" />
+                  <Input
+                    v-model="params.content"
+                    type="textarea"
+                    maxlength="200"
+                    :rows="4"
+                    clearable
+                    style="width:260px"
+                  />
                 </dd>
               </dl>
-              <dl>
+              <dl v-if="complaintInfo.complainStatus != 'COMPLETE'">
                 <dt></dt>
-                <dd style="text-align:right;display:flex; justify-content: space-between;">
-                  <Button type="primary" ghost :loading="submitLoading" v-if="arbitrationResultShow == false" @click="arbitrationHandle">
-                    直接仲裁结束投诉流程
-                  </Button>
-                  <Button :loading="submitLoading" v-if="complaintInfo.complainStatus == 'NEW'" @click="handleStoreComplaint">
-                    交由商家申诉
-                  </Button>
-                  <Button type="primary" :loading="submitLoading" v-if="arbitrationResultShow == true" @click="arbitrationHandleSubmit">
-                    提交仲裁
-                  </Button>
+                <dd>
+                  <div style="text-align: right;width: 45%;margin-top: 10px">
+                    <Button type="primary" :loading="submitLoading" @click="handleSubmit" style="margin-left: 5px">
+                      回复
+                    </Button>
+                    <Button type="primary" :loading="submitLoading" @click="returnDataList" style="margin-left: 5px">
+                      返回列表
+                    </Button>
+                  </div>
                 </dd>
               </dl>
             </div>
+          <div class="div-form-default" v-if="complaintInfo.complainStatus == 'COMPLETE'">
+            <h3>仲裁结果</h3>
+            <dl>
+              <dt>仲裁意见</dt>
+              <dd>
+                {{complaintInfo.arbitrationResult}}
+              </dd>
+            </dl>
           </div>
-          <div class="div-flow-center">
-
-          </div>
-          <div class="div-flow-right">
-            <div class="div-form-default">
-              <h3>相关商品交易信息</h3>
-              <dl>
-                <dt>
-                  <img :src="complaintInfo.goodsImage" height="60px">
-                </dt>
-                <dd>
-                  <a>{{complaintInfo.goodsName}}</a><br>
-                  <span>￥{{complaintInfo.goodsPrice}} * {{complaintInfo.num}}(数量)</span>
-                </dd>
-              </dl>
-
-            </div>
-            <div class="div-form-default">
-              <h3>订单相关信息</h3>
-              <dl>
-                <dt>
-                  订单编号
-                </dt>
-                <dd>
-                  {{complaintInfo.orderSn}}
-                </dd>
-              </dl>
-              <dl>
-                <dt>
-                  下单时间
-                </dt>
-                <dd>
-                  {{complaintInfo.createTime}}
-                </dd>
-              </dl>
-              <dl>
-                <dt>
-                  订单金额
-                </dt>
-                <dd>
-                  {{complaintInfo.orderPrice}}
-                </dd>
-              </dl>
-
-            </div>
-            <div class="div-form-default">
-              <h3>收件人信息</h3>
-              <dl>
-                <dt>
-                  收货人
-                </dt>
-                <dd>
-                  {{complaintInfo.consigneeName}}
-                </dd>
-              </dl>
-              <dl>
-                <dt>
-                  收货地址
-                </dt>
-                <dd>
-                  {{complaintInfo.consigneeAddressPath}}
-                </dd>
-              </dl>
-              <dl>
-                <dt>
-                  收货人手机
-                </dt>
-                <dd>
-                  {{complaintInfo.consigneeMobile}}
-                </dd>
-              </dl>
-            </div>
-
+          <div class="div-form-default" v-if="complaintInfo.complainStatus != 'COMPLETE'">
+            <h3>平台仲裁</h3>
+            <dl v-if="arbitrationResultShow == true">
+              <dt>仲裁</dt>
+              <dd>
+                <Input v-model="arbitrationParams.arbitrationResult" type="textarea" maxlength="200" :rows="4" clearable style="width:260px" />
+              </dd>
+            </dl>
+            <dl>
+              <dt></dt>
+              <dd style="text-align:right;display:flex; justify-content: space-between;">
+                <Button type="primary" ghost :loading="submitLoading" v-if="arbitrationResultShow == false" @click="arbitrationHandle">
+                  直接仲裁结束投诉流程
+                </Button>
+                <Button :loading="submitLoading" v-if="complaintInfo.complainStatus == 'NEW'" @click="handleStoreComplaint">
+                  交由商家申诉
+                </Button>
+                <Button type="primary" :loading="submitLoading" v-if="arbitrationResultShow == true" @click="arbitrationHandleSubmit">
+                  提交仲裁
+                </Button>
+              </dd>
+            </dl>
           </div>
         </div>
+        <div class="div-flow-center">
 
-      </Card>
-      </Col>
-    </Row>
+        </div>
+        <div class="div-flow-right">
+          <div class="div-form-default">
+            <h3>相关商品交易信息</h3>
+            <dl>
+              <dt>
+                <img :src="complaintInfo.goodsImage" height="60px">
+              </dt>
+              <dd>
+                <a>{{complaintInfo.goodsName}}</a><br>
+                <span>￥{{complaintInfo.goodsPrice}} * {{complaintInfo.num}}(数量)</span>
+              </dd>
+            </dl>
+
+          </div>
+          <div class="div-form-default">
+            <h3>订单相关信息</h3>
+            <dl>
+              <dt>
+                订单编号
+              </dt>
+              <dd>
+                {{complaintInfo.orderSn}}
+              </dd>
+            </dl>
+            <dl>
+              <dt>
+                下单时间
+              </dt>
+              <dd>
+                {{complaintInfo.createTime}}
+              </dd>
+            </dl>
+            <dl>
+              <dt>
+                订单金额
+              </dt>
+              <dd>
+                {{complaintInfo.orderPrice}}
+              </dd>
+            </dl>
+
+          </div>
+          <div class="div-form-default">
+            <h3>收件人信息</h3>
+            <dl>
+              <dt>
+                收货人
+              </dt>
+              <dd>
+                {{complaintInfo.consigneeName}}
+              </dd>
+            </dl>
+            <dl>
+              <dt>
+                收货地址
+              </dt>
+              <dd>
+                {{complaintInfo.consigneeAddressPath}}
+              </dd>
+            </dl>
+            <dl>
+              <dt>
+                收货人手机
+              </dt>
+              <dd>
+                {{complaintInfo.consigneeMobile}}
+              </dd>
+            </dl>
+          </div>
+        </div>
+      </div>
+    </Card>
   </div>
 </template>
 
 <script>
 import * as API_Order from "@/api/order";
-import uploadPicThumb from "@/views/my-components/lili/upload-pic-thumb";
 
 export default {
-  name: "orderComplaint",
-  components: {
-    uploadPicThumb,
-  },
+  name: "orderComplaintDetail",
   data() {
     return {
       id: 0, // 投诉id
@@ -267,9 +257,11 @@ export default {
         }
       });
     },
+    // 初始化数据
     init() {
       this.getDataList();
     },
+    // 获取投诉详情
     getDetail() {
       this.loading = true;
       API_Order.getOrderComplainDetail(this.id).then((res) => {
diff --git a/manager/src/views/order/flow/paymentLog.vue b/manager/src/views/order/flow/paymentLog.vue
index 366516b2..4942a812 100644
--- a/manager/src/views/order/flow/paymentLog.vue
+++ b/manager/src/views/order/flow/paymentLog.vue
@@ -27,7 +27,7 @@
           <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
         </Form>
       </Row>
-      <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect"></Table>
+      <Table :loading="loading" border :columns="columns" :data="data" ref="table" class="mt_10"></Table>
       <Row type="flex" justify="end" class="mt_10">
         <Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]"
           size="small" show-total show-elevator show-sizer></Page>
@@ -41,12 +41,9 @@ import * as API_Order from "@/api/order";
 
 export default {
   name: "paymentLog",
-  components: {},
   data() {
     return {
       loading: true, // 表单加载状态
-      drop: false, // 更多搜索项
-      dropDownIcon: "ios-arrow-down", // drop图标
       searchForm: {
         // 搜索框初始化对象
         pageNumber: 1, // 当前页数
@@ -161,6 +158,7 @@ export default {
     },
     // 改变页数
     changePageSize(v) {
+      this.searchForm.pageNumber = 1;
       this.searchForm.pageSize = v;
       this.getDataList();
     },
diff --git a/manager/src/views/order/flow/refundLog.vue b/manager/src/views/order/flow/refundLog.vue
index d6529e21..6a019d90 100644
--- a/manager/src/views/order/flow/refundLog.vue
+++ b/manager/src/views/order/flow/refundLog.vue
@@ -19,8 +19,7 @@
           <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
         </Form>
       </Row>
-      <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom"
-              @on-sort-change="changeSort" @on-selection-change="changeSelect"></Table>
+      <Table :loading="loading" border :columns="columns" :data="data" ref="table" class="mt_10"></Table>
       <Row type="flex" justify="end" class="mt_10">
         <Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize"
               @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]"
@@ -34,8 +33,7 @@
 import * as API_Order from "@/api/order";
 
 export default {
-  name: "paymentLog",
-  components: {},
+  name: "refundLog",
   data() {
     return {
       loading: true, // 表单加载状态
@@ -50,6 +48,7 @@ export default {
         orderSn: "",
         isRefund: "",
       },
+      // 退款起止时间
       selectDate: null,
       columns: [
         {
@@ -112,51 +111,35 @@ export default {
     };
   },
   methods: {
+    // 初始化数据
     init() {
       this.getDataList();
     },
+    // 分页 改变页码
     changePage(v) {
       this.searchForm.pageNumber = v;
       this.getDataList();
     },
+    // 分页 改变页数
     changePageSize(v) {
+      this.searchForm.pageNumber = 1;
       this.searchForm.pageSize = v;
       this.getDataList();
     },
+    // 搜索
     handleSearch() {
       this.searchForm.pageNumber = 1;
       this.searchForm.pageSize = 10;
       this.getDataList();
     },
-    handleReset() {
-      this.$refs.searchForm.resetFields();
-      this.searchForm.pageNumber = 1;
-      this.searchForm.pageSize = 10;
-      this.selectDate = null;
-      this.searchForm.startDate = "";
-      this.searchForm.endDate = "";
-      // 重新加载数据
-      this.getDataList();
-    },
-    changeSort(e) {
-      this.searchForm.sort = e.key;
-      this.searchForm.order = e.order;
-      if (e.order === "normal") {
-        this.searchForm.order = "";
-      }
-      this.getDataList();
-    },
-
-    changeSelect(e) {
-      this.selectList = e;
-      this.selectCount = e.length;
-    },
+    // 起止时间从新赋值
     selectDateRange(v) {
       if (v) {
         this.searchForm.startDate = v[0];
         this.searchForm.endDate = v[1];
       }
     },
+    // 获取列表数据
     getDataList() {
       this.loading = true;
       API_Order.refundLog(this.searchForm).then((res) => {
@@ -166,7 +149,6 @@ export default {
           this.total = res.result.total;
         }
       });
-      this.total = this.data.length;
       this.loading = false;
     }
   },
diff --git a/manager/src/views/order/order/fictitiousOrderList.vue b/manager/src/views/order/order/fictitiousOrderList.vue
index f4d80d60..e611e578 100644
--- a/manager/src/views/order/order/fictitiousOrderList.vue
+++ b/manager/src/views/order/order/fictitiousOrderList.vue
@@ -1,79 +1,75 @@
 <template>
   <div class="search">
-    <Row>
-      <Col>
-        <Card>
-          <Row @keydown.enter.native="handleSearch">
-            <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
-              <Form-item label="订单号" prop="orderSn">
-                <Input
-                  type="text"
-                  v-model="searchForm.orderSn"
-                  placeholder="请输入订单号"
-                  clearable
-                  style="width: 200px"
-                />
-              </Form-item>
-              <Form-item label="会员名称" prop="buyerName">
-                <Input
-                  type="text"
-                  v-model="searchForm.buyerName"
-                  placeholder="请输入会员名称"
-                  clearable
-                  style="width: 200px"
-                />
-              </Form-item>
-              <Form-item label="订单状态" prop="orderStatus">
-                <Select v-model="searchForm.orderStatus" placeholder="请选择" clearable style="width: 200px">
-                  <Option value="NEW">新订单</Option>
-                  <Option value="CONFIRM">已确认</Option>
-                  <Option value="TAKE">待核验</Option>
-                  <Option value="COMPLETE">已完成</Option>
-                  <Option value="WAIT_PINTUAN">待成团</Option>
-                  <Option value="CANCELLED">已取消</Option>
-                </Select>
-              </Form-item>
-              <Form-item label="下单时间">
-                <DatePicker
-                  v-model="selectDate"
-                  type="datetimerange"
-                  format="yyyy-MM-dd HH:mm:ss"
-                  clearable
-                  @on-change="selectDateRange"
-                  placeholder="选择起始时间"
-                  style="width: 200px"
-                ></DatePicker>
-              </Form-item>
-              <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
-            </Form>
-          </Row>
-          <Table
-            :loading="loading"
-            border
-            :columns="columns"
-            :data="data"
-            ref="table"
-            sortable="custom"
-            @on-sort-change="changeSort"
-            @on-selection-change="changeSelect"
-          ></Table>
-          <Row type="flex" justify="end" class="mt_10">
-            <Page
-              :current="searchForm.pageNumber"
-              :total="total"
-              :page-size="searchForm.pageSize"
-              @on-change="changePage"
-              @on-page-size-change="changePageSize"
-              :page-size-opts="[10, 20, 50]"
-              size="small"
-              show-total
-              show-elevator
-              show-sizer
-            ></Page>
-          </Row>
-        </Card>
-      </Col>
-    </Row>
+    <Card>
+      <Row @keydown.enter.native="handleSearch">
+        <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
+          <Form-item label="订单号" prop="orderSn">
+            <Input
+              type="text"
+              v-model="searchForm.orderSn"
+              placeholder="请输入订单号"
+              clearable
+              style="width: 200px"
+            />
+          </Form-item>
+          <Form-item label="会员名称" prop="buyerName">
+            <Input
+              type="text"
+              v-model="searchForm.buyerName"
+              placeholder="请输入会员名称"
+              clearable
+              style="width: 200px"
+            />
+          </Form-item>
+          <Form-item label="订单状态" prop="orderStatus">
+            <Select v-model="searchForm.orderStatus" placeholder="请选择" clearable style="width: 200px">
+              <Option value="NEW">新订单</Option>
+              <Option value="CONFIRM">已确认</Option>
+              <Option value="TAKE">待核验</Option>
+              <Option value="COMPLETE">已完成</Option>
+              <Option value="WAIT_PINTUAN">待成团</Option>
+              <Option value="CANCELLED">已取消</Option>
+            </Select>
+          </Form-item>
+          <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
+          <Form-item label="下单时间">
+            <DatePicker
+              v-model="selectDate"
+              type="datetimerange"
+              format="yyyy-MM-dd HH:mm:ss"
+              clearable
+              @on-change="selectDateRange"
+              placeholder="选择起始时间"
+              style="width: 200px"
+            ></DatePicker>
+          </Form-item>
+        </Form>
+      </Row>
+      <Table
+        :loading="loading"
+        border
+        :columns="columns"
+        :data="data"
+        ref="table"
+        class="mt_10"
+        sortable="custom"
+        @on-sort-change="changeSort"
+      ></Table>
+      <Row type="flex" justify="end" class="mt_10">
+        <Page
+          :current="searchForm.pageNumber"
+          :total="total"
+          :page-size="searchForm.pageSize"
+          @on-change="changePage"
+          @on-page-size-change="changePageSize"
+          :page-size-opts="[10, 20, 50]"
+          size="small"
+          show-total
+          show-elevator
+          show-sizer
+        ></Page>
+      </Row>
+    </Card>
   </div>
 </template>
 
@@ -81,8 +77,7 @@
   import * as API_Order from "@/api/order";
 
   export default {
-    name: "orderList",
-    components: {},
+    name: "fictitiousOrderList",
     data() {
       return {
         loading: true, // 表单加载状态
@@ -100,9 +95,6 @@
           orderStatus: ""
         },
         selectDate: null, // 下单时间
-        submitLoading: false, // 添加或编辑提交状态
-        selectList: [], // 多选数据
-        selectCount: 0, // 多选计数
         columns: [
           {
             title: "订单号",
@@ -226,24 +218,28 @@
       };
     },
     methods: {
+      // 初始化数据
       init() {
         this.getDataList();
       },
+      // 分页 改变页码
       changePage(v) {
         this.searchForm.pageNumber = v;
         this.getDataList();
-        this.clearSelectAll();
       },
+      // 分页 改变页数
       changePageSize(v) {
+        this.searchForm.pageNumber = 1;
         this.searchForm.pageSize = v;
         this.getDataList();
       },
+      // 搜索
       handleSearch() {
         this.searchForm.pageNumber = 1;
         this.searchForm.pageSize = 10;
         this.getDataList();
       },
-
+      // 列表排序
       changeSort(e) {
         this.searchForm.sort = e.key;
         this.searchForm.order = e.order;
@@ -252,19 +248,14 @@
         }
         this.getDataList();
       },
-      clearSelectAll() {
-        this.$refs.table.selectAll(false);
-      },
-      changeSelect(e) {
-        this.selectList = e;
-        this.selectCount = e.length;
-      },
+      // 起止时间从新赋值
       selectDateRange(v) {
         if (v) {
           this.searchForm.startDate = v[0];
           this.searchForm.endDate = v[1];
         }
       },
+      // 获取列表数据
       getDataList() {
         this.loading = true;
         API_Order.getOrderList(this.searchForm).then((res) => {
@@ -295,7 +286,7 @@
         });
 
       },
-
+      // 订单详情
       detail(v) {
         let sn = v.sn;
         this.$router.push({
diff --git a/manager/src/views/order/order/orderDetail.vue b/manager/src/views/order/order/orderDetail.vue
index 4532e0e1..2d06a001 100644
--- a/manager/src/views/order/order/orderDetail.vue
+++ b/manager/src/views/order/order/orderDetail.vue
@@ -1,142 +1,134 @@
 <template>
   <div class="search">
     <div>
-      <Col>
-      <div>
-        <Card style="height: 60px">
-          <div style="">
-
-            <Button v-if="allowOperation.editPrice" @click="modifyPrice">调整价格</Button>
-
-            <Button v-if="allowOperation.editConsignee" @click="editAddress" type="primary" ghost>修改收货地址</Button>
-
-            <Button v-if="allowOperation.cancel" @click="orderCancel" type="warning" ghost>订单取消</Button>
-
-            <Button v-if="orderInfo.order.orderStatus === 'UNPAID'" @click="confirmPrice" type="primary">收款</Button>
-            <Button @click="orderLog" type="info" ghost>订单日志</Button>
+      <Card style="height: 60px">
+        <div style="">
+          <Button v-if="allowOperation.editPrice" @click="modifyPrice">调整价格</Button>
+          <Button v-if="allowOperation.editConsignee" @click="editAddress" type="primary" ghost>修改收货地址</Button>
+          <Button v-if="allowOperation.cancel" @click="orderCancel" type="warning" ghost>订单取消</Button>
+          <Button v-if="orderInfo.order.orderStatus === 'UNPAID'" @click="confirmPrice" type="primary">收款</Button>
+          <Button @click="orderLog" type="info" ghost>订单日志</Button>
+        </div>
+      </Card>
+      <Card class="mt_10 clearfix">
+        <div style="width: 30%; float: left; margin-left: 20px">
+          <div class="div-item">
+            <div class="div-item-left">订单号：</div>
+            <div class="div-item-right">{{ orderInfo.order.sn }}</div>
           </div>
-        </Card>
-        <Card style="height: 400px">
-          <div style="width: 30%; float: left; margin-left: 20px">
-            <div class="div-item">
-              <div class="div-item-left">订单号：</div>
-              <div class="div-item-right">{{ orderInfo.order.sn }}</div>
-            </div>
-            <div class="div-item">
-              <div class="div-item-left">订单来源：</div>
-              <div class="div-item-right">
-                {{ orderInfo.order.clientType  | clientTypeWay}}
-              </div>
-            </div>
-
-            <div class="div-item">
-              <div class="div-item-left">订单状态：</div>
-              <div class="div-item-right">
-                {{ orderInfo.orderStatusValue }}
-              </div>
-            </div>
-
-            <div class="div-item">
-              <div class="div-item-left">下单时间：</div>
-              <div class="div-item-right">
-                {{ orderInfo.order.createTime }}
-              </div>
+          <div class="div-item">
+            <div class="div-item-left">订单来源：</div>
+            <div class="div-item-right">
+              {{ orderInfo.order.clientType | clientTypeWay}}
             </div>
           </div>
-          <div style="width: 30%; float: left; margin-left: 20px">
-            <div class="div-item" v-if="orderInfo.order.needReceipt == false">
-              <div class="div-item-left">发票信息：</div>
-              <div class="div-item-right">暂无发票信息</div>
-            </div>
 
-            <div class="div-item" v-if="orderInfo.order.needReceipt == true">
-              <div class="div-item-left">发票抬头：</div>
-              <div class="div-item-right">{{ orderInfo.receipt.receiptTitle ? orderInfo.receipt.receiptTitle : '暂无' }}</div>
-            </div>
-
-            <div class="div-item" v-if="orderInfo.order.needReceipt == true && orderInfo.receipt.taxpayerId">
-              <div class="div-item-left">发票税号：</div>
-              <div class="div-item-right">{{ orderInfo.receipt.taxpayerId ? orderInfo.receipt.taxpayerId : '暂无' }}</div>
-            </div>
-
-            <div class="div-item" v-if="orderInfo.order.needReceipt == true">
-              <div class="div-item-left">发票内容：</div>
-              <div class="div-item-right">{{ orderInfo.receipt.receiptContent ? orderInfo.receipt.receiptContent : '暂无' }}</div>
-            </div>
-
-            <div class="div-item" v-if="orderInfo.order.needReceipt == true">
-              <div class="div-item-left">发票金额：</div>
-              <div class="div-item-right">{{ orderInfo.receipt.receiptPrice ? orderInfo.receipt.receiptPrice : '暂无' | unitPrice('￥')}}</div>
-            </div>
-
-            <div class="div-item" v-if="orderInfo.order.needReceipt == true">
-              <div class="div-item-left">是否开票：</div>
-              <div class="div-item-right">{{ orderInfo.receipt.receiptStatus == 0 ? '未开' : '已开' }}</div>
+          <div class="div-item">
+            <div class="div-item-left">订单状态：</div>
+            <div class="div-item-right">
+              {{ orderInfo.orderStatusValue }}
             </div>
           </div>
-          <div style="width: 36%; float: left">
-            <div class="div-item">
-              <div class="div-item-left">收货信息：</div>
-              <div class="div-item-right">
-                {{ orderInfo.order.consigneeName }}
-                {{ orderInfo.order.consigneeMobile }}
-                {{ orderInfo.order.consigneeAddressPath }}
-                {{ orderInfo.order.consigneeDetail }}
-              </div>
-            </div>
-            <div class="div-item">
-              <div class="div-item-left">支付方式：</div>
-              <div class="div-item-right">
-                {{ orderInfo.paymentMethodValue }}
-              </div>
-            </div>
 
-            <div class="div-item">
-              <div class="div-item-left">买家留言：</div>
-              <div class="div-item-right">{{ orderInfo.order.remark }}</div>
-            </div>
-
-            <div class="div-item" v-if="orderInfo.order.needReceipt == false">
-              <div class="div-item-left">发票信息：</div>
-              <div class="div-item-right">暂无发票信息</div>
-            </div>
-
-            <div class="div-item" v-if="orderInfo.order.needReceipt == true">
-              <div class="div-item-left">发票抬头：</div>
-              <div class="div-item-right">{{ orderInfo.receipt.receiptTitle ? orderInfo.receipt.receiptTitle : '暂无' }}</div>
-            </div>
-
-            <div class="div-item" v-if="orderInfo.order.needReceipt == true && orderInfo.receipt.taxpayerId">
-              <div class="div-item-left">发票税号：</div>
-              <div class="div-item-right">{{ orderInfo.receipt.taxpayerId ? orderInfo.receipt.taxpayerId : '暂无' }}</div>
-            </div>
-
-            <div class="div-item" v-if="orderInfo.order.needReceipt == true">
-              <div class="div-item-left">发票内容：</div>
-              <div class="div-item-right">{{ orderInfo.receipt.receiptContent ? orderInfo.receipt.receiptContent : '暂无' }}</div>
-            </div>
-
-            <div class="div-item" v-if="orderInfo.order.needReceipt == true">
-              <div class="div-item-left">发票金额：</div>
-              <div class="div-item-right">{{ orderInfo.receipt.receiptPrice ? orderInfo.receipt.receiptPrice : '暂无' | unitPrice('￥')}}</div>
-            </div>
-
-            <div class="div-item" v-if="orderInfo.order.needReceipt == true">
-              <div class="div-item-left">是否开票：</div>
-              <div class="div-item-right">{{ orderInfo.receipt.receiptStatus == 0 ? '未开' : '已开' }}</div>
-            </div>
-
-            <div class="div-item">
-              <div class="div-item-left">配送方式：</div>
-              <div class="div-item-right">
-                {{ orderInfo.deliveryMethodValue }}
-              </div>
+          <div class="div-item">
+            <div class="div-item-left">下单时间：</div>
+            <div class="div-item-right">
+              {{ orderInfo.order.createTime }}
             </div>
           </div>
-        </Card>
-      </div>
-      </Col>
-      <Card>
+        </div>
+        <div style="width: 30%; float: left; margin-left: 20px">
+          <div class="div-item" v-if="orderInfo.order.needReceipt == false">
+            <div class="div-item-left">发票信息：</div>
+            <div class="div-item-right">暂无发票信息</div>
+          </div>
+
+          <div class="div-item" v-if="orderInfo.order.needReceipt == true">
+            <div class="div-item-left">发票抬头：</div>
+            <div class="div-item-right">{{ orderInfo.receipt.receiptTitle ? orderInfo.receipt.receiptTitle : '暂无' }}</div>
+          </div>
+
+          <div class="div-item" v-if="orderInfo.order.needReceipt == true && orderInfo.receipt.taxpayerId">
+            <div class="div-item-left">发票税号：</div>
+            <div class="div-item-right">{{ orderInfo.receipt.taxpayerId ? orderInfo.receipt.taxpayerId : '暂无' }}</div>
+          </div>
+
+          <div class="div-item" v-if="orderInfo.order.needReceipt == true">
+            <div class="div-item-left">发票内容：</div>
+            <div class="div-item-right">{{ orderInfo.receipt.receiptContent ? orderInfo.receipt.receiptContent : '暂无' }}</div>
+          </div>
+
+          <div class="div-item" v-if="orderInfo.order.needReceipt == true">
+            <div class="div-item-left">发票金额：</div>
+            <div class="div-item-right">{{ orderInfo.receipt.receiptPrice ? orderInfo.receipt.receiptPrice : '暂无' | unitPrice('￥')}}</div>
+          </div>
+
+          <div class="div-item" v-if="orderInfo.order.needReceipt == true">
+            <div class="div-item-left">是否开票：</div>
+            <div class="div-item-right">{{ orderInfo.receipt.receiptStatus == 0 ? '未开' : '已开' }}</div>
+          </div>
+        </div>
+        <div style="width: 36%; float: left">
+          <div class="div-item">
+            <div class="div-item-left">收货信息：</div>
+            <div class="div-item-right">
+              {{ orderInfo.order.consigneeName }}
+              {{ orderInfo.order.consigneeMobile }}
+              {{ orderInfo.order.consigneeAddressPath }}
+              {{ orderInfo.order.consigneeDetail }}
+            </div>
+          </div>
+          <div class="div-item">
+            <div class="div-item-left">支付方式：</div>
+            <div class="div-item-right">
+              {{ orderInfo.paymentMethodValue }}
+            </div>
+          </div>
+
+          <div class="div-item">
+            <div class="div-item-left">买家留言：</div>
+            <div class="div-item-right">{{ orderInfo.order.remark }}</div>
+          </div>
+
+          <div class="div-item" v-if="orderInfo.order.needReceipt == false">
+            <div class="div-item-left">发票信息：</div>
+            <div class="div-item-right">暂无发票信息</div>
+          </div>
+
+          <div class="div-item" v-if="orderInfo.order.needReceipt == true">
+            <div class="div-item-left">发票抬头：</div>
+            <div class="div-item-right">{{ orderInfo.receipt.receiptTitle ? orderInfo.receipt.receiptTitle : '暂无' }}</div>
+          </div>
+
+          <div class="div-item" v-if="orderInfo.order.needReceipt == true && orderInfo.receipt.taxpayerId">
+            <div class="div-item-left">发票税号：</div>
+            <div class="div-item-right">{{ orderInfo.receipt.taxpayerId ? orderInfo.receipt.taxpayerId : '暂无' }}</div>
+          </div>
+
+          <div class="div-item" v-if="orderInfo.order.needReceipt == true">
+            <div class="div-item-left">发票内容：</div>
+            <div class="div-item-right">{{ orderInfo.receipt.receiptContent ? orderInfo.receipt.receiptContent : '暂无' }}</div>
+          </div>
+
+          <div class="div-item" v-if="orderInfo.order.needReceipt == true">
+            <div class="div-item-left">发票金额：</div>
+            <div class="div-item-right">{{ orderInfo.receipt.receiptPrice ? orderInfo.receipt.receiptPrice : '暂无' | unitPrice('￥')}}</div>
+          </div>
+
+          <div class="div-item" v-if="orderInfo.order.needReceipt == true">
+            <div class="div-item-left">是否开票：</div>
+            <div class="div-item-right">{{ orderInfo.receipt.receiptStatus == 0 ? '未开' : '已开' }}</div>
+          </div>
+
+          <div class="div-item">
+            <div class="div-item-left">配送方式：</div>
+            <div class="div-item-right">
+              {{ orderInfo.deliveryMethodValue }}
+            </div>
+          </div>
+        </div>
+      </Card>
+      <Card class="mt_10">
         <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom">
           <!-- 商品栏目格式化 -->
           <template slot="goodsSlot" slot-scope="{row}">
@@ -492,7 +484,7 @@ export default {
               this.$Message.success("收款成功");
               this.getDataList();
             } else {
-              this.$Message.error(res.message);
+              // this.$Message.error(res.message);
             }
           });
         },
@@ -608,7 +600,6 @@ export default {
 <style lang="scss">
 .order-log-div {
   line-height: 30px;
-  height: 500px;
   overflow-y: scroll;
 }
 
diff --git a/manager/src/views/order/order/orderList.vue b/manager/src/views/order/order/orderList.vue
index 6d88ccd6..9b6530a9 100644
--- a/manager/src/views/order/order/orderList.vue
+++ b/manager/src/views/order/order/orderList.vue
@@ -17,6 +17,10 @@
             <Option value="VIRTUAL">核验订单</Option>
           </Select>
         </Form-item>
+        <Form-item label="下单时间">
+          <DatePicker v-model="selectDate" type="datetimerange" format="yyyy-MM-dd" clearable @on-change="selectDateRange" placeholder="选择起始时间" style="width: 160px"></DatePicker>
+        </Form-item>
+        <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
         <Form-item label="订单状态" prop="orderStatus">
           <Select v-model="searchForm.orderStatus" placeholder="请选择" clearable style="width: 160px">
             <Option value="UNPAID">未付款</Option>
@@ -28,10 +32,7 @@
             <Option value="CANCELLED">已取消</Option>
           </Select>
         </Form-item>
-        <Form-item label="下单时间">
-          <DatePicker v-model="selectDate" type="datetimerange" format="yyyy-MM-dd" clearable @on-change="selectDateRange" placeholder="选择起始时间" style="width: 160px"></DatePicker>
-        </Form-item>
-        <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
+        
       </Form>
       <div>
         <download-excel class="export-excel-wrapper" :data="data" :fields="fields" name="商品订单.xls">
@@ -111,9 +112,6 @@ export default {
         orderStatus: "",
       },
       selectDate: null,
-      submitLoading: false, // 添加或编辑提交状态
-      selectList: [], // 多选数据
-      selectCount: 0, // 多选计数
       columns: [
         {
           title: "订单号",
@@ -222,51 +220,35 @@ export default {
     };
   },
   methods: {
+    // 初始化数据
     init() {
       this.getDataList();
     },
+    // 分页 改变页码
     changePage(v) {
       this.searchForm.pageNumber = v;
       this.getDataList();
     },
+    // 分页 改变页数
     changePageSize(v) {
+      this.searchForm.pageNumber = 1;
       this.searchForm.pageSize = v;
       this.getDataList();
     },
+    // 搜索
     handleSearch() {
       this.searchForm.pageNumber = 1;
       this.searchForm.pageSize = 10;
       this.getDataList();
     },
-    handleReset() {
-      this.$refs.searchForm.resetFields();
-      this.searchForm.pageNumber = 1;
-      this.searchForm.pageSize = 10;
-      this.selectDate = null;
-      this.searchForm.startDate = "";
-      this.searchForm.endDate = "";
-      // 重新加载数据
-      this.getDataList();
-    },
-    changeSort(e) {
-      this.searchForm.sort = e.key;
-      this.searchForm.order = e.order;
-      if (e.order === "normal") {
-        this.searchForm.order = "";
-      }
-      this.getDataList();
-    },
-
-    changeSelect(e) {
-      this.selectList = e;
-      this.selectCount = e.length;
-    },
+    // 起止时间从新赋值
     selectDateRange(v) {
       if (v) {
         this.searchForm.startDate = v[0];
         this.searchForm.endDate = v[1];
       }
     },
+    // 获取列表数据
     getDataList() {
       this.loading = true;
       API_Order.getOrderList(this.searchForm).then((res) => {
diff --git a/manager/src/views/order/receipt/receipt.vue b/manager/src/views/order/receipt/receipt.vue
deleted file mode 100644
index 7c16583b..00000000
--- a/manager/src/views/order/receipt/receipt.vue
+++ /dev/null
@@ -1,293 +0,0 @@
-<template>
-  <div class="search">
-    <Row>
-      <Col>
-        <Card>
-          <Row @keydown.enter.native="handleSearch">
-            <Form
-              ref="searchForm"
-              :model="searchForm"
-              inline
-              :label-width="70"
-              class="search-form"
-            >
-              <Form-item label="订单编号" prop="orderSn">
-                <Input
-                  type="text"
-                  v-model="searchForm.orderSn"
-                  clearable
-                  placeholder="请输入订单编号"
-                  style="width: 200px"
-                />
-              </Form-item>
-              <Form-item label="会员名称" prop="memberName">
-                <Input
-                  type="text"
-                  v-model="searchForm.memberName"
-                  clearable
-                  placeholder="请输入会员名称"
-                  style="width: 200px"
-                />
-              </Form-item>
-              <Form-item label="店铺名称" prop="storeName">
-                <Input
-                  type="text"
-                  v-model="searchForm.storeName"
-                  clearable
-                  placeholder="请输入会员名称"
-                  style="width: 200px"
-                />
-              </Form-item>
-              <Form-item label="发票抬头" prop="receiptTitle">
-                <Input
-                  type="text"
-                  v-model="searchForm.receiptTitle"
-                  clearable
-                  placeholder="请输入发票抬头"
-                  style="width: 200px"
-                />
-              </Form-item>
-
-              <Form-item label="状态" prop="receiptStatus">
-                <Select v-model="searchForm.receiptStatus" placeholder="请选择" clearable style="width: 200px">
-                  <Option value="0">未开票</Option>
-                  <Option value="1">已开票</Option>
-                </Select>
-              </Form-item>
-              <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
-
-            </Form>
-          </Row>
-          <Table
-            :loading="loading"
-            border
-            :columns="columns"
-            :data="data"
-            ref="table"
-            sortable="custom"
-            @on-sort-change="changeSort"
-            @on-selection-change="changeSelect"
-          >
-            <!-- 订单详情格式化 -->
-            <template slot="orderSlot" slot-scope="scope">
-              <a
-                @click="$router.push({name: 'order-detail',query: {sn: scope.row.orderSn}})">{{scope.row.orderSn}}</a>
-            </template>
-          </Table>
-          <Row type="flex" justify="end" class="mt_10">
-            <Page
-              :current="searchForm.pageNumber"
-              :total="total"
-              :page-size="searchForm.pageSize"
-              @on-change="changePage"
-              @on-page-size-change="changePageSize"
-              :page-size-opts="[10, 20, 50]"
-              size="small"
-              show-total
-              show-elevator
-              show-sizer
-            ></Page>
-          </Row>
-        </Card>
-      </Col>
-    </Row>
-  </div>
-</template>
-
-<script>
-  import * as API_Order from "@/api/order";
-  import { getShopListData } from "@/api/shops.js";
-  export default {
-    name: "receipt",
-    components: {},
-    data() {
-      return {
-        loading: true, // 表单加载状态
-        searchForm: {
-          // 搜索框初始化对象
-          pageNumber: 1, // 当前页数
-          pageSize: 10, // 页面大小
-          sort: "createTime", // 默认排序字段
-          order: "desc", // 默认排序方式
-          receiptStatus: "", // 起始时间
-        },
-        shopsData: [], // 店铺数据
-        params: {
-          pageNumber: 1,
-          pageSize: 10,
-        },
-        submitLoading: false, // 添加或编辑提交状态
-        selectList: [], // 多选数据
-        selectCount: 0, // 多选计数
-        columns: [
-          {
-            title: "订单号",
-            key: "orderSn",
-            minWidth: 120,
-            slot: "orderSlot",
-          },
-          {
-            title: "会员名称",
-            key: "memberName",
-            minWidth: 90,
-            tooltip: true
-          },
-
-          {
-            title: "发票抬头",
-            key: "receiptTitle",
-            minWidth: 90,
-            tooltip: true
-          },
-          {
-            title: "纳税人识别号",
-            key: "taxpayerId",
-            minWidth: 100,
-            tooltip: true
-
-          },
-          {
-            title: "发票内容",
-            key: "receiptContent",
-            minWidth: 120,
-            tooltip: true
-          },
-          {
-            title: "发票金额",
-            key: "billPrice",
-            width: 90,
-            render: (h, params) => {
-              return h(
-                "div",
-                this.$options.filters.unitPrice(params.row.receiptPrice, "￥")
-              );
-            },
-          },
-          {
-            title: "发票状态",
-            key: "receiptStatus",
-            width: 90,
-            tooltip: true,
-            render: (h, params) => {
-              if(params.row.receiptStatus == 0){
-                return h(
-                  "div",
-                  "未开票"
-                );
-              }else{
-                return h(
-                  "div",
-                  "已开票"
-                );
-              }
-
-            },
-          },
-          {
-            title: "订单状态",
-            key: "orderStatus",
-            width: 90,
-            render: (h, params) => {
-              if (params.row.orderStatus == "UNPAID") {
-                return h('div', [h('span', { }, '未付款'),]);
-              } else if (params.row.orderStatus == "PAID") {
-                return h('div', [h('span', { }, '已付款'),]);
-              } else if (params.row.orderStatus == "UNDELIVERED") {
-                return h('div', [h('span', { }, '待发货'),]);
-              }else if (params.row.orderStatus == "DELIVERED") {
-                return h('div', [h('span', { }, '已发货'),]);
-              }else if (params.row.orderStatus == "COMPLETED") {
-                return h('div', [h('span', { }, '已完成'),]);
-              }else if (params.row.orderStatus == "TAKE") {
-                return h('div', [h('span', { }, '待核验'),]);
-              }else if (params.row.orderStatus == "CANCELLED") {
-                return h('div', [h('span', { }, '已取消'),]);
-              }
-            }
-          },
-        ],
-        data: [], // 表单数据
-        total: 0, // 表单数据总数
-      };
-    },
-    methods: {
-      init() {
-        this.getData();
-        this.getShopList();
-      },
-      handleReachBottom() {
-        setTimeout(() => {
-          if (this.params.pageNumber * this.params.pageSize <= this.total) {
-            this.params.pageNumber++;
-            this.getShopList();
-          }
-        }, 1500);
-      },
-      changePage(v) {
-        this.searchForm.pageNumber = v;
-        this.getData();
-        this.clearSelectAll();
-      },
-      changePageSize(v) {
-        this.searchForm.pageSize = v;
-        this.getData();
-      },
-      handleSearch() {
-        this.searchForm.pageNumber = 1;
-        this.searchForm.pageSize = 10;
-        this.getData();
-      },
-      changeSort(e) {
-        this.searchForm.sort = e.key;
-        this.searchForm.order = e.order;
-        if (e.order === "normal") {
-          this.searchForm.order = "";
-        }
-        this.getData();
-      },
-      clearSelectAll() {
-        this.$refs.table.selectAll(false);
-      },
-      changeSelect(e) {
-        this.selectList = e;
-        this.selectCount = e.length;
-      },
-      selectDateRange(v) {
-        if (v) {
-          this.searchForm.startDate = v[0];
-          this.searchForm.endDate = v[1];
-        }
-      },
-      getShopList() {
-        getShopListData(this.params).then((res) => {
-          if (res.success) {
-            /**
-             * 解决数据请求中，滚动栏会一直上下跳动
-             */
-            this.shopTotal = res.result.total;
-            this.shopsData.push(...res.result.records);
-          }
-        });
-      },
-      getData() {
-        this.loading = true;
-        API_Order.getReceiptPage(this.searchForm).then((res) => {
-          this.loading = false;
-          if (res.success) {
-            this.data = res.result.records;
-            this.total = res.result.total;
-          }
-        });
-        this.total = this.data.length;
-        this.loading = false;
-      },
-    },
-    mounted() {
-      this.init();
-    },
-  };
-</script>
-<style lang="scss" scoped>
-  // 建议引入通用样式 可删除下面样式代码
-   @import "../../../styles/table-common.scss";
-</style>
diff --git a/manager/src/views/page/article-manage/ArticleCategory.vue b/manager/src/views/page/article-manage/ArticleCategory.vue
index f6ab4b0b..86f66c1e 100644
--- a/manager/src/views/page/article-manage/ArticleCategory.vue
+++ b/manager/src/views/page/article-manage/ArticleCategory.vue
@@ -1,305 +1,322 @@
 <template>
-    <div>
-        <div class="operation mb_10">
-            <Button @click="addParent" icon="md-add">添加一级分类</Button>
+  <div>
+    <Card>
+      <div class="operation mb_10">
+        <Button @click="addParent" type="primary" icon="md-add">添加一级分类</Button>
+      </div>
+      <tree-table
+        ref="treeTable"
+        size="default"
+        :loading="loading"
+        :data="tableData"
+        :columns="columns"
+        :border="true"
+        :show-index="false"
+        :is-fold="true"
+        :expand-type="false"
+        primary-key="id"
+      >
+        <template slot="action" slot-scope="scope">
+          <Button
+            type="info"
+            @click="edit(scope.row)"
+            size="small"
+            style="margin-right: 5px"
+            >编辑
+          </Button>
+
+          <Button
+            type="error"
+            @click="remove(scope.row)"
+            size="small"
+            style="margin-right: 5px"
+            >删除
+          </Button>
+          <Button
+            v-show="scope.row.level != 2"
+            type="success"
+            @click="addChildren(scope.row)"
+            size="small"
+            style="margin-right: 5px"
+            >添加子分类
+          </Button>
+        </template>
+      </tree-table>
+    </Card>
+    <Modal
+      :title="modalTitle"
+      v-model="modalVisible"
+      :mask-closable="false"
+      :width="500"
+    >
+      <Form
+        ref="form"
+        :model="formAdd"
+        :label-width="100"
+        :rules="formValidate"
+      >
+        <div v-if="showParent">
+          <FormItem label="上级分类" prop="parentId">
+            {{ parentTitle }}
+            <Input
+              v-model="formAdd.parentId"
+              clearable
+              style="width: 100%; display: none"
+            />
+          </FormItem>
         </div>
-        <tree-table
-                ref="treeTable"
-                size="default"
-                :loading="loading"
-                :data="tableData"
-                :columns="columns"
-                :border="true"
-                :show-index="false"
-                :is-fold="true"
-                :expand-type="false"
-                primary-key="id">
-            <template slot="action" slot-scope="scope">
-                <Button
-                        type="info"
-                        @click="edit(scope.row)"
-                        size="small"
-                        style="margin-right:5px"
-                >编辑
-                </Button>
-
-                <Button
-                        type="error"
-                        @click="remove(scope.row)"
-                        size="small"
-                        style="margin-right:5px"
-                >删除
-                </Button>
-                <Button
-                        v-show="scope.row.level != 2 "
-                        type="success"
-                        @click="addChildren(scope.row)"
-                        size="small"
-                        style="margin-right:5px"
-                >添加子分类
-                </Button>
-            </template>
-        </tree-table>
-
-        <Modal :title="modalTitle" v-model="modalVisible" :mask-closable='false' :width="500">
-            <Form ref="form" :model="formAdd" :label-width="100" :rules="formValidate">
-                <div v-if="showParent">
-                    <FormItem label="上级分类" prop="parentId">
-                        {{parentTitle}}
-                        <Input v-model="formAdd.parentId" clearable style="width:100%;display:none"/>
-                    </FormItem>
-                </div>
-                <FormItem label="分类名称" prop="name">
-                    <Input v-model="formAdd.articleCategoryName" clearable style="width:100%"/>
-                </FormItem>
-                <FormItem label="排序值" prop="sort" style="width:345px">
-                    <InputNumber v-model="formAdd.sort"></InputNumber>
-                </FormItem>
-            </Form>
-            <div slot="footer">
-                <Button type="text" @click="modalVisible=false">取消</Button>
-                <Button type="primary" :loading="submitLoading" @click="Submit">提交</Button>
-            </div>
-        </Modal>
-    </div>
+        <FormItem label="分类名称" prop="name">
+          <Input
+            v-model="formAdd.articleCategoryName"
+            clearable
+            style="width: 100%"
+          />
+        </FormItem>
+        <FormItem label="排序值" prop="sort" style="width: 345px">
+          <InputNumber v-model="formAdd.sort"></InputNumber>
+        </FormItem>
+      </Form>
+      <div slot="footer">
+        <Button type="text" @click="modalVisible = false">取消</Button>
+        <Button type="primary" :loading="submitLoading" @click="Submit"
+          >提交</Button
+        >
+      </div>
+    </Modal>
+  </div>
 </template>
 <script>
-    import {
-        saveArticleCategory,
-        getArticleCategory,
-        delArticleCategory,
-        updateArticleCategory
-    } from "@/api/pages";
-    import TreeTable from "@/views/my-components/tree-table/Table/Table";
-    import uploadPicInput from "@/views/my-components/lili/upload-pic-input";
+import {
+  saveArticleCategory,
+  getArticleCategory,
+  delArticleCategory,
+  updateArticleCategory,
+} from "@/api/pages";
+import TreeTable from "@/views/my-components/tree-table/Table/Table";
+import uploadPicInput from "@/views/my-components/lili/upload-pic-input";
 
-    export default {
-        name: "lili-components",
-        components: {
-            TreeTable,
-            uploadPicInput
+export default {
+  name: "lili-components",
+  components: {
+    TreeTable,
+    uploadPicInput,
+  },
+  data() {
+    return {
+      loading: false, // 加载状态
+      expandLevel: 1, // 展开的层级
+      modalType: 0, // 添加或编辑标识
+      modalVisible: false, // 添加或编辑显示
+      modalTitle: "", // 添加或编辑标题
+      showParent: false, // 是否展示上级菜单
+      parentTitle: "", // 父级菜单名称
+      formAdd: {
+        // 添加或编辑表单对象初始化数据
+        parentId: "",
+        name: "",
+        sort: 1,
+        level: 0,
+      },
+      // 表单验证规则
+      formValidate: {},
+      columns: [
+        {
+          title: "分类名称",
+          key: "articleCategoryName",
+          witt: "100px",
         },
-        data() {
-            return {
-                currView: "index", // 展示哪一类
-                loading: false, // 加载状态
-                brands: [], //品牌集合
-                Specifications: [], //规格集合
-                expandLevel: 1, // 展开的层级
-                modalType: 0, // 添加或编辑标识
-                modalVisible: false, // 添加或编辑显示
-                modalTitle: "", // 添加或编辑标题
-                showParent: false, // 是否展示上级菜单
-                parentTitle: "", // 父级菜单名称
-                formAdd: { // 添加或编辑表单对象初始化数据
-                    parentId: "",
-                    name: "",
-                    sort: 1,
-                    level: 0,
-                },
-                // 表单验证规则
-                formValidate: {},
-                columns: [
-                    {
-                        title: "分类名称",
-                        key: "articleCategoryName",
-                        witt: "100px",
-                    },
-                    {
-                        title: "排序",
-                        key: "sort",
-                        width: "100px",
-                    },
-                    {
-                        title: "操作",
-                        key: "action",
-                        align: "center",
-                        headerAlign: "center",
-                        width: "400px",
-                        type: "template",
-                        template: "action",
-                    }
-                ],
-                tableData: []
-            };
+        {
+          title: "排序",
+          key: "sort",
+          width: "100px",
         },
-        methods: {
-            init() {
-                this.getAllList();
-                // this.getBrandList();
-                // this.getSpecList()
-            },
-            addChildren(v) {
-                this.modalType = 0;
-                this.modalTitle = "添加子分类";
-                this.formAdd.articleCategoryName = "";
-                this.parentTitle = v.articleCategoryName;
-                this.formAdd.level = eval(v.level + "+1");
-                this.showParent = true;
-                delete this.formAdd.id;
-                this.formAdd.parentId = v.id;
-                this.modalVisible = true;
-            },
-            edit(v) {
-                console.log(v);
-                this.modalType = 1;
-                this.modalTitle = "编辑";
-                this.formAdd.id = v.id;
-                this.formAdd.articleCategoryName = v.articleCategoryName;
-                this.formAdd.level = v.level;
-                this.formAdd.parentId = v.parentId;
-                this.formAdd.sort = v.sort;
-                this.showParent = false;
-                this.modalVisible = true;
-            },
-            addParent() {
-                this.modalType = 0;
-                this.modalTitle = "添加一级分类";
-                this.parentTitle = "顶级分类";
-                this.showParent = true;
-                this.$refs.form.resetFields();
-                delete this.formAdd.id;
-                this.formAdd.parentId = 0;
-                this.modalVisible = true;
-            },
-            Submit() {
-                this.$refs.form.validate(valid => {
-                    if (valid) {
-
-
-
-                        this.submitLoading = true;
-                        if (this.modalType === 0) {
-                            // 添加 避免编辑后传入id等数据 记得删除
-                            delete this.formAdd.id;
-                            saveArticleCategory(this.formAdd).then(res => {
-                                this.submitLoading = false;
-                                if (res.success) {
-                                    this.$Message.success("添加成功");
-
-
-
-                                    this.formAdd={}
-                                } else {
-                                    this.$Message.error(res.message);
-                                }
-                                this.getAllList();
-                                this.modalVisible = false;
-                            });
-                        } else {
-                            // 编辑
-                            updateArticleCategory(this.formAdd, this.formAdd.id).then(res => {
-                                this.submitLoading = false;
-                                if (res.success) {
-                                    this.$Message.success("修改成功");
-                                } else {
-                                    this.$Message.error(res.message);
-                                }
-                                this.getAllList();
-                                this.modalVisible = false;
-                                this.$refs.form.resetFields();
-                            });
-                        }
-                    }
-                });
-            },
-            remove(v) {
-                this.$Modal.confirm({
-                    title: "确认删除",
-                    // 记得确认修改此处
-                    content: "您确认要删除 " + v.articleCategoryName + " ?",
-                    loading: true,
-                    onOk: () => {
-                        // 删除
-                        delArticleCategory(v.id).then(res => {
-                            this.$Modal.remove();
-                            if (res.success) {
-                                this.$Message.success("操作成功");
-                                this.getAllList();
-                            }
-                        });
-                    }
-                });
-            },
-            getAllList() {
-                this.loading = true;
-                getArticleCategory().then(res => {
-                    this.loading = false;
-                    if (res.success) {
-                        // 仅展开指定级数 默认后台已展开所有
-                        let expandLevel = this.expandLevel;
-                        res.result.forEach(function (e) {
-                            if (expandLevel == 1) {
-                                if (e.level == 0) {
-                                    e.expand = false;
-                                }
-                                if (e.children && e.children.length > 0) {
-                                    e.children.forEach(function (c) {
-                                        if (c.level == 1) {
-                                            c.expand = false;
-                                        }
-                                        if (c.children && c.children.length > 0) {
-                                            c.children.forEach(function (b) {
-                                                if (b.level == 2) {
-                                                    b.expand = false;
-                                                }
-                                            });
-                                        }
-                                    });
-                                }
-                            } else if (expandLevel == 2) {
-                                if (e.level == 0) {
-                                    e.expand = true;
-                                }
-                                if (e.children && e.children.length > 0) {
-                                    e.children.forEach(function (c) {
-                                        if (c.level == 1) {
-                                            c.expand = false;
-                                        }
-                                        if (c.children && c.children.length > 0) {
-                                            c.children.forEach(function (b) {
-                                                if (b.level == 2) {
-                                                    b.expand = false;
-                                                }
-                                            });
-                                        }
-                                    });
-                                }
-                            } else if (expandLevel == 3) {
-                                if (e.level == 0) {
-                                    e.expand = true;
-                                }
-                                if (e.children && e.children.length > 0) {
-                                    e.children.forEach(function (c) {
-                                        if (c.level == 1) {
-                                            c.expand = true;
-                                        }
-                                        if (c.children && c.children.length > 0) {
-                                            c.children.forEach(function (b) {
-                                                if (b.level == 2) {
-                                                    b.expand = false;
-                                                }
-                                            });
-                                        }
-                                    });
-                                }
-                            }
-                        });
-                        this.tableData = res.result;
-                    }
-                });
-            },
+        {
+          title: "操作",
+          key: "action",
+          align: "center",
+          headerAlign: "center",
+          width: "400px",
+          type: "template",
+          template: "action",
         },
-        mounted() {
-            this.init();
-        }
+      ],
+      tableData: []  // 表格数据
     };
+  },
+  methods: {
+    // 初始化数据
+    init() {
+      this.getAllList();
+    },
+    // 添加子分类
+    addChildren(v) {
+      this.modalType = 0;
+      this.modalTitle = "添加子分类";
+      this.formAdd.articleCategoryName = "";
+      this.parentTitle = v.articleCategoryName;
+      this.formAdd.level = eval(v.level + "+1");
+      this.showParent = true;
+      delete this.formAdd.id;
+      this.formAdd.parentId = v.id;
+      this.modalVisible = true;
+    },
+    // 编辑分类
+    edit(v) {
+      this.modalType = 1;
+      this.modalTitle = "编辑";
+      this.formAdd.id = v.id;
+      this.formAdd.articleCategoryName = v.articleCategoryName;
+      this.formAdd.level = v.level;
+      this.formAdd.parentId = v.parentId;
+      this.formAdd.sort = v.sort;
+      this.showParent = false;
+      this.modalVisible = true;
+    },
+    // 添加一级分类
+    addParent() {
+      this.modalType = 0;
+      this.modalTitle = "添加一级分类";
+      this.parentTitle = "顶级分类";
+      this.showParent = true;
+      this.$refs.form.resetFields();
+      delete this.formAdd.id;
+      this.formAdd.parentId = 0;
+      this.modalVisible = true;
+    },
+    // 提交
+    Submit() {
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          this.submitLoading = true;
+          if (this.modalType === 0) {
+            // 添加 避免编辑后传入id等数据 记得删除
+            delete this.formAdd.id;
+            saveArticleCategory(this.formAdd).then((res) => {
+              this.submitLoading = false;
+              if (res.success) {
+                this.$Message.success("添加成功");
+
+                this.formAdd = {};
+              } else {
+                // this.$Message.error(res.message);
+              }
+              this.getAllList();
+              this.modalVisible = false;
+            });
+          } else {
+            // 编辑
+            updateArticleCategory(this.formAdd, this.formAdd.id).then((res) => {
+              this.submitLoading = false;
+              if (res.success) {
+                this.$Message.success("修改成功");
+              } else {
+                // this.$Message.error(res.message);
+              }
+              this.getAllList();
+              this.modalVisible = false;
+              this.$refs.form.resetFields();
+            });
+          }
+        }
+      });
+    },
+    // 删除分类
+    remove(v) {
+      this.$Modal.confirm({
+        title: "确认删除",
+        content: "您确认要删除 " + v.articleCategoryName + " ?",
+        loading: true,
+        onOk: () => {
+          // 删除
+          delArticleCategory(v.id).then((res) => {
+            this.$Modal.remove();
+            if (res.success) {
+              this.$Message.success("操作成功");
+              this.getAllList();
+            }
+          });
+        },
+      });
+    },
+    // 获取分类数据
+    getAllList() {
+      this.loading = true;
+      getArticleCategory().then((res) => {
+        this.loading = false;
+        if (res.success) {
+          // 仅展开指定级数 默认后台已展开所有
+          let expandLevel = this.expandLevel;
+          res.result.forEach(function (e) {
+            if (expandLevel == 1) {
+              if (e.level == 0) {
+                e.expand = false;
+              }
+              if (e.children && e.children.length > 0) {
+                e.children.forEach(function (c) {
+                  if (c.level == 1) {
+                    c.expand = false;
+                  }
+                  if (c.children && c.children.length > 0) {
+                    c.children.forEach(function (b) {
+                      if (b.level == 2) {
+                        b.expand = false;
+                      }
+                    });
+                  }
+                });
+              }
+            } else if (expandLevel == 2) {
+              if (e.level == 0) {
+                e.expand = true;
+              }
+              if (e.children && e.children.length > 0) {
+                e.children.forEach(function (c) {
+                  if (c.level == 1) {
+                    c.expand = false;
+                  }
+                  if (c.children && c.children.length > 0) {
+                    c.children.forEach(function (b) {
+                      if (b.level == 2) {
+                        b.expand = false;
+                      }
+                    });
+                  }
+                });
+              }
+            } else if (expandLevel == 3) {
+              if (e.level == 0) {
+                e.expand = true;
+              }
+              if (e.children && e.children.length > 0) {
+                e.children.forEach(function (c) {
+                  if (c.level == 1) {
+                    c.expand = true;
+                  }
+                  if (c.children && c.children.length > 0) {
+                    c.children.forEach(function (b) {
+                      if (b.level == 2) {
+                        b.expand = false;
+                      }
+                    });
+                  }
+                });
+              }
+            }
+          });
+          this.tableData = res.result;
+        }
+      });
+    },
+  },
+  mounted() {
+    this.init();
+  },
+};
 </script>
 <style lang="scss" scoped>
-    .article {
-        font-size: 16px;
-        font-weight: 400;
-        margin: 12px 0;
-    }
-
+.article {
+  font-size: 16px;
+  font-weight: 400;
+  margin: 12px 0;
+}
 </style>
diff --git a/manager/src/views/page/article-manage/articleList.vue b/manager/src/views/page/article-manage/articleList.vue
index fd0b61d4..79e9242b 100644
--- a/manager/src/views/page/article-manage/articleList.vue
+++ b/manager/src/views/page/article-manage/articleList.vue
@@ -1,9 +1,8 @@
 <template>
-
   <div class="wrapper">
     <Row>
       <Col style=" height: 100%;" span="4">
-      <Card class="article-category">
+      <Card class="article-category mr_10">
         <Tree :data="treeData" @on-select-change="handleCateChange"></Tree>
       </Card>
       </Col>
@@ -20,7 +19,7 @@
         <Row class="operation padding-row">
           <Button @click="add" type="primary">添加</Button>
         </Row>
-        <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-selection-change="changeSelect">
+        <Table :loading="loading" border :columns="columns" :data="data" ref="table">
           <!-- 页面展示 -->
           <template slot="openStatusSlot" slot-scope="scope">
             <div>
@@ -38,46 +37,44 @@
 
           </Page>
         </Row>
-        <template v-if="!selected">
-          <Modal :title="modalTitle" v-model="modalVisible" :mask-closable="false" :width="1100">
-            <Form ref="form" :model="form" :label-width="100">
-              <FormItem label="文章标题" prop="title">
-                <Input v-model="form.title" clearable style="width: 40%" />
-              </FormItem>
-              <FormItem label="文章分类" prop="categoryId">
-                <Select v-model="treeValue" placeholder="请选择" clearable style="width: 180px">
-                  <Option :value="treeValue" style="display: none">{{
-                          treeValue
-                        }}
-                  </Option>
-                  <Tree :data="treeData" @on-select-change="handleCheckChange"></Tree>
-                </Select>
-              </FormItem>
-              <FormItem label="文章排序" prop="sort">
-                <Input type="number" v-model="form.sort" clearable style="width: 10%" />
-              </FormItem>
-              <FormItem class="form-item-view-el" label="文章内容" prop="content">
-                <editor openXss v-model="form.content"></editor>
-              </FormItem>
-              <FormItem label="是否展示" prop="openStatus">
-                <i-switch size="large" v-model="form.openStatus" :true-value="open" :false-value="close">
-                  <span slot="open">展示</span>
-                  <span slot="close">隐藏</span>
-                </i-switch>
-              </FormItem>
-            </Form>
-            <div slot="footer">
-              <Button type="text" @click="modalVisible = false">取消</Button>
-              <Button type="primary" :loading="submitLoading" @click="handleSubmit">提交</Button>
-            </div>
-          </Modal>
-        </template>
-
+        
       </Card>
       </Col>
-
     </Row>
-
+    <template v-if="!selected">
+      <Modal :title="modalTitle" v-model="modalVisible" :mask-closable="false" :width="1100">
+        <Form ref="form" :model="form" :label-width="100">
+          <FormItem label="文章标题" prop="title">
+            <Input v-model="form.title" clearable style="width: 40%" />
+          </FormItem>
+          <FormItem label="文章分类" prop="categoryId">
+            <Select v-model="treeValue" placeholder="请选择" clearable style="width: 180px">
+              <Option :value="treeValue" style="display: none">{{
+                      treeValue
+                    }}
+              </Option>
+              <Tree :data="treeData" @on-select-change="handleCheckChange"></Tree>
+            </Select>
+          </FormItem>
+          <FormItem label="文章排序" prop="sort">
+            <Input type="number" v-model="form.sort" clearable style="width: 10%" />
+          </FormItem>
+          <FormItem class="form-item-view-el" label="文章内容" prop="content">
+            <editor openXss v-model="form.content"></editor>
+          </FormItem>
+          <FormItem label="是否展示" prop="openStatus">
+            <i-switch size="large" v-model="form.openStatus" :true-value="open" :false-value="close">
+              <span slot="open">展示</span>
+              <span slot="close">隐藏</span>
+            </i-switch>
+          </FormItem>
+        </Form>
+        <div slot="footer">
+          <Button type="text" @click="modalVisible = false">取消</Button>
+          <Button type="primary" :loading="submitLoading" @click="handleSubmit">提交</Button>
+        </div>
+      </Modal>
+    </template>
   </div>
 </template>
 
@@ -135,8 +132,6 @@ export default {
       //树结构
       treeData: [],
       submitLoading: false, // 添加或编辑提交状态
-      selectList: [], // 多选数据
-      selectCount: 0, // 多选计数
       columns: [
         // 表头
         {
@@ -293,10 +288,10 @@ export default {
     changePage(v) {
       this.searchForm.pageNumber = v;
       this.getDataList();
-      this.clearSelectAll();
     },
     // 改变页码
     changePageSize(v) {
+      this.selected.pageNumber = 1;
       this.searchForm.pageSize = v;
       this.getDataList();
     },
@@ -306,15 +301,6 @@ export default {
       this.searchForm.pageSize = 10;
       this.getDataList();
     },
-    // 取消全选
-    clearSelectAll() {
-      this.$refs.table.selectAll(false);
-    },
-    // 列表选择回调
-    changeSelect(e) {
-      this.selectList = e;
-      this.selectCount = e.length;
-    },
     // 获取全部文章分类
     getAllList(parent_id) {
       this.loading = true;
@@ -353,7 +339,6 @@ export default {
     getDataList(val) {
       if (val) this.form = {};
       this.loading = true;
-      // 带多条件搜索参数获取表单数据 请自行修改接口
       getArticle(this.searchForm).then((res) => {
         this.loading = false;
         if (res.success) {
@@ -434,10 +419,10 @@ export default {
         }
       });
     },
+    // 删除文章
     remove(v) {
       this.$Modal.confirm({
         title: "确认删除",
-        // 记得确认修改此处
         content: "您确认要删除么?",
         loading: true,
         onOk: () => {
diff --git a/manager/src/views/page/feedback/feedback.vue b/manager/src/views/page/feedback/feedback.vue
index 424cf7db..aecb5990 100644
--- a/manager/src/views/page/feedback/feedback.vue
+++ b/manager/src/views/page/feedback/feedback.vue
@@ -8,15 +8,12 @@
         :columns="columns"
         :data="data"
         ref="table"
-        sortable="custom"
-        @on-sort-change="changeSort"
-        @on-selection-change="changeSelect"
       ></Table>
       <Row type="flex" justify="end" class="mt_10">
         <Page
-          :current="pageNumber"
+          :current="searchForm.pageNumber"
           :total="total"
-          :page-size="pageSize"
+          :page-size="searchForm.pageSize"
           @on-change="changePage"
           @on-page-size-change="changePageSize"
           :page-size-opts="[10, 20, 50]"
@@ -28,7 +25,7 @@
       </Row>
     </Card>
     <!-- 修改模态框 -->
-    <Modal v-model="formValidate" :title="modalTitle" @on-ok="" width="500">
+    <Modal v-model="formValidate" title="详细信息" width="500">
       <Form
         ref="formValidate"
         :model="form"
@@ -54,7 +51,7 @@
             暂无
           </div>
           <div v-else>
-            <span v-for="(item, index) in this.form.images.split(',')">
+            <span v-for="(item, index) in this.form.images.split(',')" :key="index">
               <Avatar shape="square" icon="ios-person" size="large" style="width: 80px;height: 90px;margin-right: 5px" :src="item"
               />
             </span>
@@ -75,25 +72,17 @@
   } from "@/api/other";
 
   export default {
-    name: "role-manage",
+    name: "feedback",
     data() {
       return {
         loading: true, // 加载状态
-        modalType: 0, // 0 添加 1 编辑
         form: {}, // 表单数据
         searchForm: { // 请求参数
           pageNumber: 1,
           pageSize: 10,
         },
-        modalTitle: "详细", // modal标题
         formValidate: false, // modal显隐
-        images: [], // 图片列表
         columns: [ // 表头
-          {
-            type: "selection",
-            width: 60,
-            align: "center",
-          },
           {
             title: "会员名称",
             key: "userName",
@@ -140,7 +129,6 @@
             title: "操作",
             key: "action",
             align: "center",
-            fixed: "right",
             width: 130,
             render: (h, params) => {
               return h("div", [
@@ -166,42 +154,27 @@
             },
           },
         ],
-        data: [],
-        pageNumber: 1,
-        pageSize: 10,
-        total: 0,
-        permData: [],
-        editRolePermId: "",
-        selectAllFlag: false,
-        depData: [],
-        dataType: 0,
-        editDepartments: [],
+        data: [], // 表格数据
+        total: 0 // 数据总数
 
-        saveRoleWay: [], //用户保存用户点击的菜单
       };
     },
     methods: {
+      // 初始化数据
       init() {
         this.getFeedback();
       },
-
+      // 分页 修改页码
       changePage(v) {
         this.searchForm.pageNumber = v;
         this.getFeedback();
       },
+      // 分页 修改页数
       changePageSize(v) {
+        this.searchForm.pageNumber = 1;
         this.searchForm.pageSize = v;
         this.getFeedback();
       },
-      changeSort(e) {
-        this.sortColumn = e.key;
-        this.sortType = e.order;
-        if (e.order == "normal") {
-          this.sortType = "";
-        }
-        this.getFeedback();
-      },
-
       /**
        * 查询意见反馈
        */
@@ -226,7 +199,6 @@
             this.formValidate = true
           }
         });
-
       }
     },
     mounted() {
diff --git a/manager/src/views/personal-center/personal-center.vue b/manager/src/views/personal-center/personal-center.vue
index 1dc217bb..94f4b62f 100644
--- a/manager/src/views/personal-center/personal-center.vue
+++ b/manager/src/views/personal-center/personal-center.vue
@@ -64,15 +64,13 @@ import {
   userInfo,
   userInfoEdit,
 } from "@/api/index";
-import CountDownButton from "@/views/my-components/lili/count-down-button";
 import uploadPicThumb from "@/views/my-components/lili/upload-pic-thumb";
 import Cookies from "js-cookie";
 import util from "@/libs/util";
 
 export default {
   components: {
-    uploadPicThumb,
-    CountDownButton
+    uploadPicThumb
   },
   name: "personal-enter",
   data() {
diff --git a/manager/src/views/region/index.vue b/manager/src/views/region/index.vue
index 7c7b5487..c334b1c0 100644
--- a/manager/src/views/region/index.vue
+++ b/manager/src/views/region/index.vue
@@ -89,7 +89,6 @@
 import {
   getChildRegion,
   updateRegion,
-  getRegionDetail,
   delRegion,
   asyncRegion,
   addRegion,
diff --git a/manager/src/views/seller/shop/shopDetail.vue b/manager/src/views/seller/shop/shopDetail.vue
index 9d2c70d9..e450fc0e 100644
--- a/manager/src/views/seller/shop/shopDetail.vue
+++ b/manager/src/views/seller/shop/shopDetail.vue
@@ -117,9 +117,6 @@
             </span>
           </p>
         </div>
-
-
-
         <div class="ant-col-md-6">
           <p class="item">
             <span class="label">法人姓名：</span>
@@ -185,7 +182,7 @@
       </div>
     </Card>
 
-    <Card>
+    <Card class="mt_10">
       <Tabs type="order" @on-click="storeInfoChange">
         <TabPane label="TA的订单" name="order" style="min-height: 200px">
           <Row>
@@ -254,6 +251,7 @@
               :columns="orderColumns"
               :data="orderData"
               ref="table"
+              class="mt_10"
               sortable="custom"
               @on-sort-change="orderChangeSort"
             >
@@ -355,6 +353,7 @@
               :columns="refundGoodsOrderColumns"
               :data="refundGoodsOrderData"
               ref="table"
+              class="mt_10"
               sortable="custom"
               @on-sort-change="refundGoodsOrderChangeSort"
             >
@@ -478,6 +477,7 @@
               :columns="refundGoodsOrderColumns"
               :data="refundOrderData"
               ref="table"
+              class="mt_10"
               sortable="custom"
               @on-sort-change="refundOrderChangeSort"
             >
diff --git a/manager/src/views/statistics/order.vue b/manager/src/views/statistics/order.vue
index d17f6f51..f1cd7044 100644
--- a/manager/src/views/statistics/order.vue
+++ b/manager/src/views/statistics/order.vue
@@ -166,13 +166,12 @@
 <script>
 import * as API_Goods from "@/api/goods";
 import { Chart } from "@antv/g2";
-import empty from "@/views/lili-empty";
 import orderRow from "./order/orderDetail";
 import refundRow from "./order/refundOrder";
 import affixTime from "@/views/lili-components/affix-time";
 
 export default {
-  components: { empty, orderRow, refundRow, affixTime },
+  components: { orderRow, refundRow, affixTime },
 
   data() {
     return {
diff --git a/manager/src/views/sys/role-manage/roleManage.vue b/manager/src/views/sys/role-manage/roleManage.vue
index d2fc946a..aa5b70d3 100644
--- a/manager/src/views/sys/role-manage/roleManage.vue
+++ b/manager/src/views/sys/role-manage/roleManage.vue
@@ -8,113 +8,52 @@
         <Button @click="addRole" type="primary">添加角色</Button>
         <Button @click="delAll">批量删除</Button>
       </Row>
-      <Table
-        :loading="loading"
-        border
-        :columns="columns"
-        :data="data"
-        ref="table"
-        sortable="custom"
-        @on-sort-change="changeSort"
-        @on-selection-change="changeSelect"
-      ></Table>
+      <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect"></Table>
       <Row type="flex" justify="end" class="mt_10">
-        <Page
-          :current="pageNumber"
-          :total="total"
-          :page-size="pageSize"
-          @on-change="changePage"
-          @on-page-size-change="changePageSize"
-          :page-size-opts="[10, 20, 50]"
-          size="small"
-          show-total
-          show-elevator
-          show-sizer
-        ></Page>
+        <Page :current="pageNumber" :total="total" :page-size="pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]" size="small" show-total
+          show-elevator show-sizer></Page>
       </Row>
     </Card>
 
     <!-- 编辑 -->
-    <Modal
-      :title="modalTitle"
-      v-model="roleModalVisible"
-      :mask-closable="false"
-      :width="500"
-    >
-      <Form
-        ref="roleForm"
-        :model="roleForm"
-        :label-width="80"
-        :rules="roleFormValidate"
-      >
+    <Modal :title="modalTitle" v-model="roleModalVisible" :mask-closable="false" :width="500">
+      <Form ref="roleForm" :model="roleForm" :label-width="80" :rules="roleFormValidate">
         <FormItem label="角色名称" prop="name">
-          <Input v-model="roleForm.name"/>
+          <Input v-model="roleForm.name" />
         </FormItem>
         <FormItem label="备注" prop="description">
-          <Input v-model="roleForm.description"/>
+          <Input v-model="roleForm.description" />
         </FormItem>
       </Form>
       <div slot="footer">
         <Button type="text" @click="cancelRole">取消</Button>
-        <Button type="primary" :loading="submitLoading" @click="submitRole"
-        >提交
-        </Button
-        >
+        <Button type="primary" :loading="submitLoading" @click="submitRole">提交
+        </Button>
       </div>
     </Modal>
     <!-- 菜单权限 -->
-    <Modal
-      :title="modalTitle"
-      v-model="permModalVisible"
-      :mask-closable="false"
-      :width="500"
-      :styles="{ top: '30px' }"
-      class="permModal"
-    >
+    <Modal :title="modalTitle" v-model="permModalVisible" :mask-closable="false" :width="500" :styles="{ top: '30px' }" class="permModal">
       <div style="position: relative">
-        <Tree
-          ref="tree"
-          :data="permData"
-          show-checkbox
-          :render="renderContent"
-          :check-strictly="true"
-        >
+        <Tree ref="tree" :data="permData" show-checkbox :render="renderContent" :check-strictly="true">
         </Tree>
         <Spin size="large" fix v-if="treeLoading"></Spin>
       </div>
       <div slot="footer">
         <Button type="text" @click="cancelPermEdit">取消</Button>
-        <Select
-          v-model="openLevel"
-          @on-change="changeOpen"
-          style="width: 110px; text-align: left; margin-right: 10px"
-        >
+        <Select v-model="openLevel" @on-change="changeOpen" style="width: 110px; text-align: left; margin-right: 10px">
           <Option value="0">展开所有</Option>
           <Option value="1">收合所有</Option>
           <Option value="2">仅展开一级</Option>
           <Option value="3">仅展开两级</Option>
         </Select>
-        <Button
-          type="primary"
-          :loading="submitPermLoading"
-          @click="submitPermEdit(true)"
-        >编辑
-        </Button
-        >
+        <Button type="primary" :loading="submitPermLoading" @click="submitPermEdit(true)">编辑
+        </Button>
       </div>
     </Modal>
     <!-- 数据权限 -->
-    <Modal
-      :title="modalTitle"
-      v-model="depModalVisible"
-      :mask-closable="false"
-      :width="500"
-      class="depModal"
-    >
-      <Alert show-icon
-      >默认可查看全部数据，自定义数据范围时请勾选下方数据
-      </Alert
-      >
+    <Modal :title="modalTitle" v-model="depModalVisible" :mask-closable="false" :width="500" class="depModal">
+      <Alert show-icon>默认可查看全部数据，自定义数据范围时请勾选下方数据
+      </Alert>
       <Form :label-width="85">
         <FormItem label="数据范围">
           <Select v-model="dataType" transfer>
@@ -127,46 +66,37 @@
       </Form>
       <div v-show="dataType == 1" style="margin-top: 15px">
         <div style="position: relative">
-          <Tree
-            ref="depTree"
-            :data="depData"
-            :load-data="loadData"
-            @on-toggle-expand="expandCheckDep"
-            multiple
-            style="margin-top: 15px"
-          ></Tree>
+          <Tree ref="depTree" :data="depData" :load-data="loadData" @on-toggle-expand="expandCheckDep" multiple style="margin-top: 15px"></Tree>
           <Spin size="large" fix v-if="depTreeLoading"></Spin>
         </div>
       </div>
       <div slot="footer">
         <Button type="text" @click="depModalVisible = false">取消</Button>
-        <Button
-          type="primary"
-          :loading="submitDepLoading"
-          @click="submitDepEdit"
-        >提交
-        </Button
-        >
+        <Button type="primary" :loading="submitDepLoading" @click="submitDepEdit">提交
+        </Button>
       </div>
     </Modal>
 
     <!-- 保存权限弹出选择权限 -->
-    <Modal
-      v-model="selectIsSuperModel"
-      title="选择菜单权限"
-      :loading="superModelLoading"
-      @on-ok="saveRole"
-    >
-      <div v-for="(item, index) in saveRoleWay" :key="index">
-        <span class="title">{{ item.title }}</span>
-        <RadioGroup type="button" button-style="solid" v-model="item.isSuper">
-          <Radio :label="true">
-            <span>操作数据权限</span>
-          </Radio>
-          <Radio :label="false">
-            <span>查看权限</span>
-          </Radio>
-        </RadioGroup>
+    <Modal width="800" v-model="selectIsSuperModel" title="选择菜单权限" :loading="superModelLoading" @on-ok="saveRole">
+      <!-- <div class="btns">
+        <Button type="primary"  class="btn-item">一键选中·数据权限</Button>
+        <Button  class="btn-item">一键选中·查看权限</Button>
+      </div> -->
+      <div class="role-list">
+        <div class="role-item" v-for="(item, index) in saveRoleWay" :key="index">
+          <div class="title">{{ item.title }}</div>
+          <div class="content">
+          <RadioGroup type="button" button-style="solid" v-model="item.isSuper">
+            <Radio :label="true">
+              <span>操作数据权限</span>
+            </Radio>
+            <Radio :label="false">
+              <span>查看权限</span>
+            </Radio>
+          </RadioGroup>
+          </div>
+        </div>
       </div>
     </Modal>
   </div>
@@ -207,19 +137,22 @@ export default {
       permModalVisible: false, // 菜单权限modal
       depModalVisible: false, // 部门modal
       modalTitle: "", // modal标题
-      roleForm: { // 角色表单
+      roleForm: {
+        // 角色表单
         name: "",
         description: "",
       },
-      roleFormValidate: { // 验证规则
+      roleFormValidate: {
+        // 验证规则
         name: [
-          {required: true, message: "角色名称不能为空", trigger: "blur"},
+          { required: true, message: "角色名称不能为空", trigger: "blur" },
         ],
       },
       submitLoading: false, // 提交loading
       selectList: [], // 已选列表
       selectCount: 0, // 已选总数
-      columns: [ // 表头
+      columns: [
+        // 表头
         {
           type: "selection",
           width: 60,
@@ -234,7 +167,7 @@ export default {
           title: "备注",
           key: "description",
           minWidth: 150,
-          tooltip: true
+          tooltip: true,
         },
         {
           title: "创建时间",
@@ -285,7 +218,7 @@ export default {
                 {
                   props: {
                     size: "small",
-                    type: "info"
+                    type: "info",
                   },
                   style: {
                     marginRight: "5px",
@@ -342,7 +275,7 @@ export default {
       console.log(val);
     },
 
-    renderContent(h, {root, node, data}) {
+    renderContent(h, { root, node, data }) {
       let icon = "";
 
       if (data.level == 0) {
@@ -384,7 +317,7 @@ export default {
             h("span", data.title),
             h(
               "span",
-              {class: {tips: true}},
+              { class: { tips: true } },
               data.isSuper ? "操作权限" : "查看权限"
             ),
           ]),
@@ -655,7 +588,6 @@ export default {
         way.push(perm);
         this.saveRoleWay = way;
       });
-
     },
 
     /**保存权限 */
@@ -678,7 +610,7 @@ export default {
       this.permModalVisible = false;
     },
     loadData(item, callback) {
-      loadDepartment(item.id, {openDataFilter: false}).then((res) => {
+      loadDepartment(item.id, { openDataFilter: false }).then((res) => {
         if (res.success) {
           res.result.forEach(function (e) {
             e.selected = false;
@@ -777,3 +709,33 @@ export default {
   },
 };
 </script>
+<style lang="scss" scoped>
+.role-list {
+  height: 500px;
+  overflow-y: auto;
+  display: flex;
+  flex-wrap: wrap;
+}
+.role-item {
+  width: 50%;
+  display: flex;
+  padding: 20px 0;
+  align-items: center;
+  >.title{
+    flex: 2;
+    text-align: right;
+  }
+  >.content{
+    flex: 10;
+  }
+}
+.btns{
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+.btn-item{
+  margin-right: 20px;
+}
+
+</style>
diff --git a/manager/vue.config.js b/manager/vue.config.js
index c7f21d3a..3a8f6944 100644
--- a/manager/vue.config.js
+++ b/manager/vue.config.js
@@ -47,7 +47,6 @@ module.exports = {
       gitalk: "Gitalk",
       "js-cookie": "Cookies",
       wangEditor: "wangEditor",
-      quill: "Quill",
       stompjs: "Stomp",
       "sockjs-client": "SockJS",
       vuedraggable: "vuedraggable"
diff --git a/seller/src/libs/util.js b/seller/src/libs/util.js
index 659a37a7..f850e358 100644
--- a/seller/src/libs/util.js
+++ b/seller/src/libs/util.js
@@ -338,6 +338,18 @@ util.initRouter = function (vm) { // 初始化路由
             if (!menuData) {
                 return;
             }
+            // 格式化数据，设置 空children 为 null
+            for(let i =0;i<menuData.length;i++){
+                let t = menuData[i].children
+                for(let k = 0;k<t.length;k++){
+                    let tt = t[k].children;
+                    for(let z = 0;z<tt.length;z++){
+                        tt[z].children = null
+                        // 给所有三级路由添加字段，显示一级菜单name，方便点击页签时的选中筛选
+                        tt[z].firstRouterName = menuData[i].name
+                    }
+                }
+            }
             util.initAllMenuData(constRoutes, menuData);
             util.initRouterNode(otherRoutes, otherRouter);
             // 添加所有主界面路由
@@ -451,6 +463,7 @@ util.initRouterNode = function (routers, data) {  // data为所有子菜单数
         meta.permTypes = menu.permTypes ? menu.permTypes : null;
         meta.title = menu.title ? menu.title + " - lilishop商家后台" : null;
         meta.url = menu.url ? menu.url : null;
+        meta.firstRouterName = item.firstRouterName
         menu.meta = meta;
 
         routers.push(menu);
diff --git a/seller/src/views/main-components/shrinkable-menu/shrinkable-menu.vue b/seller/src/views/main-components/shrinkable-menu/shrinkable-menu.vue
index 20128efc..c73d90c2 100644
--- a/seller/src/views/main-components/shrinkable-menu/shrinkable-menu.vue
+++ b/seller/src/views/main-components/shrinkable-menu/shrinkable-menu.vue
@@ -46,6 +46,17 @@ export default {
       return this.$store.state.app.currNav;
     }
   },
+  watch: {
+    // 监听路由变化
+    $route: {
+      handler: function (val, oldVal) {
+        console.log(val);
+        if (val.meta.firstRouterName && val.meta.firstRouterName !== this.currNav) {
+          this.selectNav(val.meta.firstRouterName)
+        }
+      }
+    } 
+  },
   methods: {
     changeMenu(name) { //二级路由点击
       this.$router.push({
@@ -56,6 +67,9 @@ export default {
       this.$store.commit("setCurrNav", name);
       this.setStore("currNav", name);
       util.initRouter(this);
+      this.$nextTick(()=>{
+        this.$refs.childrenMenu.updateActiveName()
+      })
     },
   }
 };
diff --git a/seller/src/views/order/after-order/orderComplaint.vue b/seller/src/views/order/after-order/orderComplaint.vue
index b20a21d4..4ac73b09 100644
--- a/seller/src/views/order/after-order/orderComplaint.vue
+++ b/seller/src/views/order/after-order/orderComplaint.vue
@@ -102,12 +102,10 @@
           {
             title: "订单编号",
             key: "orderSn",
-            sortType: "desc",
           },
           {
             title: "商品名称",
             slot: "goodsName",
-            sortType: "desc",
           },
           {
             title: "投诉主题",
@@ -197,7 +195,7 @@
     },
     methods: {
       // 初始化数据
-      init() { 
+      init() {
         this.getDataList();
       },
       // 改变页码