From ddb554c491d808dd7e819cc00959ef1a6a236f7e Mon Sep 17 00:00:00 2001
From: Wik-T <812952667@qq.com>
Date: Fri, 30 Dec 2022 09:38:57 +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.=E6=96=B0=E5=A2=9E=E8=BD=A6=E9=98=9F=E6=B2=B9?=
 =?UTF-8?q?=E5=8D=A1=E6=94=AF=E4=BB=98=E6=A8=A1=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/goods/refuel-confirm/refuel-confirm.vue |   2 +-
 pages/order/confirmation.vue                  |  29 +-
 pages/user/order_details/order_details.vue    | 356 ++++++++++--------
 .../coupon-packge-details.vue                 |   2 +-
 subPages/lottery/lottery.vue                  |   6 +-
 5 files changed, 225 insertions(+), 170 deletions(-)

diff --git a/pages/goods/refuel-confirm/refuel-confirm.vue b/pages/goods/refuel-confirm/refuel-confirm.vue
index 27894f4..ebb1c92 100644
--- a/pages/goods/refuel-confirm/refuel-confirm.vue
+++ b/pages/goods/refuel-confirm/refuel-confirm.vue
@@ -369,7 +369,7 @@
 					type: 3
 				}
 				getUserCardList(datas).then(res => {
-					if (res.return_code == '000000') {
+					if (res.return_code == '000000' && res.return_data !='') {
 						this.oilUserCardlist = res.return_data;
 						this.oilUserno = res.return_data[0].cardNo;
 						this.contactName = res.return_data[0].contactName;
diff --git a/pages/order/confirmation.vue b/pages/order/confirmation.vue
index 61dbb4c..506154f 100644
--- a/pages/order/confirmation.vue
+++ b/pages/order/confirmation.vue
@@ -95,6 +95,23 @@
 			</view>
 		</view>
 
+		<!-- //实物配置 -->
+		<view class="width94 backcorfff mart10" v-if="couponList.wherePost">
+			<view class="width94 alijusstart height50 font14 fcor666 bor-botm1">
+				<view class="width40 fcor333 fontwig6 font16" style="padding-left: 2%;">联系人</view>
+				<input class="width60 fotrt font15" v-model="contactPepole" placeholder="请输入联系人" />
+			</view>
+			<view class="width94 alijusstart height50 font14 fcor666 bor-botm1">
+				<view class="width40 fcor333 fontwig6 font16" style="padding-left: 2%;">联系电话</view>
+				<input class="width60 fotrt font15" v-model="contactPhone" placeholder="请输入联系电话" />
+			</view>
+			<view class="width94 alijusstart height50 font14 fcor666">
+				<view class="width40 fcor333 fontwig6 font16" style="padding-left: 2%;">联系地址</view>
+				<input class="width60 fotrt font15" v-model="contactAddress" placeholder="请输入联系地址" />
+			</view>
+		</view>
+
+
 		<view class="width94 comorder mart10">
 			<view class="height50 width100 backcorfff">
 				<view class="width100 flleft fcor333 fontwig6 font16" style="padding-left: 4%;">
@@ -244,7 +261,10 @@
 				coupondiscountid: '',
 				orderDetails: '', //订单详情
 				payGold: '', //积分数
-				identificationCode: '' //渠道商
+				identificationCode: '', //渠道商
+				contactPepole: '', //联系人
+				contactPhone: '', //联系电话
+				contactAddress: '' //联系地址
 			};
 		},
 		onLoad(option) {
@@ -458,7 +478,12 @@
 						"goodsId": this.couponId,
 						"saleCount": 1,
 						"storeId": this.storeId
-					}]
+					}],
+					"postData": {
+						"address": this.contactAddress,
+						"user": this.contactPepole,
+						"phone": this.contactPhone
+					}
 				}
 				addOrder(goods).then(res => {
 					uni.hideLoading();
diff --git a/pages/user/order_details/order_details.vue b/pages/user/order_details/order_details.vue
index bb691f8..dcf699e 100644
--- a/pages/user/order_details/order_details.vue
+++ b/pages/user/order_details/order_details.vue
@@ -14,9 +14,11 @@
 			<view class="row">
 				<view class="goods-info">
 					<view class="img">
-						<image mode="widthFix" :src="imageUrl+rec.goodsImg" v-if="rec.goodsType == 1 || rec.goodsType == 7"></image>
+						<image mode="widthFix" :src="imageUrl+rec.goodsImg"
+							v-if="rec.goodsType == 1 || rec.goodsType == 7"></image>
 						<image mode="widthFix" :src="imagewxUrl+imgadres1" v-if="rec.goodsType == 6"></image>
-						<image mode="widthFix" :src="rec.goodsImg" v-if="rec.goodsType != 1 && rec.goodsType != 6 && rec.goodsType != 7"></image>
+						<image mode="widthFix" :src="rec.goodsImg"
+							v-if="rec.goodsType != 1 && rec.goodsType != 6 && rec.goodsType != 7"></image>
 					</view>
 					<view class="info">
 						<view class="title">{{rec.goodsName}}</view>
@@ -73,9 +75,9 @@
 				</view>
 				<view class="right" v-if="recinfo.payModel == 3">
 					混合
-				</view>
-				<view class="right" v-if="recinfo.payModel == 4">
-					油卡
+				</view>
+				<view class="right" v-if="recinfo.payModel == 4">
+					油卡
 				</view>
 			</view>
 
@@ -97,9 +99,9 @@
 				</view>
 				<view class="right" v-if="recinfo.payType == 5">
 					银联支付
-				</view>
-				<view class="right" v-if="recinfo.payType == 7">
-					嗨森逛油卡
+				</view>
+				<view class="right" v-if="recinfo.payType == 7">
+					嗨森逛油卡
 				</view>
 			</view>
 			<view class="row" v-if="recinfo.totalPrice">
@@ -110,8 +112,7 @@
 					￥{{recinfo.totalPrice}}
 				</view>
 				<view class="right" v-else>
-					<image style="width: 15px;height: 15px;vertical-align: sub;"
-						src="../../../static/img/jfx.png">
+					<image style="width: 15px;height: 15px;vertical-align: sub;" src="../../../static/img/jfx.png">
 					</image>{{(recinfo.totalPrice * 10 * 10).toFixed(0)}}
 				</view>
 			</view>
@@ -123,8 +124,7 @@
 					￥{{recinfo.payPrice}}
 				</view>
 				<view class="right" v-else>
-					<image style="width: 15px;height: 15px;vertical-align: sub;"
-						src="../../../static/img/jfx.png">
+					<image style="width: 15px;height: 15px;vertical-align: sub;" src="../../../static/img/jfx.png">
 					</image>{{(recinfo.payPrice* 10 * 10).toFixed(0)}}
 				</view>
 			</view>
@@ -136,8 +136,7 @@
 					￥{{recinfo.payRealPrice}}
 				</view>
 				<view class="right" v-else>
-					<image style="width: 15px;height: 15px;vertical-align: sub;"
-						src="../../../static/img/jfx.png">
+					<image style="width: 15px;height: 15px;vertical-align: sub;" src="../../../static/img/jfx.png">
 					</image>{{(recinfo.payRealPrice * 10 * 10).toFixed(0)}}
 				</view>
 			</view>
@@ -149,18 +148,17 @@
 					￥{{recinfo.deductionPrice}}
 				</view>
 				<view class="right" v-else>
-					<image style="width: 15px;height: 15px;vertical-align: sub;"
-						src="../../../static/img/jfx.png">
+					<image style="width: 15px;height: 15px;vertical-align: sub;" src="../../../static/img/jfx.png">
 					</image>{{(recinfo.deductionPrice * 10 * 10).toFixed(0)}}
 				</view>
-			</view>
-			<view class="row" v-if="recinfo.payGold">
-				<view class="left">
-					积分抵扣 :
-				</view>
-				<view class="right">
-					￥{{(recinfo.payGold / 100).toFixed(2)}}
-				</view>
+			</view>
+			<view class="row" v-if="recinfo.payGold">
+				<view class="left">
+					积分抵扣 :
+				</view>
+				<view class="right">
+					￥{{(recinfo.payGold / 100).toFixed(2)}}
+				</view>
 			</view>
 			<view class="row">
 				<view class="left">
@@ -193,112 +191,135 @@
 				<view class="right">
 					{{recinfo.refusalRefundContent}}
 				</view>
-			</view>
-			<view class="row" v-if="recinfo.finishTime">
-				<view class="left">
-					完成时间 :
-				</view>
-				<view class="right">
-					{{recinfo.finishTime | formatDate('-')}}
-				</view>
-			</view>
-		</view>
-		<!-- 优选商品 -->
-		<view class="width94 font18 fcor333 fontwig6  height40" v-if="preByOrderInfo">预约订单详情</view>
-		<view class="order" v-if="preByOrderInfo">
-			<view class="row">
-				<view class="left">
-					预约状态 :
-				</view>
-				<view class="right" v-if="preByOrderInfo.status == 1">
-					预约中
-				</view>
-				<view class="right" v-if="preByOrderInfo.status == 2">
-					预约成功
-				</view>
-				<view class="right" v-if="preByOrderInfo.status == 3">
-					预约完成
-				</view>
-				<view class="right" v-if="preByOrderInfo.status == 4">
-					预约失败
-				</view>
-				<view class="right" v-if="preByOrderInfo.status == 5">
-					预约取消
-				</view>
 			</view>
-			<view class="row">
+			<view class="row" v-if="materialData">
 				<view class="left">
-					预约订单号 :
+					联系人 :
 				</view>
 				<view class="right">
-					{{preByOrderInfo.preOrderNo}}
+					{{materialData.user}}
 				</view>
 			</view>
-			<view class="row" v-if="preByOrderInfo.opUserName">
+			<view class="row" v-if="materialData">
 				<view class="left">
-					预约门店 :
+					联系电话 :
 				</view>
 				<view class="right">
-					{{preByOrderInfo.opUserName}}
+					{{materialData.phone}}
 				</view>
 			</view>
-			<view class="row" v-if="preByOrderInfo.reachAddress">
+			<view class="row" v-if="materialData">
 				<view class="left">
-					到店地点 :
+					联系地址 :
 				</view>
 				<view class="right">
-					{{preByOrderInfo.reachAddress}}
-				</view>
-			</view>
-			<view class="row" v-if="preByOrderInfo.reachTime">
-				<view class="left">
-					到店时间 :
-				</view>
-				<view class="right">
-					{{preByOrderInfo.reachTime | formatDate('-')}}
-				</view>
-			</view>
-			<view class="row" v-if="preByOrderInfo.statusFailDesc">
-				<view class="left">
-					预约失败说明 :
+					{{materialData.address}}
 				</view>
-				<view class="right">
-					{{preByOrderInfo.statusFailDesc}}
-				</view>
-			</view>
-			<view class="row" v-if="preByOrderInfo.statusCancelDesc">
-				<view class="left">
-					预约取消说明 :
-				</view>
-				<view class="right">
-					{{preByOrderInfo.statusCancelDesc}}
-				</view>
-			</view>
-			<view class="row" v-if="preByOrderInfo.preUserRemark">
-				<view class="left">
-					预约备注 :
-				</view>
-				<view class="right">
-					{{preByOrderInfo.preUserRemark}}
-				</view>
-			</view>
-		</view>
-		<view class="width100 height60"></view>
-		
-		<view class="footer" @click="orderComplete" v-if="preByOrderInfo && preByOrderInfo.status == 2">
-			<view class="settlement">
-				<view class="btn" style="background-color: #0083f5;color: #fff;width: 100% !important;">预约完成</view>
-			</view>
-		</view>
-		
+			</view>
+			<view class="row" v-if="recinfo.finishTime">
+				<view class="left">
+					完成时间 :
+				</view>
+				<view class="right">
+					{{recinfo.finishTime | formatDate('-')}}
+				</view>
+			</view>
+		</view>
+		<!-- 优选商品 -->
+		<view class="width94 font18 fcor333 fontwig6  height40" v-if="preByOrderInfo">预约订单详情</view>
+		<view class="order" v-if="preByOrderInfo">
+			<view class="row">
+				<view class="left">
+					预约状态 :
+				</view>
+				<view class="right" v-if="preByOrderInfo.status == 1">
+					预约中
+				</view>
+				<view class="right" v-if="preByOrderInfo.status == 2">
+					预约成功
+				</view>
+				<view class="right" v-if="preByOrderInfo.status == 3">
+					预约完成
+				</view>
+				<view class="right" v-if="preByOrderInfo.status == 4">
+					预约失败
+				</view>
+				<view class="right" v-if="preByOrderInfo.status == 5">
+					预约取消
+				</view>
+			</view>
+			<view class="row">
+				<view class="left">
+					预约订单号 :
+				</view>
+				<view class="right">
+					{{preByOrderInfo.preOrderNo}}
+				</view>
+			</view>
+			<view class="row" v-if="preByOrderInfo.opUserName">
+				<view class="left">
+					预约门店 :
+				</view>
+				<view class="right">
+					{{preByOrderInfo.opUserName}}
+				</view>
+			</view>
+			<view class="row" v-if="preByOrderInfo.reachAddress">
+				<view class="left">
+					到店地点 :
+				</view>
+				<view class="right">
+					{{preByOrderInfo.reachAddress}}
+				</view>
+			</view>
+			<view class="row" v-if="preByOrderInfo.reachTime">
+				<view class="left">
+					到店时间 :
+				</view>
+				<view class="right">
+					{{preByOrderInfo.reachTime | formatDate('-')}}
+				</view>
+			</view>
+			<view class="row" v-if="preByOrderInfo.statusFailDesc">
+				<view class="left">
+					预约失败说明 :
+				</view>
+				<view class="right">
+					{{preByOrderInfo.statusFailDesc}}
+				</view>
+			</view>
+			<view class="row" v-if="preByOrderInfo.statusCancelDesc">
+				<view class="left">
+					预约取消说明 :
+				</view>
+				<view class="right">
+					{{preByOrderInfo.statusCancelDesc}}
+				</view>
+			</view>
+			<view class="row" v-if="preByOrderInfo.preUserRemark">
+				<view class="left">
+					预约备注 :
+				</view>
+				<view class="right">
+					{{preByOrderInfo.preUserRemark}}
+				</view>
+			</view>
+		</view>
+		<view class="width100 height60"></view>
+
+		<view class="footer" @click="orderComplete" v-if="preByOrderInfo && preByOrderInfo.status == 2">
+			<view class="settlement">
+				<view class="btn" style="background-color: #0083f5;color: #fff;width: 100% !important;">预约完成</view>
+			</view>
+		</view>
+
 		<view class="footer"
 			v-if="recinfo.orderStatus == 1 && recinfo.highChildOrderList[0].goodsType !=6 && recinfo.highChildOrderList[0].goodsType !=5 && recinfo.highChildOrderList[0].goodsType !=4">
 			<view class="settlement">
 				<view class="sum">合计:
 					<view class="money" v-if="recinfo.payType != 3">￥{{recinfo.payPrice}}</view>
 					<view class="money" v-else>
-						<image style="width: 15px;height: 15px;vertical-align: sub;"
-							src="../../../static/img/jfx.png">
+						<image style="width: 15px;height: 15px;vertical-align: sub;" src="../../../static/img/jfx.png">
 						</image>{{recinfo.payPrice*100}}
 					</view>
 				</view>
@@ -312,8 +333,8 @@
 <script>
 	import {
 		getOrderById,
-		cancelOrder,
-		getPreByOrderIdId,
+		cancelOrder,
+		getPreByOrderIdId,
 		orderComplete
 	} from '../../../Utils/Api.js';
 	let app = getApp()
@@ -331,14 +352,15 @@
 				orderId: '',
 				imageUrl: app.globalData.imgUrl,
 				imagewxUrl: app.globalData.imageWxImg,
-				imgadres1: 'dhf.png',
-				preByOrderInfo:''
+				imgadres1: 'dhf.png',
+				preByOrderInfo: '',
+				materialData: '' //实物参数
 
 			};
 		},
 		onShow() {
 			//页面显示时，加载订单信息
-			this.getOrderById();
+			this.getOrderById();
 			this.getPreByOrderIdId();
 		},
 		onHide() {
@@ -392,59 +414,62 @@
 					if (res.return_code == '000000') {
 						uni.hideLoading();
 						this.recinfo = res.return_data;
+						if (res.return_data.remarks) {
+							this.materialData = JSON.parse(res.return_data.remarks);
+						}
 					} else {
 						uni.hideLoading()
 					}
 				})
