From 0fb20e1701e66bd558d6266a9aa627e209634010 Mon Sep 17 00:00:00 2001
From: shuxiaoquan <853623962@qq.com>
Date: Wed, 20 Mar 2024 15:28:03 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=A4=8D=E5=88=B6=E8=AE=A2=E5=8D=95?=
=?UTF-8?q?=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/order/detail.vue | 68 ++++++++++++++++++++++++++++++++++--------
1 file changed, 56 insertions(+), 12 deletions(-)
diff --git a/pages/order/detail.vue b/pages/order/detail.vue
index f5ef289..a2caba0 100644
--- a/pages/order/detail.vue
+++ b/pages/order/detail.vue
@@ -143,10 +143,14 @@
共{{ order.total_num }}件商品，实付款￥{{ order.pay_price?Number(order.pay_price):order.pay_price }}
-
+
-
+
取消订单
@@ -316,7 +320,12 @@
v-if="order.order_status == OrderStatusEnum.COMPLETED.value && order.is_comment == 0"
@click="handleTargetComment(order.order_id)">
评价
- -->
+ -->
+
+ 复制订单详情
+
@@ -431,7 +440,7 @@
onShareAppMessage(res) {
return {
title: this.Store.storeInfo.store_name,
- path: "pages/order/detail?orderId="+this.orderId, //这是打开后的跳转路径
+ path: "/pages/order/detail?orderId="+this.orderId, //这是打开后的跳转路径
imageUrl:this.Store.storeInfo.image_url,
success: function(res){
// 转发成功之后的回调
@@ -449,7 +458,42 @@
}
}
},
- methods: {
+ methods: {
+ onCopyOrderInfo(obj) {
+ console.log(obj)
+ /**
+ * 1.订单编号:
+ 2.商品型号:
+ 3.商品编码:
+ 4.商品单价:
+ 5.商品数量:
+ 6.商品总价:
+ 7.收件人名字:
+ 8.收件人电话:
+ 9.收件人地址:
+ */
+ let goods_no = "";
+ if(obj.goods && obj.goods.length > 0){
+ obj.goods.map(a=>{
+ goods_no+=`商品型号: ${(a.goods_sku_id !=0?a.goods_sku_id:'无')};商品编码: ${a.goods_no?a.goods_no:'无编码'};商品单价: ￥${a.goods_price}元;商品数量: ${a.total_num};商品总价: ￥${a.total_price}元`
+ })
+ }
+ const str =`订单编号：${obj.order_no};${goods_no};收件人名字：${obj.address.name};收件人电话：${obj.address.phone};收件人地址：${obj.address.region.province+obj.address.region.city+obj.address.region.region+obj.address.detail};`
+ console.log(str)
+ uni.setClipboardData({
+ data: str,
+ success() {
+ uni.getClipboardData({
+ success() {
+ uni.showToast({
+ icon: "none",
+ title: "复制成功"
+ })
+ }
+ })
+ }
+ })
+ },
// 联系商家
callStore(phone) {
uni.makePhoneCall({
@@ -512,14 +556,14 @@
// 跳转到门店详情页
handleTargetExtract(shopId) {
- this.$navTo('pages/shop/detail', {
+ this.$navTo('/pages/shop/detail', {
shopId
})
},
// 跳转到物流跟踪页面
handleTargetExpress() {
- this.$navTo('pages/order/express/index', {
+ this.$navTo('/pages/order/express/index', {
orderId: this.orderId
})
},
@@ -527,12 +571,12 @@
// 跳转到商品详情页面
handleTargetGoods(goodsId) {
uni.redirectTo({
- url: 'pages/goods/detail?goodsId=' + goodsId // 目标页面路径
+ url: '/pages/goods/detail?goodsId=' + goodsId // 目标页面路径
})
},
// 修改地址
onAdress(orderId) {
- this.$navTo('pages/address/index', {
+ this.$navTo('/pages/address/index', {
orderId
})
},
@@ -628,14 +672,14 @@
},
// 点击去支付
onPay(orderId) {
- this.$navTo('pages/checkout/cashier/index', {
+ this.$navTo('/pages/checkout/cashier/index', {
orderId
})
},
// 跳转到订单评价页
handleTargetComment(orderId) {
- this.$navTo('pages/order/comment/index', {
+ this.$navTo('/pages/order/comment/index', {
orderId
})
},
From 9cfb506460492824370617a7340158edbac6938d Mon Sep 17 00:00:00 2001
From: shuxiaoquan <853623962@qq.com>
Date: Thu, 21 Mar 2024 09:46:07 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=8E=92=E8=A1=8C=E6=A6=9C=E5=93=81?=
=?UTF-8?q?=E7=89=8C=E5=88=86=E7=B1=BB=E4=B8=8E=E6=8F=90=E7=8E=B0=E6=BB=9A?=
=?UTF-8?q?=E5=8A=A8BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
manifest.json | 8 ++++----
pages/activity/charts.vue | 13 ++++++++-----
pages/news1/wallet.vue | 11 +++++++----
pages/order/detail.vue | 4 ++--
4 files changed, 21 insertions(+), 15 deletions(-)
diff --git a/manifest.json b/manifest.json
index a915bb8..7e39406 100644
--- a/manifest.json
+++ b/manifest.json
@@ -116,14 +116,14 @@
"scope.userLocation" : {
"desc" : "获取当前所在城市位置"
},
- "makePhoneCall": {
- "desc": "用于拨打电话"
- }
+ "makePhoneCall" : {
+ "desc" : "用于拨打电话"
+ }
},
"optimization" : {
"subPackages" : true
},
- "requiredPrivateInfos" : [ "chooseAddress","getLocation" ]
+ "requiredPrivateInfos" : [ "chooseAddress", "getLocation" ]
},
"mp-alipay" : {
"usingComponents" : true
diff --git a/pages/activity/charts.vue b/pages/activity/charts.vue
index 295fc2e..ef86bbe 100644
--- a/pages/activity/charts.vue
+++ b/pages/activity/charts.vue
@@ -60,12 +60,12 @@
-
{{item.name}}榜
-
+
GO
@@ -131,12 +131,15 @@
this.rankList = data.list
}
},
- toBack() {
+ toBack(item) {
// let pages = getCurrentPages();
// let beforePage = pages[pages.length - 2]
// console.log(this.removeAfter(pages, 'pages/activity/ranking'))
- uni.redirectTo({
- url: '/pages/activity/ranking'
+ // uni.redirectTo({
+ // url: '/pages/activity/ranking'
+ // })
+ uni.navigateTo({
+ url: '/pages/activity/charts?categoryId=' + item.category_id + '&name=' + item.name
})
},
removeAfter(arr, value) {
diff --git a/pages/news1/wallet.vue b/pages/news1/wallet.vue
index 6f36950..a83f5fe 100644
--- a/pages/news1/wallet.vue
+++ b/pages/news1/wallet.vue
@@ -51,7 +51,7 @@
-
+
全部
@@ -256,10 +256,11 @@