商家端保存商品列表筛选条件

manager/src/router/router.js

@@ -192,27 +192,21 @@ export const otherRouter = {
       component: () => import("@/views/goods/goods-info/goodsDetail.vue")
     },
     {
-      path: "promotion/manager-poonts-goods",
+      path: "promotion/add-points-goods",
-      title: "积分商品",
-      name: "manager-points-goods",
-      component: () => import("@/views/promotion/pointsGoods/pointsGoods.vue")
-    },
-    {
-      path: "promotion/add-poonts-goods",
       title: "添加积分商品",
       name: "add-points-goods",
       component: () =>
         import("@/views/promotion/pointsGoods/addPointsGoods.vue")
     },
     {
-      path: "promotion/edit-poonts-goods",
+      path: "promotion/edit-points-goods",
       title: "修改积分商品",
       name: "edit-points-goods",
       component: () =>
         import("@/views/promotion/pointsGoods/editPointsGoods.vue")
     },
     {
-      path: "promotion/manager-poonts-goods-category",
+      path: "promotion/manager-points-goods-category",
       title: "积分商品分类",
       name: "manager-points-goods-category",
       component: () =>

manager/src/views/promotion/pointsGoods/addPointsGoods.vue

@@ -234,7 +234,7 @@ export default {
         },
         {
           title: "店铺名称",
-          key: "sellerName",
+          key: "storeName",
           minWidth: 60,
         },
         {
@@ -348,7 +348,7 @@ export default {
     },
     // 关闭当前页面
     closeCurrentPage() {
-      this.$store.commit("removeTag", "add-poonts-goods");
+      this.$store.commit("removeTag", "add-points-goods");
       localStorage.pageOpenedList = JSON.stringify(
         this.$store.state.app.pageOpenedList
       );
@@ -406,7 +406,7 @@ export default {
             originalPrice: e.price,
             quantity: e.quantity,
             storeId: e.storeId,
-            sellerName: e.sellerName,
+            storeName: e.storeName,
             skuId: e.id,
             ...e,
           });

manager/src/views/sys/setting-manage/setting/WITHDRAWAL_SETTING.vue

@@ -62,6 +62,6 @@ export default {
 @import "./style.scss";
 /deep/ .ivu-form-item-content{
   align-items: center;
-  paddinig-bottom: 5px;
+  padding-bottom: 5px;
 }
 </style>

seller/src/config/index.js

@@ -18,10 +18,10 @@ export default {
    * @description api请求基础路径
    */
   api_dev: {
-    common: 'http://127.0.0.1:8890',
+    common: 'https://common-api.pickmall.cn',
-    buyer: 'http://127.0.0.1:8888',
+    buyer: 'https://buyer-api.pickmall.cn',
-    seller: 'http://127.0.0.1:8889',
+    seller: 'https://store-api.pickmall.cn',
-    manager: 'http://127.0.0.1:8887'
+    manager: 'https://admin-api.pickmall.cn'
   },
   api_prod: {
     common: 'http://127.0.0.1:8890',

seller/src/libs/routerJson.js

@@ -133,7 +133,7 @@ export const result = [
         permTypes: [],
         children: [
           {
-            name: "order",
+            name: "orderList",
             showAlways: true,
             level: 2,
             type: 0,
@@ -266,12 +266,12 @@ export const result = [
         permTypes: [],
         children: [
           {
-            name: "bill",
+            name: "accountStatementBill",
             showAlways: true,
             level: 2,
             type: 0,
             title: "财务对账",
-            path: "bill",
+            path: "accountStatementBill",
             component: "shop/bill/accountStatementBill",
             icon: "md-person",
             isMenu: true,
@@ -297,7 +297,7 @@ export const result = [
       },
 
       {
-        name: "receipt",
+        name: "receiptManager",
         showAlways: true,
         level: 1,
         type: 0,
@@ -386,12 +386,12 @@ export const result = [
         ]
       },
       {
-        name: "promotion",
+        name: "storePromotion",
         showAlways: true,
         level: 1,
         type: 0,
         title: "商家活动",
-        path: "/promotion",
+        path: "/storePromotion",
         component: "Main",
         icon: "md-person",
         isMenu: true,
@@ -429,12 +429,12 @@ export const result = [
         ]
       },
       {
-        name: "promotion",
+        name: "distribution",
         showAlways: true,
         level: 1,
         type: 0,
         title: "分销管理",
-        path: "/promotion",
+        path: "/distribution",
         component: "Main",
         icon: "md-person",
         isMenu: true,

seller/src/router/router.js

@@ -115,15 +115,9 @@ export const otherRouter = {
       component: () =>
         import("@/views/order/after-order/reurnGoodsOrderDetail.vue")
     },
-    {
-      path: "full-cut",
-      title: "满优惠",
-      name: "full-cut",
-      component: () => import("@/views/promotion/fullCut/full-cut.vue")
-    },
     {
       path: "full-cut-detail",
-      title: "添加满优惠",
+      title: "添加满额活动",
       name: "full-cut-detail",
       component: () => import("@/views/promotion/fullCut/newFullCut.vue")
     },

seller/src/views/goods/goods-seller/goods.vue

@@ -17,6 +17,7 @@
             <Input type="text" v-model="searchForm.sn" placeholder="商品编号" clearable style="width: 200px" />
           </Form-item>
           <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
+          <Button @click="handleReset" class="search-btn">重置</Button>
         </Form>
       </Row>
       <Row class="operation padding-row">
@@ -114,12 +115,6 @@ import * as API_Store from "@/api/shops";
 
 export default {
   name: "goods",
-  components: {},
-  watch: {
-    $route() {
-      this.getDataList();
-    },
-  },
   data() {
     return {
       id: "", //要操作的id
@@ -497,7 +492,7 @@ export default {
       this.getDataList();
     },
     handleReset () {
-      this.$refs.searchForm.resetFields();
+      this.searchForm = {};
       this.searchForm.pageNumber = 1;
       this.searchForm.pageSize = 10;
       // 重新加载数据
@@ -717,7 +712,7 @@ export default {
       });
     },
   },
-  mounted() {
+  activated () {
     this.init();
   },
 };

seller/src/views/member/memberComment.vue

@@ -42,6 +42,7 @@
                 ></DatePicker>
               </Form-item>
               <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
+              <Button @click="handleReset" class="search-btn">重置</Button>
             </Form>
           </Row>
           <Row class="padding-row">
@@ -305,6 +306,12 @@ export default {
       this.searchForm.pageSize = 10;
       this.getDataList();
     },
+    handleReset() {
+      this.searchForm = {}
+      this.searchForm.pageNumber = 1;
+      this.searchForm.pageSize = 10;
+      this.getDataList();
+    },
     changeSort(e) {
       this.searchForm.sort = e.key;
       this.searchForm.order = e.order;
@@ -335,8 +342,6 @@ export default {
           this.total = res.result.total; 
         }
       });
-      this.total = this.data.length;
-      this.loading = false;
     },
     //回复
     handleSubmit() {
@@ -379,7 +384,7 @@ export default {
       });
     },
   },
-  mounted() {
+  activated() {
     this.init();
   },
 };

seller/src/views/order/after-order/orderComplaint.vue

@@ -35,6 +35,7 @@
                 </Select>
               </Form-item>
               <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
+              <Button @click="handleReset" class="search-btn">重置</Button>
             </Form>
           </Row>
           <Row class="padding-row">
@@ -279,6 +280,12 @@
         this.searchForm.pageSize = 10;
         this.getDataList();
       },
+      handleReset() {
+        this.searchForm = {}
+        this.searchForm.pageNumber = 1;
+        this.searchForm.pageSize = 10;
+        this.getDataList();
+      },
       changeSort(e) {
         this.searchForm.sort = e.key;
         this.searchForm.order = e.order;
@@ -346,7 +353,7 @@
         });
       },
     },
-    mounted() {
+    activated() {
       this.init();
     },
   };

seller/src/views/order/after-order/returnGoodsOrder.vue

@@ -45,6 +45,7 @@
                 ></DatePicker>
               </Form-item>
               <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
+              <Button @click="handleReset" class="search-btn">重置</Button>
             </Form>
           </Row>
           <Row class="padding-row">
@@ -263,6 +264,13 @@
         this.searchForm.pageSize = 10;
         this.getDataList();
       },
+      handleReset() {
+        this.searchForm = {};
+        this.selectDate = ''
+        this.searchForm.pageNumber = 1;
+        this.searchForm.pageSize = 10;
+        this.getDataList();
+      },
 
       changeSort(e) {
         this.searchForm.sort = e.key;
@@ -307,7 +315,7 @@
 
       },
     },
-    mounted() {
+    activated () {
       this.init();
     },
   };

seller/src/views/order/after-order/returnMoneyOrder.vue

@@ -45,6 +45,7 @@
                 ></DatePicker>
               </Form-item>
               <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
+              <Button @click="handleReset" class="search-btn">重置</Button>
             </Form>
           </Row>
           <Row class="padding-row">
@@ -258,6 +259,13 @@
         this.searchForm.pageSize = 10;
         this.getDataList();
       },
+      handleReset() {
+        this.selectDate = ''
+        this.searchForm = {}
+        this.searchForm.pageNumber = 1;
+        this.searchForm.pageSize = 10;
+        this.getDataList();
+      },
       changeSort(e) {
         this.searchForm.sort = e.key;
         this.searchForm.order = e.order;
@@ -301,7 +309,7 @@
 
       },
     },
-    mounted() {
+    activated() {
       this.init();
     },
   };

seller/src/views/order/order/orderList.vue

@@ -38,7 +38,7 @@
                 <DatePicker
                   v-model="selectDate"
                   type="datetimerange"
-                  format="yyyy-MM-dd HH:mm:ss"
+                  format="yyyy-MM-dd"
                   clearable
                   @on-change="selectDateRange"
                   placeholder="选择起始时间"
@@ -46,6 +46,7 @@
                 ></DatePicker>
               </Form-item>
               <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
+              <Button @click="handleReset" class="search-btn">重置</Button>
 
             </Form>
           </Row>
@@ -83,12 +84,8 @@
 
 <script>
   import * as API_Order from "@/api/order";
-
-
   export default {
     name: "orderList",
-    components: {
-    },
     data() {
       return {
         loading: true, // 表单加载状态
@@ -245,7 +242,7 @@
         this.getDataList();
       },
       handleReset() {
-        this.$refs.searchForm.resetFields();
+        this.searchForm = {};
         this.searchForm.pageNumber = 1;
         this.searchForm.pageSize = 10;
         this.selectDate = null;
@@ -284,8 +281,6 @@
             this.total = res.result.total;
           }
         });
-        this.total = this.data.length;
-        this.loading = false;
       },
 
       detail(v) {
@@ -297,7 +292,7 @@
 
       },
     },