-			},
-			//查询预约商品详情
-			getPreByOrderIdId() {
-				let params = {
-					orderId: this.orderId,
-				}
-				getPreByOrderIdId(params).then(res => {
-					if (res.return_code == '000000') {
-						this.preByOrderInfo = res.return_data;
-					}
-				})
-			},
-			//预约商品完成
-			orderComplete(){
-				let that = this;
-				uni.showModal({
-					title: '预约完成',
-					content: '确定预约完成？',
-					success: (res) => {
-						if (res.confirm) {
-							uni.showLoading({
-								title: '加载中...'
-							})
-							let params = {
-								preOrderId : this.preByOrderInfo.id
-							}
-							orderComplete(params).then(res => {
-								if (res.return_code == '000000') {
-									uni.hideLoading();
-									uni.showToast({
-										title: res.return_data,
-										icon: 'none',
-										duration: 2000
-									})
-									this.getPreByOrderIdId();
-								} else {
-									uni.showToast({
-										title: res.return_msg,
-										icon: 'none',
-										duration: 2000
-									})
-									uni.hideLoading()
-								}
-							})
-						} else if (res.cancel) {
-							console.log('用户点击取消');
-						}
-					}
-				});
+			},
+			//查询预约商品详情
+			getPreByOrderIdId() {
+				let params = {
+					orderId: this.orderId,
+				}
+				getPreByOrderIdId(params).then(res => {
+					if (res.return_code == '000000') {
+						this.preByOrderInfo = res.return_data;
+					}
+				})
+			},
+			//预约商品完成
+			orderComplete() {
+				let that = this;
+				uni.showModal({
+					title: '预约完成',
+					content: '确定预约完成？',
+					success: (res) => {
+						if (res.confirm) {
+							uni.showLoading({
+								title: '加载中...'
+							})
+							let params = {
+								preOrderId: this.preByOrderInfo.id
+							}
+							orderComplete(params).then(res => {
+								if (res.return_code == '000000') {
+									uni.hideLoading();
+									uni.showToast({
+										title: res.return_data,
+										icon: 'none',
+										duration: 2000
+									})
+									this.getPreByOrderIdId();
+								} else {
+									uni.showToast({
+										title: res.return_msg,
+										icon: 'none',
+										duration: 2000
+									})
+									uni.hideLoading()
+								}
+							})
+						} else if (res.cancel) {
+							console.log('用户点击取消');
+						}
+					}
+				});
 			},
 			cancelOrder() {
 				let that = this;
@@ -507,7 +532,8 @@
 				uni.redirectTo({
 					url: "/pages/pay/payment/payment?amount=" + this.recinfo.payPrice +
 						'&paytype=' + payTypes + '&orderId=' + this.recinfo.id + '&couponId=' + this.recinfo
-						.highChildOrderList[0].goodsId + '&typeaout='+ this.recinfo.highChildOrderList[0].ext1+'&goodsType='+ this.recinfo.highChildOrderList[0].goodsType
+						.highChildOrderList[0].goodsId + '&typeaout=' + this.recinfo.highChildOrderList[0].ext1 +
+						'&goodsType=' + this.recinfo.highChildOrderList[0].goodsType
 				})
 			},
 		}
