From 3f7202e1519cf2bb685cdba90e5681a97eaf4bbe Mon Sep 17 00:00:00 2001
From: Wik-T <812952667@qq.com>
Date: Fri, 30 Dec 2022 09:39:30 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=96=B0=E5=A2=9E=E5=AE=9E=E7=89=A9=E5=95=86?=
=?UTF-8?q?=E5=93=81=202.=E4=BF=AE=E6=94=B9=E6=8A=BD=E5=A5=96=E6=B4=BB?=
=?UTF-8?q?=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
high-unionPay/pages/order/confirmation.vue | 28 ++++++++++++++--
.../user/order_details/order_details.vue | 32 +++++++++++++++++--
.../coupon-packge-details.vue | 2 +-
high-unionPay/subPages/lottery/lottery.vue | 5 ++-
4 files changed, 61 insertions(+), 6 deletions(-)
diff --git a/high-unionPay/pages/order/confirmation.vue b/high-unionPay/pages/order/confirmation.vue
index 1db1a5b..1df7bad 100644
--- a/high-unionPay/pages/order/confirmation.vue
+++ b/high-unionPay/pages/order/confirmation.vue
@@ -93,6 +93,22 @@
邀请码
+
+
+
+
+
+ 联系人
+
+
+
+ 联系电话
+
+
+
+ 联系地址
+
+
@@ -247,7 +263,10 @@
isDiscont: false,
coupondiscountid: '',
typeId: '',
- identificationCode: '' //渠道商
+ identificationCode: '' ,//渠道商
+ contactPepole: '', //联系人
+ contactPhone: '', //联系电话
+ contactAddress: '' //联系地址
};
},
@@ -440,7 +459,12 @@
"goodsId": this.couponId,
"saleCount": 1,
"storeId": this.storeId
- }]
+ }],
+ "postData": {
+ "address": this.contactAddress,
+ "user": this.contactPepole,
+ "phone": this.contactPhone
+ }
}
addOrder(goods).then(res => {
if (res.return_code == '000000') {
diff --git a/high-unionPay/pages/user/order_details/order_details.vue b/high-unionPay/pages/user/order_details/order_details.vue
index 8270a79..c47bf8e 100644
--- a/high-unionPay/pages/user/order_details/order_details.vue
+++ b/high-unionPay/pages/user/order_details/order_details.vue
@@ -150,6 +150,30 @@
{{recinfo.refusalRefundContent}}
+
+
+
+ 联系人 :
+
+
+ {{materialData.user}}
+
+
+
+
+ 联系电话 :
+
+
+ {{materialData.phone}}
+
+
+
+
+ 联系地址 :
+
+
+ {{materialData.address}}
+
@@ -286,7 +310,8 @@
imageUrl: app.globalData.imgUrl,
imagewxUrl: app.globalData.imageWxImg,
imgadres1: 'dhf.png',
- preByOrderInfo: ''
+ preByOrderInfo: '',
+ materialData: '' //实物参数
};
},
onShow() {
@@ -343,7 +368,10 @@
getOrderById(params).then(res => {
if (res.return_code == '000000') {
uni.hideLoading();
- this.recinfo = res.return_data;
+ this.recinfo = res.return_data;
+ if (res.return_data.remarks) {
+ this.materialData = JSON.parse(res.return_data.remarks);
+ }
} else {
uni.hideLoading()
}
diff --git a/high-unionPay/subPages/coupon-packge-details/coupon-packge-details.vue b/high-unionPay/subPages/coupon-packge-details/coupon-packge-details.vue
index 7006c03..927a745 100644
--- a/high-unionPay/subPages/coupon-packge-details/coupon-packge-details.vue
+++ b/high-unionPay/subPages/coupon-packge-details/coupon-packge-details.vue
@@ -19,7 +19,7 @@
-
+
diff --git a/high-unionPay/subPages/lottery/lottery.vue b/high-unionPay/subPages/lottery/lottery.vue
index 2a02f99..6c563a4 100644
--- a/high-unionPay/subPages/lottery/lottery.vue
+++ b/high-unionPay/subPages/lottery/lottery.vue
@@ -193,6 +193,7 @@
couponId: this.couponId
}
getActivityByCoupon(params).then(res => {
+ uni.hideLoading();
if (res.return_code == '000000') {
let prizeLists = res.return_data.activityAward;
this.activityId = res.return_data.activityInfo.id;
@@ -287,7 +288,9 @@
},
onLoad(options) {
this.couponId = options.id
- this.handleInitCanvas()
+ },
+ onShow() {
+ this.handleInitCanvas();
},
onUnload() {
uni.hideLoading()