订单

my/hongbao/youhuijuanList.vue

@@ -9,7 +9,7 @@
 		</view> -->
 		<view @tap="queding()" class="ticket-button">确定</view>
 		<checkbox-group @change="checkboxChange">
-			<view class="youhui-weiyong youhui-list" v-for="(item,index) in hongbao" :key="index">
+			<view class="youhui-weiyong youhui-list" v-if="priceDd>=item.minMoney" v-for="(item,index) in hongbao" :key="index">
 				<view class="youhui-view-left">
 					<view class="youhui-view-left-yuan">
 						<span class="youhui-view-left-num">{{item.money}}</span>
@@ -71,11 +71,13 @@
 					contentnomore: '没有更多数据了'
 				},
 				couponId:'',
-				content:''
+				content:'',
+				priceDd:''
 			}
 		},
 		onLoad(e) {
 			if(e){
+				this.priceDd=e.price
 				this.content=e.text
 			}
 			this.getMyList();

my/order/pay.vue

@@ -266,7 +266,7 @@
 				</u-button>
 				<u-button v-if="order.status == 10" :custom-style="customStyle2"
 					shape="circle" :plain="true"
-					@click="goNav('/my/order/payModifyDzhifu?ordersId='+order.ordersId,order)"
+					@click="goNav('/my/order/payModifyDd?ordersId='+order.ordersId,order)"
 					class="dingshi">
 					立即预约
 				</u-button>
@@ -1145,7 +1145,7 @@
 				});
 			},
 			goNav(e,item) {
-				this.$queue.setData('daibudan',item);
+				this.$queue.setData('xiangmu',item);
 				uni.navigateTo({
 					url: e
 				})

my/order/payModify.vue

@@ -421,7 +421,7 @@
 			},
 			youhuijuan(){
 				uni.navigateTo({
-					url:'/my/hongbao/youhuijuanList'
+					url:'/my/hongbao/youhuijuanList?price='+this.orderXm.price
 				})
 			},
 			openpay() {//验证

my/order/payModifyDd.vue

@@ -22,16 +22,17 @@
 									<view class="flex justify-between margin-tb-sm" style="color: #999999;">
 										<view style="justify-content: space-between;">
 											{{orderXm.ordersMassageList[0].massageType.duration}}分钟
-											x{{orderXm.massageNum}}
+											
 										</view>
 									</view>
 									<view class="money-pay">
 										<view class="money-pay-zhen">
 											<span>￥</span>
 											<span>{{orderXm.price}}</span>
+											<!-- <span style="color: #666;font-size: 12px;">x{{orderXm.massageNum}}</span> -->
 										</view>
 										<view>
-											<uni-number-box :disabled="true" :width='27' :min="1" @change="changeValue" />
+											<uni-number-box :disabled="true" :value="orderXm.massageNum" :width='27' :min="1" @change="changeValue" />
 										</view>
 									</view>
 								</view>
@@ -92,7 +93,7 @@
 							</view>
 						</view>
 					</view>
-					<view class="liliao" @click="liliaoshi">
+					<view class="liliao" @click="liliaoshi(orderXm)">
 						<view class="liliao-top" style="width: 30%;">
 							<span>理疗师</span>
 							<span v-if="jishiName">{{jishiName.technicianTypeName}}</span>
@@ -325,7 +326,7 @@
 			}
 			this.orderXm=this.$queue.getData('xiangmu');//上一个页面带过来的全部数据
 			this.number=this.orderXm.massageNum
-			console.log("this.orderXm====>",this.orderXm)
+			console.log('this.orderXm',this.orderXm.technicianType)
 			this.youhui()
 			// this.getOrder()
 			// couponMoney
@@ -482,13 +483,15 @@
 							
 				});
 			},
