From 24c598733b7939b39e1f12305076919dccd80929 Mon Sep 17 00:00:00 2001
From: youmengting <2080639302@qq.com>
Date: Mon, 22 May 2023 15:33:14 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=89=A9=E6=B5=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/tabBar/classify/classify.vue | 1 +
.../classify/order/orderDetail.vue | 167 ++++++++++--------
2 files changed, 98 insertions(+), 70 deletions(-)
diff --git a/pages/tabBar/classify/classify.vue b/pages/tabBar/classify/classify.vue
index 1ebba90..c6344b7 100644
--- a/pages/tabBar/classify/classify.vue
+++ b/pages/tabBar/classify/classify.vue
@@ -264,6 +264,7 @@
pageNum:_this.pageData.pageStart,
pageSize:_this.pageData.pageNum,
price:price,
+ companyId:app.globalData.companyId
}
// uni.showLoading({
diff --git a/physical-merchants/classify/order/orderDetail.vue b/physical-merchants/classify/order/orderDetail.vue
index 2c9d8c2..eb32f34 100644
--- a/physical-merchants/classify/order/orderDetail.vue
+++ b/physical-merchants/classify/order/orderDetail.vue
@@ -40,30 +40,8 @@
-
-
-
-
-
-
- {{item.goodsName}}
- 规格: {{item.goodsSpecName}}
- 数量: {{item.saleCount}}
-
-
- ¥ {{item.goodsPrice}}
- ¥ {{item.goodsActualPrice}}
-
-
-
-
-
-
-
- 还有{{goodsList2.length}}种商品
-
-
-
+
+
@@ -73,11 +51,49 @@
规格: {{item.goodsSpecName}}
数量: {{item.saleCount}}
-
+
¥ {{item.goodsPrice}}
¥ {{item.goodsActualPrice}}
+
+
+
+
+
+
+
+ 查看物流
+
+
+
+
+ 还有{{goodsList2.length}}种商品
+
+
+
+
+
+
+
+
+
+ {{item.goodsName}}
+ 规格: {{item.goodsSpecName}}
+ 数量: {{item.saleCount}}
+
+
+ ¥ {{item.goodsPrice}}
+ ¥ {{item.goodsActualPrice}}
+
+
+
+
+
+
+
+
+ 查看物流
@@ -137,26 +153,7 @@
-
-
-
+
@@ -173,12 +170,12 @@
-
+
订单编号
@@ -276,6 +273,7 @@
+
@@ -442,10 +440,10 @@
this.moreThanThree = !this.moreThanThree
},
// 查看物流
- checkWuliu() {
- let logisticsNo = this.recinfo.goodsOrder.logisticsNo;
+ checkWuliu(id,status) {
+ // let logisticsNo = this.recinfo.goodsOrder.logisticsNo;
- if (!logisticsNo) {
+ if (status == null) {
uni.showToast({
title: '暂无数据',
icon: 'none',
@@ -454,7 +452,7 @@
return
}
- this.$refs.wuliu.show(logisticsNo)
+ this.$refs.wuliu.show(id)
},
// 点击修改订单
@@ -577,6 +575,21 @@
// #endif
+ },
+ // 申请退款
+ applyRefund(){
+
+ // 在这里需要判断商品是否已发货
+
+ // 如果已发货 ==>去选择退货类型
+ uni.navigateTo({
+ url:"/physical-merchants/applyRefund/selectApplyRefund?msg="+encodeURIComponent(JSON.stringify(this.recinfo))
+ })
+
+ //如果未发货 ==>直接跳到申请页面
+ // uni.navigateTo({
+ // url:"/physical-merchants/applyRefund/applyRefund?msg="+encodeURIComponent(JSON.stringify(this.recinfo))+"&refundType="+1
+ // })
}
}
}
@@ -584,6 +597,8 @@
From 70c04adc5a68bdb8eb419c9c0140dbfa6927949b Mon Sep 17 00:00:00 2001
From: youmengting <2080639302@qq.com>
Date: Mon, 22 May 2023 15:39:20 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=89=A9=E6=B5=812?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
physical-merchants/classify/order/wuliuPupup/wuliuPupup.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/physical-merchants/classify/order/wuliuPupup/wuliuPupup.vue b/physical-merchants/classify/order/wuliuPupup/wuliuPupup.vue
index 722117e..a8476e1 100644
--- a/physical-merchants/classify/order/wuliuPupup/wuliuPupup.vue
+++ b/physical-merchants/classify/order/wuliuPupup/wuliuPupup.vue
@@ -147,7 +147,7 @@
//查询物流信息
getLogisticsMsg(num){
let params ={
- num:num
+ orderId:num
}
uni.showLoading({
title: '加载中',