From c879cb2af0960b149b8b4709cdd2257f7e86317d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com> Date: Wed, 2 Mar 2022 15:02:18 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E4=B8=AD=E6=98=BE=E7=A4=BA=E7=9A=84=E4=BB=B7?= =?UTF-8?q?=E6=A0=BC=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manager/src/views/order/order/orderDetail.vue | 7 +++---- seller/src/views/order/order/orderDetail.vue | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/manager/src/views/order/order/orderDetail.vue b/manager/src/views/order/order/orderDetail.vue index 998cb3bb..7a113845 100644 --- a/manager/src/views/order/order/orderDetail.vue +++ b/manager/src/views/order/order/orderDetail.vue @@ -587,7 +587,7 @@ export default { if (!params.row.goodsPrice) { return h("div", this.$options.filters.unitPrice(0, "￥")); } - return h("div", this.$options.filters.unitPrice(params.row.goodsPrice, "￥")); + return h("div", this.$options.filters.unitPrice(params.row.unitPrice, "￥")); }, }, @@ -601,7 +601,7 @@ export default { key: "subTotal", minWidth: 100, render: (h, params) => { - return h("div", this.$options.filters.unitPrice(params.row.subTotal, "￥")); + return h("div", this.$options.filters.unitPrice(params.row.flowPrice, "￥")); }, }, ], @@ -674,8 +674,7 @@ export default { }, modifyPrice() { //默认要修改的金额为订单总金额 - this.modifyPriceForm.price = this.orderInfo.order.subTotal; - console.log(this.modifyPriceForm.price) + this.modifyPriceForm.price = this.orderInfo.order.flowPrice; this.modal = true; }, //修改订单金额提交 diff --git a/seller/src/views/order/order/orderDetail.vue b/seller/src/views/order/order/orderDetail.vue index cf7a037c..86c71c2e 100644 --- a/seller/src/views/order/order/orderDetail.vue +++ b/seller/src/views/order/order/orderDetail.vue @@ -643,7 +643,7 @@ export default { render: (h, params) => { return h( "div", - this.$options.filters.unitPrice(params.row.subTotal, "￥") + this.$options.filters.unitPrice(params.row.flowPrice, "￥") ); }, }, @@ -900,7 +900,7 @@ dl dt { .search { - + .div-item { line-height: 35px; From 2dac9582275d01b987398e83a9900f0d21714b7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com> Date: Wed, 2 Mar 2022 15:21:28 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E4=B9=B0=E5=AE=B6?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=94=AE=E5=90=8E=E6=98=BE=E7=A4=BA=E7=9A=84?= =?UTF-8?q?=E4=BB=B7=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- buyer/src/pages/home/orderCenter/ApplyAfterSale.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buyer/src/pages/home/orderCenter/ApplyAfterSale.vue b/buyer/src/pages/home/orderCenter/ApplyAfterSale.vue index 3f0441cf..91911629 100644 --- a/buyer/src/pages/home/orderCenter/ApplyAfterSale.vue +++ b/buyer/src/pages/home/orderCenter/ApplyAfterSale.vue @@ -12,7 +12,7 @@
From 33bb16a0d3776c49098697cafbe88a2725e73c1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com> Date: Fri, 4 Mar 2022 15:12:37 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E6=A0=8F=E9=87=8D=E5=A4=8D=E7=82=B9=E5=87=BBconsole=E4=BC=9A?= =?UTF-8?q?=E6=98=BE=E7=A4=BAbug=20=EF=BC=8C=20=E4=BB=A5=E5=8F=8A=E8=A1=8C?= =?UTF-8?q?=E6=94=BF=E5=9C=B0=E5=8C=BA=E4=B8=8D=E5=9B=9E=E6=98=BE=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- buyer/src/router/index.js | 8 ++++++ manager/src/router/index.js | 10 ++++++++ manager/src/views/region/index.vue | 41 +++++++++++++++++++----------- seller/src/router/index.js | 8 ++++++ 4 files changed, 52 insertions(+), 15 deletions(-) diff --git a/buyer/src/router/index.js b/buyer/src/router/index.js index 80251a22..5dfb92eb 100644 --- a/buyer/src/router/index.js +++ b/buyer/src/router/index.js @@ -97,6 +97,14 @@ const ShopEntry = (resolve) => Vue.use(Router); +/** + * 解决重复点击菜单会控制台报错bug + */ + const routerPush = Router.prototype.push + Router.prototype.push = function push(location) { + return routerPush.call(this, location).catch(error=> error) + } + export default new Router({ mode: "history", routes: [ diff --git a/manager/src/router/index.js b/manager/src/router/index.js index 4064391d..3d4484c3 100644 --- a/manager/src/router/index.js +++ b/manager/src/router/index.js @@ -13,6 +13,14 @@ const RouterConfig = { routes: routers }; +/** + * 解决重复点击菜单会控制台报错bug + */ +const routerPush = VueRouter.prototype.push +VueRouter.prototype.push = function push(location) { + return routerPush.call(this, location).catch(error=> error) +} + export const router = new VueRouter(RouterConfig); router.beforeEach((to, from, next) => { @@ -44,3 +52,5 @@ router.afterEach((to) => { ViewUI.LoadingBar.finish(); window.scrollTo(0, 0); }); + + diff --git a/manager/src/views/region/index.vue b/manager/src/views/region/index.vue index a3e5b5c6..64d46a71 100644 --- a/manager/src/views/region/index.vue +++ b/manager/src/views/region/index.vue @@ -1,7 +1,11 @@