-			liliaoshi(){
+			liliaoshi(item){
+				var that=this
+				// console.log("item",item)
 				uni.setStorage({
 				  key: 'taocanDd',
-				  data: '支付',
+				  data: '订单支付',
 				  success: function () {
 				   uni.navigateTo({
-				   	url: '/pages/therapist/therapistDingdan'
+				   	url: '/pages/therapist/therapistDingdan?technicianType='+that.orderXm.technicianType
 				   })
 				  }
 				});
@@ -657,7 +660,7 @@
 				  serveTime:that.startTime,
 				  userName:that.name,
 				  userId: uni.getStorageSync('userId'),
-				  remarks:that.textareaData,
+				  remark:that.textareaData,
 				  classifyId:that.orderXm.classifyId,
 				  couponId: that.couponId==''?that.huixian.join(','):that.couponId,
 				  longitude:that.longitude,

my/order/payding.vue

@@ -36,7 +36,6 @@
 									<view class="flex justify-between margin-tb-sm" style="color: #999999;">
 										<view style="justify-content: space-between;">
 											{{order.ordersMassageList[0].massageType.duration}}分钟
-											x{{order.massageNum}}
 										</view>
 									</view>
 										
@@ -44,6 +43,7 @@
 										<view class="money-pay-zhen">
 											<span>￥</span>
 											<span>{{order.massagePrice}} </span>
+											<span style="color: #666;font-size: 12px;margin-left: 3px;"> x{{order.massageNum}}</span>
 										</view>
 										<!-- <view class="money-pay-jia">￥298</view> -->
 									</view>

my/order/paydingDd.vue

@@ -36,7 +36,6 @@
 									<view class="flex justify-between margin-tb-sm" style="color: #999999;">
 										<view style="justify-content: space-between;">
 											{{order.ordersMassageList[0].massageType.duration}}分钟
-											x{{order.massageNum}}
 										</view>
 									</view>
 										
@@ -44,6 +43,10 @@
 										<view class="money-pay-zhen">
 											<span>￥</span>
 											<span>{{order.massagePrice}}</span>
+											<!-- <span style="color: #666;font-size: 12px;">x{{order.massageNum}}</span> -->
+										</view>
+										<view>
+											<uni-number-box :disabled="true" :value="order.massageNum" :width='27' :min="1" @change="changeValue" />
 										</view>
 										<!-- <view class="money-pay-jia">￥298</view> -->
 									</view>

pages/index/index.vue

@@ -4,9 +4,7 @@
 			<view class="index-top">
 				<view class="index-top-left font-size-34">盛安到家</view>
 				<view class="index-top-mian">
-					--{{latitude}}--
+					
-					--{{longitude}}--
-					--{{cuowu}}--
 					<view class="index-top-mian-text">
 						<image style="margin-top: 4px;" src="../../static/index-nav-1.png" mode=""></image>
 						<span>实名认证</span>

pages/order/index.vue

@@ -76,7 +76,7 @@
 								拒单详情
 							</u-button>
 							<u-button v-if="item.status == 1" :custom-style="customStyle1" shape="circle" :plain="true"
-								@click="goNav('/my/order/payModifyDzhifu?ordersId='+item.ordersId,item)" class="btns">
+								@click="goNav('/my/order/payModifyDd?ordersId='+item.ordersId,item)" class="btns">
 								去支付
 							</u-button>
 							

pages/therapist/therapistDingdan.vue

@@ -339,16 +339,16 @@
 				socketConnect: null,
 				pointMap: {}, //点map
 				pointThread: null,
-				massageTypeId: null,
 				currentMarkerIndex: -1,
 				showPopup: false,
-				dataIndex:''
+				dataIndex:'',
+				technicianType:''
 			}
 		},
 
 		onLoad(e) {
 			let that = this
-			that.massageTypeId = e.massageTypeId
+			that.technicianType=e.technicianType
 			// that.getLocation();//低精度，快就完事了
 			//    that.getLocation(true);//高精度，慢慢查询
 			uni.getStorage({
@@ -499,6 +499,11 @@
 						uni.reLaunch({
 							url:'/my/wallet/index?artificerId='+e.artificerId+'&text='+'my'
 						})
+					}else if(this.dataIndex=='订单支付'){
+						this.$queue.setData('getJishi',e);
+						uni.reLaunch({
+							url:'/my/order/payModifyDd?artificerId='+e.artificerId+'&text='+'my'
+						})
 					}
 			},
 			switch1Change: function (e) {//地图和列表切换
@@ -795,7 +800,8 @@
 					by: index, //价格
 					latitude: this.latitude,
 					longitude: this.longitude,
-					city: this.city
+					city: this.city,
+					technicianType:this.technicianType
 				}
 				// console.log(data)
 				this.$Request.get("/app/artificer/selectArtificerList", data).then(res => {
@@ -1486,7 +1492,7 @@
 		/* padding: 10px; */
 		display: flex;
 		flex-direction: column;
-		justify-content: space-between;
+		// justify-content: space-between;
 		align-items: baseline;
 	}
 	.list-view{