From f2c2734b15699fdc2dc1c8fcd3ebf91a8724aca6 Mon Sep 17 00:00:00 2001 From: mabo Date: Fri, 14 May 2021 17:28:01 +0800 Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=AE=B6=E7=AB=AF=E4=BF=9D=E5=AD=98?= =?UTF-8?q?=E5=95=86=E5=93=81=E5=88=97=E8=A1=A8=E7=AD=9B=E9=80=89=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manager/src/router/router.js | 12 +++------ .../promotion/pointsGoods/addPointsGoods.vue | 6 ++--- .../setting/WITHDRAWAL_SETTING.vue | 2 +- seller/src/api/goods.js | 2 +- seller/src/config/index.js | 8 +++--- seller/src/libs/routerJson.js | 16 +++++------ seller/src/router/router.js | 8 +----- seller/src/views/goods/goods-seller/goods.vue | 27 ++++++++----------- seller/src/views/member/memberComment.vue | 13 ++++++--- .../order/after-order/orderComplaint.vue | 9 ++++++- .../order/after-order/returnGoodsOrder.vue | 10 ++++++- .../order/after-order/returnMoneyOrder.vue | 10 ++++++- seller/src/views/order/order/orderList.vue | 13 +++------ .../views/order/receiptManager/receipt.vue | 10 +++++-- seller/src/views/promotion/coupon/coupon.vue | 16 +++++------ .../src/views/promotion/fullCut/full-cut.vue | 19 ++++++------- .../src/views/promotion/pintuan/pintuan.vue | 17 ++++++------ .../src/views/promotion/seckill/seckill.vue | 21 ++++++++------- .../views/shop/bill/accountStatementBill.vue | 8 +++++- seller/src/views/shop/bill/storeBill.vue | 10 +++++-- 20 files changed, 132 insertions(+), 105 deletions(-) diff --git a/manager/src/router/router.js b/manager/src/router/router.js index cf4d9628..5e3497f7 100644 --- a/manager/src/router/router.js +++ b/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", - title: "积分商品", - name: "manager-points-goods", - component: () => import("@/views/promotion/pointsGoods/pointsGoods.vue") - }, - { - path: "promotion/add-poonts-goods", + path: "promotion/add-points-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: () => diff --git a/manager/src/views/promotion/pointsGoods/addPointsGoods.vue b/manager/src/views/promotion/pointsGoods/addPointsGoods.vue index b0c67267..7cc7f5d1 100644 --- a/manager/src/views/promotion/pointsGoods/addPointsGoods.vue +++ b/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, }); diff --git a/manager/src/views/sys/setting-manage/setting/WITHDRAWAL_SETTING.vue b/manager/src/views/sys/setting-manage/setting/WITHDRAWAL_SETTING.vue index 527ad884..2998ef14 100644 --- a/manager/src/views/sys/setting-manage/setting/WITHDRAWAL_SETTING.vue +++ b/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; } diff --git a/seller/src/api/goods.js b/seller/src/api/goods.js index c0daedaf..70ebe9cc 100644 --- a/seller/src/api/goods.js +++ b/seller/src/api/goods.js @@ -255,7 +255,7 @@ export const getGoodsListDataByStockSeller = params => { export const getGoods = id => { return getRequest(`/goods/get/${id}`); }; -// 上架商品 +// 上架商品 export const upGoods = params => { return putRequest(`/goods/up`, params); }; diff --git a/seller/src/config/index.js b/seller/src/config/index.js index 0d51af68..f9363323 100644 --- a/seller/src/config/index.js +++ b/seller/src/config/index.js @@ -18,10 +18,10 @@ export default { * @description api请求基础路径 */ api_dev: { - common: 'http://127.0.0.1:8890', - buyer: 'http://127.0.0.1:8888', - seller: 'http://127.0.0.1:8889', - manager: 'http://127.0.0.1:8887' + common: 'https://common-api.pickmall.cn', + buyer: 'https://buyer-api.pickmall.cn', + seller: 'https://store-api.pickmall.cn', + manager: 'https://admin-api.pickmall.cn' }, api_prod: { common: 'http://127.0.0.1:8890', diff --git a/seller/src/libs/routerJson.js b/seller/src/libs/routerJson.js index 80c2ad5e..41937a01 100644 --- a/seller/src/libs/routerJson.js +++ b/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, diff --git a/seller/src/router/router.js b/seller/src/router/router.js index 38a5731a..eaf49412 100644 --- a/seller/src/router/router.js +++ b/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") }, diff --git a/seller/src/views/goods/goods-seller/goods.vue b/seller/src/views/goods/goods-seller/goods.vue index 58020981..e27815aa 100644 --- a/seller/src/views/goods/goods-seller/goods.vue +++ b/seller/src/views/goods/goods-seller/goods.vue @@ -17,6 +17,7 @@ + @@ -114,12 +115,6 @@ import * as API_Store from "@/api/shops"; export default { name: "goods", - components: {}, - watch: { - $route() { - this.getDataList(); - }, - }, data() { return { id: "", //要操作的id @@ -482,28 +477,28 @@ export default { } }); }, - changePage(v) { + changePage (v) { this.searchForm.pageNumber = v; this.getDataList(); this.clearSelectAll(); }, - changePageSize(v) { + changePageSize (v) { this.searchForm.pageSize = v; this.getDataList(); }, - handleSearch() { + handleSearch () { this.searchForm.pageNumber = 1; this.searchForm.pageSize = 10; this.getDataList(); }, - handleReset() { - this.$refs.searchForm.resetFields(); + handleReset () { + this.searchForm = {}; this.searchForm.pageNumber = 1; this.searchForm.pageSize = 10; // 重新加载数据 this.getDataList(); }, - changeSort(e) { + changeSort (e) { this.searchForm.sort = e.key; this.searchForm.order = e.order; if (e.order === "normal") { @@ -511,15 +506,15 @@ export default { } this.getDataList(); }, - clearSelectAll() { + clearSelectAll () { this.$refs.table.selectAll(false); }, - changeSelect(e) { + changeSelect (e) { this.selectList = e; this.selectCount = e.length; }, //保存运费模板信息 - saveShipTemplate() { + saveShipTemplate () { if (this.shipTemplateForm.freightPayer == "BUYER") { { this.shipTemplateForm.templateId = 0; @@ -717,7 +712,7 @@ export default { }); }, }, - mounted() { + activated () { this.init(); }, }; diff --git a/seller/src/views/member/memberComment.vue b/seller/src/views/member/memberComment.vue index 4c2b9689..9aea4fd2 100644 --- a/seller/src/views/member/memberComment.vue +++ b/seller/src/views/member/memberComment.vue @@ -42,6 +42,7 @@ > + @@ -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; @@ -332,11 +339,9 @@ export default { this.loading = false; if (res.success) { this.data = res.result.records; - this.total = res.result.total; + this.total = res.result.total; } }); - this.total = this.data.length; - this.loading = false; }, //回复 handleSubmit() { @@ -379,7 +384,7 @@ export default { }); }, }, - mounted() { + activated() { this.init(); }, }; diff --git a/seller/src/views/order/after-order/orderComplaint.vue b/seller/src/views/order/after-order/orderComplaint.vue index 8bb6b2bf..44d3f156 100644 --- a/seller/src/views/order/after-order/orderComplaint.vue +++ b/seller/src/views/order/after-order/orderComplaint.vue @@ -35,6 +35,7 @@ + @@ -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(); }, }; diff --git a/seller/src/views/order/after-order/returnGoodsOrder.vue b/seller/src/views/order/after-order/returnGoodsOrder.vue index d6a6bfad..d4c65068 100644 --- a/seller/src/views/order/after-order/returnGoodsOrder.vue +++ b/seller/src/views/order/after-order/returnGoodsOrder.vue @@ -45,6 +45,7 @@ > + @@ -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(); }, }; diff --git a/seller/src/views/order/after-order/returnMoneyOrder.vue b/seller/src/views/order/after-order/returnMoneyOrder.vue index e9076b67..c7afbcf6 100644 --- a/seller/src/views/order/after-order/returnMoneyOrder.vue +++ b/seller/src/views/order/after-order/returnMoneyOrder.vue @@ -45,6 +45,7 @@ > + @@ -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(); }, }; diff --git a/seller/src/views/order/order/orderList.vue b/seller/src/views/order/order/orderList.vue index c61c93c5..da83e39b 100644 --- a/seller/src/views/order/order/orderList.vue +++ b/seller/src/views/order/order/orderList.vue @@ -38,7 +38,7 @@ + @@ -83,12 +84,8 @@