-    mounted() {
+    activated () {
       this.init();
     },
   };

seller/src/views/order/receiptManager/receipt.vue

@@ -45,7 +45,7 @@
                 </Select>
               </Form-item>
               <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
-
+              <Button @click="handleReset" class="search-btn">重置</Button>
             </Form>
           </Row>
           <Row class="padding-row">
@@ -256,6 +256,12 @@
         this.searchForm.pageSize = 10;
         this.getData();
       },
+      handleReset() {
+        this.searchForm = {}
+        this.searchForm.pageNumber = 1;
+        this.searchForm.pageSize = 10;
+        this.getData();
+      },
       changeSort(e) {
         this.searchForm.sort = e.key;
         this.searchForm.order = e.order;
@@ -309,7 +315,7 @@
         });
       },
     },
-    mounted() {
+    activated() {
       this.init();
     },
   };

seller/src/views/promotion/coupon/coupon.vue

@@ -47,6 +47,7 @@
             icon="ios-search"
             >搜索</Button
           >
+          <Button @click="handleReset" class="search-btn">重置</Button>
         </Form>
       </Row>
       <Row class="operator padding-row">
@@ -264,6 +265,12 @@ export default {
       this.searchForm.pageNumber = 0;
       this.getDataList();
     },
+    handleReset() {
+      this.searchForm = {}
+      this.selectDate = ''
+      this.searchForm.pageNumber = 0;
+      this.getDataList();
+    },
 
     changeSort(e) {
       this.searchForm.sort = e.key;
@@ -390,16 +397,9 @@ export default {
       });
     },
   },
