From 5e0d1ea2ef78db4cbf4bba5544535316b3ea1133 Mon Sep 17 00:00:00 2001
From: "Mr.jiang" <714156421@qq.com>
Date: Tue, 2 Jul 2024 16:28:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E6=B7=BB=E5=8A=A0=20=E6=8A=80?=
 =?UTF-8?q?=E5=B8=88=E4=B8=8B=E8=AE=A2=E5=8D=95=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 my/order/payModifyJsDetail.vue  | 2005 +++++++++++++++++++++++++++++++
 pages.json                      |    9 +
 pages/therapist/orderDetail.vue |   68 +-
 3 files changed, 2061 insertions(+), 21 deletions(-)
 create mode 100644 my/order/payModifyJsDetail.vue

diff --git a/my/order/payModifyJsDetail.vue b/my/order/payModifyJsDetail.vue
new file mode 100644
index 0000000..27062f6
--- /dev/null
+++ b/my/order/payModifyJsDetail.vue
@@ -0,0 +1,2005 @@
+<template>
+	<view class="content">
+		<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="flex">
+						<view class="" style="width: 160upx;height: 160upx;">
+							<image :src="orderXm.massageImg"
+								style="width: 100%;height: 100%;border-radius: 19upx;"></image>
+						</view>
+						<view class="head-bottom  margin-left-sm">
+							<view class="flex head-title-right">
+								<view class="margin-right-xs text-df u-skeleton-fillet head-title">
+									{{orderXm.title}}
+								</view>
+								
+							</view>
+							<view class="flex align-center">
+								<view style="width: 100%;">
+									<view class="money-pay">
+										<view class="money-pay-zhen">
+											<span>￥</span>
+											<span>{{orderXm.price}}</span>
+										</view>
+										<view>
+											<uni-number-box :width='27' :min="1" @change="changeValue" />
+										</view>
+									</view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+				<view class="ske-padding margin-top-sm header-view">
+					<view v-if="!detailaddress">请选择地址</view>
+					<view class="margin-right-xs">
+						<view class="flex justify-between margin-top-lg">
+							<view class="header-view-text">联系人</view>
+							<view class="header-view-data">
+								<text>{{name}}</text>
+								<text class="xuanzhe" @click="getAddressList()">修改</text>
+							</view>
+						</view>
+						<view class="flex justify-between margin-top-lg">
+							<view class="header-view-text">手机号码</view>
+							<view class="header-view-data">
+								{{mobile}}
+							</view>
+						</view>
+						<view class="flex justify-between margin-top-lg">
+							<view class="header-view-text">详细地址</view>
+							<view class="flex adders-view">
+									<span>
+										{{province}}/{{city}}/{{district}}/{{detailaddress}}
+									</span>
+									<span class="view-more"></span>
+							</view>
+						</view>
+						<view class="flex justify-between margin-top-lg" v-if="order.remark">
+							<view style="width: 170rpx;">备注内容</view>
+							<view class="flex">
+								<view class="">
+									{{order.remark}}
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+				<view class="ske-padding margin-top-sm header-view">
+					<view class="fuwu-time" @click="liliaoshi">
+					 	<view  class="fuwu-title" >
+							<span>技师</span>
+							<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-else>选择不同技师价格可能不一样哦~</span>
+								<span class="view-more"></span>
+						</view>
+					</view>
+					<view class="liliao" @click="youhuijuan">
+						<view  class="fuwu-title">
+							<span>平台优惠劵</span>
+						</view>
+						<view class="header-bottom-money-zhen">
+							<view v-if="couponDataList" class="" style="margin-right: 5px;">
+								<span>-￥{{couponDataList}}</span>
+							</view>
+							<span v-else>选择优惠劵</span>
+							<span class="view-more"></span>
+						</view>
+					</view>
+					<view class="fuwu-time">
+						<view class="fuwu-title">
+							服务时间
+						</view>
+						<!-- <view class="fuwu-time-view" @change="changeLog">
+							<uni-datetime-picker :hide-second='true' v-model="single" type="datetime">{{single==''?order.serveTime:single}}</uni-datetime-picker>
+							<image style="margin-left: 5px;" class="fuwu-img" src="../../static/images/my/jiantou.png" mode=""></image>
+						</view> -->
+						<view class="flex align-center justify-between"
+							style="height: 100rpx;line-height: 100rpx;padding: 0rpx 10rpx;">
+							<view class="flex justify-between margin-tb-sm" @click="openData()">
+								<view v-if="startTime">{{startTime}}</view>
+								<view class="tetx-sm" v-else>请选择预约时间<span class="view-more"></span></view>
+								<!---<u-icon name="arrow-right" color="#999999"></u-icon>-->
+								</view>
+						</view>
+					</view>
+					
+					
+				</view>
+				<view class="margin-top-xl pay-ding">
+					<view class="d-title">备注</view>
+					<view class="list-pay">
+						<view class="textarea-pay-list">
+							<textarea @input="textareaChange" class="textarea-pay" v-model="textareaData" placeholder="请输入备注" name="" maxlength="100"></textarea>
+						</view>
+						
+					</view>
+				</view>
+				<!-- <view class="margin-top-xl pay-ding">
+					<view class="d-title" style="margin-bottom: 5px;">服务保障</view>
+					<view class="list-pay">
+						<view class="list-pay-text">
+							<span>*每单保险</span>
+							<span>赠送意外险，每单保障您的人身及财产安全</span>
+						</view>
+						<view class="list-pay-text">
+							<span>*迟到补偿</span>
+							<span>调理师迟到，按迟到时长规则补偿一定金额给客户</span>
+						</view>
+						<view class="list-pay-text">
+							<span>*不满意退全款</span>
+							<span>服务不满意，可在订单结束48小时内向平台提出异议</span>
+						</view>
+					</view>
+					<view class="checkbox-data">
+						<uni-data-checkbox v-model="radio1" :localdata="sex"></uni-data-checkbox>
+					</view>
+				</view> -->
+			</view>
+
+
+			
+			<view class="pay_btn" style="margin-top: 30px;" @click="openpay()">去支付</view>
+		
+		</view>
+		<!-- <u-skeleton :loading="loading" :animation="true" bgColor="#FFF"></u-skeleton> -->
+		<u-popup v-model="showorder" mode="bottom" :closeable="closeable">
+			<scroll-view scroll-y="true" style="width: 750rpx;height: 500rpx;">
+				<view class="list_item" v-for="(item,index) in orderList" :key="index">
+					<image :src="item.massageImg"></image>
+					<view class="listitem_rightview">
+						<view class="titleview">
+							<view class="item_title">{{item.title}}</view>
+							<view class="item_yishou">已售{{item.sales}}</view>
+						</view>
+						<view class="flex flex-wrap" style="margin-top: 10rpx;" v-if="item.labels.length>0">
+							<text class="margin-bottom-xs box" v-for="(items,index) in item.labels"
+								:key="index">{{items}}</text>
+						</view>
+						<view class="btnview">
+							<view class="item_money"> <text style="font-size: 24upx;">￥</text> <text
+									v-if="isVip">{{item.memberPrice}}</text><text v-if="!isVip">{{item.price}}</text>
+								/<text style="font-weight: 500;font-size: 24upx;	">{{item.duration}}分钟</text></view>
+							<view class="item_btn" @click="goOrder(item)">确认加钟</view>
+						</view>
+					</view>
+				</view>
+			</scroll-view>
+		</u-popup>
+		<!-- 支付方式 -->
+		<u-popup v-model="showpay" mode="bottom" :closeable="closeable">
+			<view class="popup_pay">
+				<view style="background-color: #fff;">
+					<view style="padding: 0 20upx;margin-top: 60rpx;margin-bottom: 20rpx;">
+						<view style="display: flex;height: 100upx;align-items: center;padding: 20upx 0;justify-content: center;"
+							v-for="(item,index) in openLists" :key='index'>
+							<image :src="item.image" style="width: 55upx;height: 55upx;border-radius: 50upx;">
+							</image>
+							<view style="font-size: 30upx;margin-left: 20upx;width: 70%;">
+								{{item.text}}
+							</view>
+							<radio-group name="openWay" style="margin-left: 45upx;" @tap='selectWay(item)'>
+								<label class="tui-radio">
+									<radio color="#029d88" :checked="openWay === item.id ? true : false" />
+								</label>
+							</radio-group>
+						</view>
+					</view>
+				</view>
+				<view class="tabber padding-top-sm padding-bottom-sm pay-zhifu" style="background: #fff !important;">
+					<span class="daizhifu">待支付:￥{{tpayMoney}}</span>
+					<u-button class="u-button-pay" @click="pay()" shape="circle" :custom-style="customStyle2" :hair-line="false">
+						立即支付
+					</u-button>
+				</view>
+			
+			</view>
+		</u-popup>
+		<!-- 预约弹窗 -->
+		<u-popup v-model="isTrue" mode="bottom">
+			<view>
+				<scroll-view scroll-y="true">
+					<its-calendar :sta_num="0" :end_num="24" :int_num="msTimeDate" :msTimeList="msTimeList" :classifyId="orderXm.classifyId"
+						@getTime="TimeData">
+					</its-calendar>
+				</scroll-view>
+			</view>
+		</u-popup>
+	</view>
+
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				startTime: '',
+				msTimeList: [],
+				msTimeDate: 0,
+				isTrue1: false,
+				single:'请选择时间',
+				radio1:'',
+				sex: [{
+					text: '我已同意《盛安健康服务协议》',
+					value: 0
+				}],
+				tordersId: '',
+				tpayMoney: '',
+				paySel: 0,
+				showorder: false,
+				orderList: [],
+				loading: true,
+				customStyle: {
+					// backgroundColor: '#e5e5e5',
+					// color: '#FFFFFF',
+
+					// #ifdef MP-WEIXIN
+					width: "310upx",
+					// #endif
+					// #ifndef MP-WEIXIN
+					width: '310upx',
+
+					// #endif	
+					margin: '0 10upx',
+				},
+				customStyle2: {
+					backgroundColor: '',
+					color: '#FFFFFF',
+					// #ifdef MP-WEIXIN
+					width: "310upx",
+					// #endif
+					// #ifndef MP-WEIXIN
+					width: '310upx',
+
+					// #endif	
+					margin: '0 10upx',
+				},
+				id: '',
+				order: {
+					user: {},
+					game: {}
+				},
+				phone: '',
+				isVip: false,
+				birthDate: '',
+				age: '',
+				showpay: false,
+				openLists: [],
+				openWay: 1,
+				closeable: true,
+				yhqxSel: '否',
+				address:[],
+				detailaddress:'',
+				name:'',
+				mobile:'',
+				cityaddress:'',
+				isDefault:'',
+				userId:'',
+				latitude:'',
+				longitude:'',
+				province:'',
+				city:'',
+				district:'',
+				addressId:'',
+				isTrue: false,
+				jishiName:'',
+				checkbox:false,
+				couponData:[],
+				couponId:'',
+				textareaData:'',
+				ordersId:'',
+				userPackageDetailId:'',
+				couponDataList:'',
+				orderXm:[],
+				number:1,
+			}
+		},
+		onLoad(e) {
+			if (this.$queue.getData('msTimeDate')) {
+				this.msTimeDate = parseInt(this.$queue.getData('msTimeDate'));
+			} else {
+				this.msTimeDate = 60;
+			}
+			var date = new Date();
+			var year = date.getFullYear();
+			let month = (parseInt(date.getMonth()) + 1) > 9 ? (parseInt(date.getMonth()) + 1) : "0" + (parseInt(
+				date.getMonth()) + 1) // 当前月份
+			let days = (date.getDate()) > 9 ? date.getDate() : "0" + date.getDate() //当前日期
+			let fullDate = `${month}-${days}`
+			let Time = year + '-' + fullDate
+			this.yearsDate = Time;
+			
+			this.jishiName=this.$queue.getData('getJishi');
+			if(this.jishiName){
+				this.getMsTime(Time);
+			}
+			this.couponId=this.$queue.getData('youhui');
+			if(this.couponId){
+				this.youhuiF(this.couponId)
+			}
+			this.orderXm=this.$queue.getData('xiangmu');//上一个页面带过来的全部数据
+			console.log("this.orderXm",this.orderXm)
+			this.ordersId = this.$queue.getData('ordersId');
+			this.userPackageDetailId = this.$queue.getData('userPackageDetailId');
+			this.youhui()
+			// this.getOrder()
+		},
+		
+		onShow() {
+			this.addressId = this.$queue.getData('EditAddress');
+			if (this.addressId) {
+				this.getAddressList(this.addressId);
+			} else {
+				this.addressMy()
+			}
+
+			// #ifndef MP-WEIXIN
+			this.openLists = [{
+					image: '../../static/images/icon_weixin.png',
+					text: '微信支付',
+					id: 2
+				}, {
+					image: '../../static/images/zhifubao.png',
+					text: '支付宝支付',
+					id: 3
+				}, {
+					image: '../../static/images/lingqian.png',
+					text: '零钱支付',
+					id: 1
+				}],
+				this.openWay = 2;
+			// #endif
+
+			// #ifdef MP-WEIXIN
+			this.openLists = [{
+					image: '../../static/images/icon_weixin.png',
+					text: '微信支付',
+					id: 2
+				}, {
+					image: '../../static/images/lingqian.png',
+					text: '零钱支付',
+					id: 1
+				}],
+				this.openWay = 2;
+			// #endif
+		},
+		methods: {
+			changeValue(value){
+				this.number=value
+			},
+			// 时间段数据
+			TimeData(e) {
+				var date = new Date();
+				var year = date.getFullYear();
+				// if(this.msTimeList.length > 0){
+				// 	let startTime = year + '-' + e.days + ' ' + e.hours
+				// 	for (var i = 0; i < this.msTimeList.length; i++) {
+				// 		let msTime = this.msTimeList[i].artificerDate + ' ' + this.msTimeList[i].artificerTime
+				// 		if(startTime === msTime){
+				// 			this.isTrue = false
+				// 			uni.showModal({
+				// 				title: '温馨提示',
+				// 				content: '当前时段已被预约，请更换预约时段！',
+				// 				showCancel: true,
+				// 				cancelText: '取消',
+				// 				confirmText: '确定',
+				// 				success: res => {
+				// 					if(res.confirm){
+				// 						this.isTrue = true
+				// 					}
+				// 				}
+				// 			});
+				// 			return;
+				// 		}
+				// 	}
+				// }else{
+				this.startTime = year + '-' + e.days + ' ' + e.hours
+				this.isTrue = false
+				// }
+			},
+			getMsTime(artificerDate) {
+				let that = this;
+				let artificerId = that.jishiName.artificerId;
+				this.$Request.getT('/app/artificerTime/selectArtificerTimeListByArtificerId?artificerId=' + artificerId + '&artificerDate=' + artificerDate).then(res => {
+					if (res.code == 0) {
+						this.msTimeList = res.data;
+						console.log(res.data, "获取忙时时间")
+					}
+				})
+			},
+			// 打开弹窗
+			openData() {
+				this.isTrue = true
+			},
+			youhuijuan(){
+				uni.navigateTo({
+					url:'/my/hongbao/youhuijuanList?price='+this.orderXm.price+'&text='+'支付'
+				})
+			},
+			openpay() {//验证
+					// else if(this.radio1!='0'){
+					// 	uni.showToast({
+					// 		title:'请同意服务保障！'
+					// 	})
+					// }
+				if(this.startTime==''){
+					uni.showToast({
+						title:'请选择服务时间！'
+					})
+				}else if(this.jishiName==''){
+					uni.showToast({
+						title:'请选择技师！'
+					})
+				}else{
+					// this.showpay = true;
+					this.goOrder()
+				}
+				
+			},
+			textareaChange(e){//备注
+				this.textareaData=e.detail.value
+				console.log("adsadas0",this.textareaData)
+			},
+			checkboxChange(e){
+				this.couponId=e.detail.value.join(",")
+			},
+			youhuiF(couponId){//获取优惠卷
+				let that = this;
+				let data = {
+							  page: 1,
+							  limit: 10,
+							  id:couponId,
+							}
+				that.$Request.get("/app/coupon/selectCouponUserList", data).then(res => {
+					if (res.code == 0) {
+						var list=res.data.list;
+						that.couponDataList=list.reduce((sum, item) => sum + item.money, 0)
+						console.log("asdasdasdasd",that.couponDataList)
+					} else {
+						that.$queue.showToast(res.msg)
+					}
+							
+				});
+			},
+			youhui(){//获取优惠卷
+				let that = this
+				let data = {
+							  status: 0,
+							  page: 1,
+							  limit: 10
+							}
+				that.$Request.get("/app/coupon/selectCouponUserList", data).then(res => {
+					if (res.code == 0) {
+						that.couponData=res.data.list
+					} else {
+						that.$queue.showToast(res.msg)
+					}
+							
+				});
+			},
+			liliaoshi(){
+				uni.setStorage({
+				  key: 'taocanDd',
+				  data: '支付',
+				  success: function () {
+				   uni.navigateTo({
+				   	url: '/pages/therapist/therapistDingdan'
+				   })
+				  }
+				});
+			},
+			getChuXing() {//判断这个城市 是不是在经营范围
+				this.$Request.getT('/app/artificer/selectTaxiMoney?artificerId=' + this.artificerId + '&latitude=' + this
+					.latitude + '&longitude=' + this.longitude).then(res => {
+					if (res.code == 0) {
+						this.cheFei = res.data.taxiMoney ? res.data.taxiMoney : 0;
+						// this.price = parseInt(this.price)+parseInt(this.cheFei).toFixed(2)
+						this.distances = res.data.distances
+						this.tripNum = res.data.tripNum
+						this.xuMoney = res.data.xuMoney
+						this.tripPrice = res.data.tripPrice
+						this.cxSel = true;
+					} else {
+						this.cxSel = false;
+						uni.showToast({
+							title: '当前城市暂未开通，请切换城市',
+							duration: 2000,
+							icon: 'none'
+						});
+					}
+				});
+			},
+			addressMy() {
+				this.$Request.getT('/app/address/selectAddressById').then(res => {
+					console.log(res)
+					if (res.code == 0) {
+						this.name = res.data.name;
+						this.mobile = res.data.phone;
+						this.cityaddress = res.data.province + res.data.city + res.data.district;
+						this.detailaddress = res.data.detailsAddress;
+						this.isDefault = res.data.isDefault;
+						this.userId = res.data.userId;
+						this.latitude = res.data.latitude;
+						this.longitude = res.data.longitude;
+						this.province = res.data.province
+						this.city = res.data.city
+						this.district = res.data.district
+						this.addressId = res.data.addressId
+						// this.getChuXing();
+						// this.$queue.setData('EditAddress', res.data.addressId);
+					}
+				});
+			},
+			// 选中地址
+			getAddressList(addressId) {
+				if (addressId) {
+					this.$Request.getT('/app/address/selectAddressByAddressId?addressId=' + this.addressId).then(res => {
+						console.log(res)
+						if (res.code == 0) {
+							this.name = res.data.name;
+							this.mobile = res.data.phone;
+							this.cityaddress = res.data.province + res.data.city + res.data.district;
+							this.detailaddress = res.data.detailsAddress;
+							this.isDefault = res.data.isDefault;
+							this.userId = res.data.userId;
+							this.latitude = res.data.latitude;
+							this.longitude = res.data.longitude;
+							this.province = res.data.province
+							this.city = res.data.city
+							this.district = res.data.district
+				
+							// this.getChuXing();
+						}
+						// uni.hideLoading();
+					});
+				} else {
+					uni.navigateTo({
+						url: '../address/address?id=' + 2
+					})
+				}
+				
+			},
+			changeLog(e){//服务时间
+			console.log("11111",e)
+				this.single=e;
+			},
+			goChat() {
+				let kefu = this.$queue.getData('kefu'); // 用户端联系方式 1 手机号 2企业微信 
+				let kefuPhone = this.$queue.getData('kefuPhone');
+				if (uni.getStorageSync('token')) {
+					if (kefu == 1) {
+						uni.makePhoneCall({
+							phoneNumber: kefuPhone //仅为示例
+						});
+					} else if (kefu == 3) {
+						uni.navigateTo({
+							url: '/my/setting/customer'
+						});
+					} else {
+						// #ifdef MP-WEIXIN
+						let that = this
+						try {
+							wx.openCustomerServiceChat({
+								extInfo: {
+									url: that.$queue.getData('kefuUrl')
+								},
+								corpId: that.$queue.getData('kefuAppId'),
+								success(res) {},
+								fail(res) {
+									console.error(res)
+								}
+							})
+						} catch (error) {
+							console.error("catchcatch" + error)
+							uni.showToast({
+								title: '请更新至微信最新版本'
+							});
+						}
+						// #endif
+						// #ifndef MP-WEIXIN
+						let url = this.$queue.getData('kefuUrl');
+						if (url.indexOf('/pages/') !== -1 || url.indexOf('/my/') !== -1) {
+							uni.navigateTo({
+								url
+							});
+						} else {
+							//#ifndef H5
+							uni.navigateTo({
+								url: '/pages/index/webView?url=' + url
+							});
+							//#endif
+							//#ifdef H5
+							window.location.href = url;
+							//#endif
+						}
+						// #endif
+					}
+				} else {
+					uni.showModal({
+						title: '提示',
+						content: '您还未登录,请先登录',
+						success: function(res) {
+							if (res.confirm) {
+								console.log('用户点击确定');
+								uni.navigateTo({
+									url: '/pages/public/login'
+								})
+							} else if (res.cancel) {
+								console.log('用户点击取消');
+							}
+						}
+					})
+				}
+			},
+			copy(num) {
+				uni.setClipboardData({
+					data: num,
+					success: r => {
+						this.$queue.showToast('复制成功');
+					}
+				});
+			},
+			goOrder() {//生成orderId
+				let that = this
+				let data = {
+				  address:that.province+that.city+that.district+that.detailaddress,
+				  artificerId:that.jishiName.artificerId,
+				  userPackageDetailId:that.userPackageDetailId,
+				  phone:that.mobile,
+				  userName:that.name,
+				  tripWay:that.jishiName.tripWay,
+				  city:that.city,
+				  couponId: that.couponId,
+				  userId: uni.getStorageSync('userId'),
+				  longitude:that.longitude,
+				  latitude:that.latitude,
+				  serveTime:that.startTime,
+				  remark:that.textareaData,
+				  ordersMassageList:[
+				    {massageId: that.userPackageDetailId? that.userPackageDetailId:that.ordersId,num: that.number},
+				  ]
+				}
+				that.$Request.postJson("/app/artificer/insertOrders", data).then(res => {
+					that.showorder = false
+					if (res.code == 0) {
+						that.ordersId = res.data.ordersId;
+						that.tpayMoney = res.data.payMoney;
+						// that.showpay = true;
+						that.paySel = 1;
+						uni.navigateTo({
+							url:'/my/order/payding?ordersId='+ res.data.ordersId
+						})
+					} else {
+						that.$queue.showToast(res.msg)
+					}
+							
+				});
+			},
+			payJZ() {
+				let that = this;
+				if (that.openWay == 1) { //零钱支付
+					uni.showModal({
+						title: '付款提示',
+						content: '确认支付' + that.tpayMoney + '元吗?',
+						success: function(re) {
+							if (re.confirm) {
+								that.$queue.showLoading('支付中...')
+								// console.log('用户点击确定');
+								that.$Request.post("/app/artificer/payOrders", {
+									ordersId: that.ordersId,
+								}).then(ret => {
+									uni.hideLoading();
+									if (ret.code == 0) {
+										uni.showToast({
+											title: '支付成功',
+											icon: 'none'
+										})
+										// that.getOrder()
+
+									} else {
+										uni.showToast({
+											title: ret.msg,
+											icon: 'none'
+										})
+									}
+								});
+							} else if (re.cancel) {
+								// that.getOrder()
+							}
+						}
+					})
+				} else if (that.openWay == 2) { //微信支付
+					// #ifdef MP-WEIXIN
+					let data = {
+						ordersId: that.tordersId,
+						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.tordersId,
+							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.tordersId,
+							type: 4
+						}
+						that.$Request.post('/app/wxPay/payOrder', data).then(rea => {
+							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) { //支付宝支付
+					// #ifdef H5
+					let data = {
+						ordersId: that.tordersId,
+						type: 2
+					}
+					that.$Request.post('/app/aliPay/payOrder', data).then(
+						rea => {
+							that.showpay = false
+							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.tordersId,
+						type: 1
+					}
+					that.$Request.post('/app/aliPay/payOrder', data).then(
+						rea => {
+							that.showpay = false
+							that.setPayment('alipay', rea.data);
+						});
+					// #endif
+				}
+
+			},
+			saveJZ(classifyId) {
+				let data = {
+					parentId: classifyId,
+					page: 1,
+					limit: 50,
+					status: 1
+				}
+				let that = this;
+				this.$queue.showLoading('查询中...')
+				that.$Request.get("/app/artificer/selectMassageTypePage", data).then(res => {
+					if (res.code == 0) {
+						if (res.data.list && res.data.list.length > 0) {
+							that.orderList = res.data.list
+							for (let i = 0; i < that.orderList.length; i++) {
+								if (that.orderList[i].labels) {
+									that.orderList[i].labels = that.orderList[i].labels.split(",");
+								}
+							}
+							uni.hideLoading();
+							that.showorder = true;
+						} else {
+							uni.hideLoading();
+							that.$queue.showToast('暂无可加钟项目');
+						}
+					} else {
+						uni.hideLoading();
+						that.$queue.showToast(res.msg);
+					}
+
+				})
+			},
+			//支付选择
+			selectWay: function(item) {
+				this.openWay = item.id;
+			},
+			//换算年龄
+			getAge(e) {
+				console.log('出生日期：' + e)
+				this.birthDate = e
+				//创建系统日期
+				var today = new Date();
+				//把出生日期转换成日期
+				this.birthDate = new Date(this.birthDate);
+				//分别获取到年份后相减
+				this.age = today.getFullYear() - this.birthDate.getFullYear();
+				// console.log(this.age+'当前年龄')
+			},
+			// 修改订单地址
+			undateAdd(order) {
+				if (order.state == 0) {
+					uni.navigateTo({
+						url: '../address/address?order=' + order.ordersId + '&id=' + 3
+					})
+				}
+			},
+			// 一键导航
+			bindGps(latitude, longitude, name, detailsadd) {
+				console.log(latitude, longitude, name, detailsadd)
+				uni.openLocation({
+					latitude: latitude - 0, //要去的纬度-地址       
+					longitude: longitude - 0, //要去的经度-地址
+					name: name, //地址名称
+					address: detailsadd, //详细地址名称
+					success: function() {
+						console.log('导航成功');
+					},
+					fail: function(error) {
+						console.log(error)
+					}
+				});
+			},
+			ysPhone(phoneA, phoneB) {
+				this.$Request.getT('/app/user/insertVirtualPhone?phoneA=' + phoneA + '&phoneB=' + phoneB).then(res => {
+					if (res.code == 0) {
+						this.order.artificer.phone = res.data;
+					}
+				});
+			},
+			// 拨打电话
+			bindphone(phone) {
+				let that = this
+				uni.showModal({
+					title: '提示',
+					content: '是否拨打电话',
+					success: function(res) {
+						if (res.confirm) {
+							console.log('用户点击确定', phone);
+							uni.makePhoneCall({
+								phoneNumber: phone //仅为示例
+							});
+						} else if (res.cancel) {
+							console.log('用户点击取消');
+						}
+					}
+				});
+			},
+			goNav(e) {
+				uni.navigateTo({
+					url: e
+				})
+			},
+			getOrder() {
+				let data = {
+					ordersId: this.ordersId
+				}
+				this.$Request.get('/app/artificer/selectOrdersDetails', data).then(res => {
+					if (res.code == 0) {
+						this.loading = false
+						uni.hideLoading()
+						this.order = res.data
+						let aliphone = this.$queue.getData('aliphone');
+						if (aliphone === '是' && this.order.artificer) {
+							this.ysPhone(this.order.phone, this.order.artificer.phone);
+						}
+					}
+				})
+			},
+			delOrder(e) {
+				let that = this
+				uni.showModal({
+					title: '提示',
+					content: '确定删除订单吗?',
+					success: function(res) {
+						if (res.confirm) {
+							let data = {
+								ordersId: e.ordersId,
+							}
+							that.$queue.showLoading('删除中...')
+							that.$Request.post('/app/artificer/removeOrders', data).then(res => {
+								uni.hideLoading();
+								if (res.code == 0) {
+									uni.showToast({
+										name: "删除成功"
+									})
+									uni.navigateBack()
+								} else {
+									that.$queue.showToast(res.msg);
+								}
+							})
+						} else if (res.cancel) {
+							console.log('用户点击取消');
+						}
+					}
+				});
+			},
+			getIsVip() {
+				this.$Request.get("/app/UserVip/isUserVip").then(res => {
+					if (res.code == 0) {
+						this.isVip = res.data
+						uni.setStorageSync('isVIP', res.data)
+					}
+				});
+			},
+			
+			// 支付订单
+			pay() {
+				let that = this
+				this.showpay = false
+				if (this.paySel != 0) {
+					this.payJZ();
+					return;
+				}
+				if (that.openWay == 1) { //零钱支付
+					uni.showModal({
+						title: '付款提示',
+						content: '确认支付' + that.tpayMoney + '元吗?',
+						success: function(re) {
+							if (re.confirm) {
+								that.$queue.showLoading('支付中...')
+								console.log('用户点击确定');
+								that.$Request.post("/app/artificer/payOrders", {
+									ordersId: that.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) {
+						document.addEventListener('WeixinJSBridgeReady', this.onBridgeReady(response), false);
+					} else if (document.attachEvent) {
+						document.attachEvent('WeixinJSBridgeReady', this.onBridgeReady(response));
+						document.attachEvent('onWeixinJSBridgeReady', this.onBridgeReady(response));
+					}
+				} else {
+					this.onBridgeReady(response);
+				}
+			},
+			onBridgeReady: function(response) {
+				let that = this;
+				if (!response.package) {
+					return;
+				}
+				WeixinJSBridge.invoke(
+					'getBrandWCPayRequest', {
+						"appId": response.appid, //公众号名称，由商户传入
+						"timeStamp": response.timestamp, //时间戳，自1970年以来的秒数
+						"nonceStr": response.noncestr, //随机串
+						"package": response.package,
+						"signType": response.signType, //微信签名方式：
+						"paySign": response.sign //微信签名
+					},
+					function(res) {
+						if (res.err_msg === "get_brand_wcpay_request:ok") {
+							// 使用以上方式判断前端返回,微信团队郑重提示：
+							//res.err_msg将在用户支付成功后返回ok，但并不保证它绝对可靠。
+							uni.hideLoading();
+
+							uni.showToast({
+								title: '支付成功',
+								icon: 'none'
+							})
+							// that.getOrder()
+						} else {
+							uni.hideLoading();
+						}
+						WeixinJSBridge.log(response.err_msg);
+					}
+				);
+			},
+			isCheckPay(code, name, order) {
+				if (code == 0) {
+					this.setPayment(name, order);
+				} else {
+					uni.hideLoading();
+					uni.showToast({
+						title: '支付信息有误'
+					});
+				}
+			},
+			setPayment(name, order) {
+				let that = this
+				uni.requestPayment({
+					provider: name,
+					orderInfo: order, //微信、支付宝订单数据
+					success: function(res) {
+						uni.hideLoading();
+						uni.showToast({
+							title: '支付成功',
+							icon: 'none'
+						})
+						// that.getOrder()
+					},
+					fail: function(err) {
+						uni.hideLoading();
+					},
+					complete() {
+						uni.hideLoading();
+					}
+				});
+			},
+			// 取消订单
+			cancelOrder(e) {
+				let contentName = '';
+				let closeKC = this.$queue.getData('closeKC');
+				if (e.status == 7 || e.status == 8 && closeKC) {
+					let money = parseFloat(parseFloat(e.price) * parseFloat(closeKC)).toFixed(2);
+					contentName = '取消订单将扣除' + money + '元的手续费，并且车费将全部扣除！';
+				}
+				let that = this
+				uni.showModal({
+					title: '温馨提示',
+					content: '是否确认取消订单？' + contentName,
+					success: function(res) {
+						if (res.confirm) {
+							let data = {
+								ordersId: e.ordersId
+							}
+							that.$queue.showLoading('提交中...')
+							that.$Request.post('/app/artificer/deleteOrders', data).then(res => {
+								uni.hideLoading();
+								if (res.code == 0) {
+									// that.getOrder()
+								} else {
+									that.$queue.showToast(res.msg);
+								}
+							})
+						} else if (res.cancel) {
+							console.log('用户点击取消');
+						}
+					}
+				});
+			},
+			// 完成订单
+			cancel(e) {
+				let that = this
+				uni.showModal({
+					title: '提示',
+					content: '确认完成订单吗?',
+					success: function(res) {
+						if (res.confirm) {
+							let data = {
+								ordersId: e.ordersId,
+							}
+							that.$queue.showLoading('提交中...')
+							that.$Request.post('/app/artificer/accomplishOrders', data).then(res => {
+								uni.hideLoading();
+								if (res.code == 0) {
+									uni.navigateBack()
+								} else {
+									that.$queue.showToast(res.msg);
+								}
+							})
+						} else if (res.cancel) {
+							console.log('用户点击取消');
+						}
+					}
+				});
+			},
+			goMsg() {
+				let data = {
+					userId: uni.getStorageSync('userId'),
+					focusedUserId: this.order.user.userId
+				}
+				this.$Request.postJson('/app/chat/insertChatConversation ', data).then(res => {
+					if (res.code == 0) {
+						let id = this.order.user.userId == res.data.userId ? res.data.focusedUserId : this.order
+							.user.userId
+						uni.navigateTo({
+							url: '/pages/msg/im?chatConversationId=' + res.data.chatConversationId +
+								'&byUserId=' + id
+						})
+					}
+				})
+			},
+		}	
+	}
+</script>
+
+<style lang="scss" scoped>
+	.head-bottom{
+		width: 68%;
+		display: flex;
+		flex-direction: column;
+		justify-content: space-around;
+	}
+	.money-pay-jia{
+		font-weight: 400;
+		font-size: 25rpx;
+		color: #666666;
+		text-decoration-line: line-through;
+		margin-left: 5px;
+	}
+	.money-pay-zhen span{
+		color: #FF6000;
+	}
+	.money-pay-zhen span:nth-child(1){
+		font-size: 25rpx;
+	}
+	.money-pay-zhen span:nth-child(2){
+		font-size: 31.25rpx;
+		font-weight: bold;
+	}
+	.money-pay-zhen{
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+	}
+	.money-pay{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+	}
+	.head-top{
+		background-color: #ffffff;
+		border-radius: 24rpx;
+		padding: 29rpx;
+	}
+	.pay-title{
+		font-weight: bold;
+		font-size: 28rpx;
+		color: #333333;
+		margin-bottom: 5px;
+	}
+	.view-more{
+		display:inline-block;
+		border-top:1px solid;
+		border-right:1px solid;
+		width: 15rpx;
+		height: 15rpx;
+		border-color:#999;
+		transform:rotate(45deg);
+		margin-top: 14rpx;
+		}
+	.tetx-sm{
+		font-size: 30rpx;
+		color:#888;
+	}
+	.ske-padding{
+		padding: 5rpx 30rpx 36rpx 30rpx;
+		
+	}
+
+	.header-bottom-money-zhen span{
+		color: #F95900 !important;
+		font-weight: bold !important;
+		font-size: 26rpx !important;
+	}
+	.header-bottom-money-zhen{
+		display: flex;
+		flex-direction: row;
+		align-items: baseline;
+	}
+	/deep/uni-checkbox .uni-checkbox-input{
+		width: 26px;
+		height: 26px;
+		border-radius: 50%;
+	}
+	.youhui-img{
+		width: 111.81rpx;
+		height: 111.81rpx;
+	}
+	.youhui-view-right-btn{
+		width: 158rpx;
+		height: 64rpx;
+		background: linear-gradient(-90deg, #019C88, #2DC48E);
+		border-radius: 32rpx;
+		text-align: center;
+		line-height: 64rpx;
+		font-weight: 400;
+		font-size: 28rpx;
+		color: #FFFFFF;
+		text-shadow: 0rpx 2rpx 4rpx rgba(0,119,104,0.44);
+		margin-left: 10px;
+	}
+	.youhui-view-right-time{
+		font-weight: 400;
+		font-size: 22rpx;
+		color: #999999;
+	}
+	.youhui-view-right-title{
+		width: 110px;
+		font-weight: 400;
+		font-size: 32rpx;
+		color: #333333;
+	}
+	.youhui-view-right-top{
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+	}
+	.youhui-view-right{
+		width: 502.08rpx;
+		height: 100%;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-around;
+	}
+	.youhui-view-left-bottom{
+		font-weight: 400;
+		font-size: 22rpx;
+		color: #FFFFFF;
+	}
+	.youhui-view-left-yuan{
+		display: flex;
+		flex-direction: row;
+		align-items: baseline;
+		color: #FFFFFF;
+	}
+	.youhui-view-left-num{
+		font-weight: bold;
+		font-size: 89rpx;
+	}
+	.youhui-view-left-text{
+		font-weight: bold;
+		font-size:24.31rpx;
+	}
+	.youhui-view-left{
+		width: 199rpx;
+		height: 242rpx;
+		display: flex;
+		flex-direction:column;
+		align-items: center;
+		justify-content: center;
+	}
+	.youhui-yiyong{
+		background-image: url('../../static/youhuijuan/coupons7.png');
+	}
+	.youhui-weiyong{
+		background-image: url('../../static/youhuijuan/coupons1.png');
+	}
+	.youhui-list{
+		width: 95%;
+		display: flex;
+		flex-direction: row;
+		height: 242rpx;
+		border-radius: 21rpx;
+		background-size: 100%;
+		margin: 20px auto;
+		justify-content: space-between;
+	}
+	.dingwei-image{
+		margin-right: 20rpx;
+		width: 66rpx;
+		height: 66rpx;
+		padding: 10rpx 0;
+		border-radius: 50%;
+		background: linear-gradient(90deg, #029d88, #2fc094);
+		text-align: center;
+		line-height: 66rpx;
+	}
+	/deep/.skeleton-fade{
+		display: none;
+	}
+	/deep/.u-button-pay{
+		width: 381rpx;
+		height: 76rpx;
+		line-height: 76px;
+		text-align: center;
+		color: #fff;
+		font-size: 32rpx;
+		background: linear-gradient(90deg, #029d88, #2fc094);
+		border-radius: 60rpx;
+	}
+	.daizhifu{
+		font-size: 38rpx;
+		color: #333333;
+	}
+	.pay-zhifu{
+		width: 100%;
+		background-color: #f7f7f7 !important;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between !important;
+	}
+	.liliao{
+		margin-top: 17px;
+	}
+	.fuwu-time-view{
+		text-align: right;
+	}
+	.liliao-top span:nth-child(2){
+		width: 78rpx;
+		height: 35rpx;
+		line-height: 35rpx;
+		background: linear-gradient(90deg, #FE912E, #FF9970);
+		border-radius: 17rpx;
+		text-align: center;
+		font-weight: 400;
+		font-size: 25rpx;
+		color: #FFFFFF;
+		margin-left: 5px;
+	}
+	.fuwu-time-view span:nth-child(1),.liliao-bottom span:nth-child(1){
+		font-weight: 400;
+		font-size: 29rpx;
+		color: #888;
+		}
+	.fuwu-time-view,.liliao-top{
+		width: 70%;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+	}
+	.fuwu-title,.liliao-top span:nth-child(1){
+		font-size: 29rpx;
+		color: #222222;
+	}
+	.fuwu-time,.liliao{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+	}
+	.adders-view image{
+		margin-top: 5px;
+	}
+	.xuanzhe{
+		background: #e5e7eb;
+		color: #666;
+		margin-left: 5px;
+		border: 1px solid #cdd2db;
+		border-radius: 30rpx;
+		padding: 4rpx 15rpx;
+		font-size: 26rpx;
+	}
+	.header-view-data{
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+	}
+	.adders-view span,.header-view-data{
+		font-size: 29rpx;
+		color: #888;
+		text-align: right;
+	}
+	.adders-view{
+		display: flex;
+		flex-direction: row;
+		position: relative;
+	}
+	.header-view-text{
+		width: 170rpx;
+		font-size: 29rpx;
+		color: #222222;
+	}
+	.header-view{
+		background-color: #fff;
+		margin-bottom: 12px;
+		border-radius: 11px;
+	}
+	.head-foot span:nth-child(1){
+		margin-right: 5px;
+	}
+	.head-foot span{
+		font-weight: bold;
+		font-size: 28rpx;
+		color: #222222;
+	}
+	.head-foot{
+		display: flex;
+		flex-direction: row;
+		justify-content: flex-end;
+		margin-top: 10px;
+	}
+	.head-mian{
+		margin-top: 3px;
+	}
+	.qian-right span:nth-child(1){
+		font-size: 16.67rpx;
+	}
+	.qian-right span:nth-child(2){
+		font-size:25rpx;
+	}
+	.qian-right span{
+		color: #727272;
+	}
+	.qian-left span:nth-child(1){
+		font-size: 25rpx;
+	}
+	.qian-left span:nth-child(2){
+		font-size:29.17rpx;
+	}
+	.qian-left span{
+		color: #F95900;
+	}
+	.head-top-view-right-img,.adders-view image,.fuwu-img{
+		width: 9.38rpx;
+		height: 15.83rpx;
+	}
+	.head-top-title-bottom{
+		margin-top: 10px;
+	}
+	.head-top-title,.head-top-title-bottom,.head-mian{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+	}
+	.head-top-view-right{
+		width: 83%;
+		display: flex;
+		flex-direction: column;
+	}
+	.head-top-view-img{
+		width: 98.61rpx;
+		height: 98.61rpx;
+	}
+	.head-top-view{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+	}
+	.head-top{
+		width: 100%;
+		background-color: #ffffff;
+		border-radius: 24rpx;
+		padding: 29rpx;
+	}
+	.d-title{
+		font-weight: 400;
+		font-size: 29rpx;
+		color: #222;
+		padding: 16px 15px 0px 15px;
+		width: 100%;
+	}
+	.checkbox-data{
+		padding: 0px 11px;
+		margin: 15px 0px;
+	}
+	.list-pay-text span:nth-child(2){
+		padding-left: 5px;
+	}
+	.list-pay-text{
+		display: flex;
+		flex-direction: column;
+		width: 100%;
+		font-weight: 400;
+		font-size: 24rpx;
+		color: #999999;
+		line-height: 42rpx;
+	}
+	.list-pay{
+		width: 100%;
+		padding: 0px 29rpx;
+	}
+	.pay-ding-top{
+		width: 100%;
+		height: 80rpx;
+		padding: 0px 29rpx;
+	}
+	.fei-view-list span,.fei-view-list-z span{
+		font-weight: bold;
+		font-size: 25rpx;
+	}
+	.fei-view-list-z{
+		height: 65rpx;
+		background-color: rgba(247, 247, 247, 0.8);
+		border-radius: 33rpx;
+		padding: 0px 5px;
+	}
+	.fei-view-list span:nth-child(1),.fei-view-list-z span:nth-child(1){
+		color: #666666;
+	}
+	.fei-view-list span:nth-child(2){
+		color: #333333;
+	}
+	.fei-view-list,.fei-view-list-z{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+		margin-top: 5px;
+	}
+	.fei-view{
+		width: 100%;
+		display: flex;
+		flex-direction: column;
+	}
+	.fei-title{
+		width: 100%;
+		text-align: center;
+		font-weight: bold;
+		font-size: 29rpx;
+		color: #333333;
+		padding-bottom: 10px;
+		margin-bottom: 10px;
+		border-bottom: 1px solid #E5E5E5;
+	}
+	.feiuong{
+		padding: 29rpx;
+	}
+	/deep/.uni-textarea-textarea{
+		font-weight: 400;
+		font-size: 25rpx;
+	}
+	/deep/.uni-textarea-placeholder{
+		font-weight: 400;
+		font-size: 25rpx;
+		color: #C5C5C5;
+	}
+	.textarea-pay-list{
+		width: 100%;
+		height: 126rpx;
+		margin-top: 10px;
+	}
+	.textarea-pay{
+		background-color: #f3f3f3;
+		width: 100%;
+		height: 100%;
+		background: #F3F3F3;
+		border-radius: 14rpx;
+		padding: 7px;
+	}
+	
+	.pay-ding{
+		padding-bottom: 15px;
+	}
+	.pay-ding,.feiuong{
+		background-color: #ffffff;
+		border-radius: 24rpx;
+		margin-top: 24rpx;
+		// padding: 29rpx;
+	}
+	.phone-pay{
+		width: 49rpx;
+		height: 44rpx;
+	}
+	
+	.d-touxiang{
+		width: 46rpx;
+		height: 46rpx;
+		border-radius: 50%;
+	}
+	.money-pay-jia{
+		font-weight: 400;
+		font-size: 25rpx;
+		color: #666666;
+		text-decoration-line: line-through;
+		margin-left: 5px;
+	}
+	.money-pay-zhen span{
+		color: #FF6000;
+	}
+	.money-pay-zhen span:nth-child(1){
+		font-size: 25rpx;
+	}
+	.money-pay-zhen span:nth-child(2){
+		font-size: 31.25rpx;
+		font-weight: bold;
+	}
+	.money-pay-zhen{
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+	}
+	.money-pay{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+	}
+	
+	.content{
+		 padding-top: 1px;
+		 width: 100%;
+		 background-color: #f7f7f7;
+	}
+	.pay-title{
+		font-weight: bold;
+		font-size: 28rpx;
+		color: #333333;
+		margin-bottom: 5px;
+	}
+	page {
+		background: #f7f7f7;
+	}
+
+	.bgImg {
+		background-image: url('https://admin.sjajk.com/file/uploadPath/2023/01/03/02952e7260e553d0f3bb26a1cd154921.png');
+		background-size: 100% 1161rpx;
+	}
+
+	.bg {
+		background: #fff;
+	}
+
+	.list_item {
+		// width: 650upx;
+		// height: 160upx;
+		width: 92%;
+		// margin: 30rpx 0;
+		background: #FFFFFF;
+		border-radius: 24upx;
+		padding: 20upx;
+		display: flex;
+		margin-top: 26upx;
+
+		.listitem_rightview {
+			margin-left: 20upx;
+			width: 80%;
+			padding-top: 10rpx;
+
+			.btnview {
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+				margin-top: 12upx;
+				width: 100%;
+			}
+
+			.titleview {
+				display: flex;
+				align-items: flex-end;
+				justify-content: space-between
+			}
+
+			.moneyview {
+				display: flex;
+				align-items: flex-end;
+
+				image {
+					width: 30upx;
+					height: 30upx;
+					margin-left: 20upx;
+					margin-bottom: 2upx;
+				}
+			}
+
+			.item_time {
+				font-size: 24upx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #999999;
+				margin-left: 10upx;
+			}
+
+			.item_money {
+				font-size: 32upx;
+				font-family: PingFang SC;
+				font-weight: 800;
+				color: #FF1200;
+			}
+
+			.item_oldmoney {
+				font-size: 24upx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				text-decoration: line-through;
+				color: #999999;
+				margin-left: 10upx;
+			}
+
+			.item_btn {
+				width: 140upx;
+				height: 56upx;
+				background: linear-gradient(to right, #223845, #00a85b);
+				border-radius: 16upx;
+				text-align: center;
+				line-height: 56upx;
+				font-size: 24upx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #FFFFFF;
+			}
+
+			.item_yishou {
+				font-size: 22upx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #999999;
+			}
+
+			.item_title {
+				font-size: 28upx;
+				font-family: PingFang SC;
+				font-weight: bold;
+				color: #1E1F31;
+			}
+		}
+
+		image {
+			width: 220upx;
+			height: 160upx;
+			border-radius: 24upx;
+		}
+	}
+
+	.jz_btn {
+		width: 170rpx;
+		height: 56upx;
+		background: #096f4b;
+		margin-left: 40rpx;
+		border-radius: 35rpx;
+		line-height: 56upx;
+		text-align: center;
+		font-size: 28rpx;
+		font-family: PingFang SC;
+		font-weight: bold;
+		color: #FFFFFF;
+	}
+
+	.tabber {
+		width: 100%;
+		background: #ffffff;
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		right: 0;
+		justify-content: center;
+		height: 127rpx;
+		padding: 0 30rpx;
+	}
+
+	.box {
+		/* border: 1px solid #005dff; */
+		background: #E8FAE1;
+		border-radius: 4rpx;
+		color: #096f4b;
+		padding: 5upx 10upx;
+		font-size: 22rpx;
+		margin-top: 10rpx;
+	}
+
+	.popup_pay {
+		width: 100%;
+		height: 210px;
+		position: relative;
+		padding-bottom: 45rpx;
+		/* #ifndef MP-WEIXIN */
+		/* height: 130px; */
+		/* #endif */
+
+	}
+
+	.pay_btn {
+		width: 90%;
+		margin: 0 auto;
+		text-align: center;
+		background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
+		height:80rpx;
+		border-radius: 80rpx;
+		color: #ffffff;
+		line-height: 80rpx;
+		font-size: 32rpx;
+	}
+
+	.serverAddress {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+	}
+</style>
\ No newline at end of file
diff --git a/pages.json b/pages.json
index cc9b757..0962b0b 100644
--- a/pages.json
+++ b/pages.json
@@ -511,6 +511,15 @@
 						"titleNView": false
 					}
 				}
+			},{
+				"path": "order/payModifyJsDetail",
+				"style": {
+					"navigationBarTitleText": "技师订单详情",
+					"enablePullDownRefresh": false,
+					"app-plus": {
+						"titleNView": false
+					}
+				}
 			},{
 				"path": "order/payCLDetail",
 				"style": {
diff --git a/pages/therapist/orderDetail.vue b/pages/therapist/orderDetail.vue
index 58c702f..0bc1884 100644
--- a/pages/therapist/orderDetail.vue
+++ b/pages/therapist/orderDetail.vue
@@ -31,14 +31,7 @@
 						
 					</view>
 				</view>
-				<view class="jieshao">
-					<view>
-						自我介绍
-					</view>
-					<view>
-						{{order.content}}
-					</view>
-				</view>
+				
 				<view class="oder-mian">
 					<view class="oder-mian-left">
 						<span>ID:{{order.artificerId}}</span>
@@ -78,6 +71,7 @@
 					</view>
 				</view> -->
 			</view>
+			
 			<view class="oder-foot">
 				<view class="oder-foot-left">
 					<view class="oder-foot-left-view">
@@ -115,6 +109,14 @@
 				</view>
 			</view>
 		</view> -->
+		<view class="jianjie">
+			<view class="jianjie-title">
+				自我介绍
+			</view>
+			<view class="jieshao">
+				{{order.content}}
+			</view>
+		</view>
 		<view class="oder-footer">
 			<u-tabs :list="tabs" :is-scroll="true" :current="tabIndex" @change="tabChange" active-color="#000000"
 				gutter="60">
@@ -554,7 +556,7 @@
 					this.$queue.setData('getJishi',data)
 					this.$queue.setData('xiangmu',massageTypeId)
 					uni.navigateTo({
-						url: "/my/order/payModify"
+						url: "/my/order/payModifyJsDetail"
 					})
 				}
 
@@ -604,6 +606,41 @@
 </script>
 
 <style scoped>
+	.jianjie-title{
+		padding: 0px !important;
+		text-align: left;
+		transition-property: background-color, color;
+		height: 40px;
+		line-height: 40px;
+		font-size: 13px;
+		color: #000000;
+		transition-duration: 0.5s;
+		width: 100%;
+		font-weight: bold;
+	}
+	.jianjie{
+		width: 95%;
+		height: 126px;
+		background: #FFFFFF;
+		border-radius: 10px;
+		margin: 0px auto 10px auto;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		padding: 10px;
+	}
+	.jieshao{
+		width: 100%;
+		margin-top: 15px;
+		font-size: 26rpx;
+		line-height: 40rpx;
+		color: #888;
+		display: -webkit-box;
+		-webkit-box-orient: vertical;
+		-webkit-line-clamp: 2;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		}
 	/deep/.padding-tb-sm{
 		background: #fff;
 		padding: 10px;
@@ -1077,18 +1114,7 @@
 		align-items: center;
 		margin-left: 10px;
 	}
-	.jieshao{
-		margin-top: 15px;
-		margin-bottom: 15px;
-		font-size: 26rpx;
-		line-height: 40rpx;
-		color: #888;
-		display: -webkit-box;
-		-webkit-box-orient: vertical;
-		-webkit-line-clamp: 2;
-		overflow: hidden;
-		text-overflow: ellipsis;
-		}
+	
 	.view-head{
 		padding-bottom: 15px;
 		margin: 15px 24px 0px 24px;