From b1b587a50c08cf5577d129a1336cd6ead1f3f147 Mon Sep 17 00:00:00 2001 From: mabo Date: Fri, 21 May 2021 10:24:56 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../goodsDetail/ShowGoodsDetail.vue | 2 +- buyer/src/config/index.js | 16 +++++------ buyer/src/pages/Cart.vue | 2 +- buyer/src/pages/GoodsDetail.vue | 2 +- buyer/src/pages/GoodsList.vue | 4 +-- buyer/src/pages/Merchant.vue | 4 +-- .../pages/home/memberCenter/CommentList.vue | 4 +-- .../home/memberCenter/ComplainDetail.vue | 2 +- .../pages/home/memberCenter/ComplainList.vue | 4 +-- .../memberCenter/evaluation/EvalDetail.vue | 4 +-- manager/src/views/goods/goods-info/goods.vue | 14 +++++++--- .../after-order/afterSaleOrderDetail.vue | 28 +++++++++++++------ seller/src/config/index.js | 8 +++--- seller/src/views/goods/goods-seller/goods.vue | 26 ++++++++++------- .../views/goods/goods-seller/goodsStock.vue | 4 --- seller/src/views/home/home.vue | 12 ++++---- seller/src/views/member/memberComment.vue | 5 ++-- .../my-components/lili/upload-pic-thumb.vue | 5 ++++ seller/src/views/promotion/coupon/coupon.vue | 4 +-- .../views/promotion/coupon/couponPublish.vue | 2 +- 20 files changed, 89 insertions(+), 63 deletions(-) diff --git a/buyer/src/components/goodsDetail/ShowGoodsDetail.vue b/buyer/src/components/goodsDetail/ShowGoodsDetail.vue index c2b34e53..99c878ae 100644 --- a/buyer/src/components/goodsDetail/ShowGoodsDetail.vue +++ b/buyer/src/components/goodsDetail/ShowGoodsDetail.vue @@ -56,7 +56,7 @@

{{item.content}}

-
+
总价(不含运费):{{ priceDetailDTO.billPrice | unitPrice("¥") }}
-
去支付
+
去结算
diff --git a/buyer/src/pages/GoodsDetail.vue b/buyer/src/pages/GoodsDetail.vue index 39c67e93..663bd301 100644 --- a/buyer/src/pages/GoodsDetail.vue +++ b/buyer/src/pages/GoodsDetail.vue @@ -11,7 +11,7 @@ {{item.name}}
- {{goodsMsg.data.storeName}} + {{goodsMsg.data.storeName}} {{storeCollected?'已收藏店铺':'收藏店铺'}}
diff --git a/buyer/src/pages/GoodsList.vue b/buyer/src/pages/GoodsList.vue index 99168bcc..718ae499 100644 --- a/buyer/src/pages/GoodsList.vue +++ b/buyer/src/pages/GoodsList.vue @@ -157,11 +157,11 @@ export default { window.open(routeUrl.href, '_blank'); }, changePageNum (val) { - this.params.pageNumber = val - 1; + this.params.pageNumber = val; this.getGoodsList(); }, changePageSize (val) { - this.params.pageNumber = 0; + this.params.pageNumber = 1; this.params.pageSize = val; this.getGoodsList(); }, diff --git a/buyer/src/pages/Merchant.vue b/buyer/src/pages/Merchant.vue index cc1942d5..72cf73ce 100644 --- a/buyer/src/pages/Merchant.vue +++ b/buyer/src/pages/Merchant.vue @@ -146,11 +146,11 @@ export default { this.getGoodsList() }, changePageNum (val) { - this.params.pageNumber = val - 1; + this.params.pageNumber = val; this.getGoodsList(); }, changePageSize (val) { - this.params.pageNumber = 0; + this.params.pageNumber = 1; this.params.pageSize = val; this.getGoodsList(); }, diff --git a/buyer/src/pages/home/memberCenter/CommentList.vue b/buyer/src/pages/home/memberCenter/CommentList.vue index 5f33c240..661669fe 100644 --- a/buyer/src/pages/home/memberCenter/CommentList.vue +++ b/buyer/src/pages/home/memberCenter/CommentList.vue @@ -22,10 +22,10 @@ -
+
-
+
{{item.goodsName}}
diff --git a/buyer/src/pages/home/memberCenter/ComplainDetail.vue b/buyer/src/pages/home/memberCenter/ComplainDetail.vue index 682852cf..61db7505 100644 --- a/buyer/src/pages/home/memberCenter/ComplainDetail.vue +++ b/buyer/src/pages/home/memberCenter/ComplainDetail.vue @@ -13,7 +13,7 @@ - + diff --git a/buyer/src/pages/home/memberCenter/ComplainList.vue b/buyer/src/pages/home/memberCenter/ComplainList.vue index d4cf694b..c8cdc281 100644 --- a/buyer/src/pages/home/memberCenter/ComplainList.vue +++ b/buyer/src/pages/home/memberCenter/ComplainList.vue @@ -23,10 +23,10 @@ -
+
-
+
{{item.goodsName}}
diff --git a/buyer/src/pages/home/memberCenter/evaluation/EvalDetail.vue b/buyer/src/pages/home/memberCenter/evaluation/EvalDetail.vue index c3f2d724..b1439cde 100644 --- a/buyer/src/pages/home/memberCenter/evaluation/EvalDetail.vue +++ b/buyer/src/pages/home/memberCenter/evaluation/EvalDetail.vue @@ -35,8 +35,8 @@
-
投诉商品  {{ detail.goodsName }}  {{ detail.goodsName }}
投诉主题