-  mounted() {
+  activated () {
     this.init();
   },
-  watch: {
-    $route(to, from) {
-      if (to.fullPath == "/promotion/coupon") {
-        this.init();
-      }
-    },
-  },
 };
 </script>
 <style lang="scss">

seller/src/views/promotion/fullCut/full-cut.vue

@@ -41,6 +41,7 @@
             ></DatePicker>
           </Form-item>
           <Button @click="handleSearch" type="primary" class="search-btn" icon="ios-search">搜索</Button>
+          <Button @click="handleReset" class="ml_10">重置</Button>
         </Form>
       </Row>
       <Row class="operation">
@@ -207,6 +208,13 @@ export default {
       this.searchForm.pageSize = 10;
       this.getDataList();
     },
+    handleReset() {
+      this.selectDate = ''
+      this.searchForm = {}
+      this.searchForm.pageNumber = 0;
+      this.searchForm.pageSize = 10;
+      this.getDataList();
+    },
 
     edit(row) {
       //  编辑
@@ -248,16 +256,9 @@ export default {
       });
     },
   },
-  mounted() {
+  activated() {
-    this.init();
-  },
-  watch: {
-    $route(to, from) {
-      if (to.fullPath == "/promotion/full-cut") {
     this.init();
   }
-    },
-  },
 };
 </script>
 <style lang="scss" scoped>

