From c3349ee8ecdf5264e8289d3cce0328f72b7f1fbe Mon Sep 17 00:00:00 2001
From: "Mr.jiang" <714156421@qq.com>
Date: Mon, 1 Jul 2024 19:01:13 +0800
Subject: [PATCH] =?UTF-8?q?=E6=AC=A1=E5=8D=A1=20=E7=96=97=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 my/order/payModifyCi.vue         |  69 ++++--
 my/order/payModifyLiao.vue       |  69 ++++--
 my/order/payModifyTcMy.vue       |  25 +-
 my/order/paydingTCX.vue          | 403 ++++++++++++++++---------------
 my/order/paydingTc.vue           |   7 +-
 pages/my/cikarDrtail.vue         |   8 +-
 pages/my/cureOderDrtail.vue      |   6 +-
 pages/my/fuwuliaochengDetail.vue |   8 +-
 8 files changed, 357 insertions(+), 238 deletions(-)

diff --git a/my/order/payModifyCi.vue b/my/order/payModifyCi.vue
index 6edf151..68efc94 100644
--- a/my/order/payModifyCi.vue
+++ b/my/order/payModifyCi.vue
@@ -3,7 +3,7 @@
 		<view class="padding-bottom u-skeleton">
 			<view class="bgImg u-skeleton-fillet" style="padding: 0 29rpx;">
 				<view class="head-top">
-					<view class="pay-title" style="">服务疗程</view>
+					<view class="pay-title" style="">服务项目</view>
 					<view class="flex">
 						<view class="" style="width: 160upx;height: 160upx;">
 							<image :src="orderXm.packageImg"
@@ -34,9 +34,11 @@
 				</view>
 				
 			</view>
+			
+			
 			<view class="detail-foot">
 				<view class="detail-foot-nav">
-					<span class="detail-foot-nav-text">服务疗程</span>
+					<span class="detail-foot-nav-text">套餐详情</span>
 					<span class="detail-foot-nav-bor"></span>
 				</view>
 				<view class="detail-foot-mian">
@@ -45,22 +47,29 @@
 							<span style="margin-right: 5px;">{{item.title}}</span>
 							<span style="display: none;">详情</span>
 						</view>
-						<view class="header-bottom-money" style="margin: 7px 0px;">
-							<view class="header-bottom-money-zhen">
-								<span>￥</span>
-								<span style="font-size: 38rpx;font-weight: bold">{{item.price}}</span>
-								<span>元/套</span>
-								<span class="header-bottom-money-jia" style="margin-left: 20px; color: #666;">￥{{item.oldPrice}}</span>
-								<!-- <span style="color: #019c88;">服务时长:{{item.duration}}分钟</span> -->
+						<view class="detail-view">
+							<image class="detail-view-img" :src="item.massageImg" mode=""></image>
+							<view class="detail-view-mina">
+								<view class="header-bottom-money" style="margin: 7px 0px; justify-content: space-between ">
+									<view class="header-bottom-money-zhen">
+										<span>￥</span>
+										<span>{{item.price}}</span>
+									</view>
+									<view class="header-bottom-money-jia" style="margin-left: 20px; ">
+										￥{{item.oldPrice}}
+									</view>
+									<view style="color: #019c88;">服务时长:{{item.duration}}分钟</view>
+								</view>
+								<view class="tese">
+									<span>项目特色: </span>
+									<span>{{item.jianjie}}</span>
+								</view>
 							</view>
-							</view>
-						<view class="tese">
-							<span>项目特色: </span>
-							<span>{{item.jianjie}}</span>
 						</view>
-						<!-- <view class="detail-foot-title">
+						
+						<view class="detail-foot-title">
 							服务项目{{index+1}}
-						</view> -->
+						</view>
 					</view>
 				</view>
 			</view>
@@ -233,7 +242,7 @@
 				couponDataList:'',
 				orderXm:[],
 				detailData:[],