@@ -719,7 +745,7 @@
 					font-size: 20px;
 					font-weight: 600;
 					display: flex;
-					    align-items: center;
+					align-items: center;
 				}
 			}
 
diff --git a/subPages/coupon-packge-details/coupon-packge-details.vue b/subPages/coupon-packge-details/coupon-packge-details.vue
index 7006c03..d47b5f4 100644
--- a/subPages/coupon-packge-details/coupon-packge-details.vue
+++ b/subPages/coupon-packge-details/coupon-packge-details.vue
@@ -19,7 +19,7 @@
 		</view>
 		<!-- 商品主图轮播 -->
 		<view class="swiper-box">
-			<swiper circular="true" autoplay="true" @change="swiperChange">
+			<swiper circular="true" autoplay="true" style="height: 188px;" @change="swiperChange">
 				<swiper-item v-for="(swiper,index) in swiperList" :key="index">
 					<image mode="widthFix" :src="imageUrl+swiper" @click="perImage(swiper)"></image>
 				</swiper-item>
diff --git a/subPages/lottery/lottery.vue b/subPages/lottery/lottery.vue
index 2a02f99..4db1df9 100644
--- a/subPages/lottery/lottery.vue
+++ b/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,10 @@
 		},
 		onLoad(options) {
 			this.couponId = options.id
-			this.handleInitCanvas()
+			// this.handleInitCanvas();
+		},
+		onShow() {
+			this.handleInitCanvas();
 		},
 		onUnload() {
 			uni.hideLoading()