seller/src/views/promotion/pintuan/pintuan.vue

@@ -39,6 +39,7 @@
             ></DatePicker>
           </Form-item>
           <Button @click="handleSearch" type="primary" class="search-btn " icon="ios-search">搜索</Button>
+          <Button @click="handleReset" class="search-btn">重置</Button>
         </Form>
       </Row>
       <Row class="operation padding-row">
@@ -206,6 +207,13 @@ export default {
       this.searchForm.pageSize = 10;
       this.getDataList();
     },
+    handleReset() {
+      this.searchForm = {}
+      this.selectDate = ''
+      this.searchForm.pageNumber = 0;
+      this.searchForm.pageSize = 10;
+      this.getDataList();
+    },
 
     clearSelectAll() {
       this.$refs.table.selectAll(false);
@@ -323,14 +331,7 @@ export default {
       });
     },
   },
-  watch: {
+  activated() {
-    $route(to, from) {
-      if (to.fullPath == "/promotion/pintuan") {
-        this.init();
-      }
-    },
-  },
-  mounted() {
     this.init();
   },
 };

seller/src/views/promotion/seckill/seckill.vue

@@ -41,6 +41,7 @@
             ></DatePicker>
           </Form-item>
           <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
+          <Button @click="handleReset" class="ml_10">重置</Button>
         </Form>
       </Row>
 
@@ -95,7 +96,7 @@
 <script>
 import { seckillList } from "@/api/promotion";
 export default {
-  name: "goods",
+  name: "seckill",
   components: {},
   data() {
     return {
@@ -185,6 +186,13 @@ export default {
       this.searchForm.pageSize = 10;
       this.getDataList();
     },
+    handleReset() {
+      this.searchForm = {}
+      this.selectDate = ''
+      this.searchForm.pageNumber = 0;
+      this.searchForm.pageSize = 10;
+      this.getDataList();
+    },
 
     manage(row) {
       this.$router.push({ name: "seckill-goods", query: { id: row.id } });
@@ -220,16 +228,9 @@ export default {
       return hourArr;
     },
   },
-  mounted() {
+  activated () {
-    this.init();
-  },
-  watch: {
-    $route(to, from) {
-      if (to.fullPath == "/promotion/seckill") {
     this.init();
   }
-    },
-  },
 };
 </script>
 <style lang="scss"  scoped>

seller/src/views/shop/bill/accountStatementBill.vue

@@ -33,7 +33,7 @@
                 ></DatePicker>
               </Form-item>
               <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
-
+              <Button @click="handleReset" class="search-btn">重置</Button>
             </Form>
           </Row>
           <Row class="padding-row">
@@ -202,6 +202,12 @@
         this.searchForm.pageSize = 10;
         this.getDataList();
       },
+      handleReset() {
+        this.searchForm = {}
+        this.searchForm.pageNumber = 1;
+        this.searchForm.pageSize = 10;
+        this.getDataList();
+      },
       changeSort(e) {
         this.searchForm.sort = e.key;
         this.searchForm.order = e.order;

seller/src/views/shop/bill/storeBill.vue

@@ -40,7 +40,7 @@
                 </Select>
               </Form-item>
               <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
-
+              <Button @click="handleReset" class="search-btn">重置</Button>
             </Form>
           </Row>
           <Row class="padding-row">
@@ -209,6 +209,12 @@
         this.searchForm.pageSize = 10;
         this.getDataList();
       },
+      handleReset() {
+        this.searchForm = {}
+        this.searchForm.pageNumber = 1;
+        this.searchForm.pageSize = 10;
+        this.getDataList();
+      },
       changeSort(e) {
         this.searchForm.sort = e.key;
         this.searchForm.order = e.order;
@@ -252,7 +258,7 @@
 
       },
     },
-    mounted() {
+    activated () {
       this.init();
     },
   };