-				number:1
+				number:1,
 			}
 		},
 		onLoad(e) {
@@ -358,7 +367,7 @@
 			},
 			youhuijuan(){
 				uni.navigateTo({
-					url:'/my/hongbao/youhuijuanList?price='+this.orderXm.price+'&text='+'次卡'
+					url:'/my/hongbao/youhuijuanList?price='+this.orderXm.price+'&text='+'套餐'
 				})
 			},
 			openpay() {//验证
@@ -591,7 +600,7 @@
 						that.paySel = 1;
 						// console.log("res.data",res.data)
 						uni.navigateTo({
-							url:'/my/order/paydingCi?ordersId='+ res.data.ordersId
+							url:'/my/order/paydingTc?ordersId='+ res.data.ordersId
 						})
 					} else {
 						that.$queue.showToast(res.msg)
@@ -1240,6 +1249,30 @@
 </script>
 
 <style lang="scss" scoped>
+	.header-bottom-money{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		align-items: flex-end;
+	}
+	.detail-view-mina{
+		width: 68%;
+		display: flex;
+		flex-direction: column;
+		justify-content: space-around;
+	}
+	.detail-view-img{
+		width: 76px;
+		height: 76px;
+		border-radius: 9px;
+	}
+	.detail-view{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+	}
 	.head-bottom{
 		width: 68%;
 		display: flex;
diff --git a/my/order/payModifyLiao.vue b/my/order/payModifyLiao.vue
index 95f214e..68efc94 100644
--- a/my/order/payModifyLiao.vue
+++ b/my/order/payModifyLiao.vue
@@ -3,7 +3,7 @@
 		<view class="padding-bottom u-skeleton">
 			<view class="bgImg u-skeleton-fillet" style="padding: 0 29rpx;">
 				<view class="head-top">
-					<view class="pay-title" style="">服务疗程</view>
+					<view class="pay-title" style="">服务项目</view>
 					<view class="flex">
 						<view class="" style="width: 160upx;height: 160upx;">
 							<image :src="orderXm.packageImg"
@@ -34,9 +34,11 @@
 				</view>
 				
 			</view>
+			
+			
 			<view class="detail-foot">
 				<view class="detail-foot-nav">
-					<span class="detail-foot-nav-text">服务疗程</span>
+					<span class="detail-foot-nav-text">套餐详情</span>
 					<span class="detail-foot-nav-bor"></span>
 				</view>
 				<view class="detail-foot-mian">
@@ -45,22 +47,29 @@
 							<span style="margin-right: 5px;">{{item.title}}</span>
 							<span style="display: none;">详情</span>
 						</view>
-						<view class="header-bottom-money" style="margin: 7px 0px;">
-							<view class="header-bottom-money-zhen">
-								<span>￥</span>
-								<span style="font-size: 38rpx;font-weight: bold">{{item.price}}</span>
-								<span>元/套</span>
-								<span class="header-bottom-money-jia" style="margin-left: 20px; color: #666;">￥{{item.oldPrice}}</span>
-								<!-- <span style="color: #019c88;">服务时长:{{item.duration}}分钟</span> -->
+						<view class="detail-view">
+							<image class="detail-view-img" :src="item.massageImg" mode=""></image>
+							<view class="detail-view-mina">
+								<view class="header-bottom-money" style="margin: 7px 0px; justify-content: space-between ">
+									<view class="header-bottom-money-zhen">
+										<span>￥</span>
+										<span>{{item.price}}</span>
+									</view>
+									<view class="header-bottom-money-jia" style="margin-left: 20px; ">
+										￥{{item.oldPrice}}
+									</view>
+									<view style="color: #019c88;">服务时长:{{item.duration}}分钟</view>
+								</view>
+								<view class="tese">
+									<span>项目特色: </span>
+									<span>{{item.jianjie}}</span>
+								</view>
 							</view>
-							</view>
-						<view class="tese">
-							<span>项目特色: </span>
-							<span>{{item.jianjie}}</span>
 						</view>
-						<!-- <view class="detail-foot-title">
+						
+						<view class="detail-foot-title">
 							服务项目{{index+1}}
-						</view> -->
+						</view>
 					</view>
 				</view>
 			</view>
@@ -233,7 +242,7 @@
 				couponDataList:'',
 				orderXm:[],
 				detailData:[],
-				number:1
+				number:1,
 			}
 		},
 		onLoad(e) {
@@ -358,7 +367,7 @@
 			},
 			youhuijuan(){
 				uni.navigateTo({
-					url:'/my/hongbao/youhuijuanList?price='+this.orderXm.price+'&text='+'疗程'
+					url:'/my/hongbao/youhuijuanList?price='+this.orderXm.price+'&text='+'套餐'
 				})
 			},
 			openpay() {//验证
@@ -591,7 +600,7 @@
 						that.paySel = 1;
 						// console.log("res.data",res.data)
 						uni.navigateTo({
-							url:'/my/order/paydingLiao?ordersId='+ res.data.ordersId
+							url:'/my/order/paydingTc?ordersId='+ res.data.ordersId
 						})
 					} else {
 						that.$queue.showToast(res.msg)
@@ -1240,6 +1249,30 @@
 </script>
 
 <style lang="scss" scoped>
+	.header-bottom-money{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		align-items: flex-end;
+	}
+	.detail-view-mina{
+		width: 68%;
+		display: flex;
+		flex-direction: column;
+		justify-content: space-around;
+	}
+	.detail-view-img{
+		width: 76px;
+		height: 76px;
+		border-radius: 9px;
+	}
+	.detail-view{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+	}
 	.head-bottom{
 		width: 68%;
 		display: flex;
diff --git a/my/order/payModifyTcMy.vue b/my/order/payModifyTcMy.vue
index 3d8cac8..ebdc0e8 100644
--- a/my/order/payModifyTcMy.vue
+++ b/my/order/payModifyTcMy.vue
@@ -69,7 +69,7 @@
 						<!-- <span v-if="jishiName">{{jishiName.technicianTypeName}}</span> -->
 					</view>
 					<view class="liliao-bottom" style="margin-right: 6px;">
-							<span v-if="jishiName">{{jishiName.artificerName}}</span>
+							<span v-if="jishiName.artificerId">{{jishiName.artificerName}}</span>
 							<span v-else>请选择技师</span>
 							<span class="view-more"></span>
 					</view>
@@ -274,6 +274,9 @@
 			this.jishiName=this.$queue.getData('getJishi');
 			if(this.jishiName){
 				this.getMsTime(Time);
+			}else{
+				this.jishiName=[];
+				this.jishiName.artificerId='';
 			}
 			this.couponId=this.$queue.getData('youhui');
 			if(this.couponId){
@@ -325,6 +328,19 @@
 			// #endif
 		},
 		methods: {
+			openpay() {//验证
+				if(this.jishiName==''){
+					uni.showToast({
+						title:'请选择技师！'
+					})
+				}else if(this.startTime==''){
+					uni.showToast({
+						title:'请选择服务时间！'
+					})
+				}else{
+					this.goOrder()
+				}
+			},
 			goOrder() {//生成orderId
 				let that = this
 				// let payMoney =item.price;
@@ -347,6 +363,7 @@
 					 ],
 					 userPackageDetailId : that.ordersId
 				}
+				
 				that.$Request.postJson("/app/artificer/insertOrders", data).then(res => {
 					that.showorder = false
 					if (res.code == 0) {
@@ -416,9 +433,7 @@
 					url:'/my/hongbao/youhuijuanList?price='+this.orderXm.price+'&text='+'套餐'
 				})
 			},
-			openpay() {//验证
-					this.goOrder()
-			},
+			
 			textareaChange(e){//备注
 				this.textareaData=e.detail.value
 				console.log("adsadas0",this.textareaData)
@@ -634,6 +649,7 @@
 								// console.log('用户点击确定');
 								that.$Request.post("/app/artificer/payOrders", {
 									ordersId: that.ordersId,
+									
 								}).then(ret => {
 									uni.hideLoading();
 									if (ret.code == 0) {
@@ -1262,6 +1278,7 @@
 	}
 </script>
 
+
 <style lang="scss" scoped>
 	.textarea-pay-list{
 		width: 100%;
diff --git a/my/order/paydingTCX.vue b/my/order/paydingTCX.vue
index 521b222..8dfabd2 100644
--- a/my/order/paydingTCX.vue
+++ b/my/order/paydingTCX.vue
@@ -10,7 +10,7 @@
 					<view class="pay-title" style="">服务项目</view>
 					<view class="flex justify-around">
 						<view class="" style="width: 160upx;height: 160upx;">
-							<image :src="order.ordersMassageList[0].massageType.massageImg"
+							<image :src="order.ordersMassageList[0].massageType?order.ordersMassageList[0].massageType.massageImg:order.ordersMassageList[0].userPackageDetail.massageImg"
 								style="width: 100%;height: 100%;border-radius: 19upx;"></image>
 						</view>
 						<view class="u-flex-1  margin-left-sm">
@@ -35,7 +35,7 @@
 								<view style="width: 100%;">
 									<view class="flex justify-between margin-tb-sm" style="color: #999999;">
 										<view style="justify-content: space-between;">
-											{{order.ordersMassageList[0].massageType.duration}}分钟
+											{{order.ordersMassageList[0].massageType?order.ordersMassageList[0].massageType.duration:order.ordersMassageList[0].userPackageDetail.duration}}分钟
 										</view>
 									</view>
 										
@@ -119,6 +119,12 @@
 						</view>
 						
 						<view style="font-size: 14px;font-weight: bold;margin-bottom: 10px;">订单费用</view>
+						<view class="flex justify-between" style="margin-top: 19rpx;">
+							<view style="color: #999;font-size: 26rpx;">套餐名称</view>
+							<view class="" style="color: #333;font-size: 26rpx;">
+								{{order.ordersMassageList[0].userPackageDetail?order.ordersMassageList[0].userPackageDetail.mainTitle:order.ordersMassageList[0].massageType.mainTitle}}
+							</view>
+						</view>
 						<view class="flex justify-between" style="margin-top: 19rpx;">
 							<view style="color: #999;font-size: 26rpx;">项目名称</view>
 							<view class="" style="color: #333;font-size: 26rpx;">{{order.entryName}}</view>
@@ -136,9 +142,12 @@
 							<view class="" style="color: #333;font-size: 26rpx;">{{order.vipRate}}%</view>
 						</view> 
 						<view class="flex align-center margin-top-lg" style="justify-content: flex-end;border-bottom:1px solid #ccc;padding-bottom:5px ;margin: 5px 0px;">
-							<view style="color: #333;font-size: 26rpx;">小计：</view>
-							<view class="" style="color: #333;">￥<text
-									style="font-size: 35rpx;font-weight: bold;">{{order.massageMoney}}</text></view>
+							<view style="color: #333;font-size: 26rpx;">实付金额：</view>
+							<view class="" style="color: #333;">
+								<text style="font-size: 35rpx;font-weight: bold;">
+									￥0
+								 </text>
+							</view>
 						</view>
 						
 						<view style="font-size: 14px;font-weight: bold;margin-bottom: 10px;">出行费用</view>
@@ -157,7 +166,7 @@
 							<view class="" style="color: #333;font-size: 26rpx;">￥{{order.taxiMoney}}</view>
 						</view>
 						
-						<view class="textarea-pay-list">
+						<view class="textarea-pay-list" v-if="order.remark">
 							<view style="color: #999;font-size: 26rpx;margin-bottom: 9px;">备注内容</view>
 							<textarea class="textarea-pay" v-model="order.remark" disabled="disabled" placeholder="请输入备注" name="" maxlength="100"></textarea>
 						</view>
@@ -169,7 +178,7 @@
 						<view class="flex align-center margin-top-lg justify-between">
 							<view style="color: #333;font-size: 26rpx;">订单费用：</view>
 							<view class="" style="color: #333;">￥<text
-									style="font-size: 26rpx;font-weight: bold;">{{order.massageMoney}}</text></view>
+									style="font-size: 26rpx;font-weight: bold;">0</text></view>
 						</view>
 						<view class="flex align-center margin-top-lg justify-between" v-if="order.taxiMoney">
 							<view style="color: #333;font-size: 26rpx;">出行费用：</view>
@@ -178,7 +187,7 @@
 						</view>
 						<view class="fei-view-list-z">
 							<span>总金额</span>
-							<span style="color: #FF3939;font-size: 29rpx;">￥{{order.sumMoney}}</span>
+							<span style="color: #FF3939;font-size: 29rpx;">￥{{order.artificerTaxiMoney}}</span>
 						</view>
 					</view>
 				</view>
@@ -769,13 +778,14 @@
 				
 					uni.showModal({
 						title: '付款提示',
-						content: '确认支付' + that.order.sumMoney + '元吗?',
+						content: '确认支付' + that.order.artificerTaxiMoney + '元吗?',
 						success: function(re) {
 							if (re.confirm) {
 								that.$queue.showLoading('支付中...')
 								// console.log('用户点击确定');
 								that.$Request.post("/app/artificer/payOrders", {
-									ordersId: order.ordersId,
+									ordersId: that.order.ordersId,
+									userPackageDetailId : that.order.userPackageDetailId
 								}).then(ret => {
 									uni.hideLoading();
 									if (ret.code == 0) {
@@ -801,7 +811,8 @@
 					// #ifdef MP-WEIXIN
 					let data = {
 						ordersId: that.ordersId,
-						type: 3
+						type: 3,
+						userPackageDetailId : that.order.userPackageDetailId
 					}
 					that.$Request.post('/app/wxPay/payOrder', data).then(ret => {
 						console.log(ret)
@@ -845,7 +856,8 @@
 					if (ua.indexOf('micromessenger') != -1) {
 						let data = {
 							ordersId: that.ordersId,
-							type: 2
+							type: 2,
+							userPackageDetailId : that.order.userPackageDetailId
 						}
 						that.$Request.post('/app/wxPay/payOrder', data).then(rea => {
 							that.showpay = false
@@ -861,7 +873,8 @@
 					} else {
 						let data = {
 							ordersId: that.ordersId,
-							type: 4
+							type: 4,
+							userPackageDetailId : that.order.userPackageDetailId
 						}
 						that.$Request.post('/app/wxPay/payOrder', data).then(rea => {
 							that.showpay = false
@@ -885,7 +898,8 @@
 					// #ifdef APP
 					let data = {
 						ordersId: that.order.ordersId,
-						type: 1
+						type: 1,
+						userPackageDetailId : that.order.userPackageDetailId
 					}
 					that.$Request.post('/app/wxPay/payOrder', data).then(rea => {
 						console.log(rea)
@@ -899,7 +913,8 @@
 					// #ifdef H5
 					let data = {
 						ordersId: that.ordersId,
-						type: 2
+						type: 2,
+						userPackageDetailId : that.order.userPackageDetailId
 					}
 					that.$Request.post('/app/aliPay/payOrder', data).then(
 						rea => {
@@ -914,7 +929,8 @@
 					// #ifdef APP-PLUS
 					let data = {
 						ordersId: that.ordersId,
-						type: 1
+						type: 1,
+						userPackageDetailId : that.order.userPackageDetailId
 					}
 					that.$Request.post('/app/aliPay/payOrder', data).then(
 						rea => {
@@ -925,7 +941,185 @@
 				}
 
 			},
+			// 支付订单
+			pay() {
+				let that = this
+				this.showpay = false
+				if (this.paySel != 0) {
+					this.payJZ();
+					return;
+				}
+				if (that.openWay == 1) { //零钱支付
+					uni.showModal({
+						title: '付款提示',
+						content: '确认支付' + that.order.artificerTaxiMoney + '元吗?',
+						success: function(re) {
+							if (re.confirm) {
+								that.$queue.showLoading('支付中...')
+								console.log('用户点击确定');
+								that.$Request.post("/app/artificer/payOrders", {
+									ordersId: that.order.ordersId,
+									userPackageDetailId : that.order.userPackageDetailId
+								}).then(res => {
+									uni.hideLoading();
+									if (res.code == 0) {
+										uni.showToast({
+											title: '支付成功'
+										})
+										that.getOrder()
+									} else {
+										uni.showToast({
+											title: res.msg,
+											icon: 'none'
+										})
+									}
+								});
+							} else if (re.cancel) {
+								uni.hideLoading();
+								console.log('用户点击取消');
+							}
+						}
 			
+					})
+				} else if (that.openWay == 2) { //微信支付
+					that.$queue.showLoading('支付中...')
+					// #ifdef MP-WEIXIN
+					let data = {
+						ordersId: that.order.ordersId,
+						type: 3,
+						userPackageDetailId : that.order.userPackageDetailId
+					}
+					that.$Request.post('/app/wxPay/payOrder', data).then(ret => {
+						console.log(ret)
+						if (ret.code == 0) {
+							uni.hideLoading();
+							uni.requestPayment({
+								provider: 'wxpay',
+								timeStamp: ret.data.timestamp,
+								nonceStr: ret.data.noncestr,
+								package: ret.data.package,
+								signType: ret.data.signType,
+								paySign: ret.data.sign,
+								success: function(ret) {
+									console.log(ret)
+									uni.showToast({
+										title: '支付成功',
+										icon: 'none'
+									})
+									that.getOrder()
+									// this.$queue.showToast('支付成功');
+			
+									// uni.switchTab({
+									// 	url: '/pages/my/index'
+									// })
+								},
+								fail: function(err) {
+									// this.$queue.showToast('支付失败');
+									uni.showToast({
+										title: '支付失败',
+										icon: 'nones'
+									});
+									that.getOrder()
+								}
+							});
+						}
+					});
+					// #endif
+			
+					// #ifdef H5
+					let ua = navigator.userAgent.toLowerCase();
+					if (ua.indexOf('micromessenger') != -1) {
+						let data = {
+							ordersId: that.order.ordersId,
+							type: 2,
+							userPackageDetailId : that.order.userPackageDetailId
+						}
+						that.$Request.post('/app/wxPay/payOrder', data).then(rea => {
+							that.showpay = false
+							if (rea.code == 0) {
+								that.callPay(rea.data);
+							} else {
+								uni.showToast({
+									title: rea.msg,
+									icon: 'none'
+								})
+							}
+						});
+					} else {
+						let data = {
+							ordersId: that.order.ordersId,
+							type: 4,
+							userPackageDetailId : that.order.userPackageDetailId
+						}
+						// debugger;
+						that.$Request.post('/app/wxPay/payOrder', data).then(rea => {
+							// const urlArr = window.location.href;
+							// const hostUrl = urlArr.split("/");
+							// const callBack = hostUrl[0] + "//" + hostUrl[2] + "/";
+							// const url = '&redirect_url=' + callBack + 'my/order/pay';
+							// window.location = rea.mweb_url + url
+							that.showpay = false
+							if (rea.code == 0) {
+								const urlArr = window.location.href;
+								const hostUrl = urlArr.split("/");
+								const callBack = hostUrl[0] + "//" + hostUrl[2] + "/";
+								const url = '&redirect_url=' + callBack + 'my/order/pay';
+								window.location = rea.data.mweb_url + url
+							} else {
+								uni.showToast({
+									title: rea.msg,
+									icon: 'none'
+								})
+							}
+						});
+					}
+			
+					// #endif
+			
+					// #ifdef APP
+					let data = {
+						ordersId: that.order.ordersId,
+						type: 1,
+						userPackageDetailId : that.order.userPackageDetailId
+					}
+					that.$Request.post('/app/wxPay/payOrder', data).then(rea => {
+						console.log(rea)
+						that.showpay = false
+						if (rea.code == 0) {
+							that.isCheckPay(rea.code, 'wxpay', JSON.stringify(rea.data));
+						}
+					});
+					// #endif
+				} else if (that.openWay == 3) { //支付宝支付
+					that.$queue.showLoading('支付中...')
+					// #ifdef H5
+					let data = {
+						ordersId: that.order.ordersId,
+						type: 2,
+						userPackageDetailId : that.order.userPackageDetailId
+					}
+					that.$Request.post('/app/aliPay/payOrder', data).then(
+						rea => {
+							const div = document.createElement('div')
+							div.innerHTML = rea.data //此处form就是后台返回接收到的数据
+							document.body.appendChild(div)
+							document.forms[0].submit()
+						});
+					// #endif
+			
+					// #ifdef APP-PLUS
+					let data = {
+						ordersId: that.order.ordersId,
+						type: 1,
+						userPackageDetailId : that.order.userPackageDetailId
+					}
+					that.$Request.post('/app/aliPay/payOrder', data).then(
+						rea => {
+							that.setPayment('alipay', rea.data);
+						});
+					// #endif
+				}
+			},
 			//支付选择
 			selectWay: function(item) {
 				this.openWay = item.id;
@@ -1040,179 +1234,7 @@
 				// })
 				this.showpay = true
 			},
-			// 支付订单
-			pay() {
-				let that = this
-				this.showpay = false
-				if (this.paySel != 0) {
-					this.payJZ();
-					return;
-				}
-				if (that.openWay == 1) { //零钱支付
-				console.log("that.order.sumMoney",that.order)
-					uni.showModal({
-						title: '付款提示',
-						content: '确认支付' + that.order.sumMoney + '元吗?',
-						success: function(re) {
-							if (re.confirm) {
-								that.$queue.showLoading('支付中...')
-								console.log('用户点击确定');
-								that.$Request.post("/app/artificer/payOrders", {
-									ordersId: that.order.ordersId,
-								}).then(res => {
-									uni.hideLoading();
-									if (res.code == 0) {
-										uni.showToast({
-											title: '支付成功'
-										})
-										that.getOrder()
-									} else {
-										uni.showToast({
-											title: res.msg,
-											icon: 'none'
-										})
-									}
-								});
-							} else if (re.cancel) {
-								uni.hideLoading();
-								console.log('用户点击取消');
-							}
-						}
-
-					})
-				} else if (that.openWay == 2) { //微信支付
-					that.$queue.showLoading('支付中...')
-					// #ifdef MP-WEIXIN
-					let data = {
-						ordersId: that.order.ordersId,
-						type: 3
-					}
-					that.$Request.post('/app/wxPay/payOrder', data).then(ret => {
-						console.log(ret)
-						if (ret.code == 0) {
-							uni.hideLoading();
-							uni.requestPayment({
-								provider: 'wxpay',
-								timeStamp: ret.data.timestamp,
-								nonceStr: ret.data.noncestr,
-								package: ret.data.package,
-								signType: ret.data.signType,
-								paySign: ret.data.sign,
-								success: function(ret) {
-									console.log(ret)
-									uni.showToast({
-										title: '支付成功',
-										icon: 'none'
-									})
-									that.getOrder()
-									// this.$queue.showToast('支付成功');
-
-									// uni.switchTab({
-									// 	url: '/pages/my/index'
-									// })
-								},
-								fail: function(err) {
-									// this.$queue.showToast('支付失败');
-									uni.showToast({
-										title: '支付失败',
-										icon: 'nones'
-									});
-									that.getOrder()
-								}
-							});
-						}
-					});
-					// #endif
-
-					// #ifdef H5
-					let ua = navigator.userAgent.toLowerCase();
-					if (ua.indexOf('micromessenger') != -1) {
-						let data = {
-							ordersId: that.order.ordersId,
-							type: 2
-						}
-						that.$Request.post('/app/wxPay/payOrder', data).then(rea => {
-							that.showpay = false
-							if (rea.code == 0) {
-								that.callPay(rea.data);
-							} else {
-								uni.showToast({
-									title: rea.msg,
-									icon: 'none'
-								})
-							}
-						});
-					} else {
-						let data = {
-							ordersId: that.order.ordersId,
-							type: 4
-						}
-						// debugger;
-						that.$Request.post('/app/wxPay/payOrder', data).then(rea => {
-							// const urlArr = window.location.href;
-							// const hostUrl = urlArr.split("/");
-							// const callBack = hostUrl[0] + "//" + hostUrl[2] + "/";
-							// const url = '&redirect_url=' + callBack + 'my/order/pay';
-							// window.location = rea.mweb_url + url
-							that.showpay = false
-							if (rea.code == 0) {
-								const urlArr = window.location.href;
-								const hostUrl = urlArr.split("/");
-								const callBack = hostUrl[0] + "//" + hostUrl[2] + "/";
-								const url = '&redirect_url=' + callBack + 'my/order/pay';
-								window.location = rea.data.mweb_url + url
-							} else {
-								uni.showToast({
-									title: rea.msg,
-									icon: 'none'
-								})
-							}
-						});
-					}
-
-					// #endif
-
-					// #ifdef APP
-					let data = {
-						ordersId: that.order.ordersId,
-						type: 1
-					}
-					that.$Request.post('/app/wxPay/payOrder', data).then(rea => {
-						console.log(rea)
-						that.showpay = false
-						if (rea.code == 0) {
-							that.isCheckPay(rea.code, 'wxpay', JSON.stringify(rea.data));
-						}
-					});
-					// #endif
-				} else if (that.openWay == 3) { //支付宝支付
-					that.$queue.showLoading('支付中...')
-					// #ifdef H5
-					let data = {
-						ordersId: that.order.ordersId,
-						type: 2
-					}
-					that.$Request.post('/app/aliPay/payOrder', data).then(
-						rea => {
-							const div = document.createElement('div')
-							div.innerHTML = rea.data //此处form就是后台返回接收到的数据
-							document.body.appendChild(div)
-							document.forms[0].submit()
-						});
-					// #endif
-
-					// #ifdef APP-PLUS
-					let data = {
-						ordersId: that.order.ordersId,
-						type: 1
-					}
-					that.$Request.post('/app/aliPay/payOrder', data).then(
-						rea => {
-							that.setPayment('alipay', rea.data);
-						});
-					// #endif
-				}
-			},
+			
 			callPay: function(response) {
 				if (typeof WeixinJSBridge === "undefined") {
 					if (document.addEventListener) {
@@ -1303,7 +1325,8 @@
 					success: function(res) {
 						if (res.confirm) {
 							let data = {
-								ordersId: e.ordersId
+								ordersId: that.order.ordersId,
+								userPackageDetailId : that.order.userPackageDetailId
 							}
 							that.$queue.showLoading('提交中...')
 							that.$Request.post('/app/artificer/deleteOrders', data).then(res => {
diff --git a/my/order/paydingTc.vue b/my/order/paydingTc.vue
index c351517..66f04fb 100644
--- a/my/order/paydingTc.vue
+++ b/my/order/paydingTc.vue
@@ -219,6 +219,7 @@
 				addressId:'',
 				mobile:'',
 				detailaddress:'',
+				orderXm:''
 			}
 		},
 		onLoad(e) {
@@ -229,7 +230,9 @@
 				})
 			}
 			this.ordersId = e.ordersId
-			this.getOrder()
+			this.getOrder();
+			this.orderXm=this.$queue.getData('mainData');
+			console.log("asdsadsadsadasdsa111",this.orderXm)
 		},
 		onShow() {
 			this.addressId = this.$queue.getData('EditAddress');
@@ -745,7 +748,7 @@
 											title: '支付成功'
 										})
 										uni.redirectTo({
-											url:'/pages/my/indextaociliaoList?type='+104+'&name='+'index'
+											url:'/pages/my/indextaociliaoList?type='+that.orderXm.type+'&name='+'index'
 										})
 										that.getOrder()
 									} else {
diff --git a/pages/my/cikarDrtail.vue b/pages/my/cikarDrtail.vue
index e16e871..9d175d1 100644
--- a/pages/my/cikarDrtail.vue
+++ b/pages/my/cikarDrtail.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="content">
 		<view class="header">
-			<view class="header-top" :style="backgroundStyle">
+			<view class="header-top" :style="backgroundStyle" @click="goNav('/my/vip/index')">
 				<image src="../../static/servicePackage/member_ba.png" mode="widthFix" v-if="!isVIP"></image>
 				<image src="../../static/activate2.png" mode="widthFix" v-if="isVIP"></image>
 			</view>
@@ -218,7 +218,11 @@
 			// #endif
 		},
 		methods:{
-			
+			goNav(e) {
+				uni.navigateTo({
+					url: e
+				})
+			},
 			payJZ() {
 				let that = this;
 				if (that.openWay == 1) { //零钱支付
diff --git a/pages/my/cureOderDrtail.vue b/pages/my/cureOderDrtail.vue
index e3b958e..b1a0c25 100644
--- a/pages/my/cureOderDrtail.vue
+++ b/pages/my/cureOderDrtail.vue
@@ -164,8 +164,10 @@
 					// this.$queue.setData('ordersId',this.dataList.massageTypeId);
 					// this.$queue.setData('userPackageDetailId',this.dataList.id);
 					this.$queue.setData('daibudan','');
-					this.$queue.setData('mainData',item)
-					// this.$queue.setData('detailData',this.detailData)
+					this.$queue.setData('detailData',this.detailData)
+					this.$queue.setData('mainData',item);
+					this.$queue.setData('xiangmu',item);
+					this.$queue.setData('getJishi','');
 					this.$queue.setData('youhui','');
 					// uni.navigateTo({
 					// 	url:'/my/order/payModifyTcMy?ordersId='+item.packageDetailId
diff --git a/pages/my/fuwuliaochengDetail.vue b/pages/my/fuwuliaochengDetail.vue
index f2aa246..c12866c 100644
--- a/pages/my/fuwuliaochengDetail.vue
+++ b/pages/my/fuwuliaochengDetail.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="content">
 		<view class="header">
-			<view class="header-top" :style="backgroundStyle">
+			<view class="header-top" :style="backgroundStyle" @click="goNav('/my/vip/index')">
 				<image src="../../static/servicePackage/member_ba.png" mode="widthFix" v-if="!isVIP"></image>
 				<image src="../../static/activate2.png" mode="widthFix" v-if="isVIP"></image>
 			</view>
@@ -225,7 +225,11 @@
 			// #endif
 		},
 		methods:{
-			
+			goNav(e) {
+				uni.navigateTo({
+					url: e
+				})
+			},
 			payJZ() {
 				let that = this;
 				if (that.openWay == 1) { //零钱支付