From 9ef1761c6323e7e072a82632a6683f0a1c0927a4 Mon Sep 17 00:00:00 2001 From: mabo Date: Thu, 24 Jun 2021 17:45:00 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=99=9A=E6=8B=9F=E5=95=86=E5=93=81?= =?UTF-8?q?=E4=B8=8D=E5=B1=95=E7=A4=BA=E9=87=8D=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- buyer/src/components/goodsDetail/ShowGoods.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buyer/src/components/goodsDetail/ShowGoods.vue b/buyer/src/components/goodsDetail/ShowGoods.vue index 6380f86f..f10a8148 100644 --- a/buyer/src/components/goodsDetail/ShowGoods.vue +++ b/buyer/src/components/goodsDetail/ShowGoods.vue @@ -111,7 +111,7 @@ 库存{{skuDetail.quantity}} -
+

重量

From 73246e1dc6340cdec06b9cb3a4b5206a51737f8e Mon Sep 17 00:00:00 2001 From: mabo Date: Fri, 25 Jun 2021 15:28:31 +0800 Subject: [PATCH 2/3] =?UTF-8?q?PC=E7=AB=AFbug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/goodsDetail/ShowGoods.vue | 8 +++--- buyer/src/components/verify/index.vue | 4 +-- .../src/pages/home/memberCenter/Favorites.vue | 6 ++-- .../pages/home/orderCenter/OrderDetail.vue | 5 ++-- buyer/src/pages/home/userCenter/MyTracks.vue | 28 +++++++++++++++++-- .../src/views/my-components/verify/index.vue | 4 +-- .../src/views/my-components/verify/index.vue | 4 +-- 7 files changed, 42 insertions(+), 17 deletions(-) diff --git a/buyer/src/components/goodsDetail/ShowGoods.vue b/buyer/src/components/goodsDetail/ShowGoods.vue index f10a8148..e9b2b40e 100644 --- a/buyer/src/components/goodsDetail/ShowGoods.vue +++ b/buyer/src/components/goodsDetail/ShowGoods.vue @@ -64,7 +64,7 @@

- +

促     销 @@ -111,7 +111,7 @@ 库存{{skuDetail.quantity}}

-
+

重量

@@ -119,10 +119,10 @@ {{skuDetail.weight}}kg
-
+
-
+
diff --git a/buyer/src/components/verify/index.vue b/buyer/src/components/verify/index.vue index 6fb6b735..6dfa3be0 100644 --- a/buyer/src/components/verify/index.vue +++ b/buyer/src/components/verify/index.vue @@ -98,14 +98,14 @@ export default { } }, created () { - this.getImg(); + // this.getImg(); }, watch: { verifyType: { immediate: true, handler: function (v) { this.type = v; - this.refresh(); + // this.refresh(); } }, show (v) { diff --git a/buyer/src/pages/home/memberCenter/Favorites.vue b/buyer/src/pages/home/memberCenter/Favorites.vue index 6e77e3b0..d63fcd2b 100644 --- a/buyer/src/pages/home/memberCenter/Favorites.vue +++ b/buyer/src/pages/home/memberCenter/Favorites.vue @@ -30,13 +30,13 @@
-
+
@@ -61,7 +61,7 @@ export default { total: 0, // 收藏总数 params: { // 请求参数 pageNumber: 1, - pageSize: 10, + pageSize: 100, type: 'GOODS' }, spinShow: false // 加载状态 diff --git a/buyer/src/pages/home/orderCenter/OrderDetail.vue b/buyer/src/pages/home/orderCenter/OrderDetail.vue index 629ac5aa..a073cc4e 100644 --- a/buyer/src/pages/home/orderCenter/OrderDetail.vue +++ b/buyer/src/pages/home/orderCenter/OrderDetail.vue @@ -3,6 +3,7 @@

{{ order.orderStatusValue }}

+

核验码:{{order.orderCode || 'AHDN4123'}}

订单号:{{ order.order.sn }}

操作时间:{{order.order.updateTime}}
@@ -22,8 +23,8 @@

付款信息

-

支付方式:在线支付

-

付款状态:未付款

+

支付方式:{{order.paymentMethodValue}}

+

付款状态:{{order.payStatusValue}}

配送信息

diff --git a/buyer/src/pages/home/userCenter/MyTracks.vue b/buyer/src/pages/home/userCenter/MyTracks.vue index 7a721be1..4c87b002 100644 --- a/buyer/src/pages/home/userCenter/MyTracks.vue +++ b/buyer/src/pages/home/userCenter/MyTracks.vue @@ -15,6 +15,14 @@ + +
+ + +
@@ -25,7 +33,14 @@ export default { data () { return { list: [], // 我的足迹,商品列表 - spinShow: false // 控制loading是否加载 + spinShow: false, // 控制loading是否加载 + params: { + pageNumber: 1, + pageSize: 30, + order: 'desc', + sort: 'createTime' + }, + total: 0 }; }, mounted () { @@ -71,7 +86,16 @@ export default { } }) }, - getList () { + changePageNum (val) { // 修改页码 + this.params.pageNumber = val; + this.getList() + }, + changePageSize (val) { // 修改页数 + this.pageNumber = 1; + this.params.pageSize = val; + this.getList() + }, + getList () { // 获取足迹列表 this.spinShow = true; tracksList(this.params).then(res => { this.spinShow = false diff --git a/manager/src/views/my-components/verify/index.vue b/manager/src/views/my-components/verify/index.vue index 2ce1ef45..34f07f36 100644 --- a/manager/src/views/my-components/verify/index.vue +++ b/manager/src/views/my-components/verify/index.vue @@ -98,14 +98,14 @@ export default { } }, created () { - this.getImg(); + // this.getImg(); }, watch: { verifyType: { immediate: true, handler: function (v) { this.type = v; - this.refresh(); + // this.refresh(); } }, show (v) { diff --git a/seller/src/views/my-components/verify/index.vue b/seller/src/views/my-components/verify/index.vue index 2ce1ef45..34f07f36 100644 --- a/seller/src/views/my-components/verify/index.vue +++ b/seller/src/views/my-components/verify/index.vue @@ -98,14 +98,14 @@ export default { } }, created () { - this.getImg(); + // this.getImg(); }, watch: { verifyType: { immediate: true, handler: function (v) { this.type = v; - this.refresh(); + // this.refresh(); } }, show (v) { From be611871bca06084209e05c6c9e750c29fc9e100 Mon Sep 17 00:00:00 2001 From: mabo Date: Fri, 25 Jun 2021 16:03:10 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=91=E5=B8=83?= =?UTF-8?q?=E5=95=86=E5=93=81=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../goods/goods-seller/goodsOperation.vue | 29 +++++++------------ 1 file changed, 10 insertions(+), 19 deletions(-) diff --git a/seller/src/views/goods/goods-seller/goodsOperation.vue b/seller/src/views/goods/goods-seller/goodsOperation.vue index a442aef8..3166560d 100644 --- a/seller/src/views/goods/goods-seller/goodsOperation.vue +++ b/seller/src/views/goods/goods-seller/goodsOperation.vue @@ -148,17 +148,9 @@
+ handleGoodsPicRemoteUp(baseInfoForm.goodsGalleryFiles,__index)"/> + handleGoodsPicRemoteDown(baseInfoForm.goodsGalleryFiles,__index)"/>
@@ -193,7 +185,7 @@ + @on-change="editSkuItem"> @@ -204,15 +196,14 @@
- - + -