1

pages/reserve/designerDetail.vue

@@ -638,7 +638,7 @@
 			},
 			gocoupon(item) { //优惠券详情
 				uni.navigateTo({
-					url: "/pages/reserve/personal/couponDetail?ID=" + item.CouponId,
+					url: "/pages/reserve/personal/couponDetail?ID=" + item.CouponId+'&storeId='+this.storeId,
 				})
 			},
 			gogoods(item) { //商品详情

pages/reserve/goodsDetails.vue

@@ -172,7 +172,7 @@
       </view>
      <view class="submit">
      	<view class="submit-l">
-     		<text>定金：</text>
+     		<text>金额：</text>
      		<text :style="{'color':mc}">￥<text style='font-size: 20px;'>{{g.price}}</text></text>
      	</view>
      	<u-button

pages/reserve/subscribe.vue

@@ -327,10 +327,10 @@
 						:style="{
 							'margin-left':i==0?'15px':'0',
 							'margin-right': i+1==designerList.length?'15px':'5px',
-							'border-color':c.Gender== selectdesigner?'#FF4048':'#D8D8D8',
-							'color':c.Gender== selectdesigner?'#FF4048':'#888888',
-							'background':c.Gender== selectdesigner?'#FBE5E7':'#FFF',
-							'font-weight':c.Gender== selectdesigner?'Bold':'100',
+							'border-color':c.ServiceId== selectdesigner?'#FF4048':'#D8D8D8',
+							'color':c.ServiceId== selectdesigner?'#FF4048':'#888888',
+							'background':c.ServiceId== selectdesigner?'#FBE5E7':'#FFF',
+							'font-weight':c.ServiceId== selectdesigner?'Bold':'100',
 							'padding':i==0?'20px 0':'10px 0',
 							'height':'123px'
 							}">
@@ -359,7 +359,7 @@
 						<u-icon name="arrow" color='#9F9F9F'></u-icon>
 					</view>
 				</view>
-				<view class="info-item" v-if="payId==2">
+				<view class="info-item" v-if="PaymentWay==1">
 					<text class="info-i-l">套餐卡</text>
 					<view class="right" >
 						<text class="content" v-if="courseList.length>0 && Use_Education_Id==0" @click="showCourseHandler">选择套餐卡
@@ -382,9 +382,9 @@
 			</view>
 			<view class="submit">
 				<view class="submit-l">
-					<text v-if="payId==0">线下付款金额：</text>
-					<text v-if="payId==1">预付定金：</text>
-					<text v-if="payId==2">线上付款金额：</text>
+					<text v-if="PaymentWay==4">线下付款金额：</text>
+					<text v-if="PaymentWay==5">预付定金：</text>
+					<text v-if="PaymentWay==1">线上付款金额：</text>
 					<text :style="{'color':mainColor}">￥<text style='font-size: 20px;'>{{Income*value}}</text></text>
 				</view>
 				<u-button
@@ -449,7 +449,7 @@
 				<view class="txtype">
 					<view class="typeitem" v-for="(item, index) in paymentList" :key="index">
 						<Text>{{item.name}}</Text>
-						<u-radio-group v-model="payId">
+						<u-radio-group v-model="PaymentWay">
 							<u-radio  :active-color="mainColor" shape="circle" :name="item.Id" @change="radioChange(item)">
 							</u-radio>
 						</u-radio-group>
@@ -514,7 +514,7 @@
 				paymentList:[],//付款方式的选择
 				
 				payname:'线下付款',
-				payId:0,
+				PaymentWay:0,
 			};
 		},
 		
@@ -616,7 +616,7 @@
 				ProductList.push(obj);
 				//获取套餐卡的处理
 				this.Use_Education_Id=0,
-				this.Income =this.payId==1?this.goods.depositMoney: this.goods.price;
+				this.Income =this.PaymentWay==5?this.goods.depositMoney: this.goods.price;
 				this.EduCationMoney= 0;
 				
 				this.request2({
@@ -657,11 +657,11 @@
 								let obj = {
 									ServiceLogo:'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/timeisup.png',
 									Name:'到点分配',
-									Gender:0,
+									ServiceId:0,
 								}
 								this.designerList.unshift(obj)
 								
-								this.selectdesigner= this.designerList[0].Gender;
+								this.selectdesigner= this.designerList[0].ServiceId;
 								
 								let set = uni.getStorageSync("basedata") ? uni.getStorageSync("basedata").mall.offlineServiceSetting.offlineServicePayType : [];
 								if(set.length>0){
@@ -669,15 +669,15 @@
 									set.forEach(x=>{
 										if(x==1){
 											//data有默认值 这里不做处理
-											let obj = {name:'线下付款',Id:0};
+											let obj = {name:'线下付款',Id:4};
 											this.paymentList.push(obj)
 										}else if(x==2){
 											let obj
 											if(this.goods.depositMoney>0){//预定金额大于0
-												obj =[{name:'预付定金',Id:1},{name:'线上付款',Id:2}]
+												obj =[{name:'预付定金',Id:5},{name:'线上付款',Id:1}]
 												
 											}else{
-												obj =[{name:'线上付款',Id:2}]
+												obj =[{name:'线上付款',Id:1}]
 											}
 											this.paymentList= this.paymentList.concat(obj)
 											
@@ -685,7 +685,8 @@
 									})
 								}
 								this.payname = this.paymentList[0].name;
-								this.payId = this.paymentList[0].Id;
+								this.PaymentWay = this.paymentList[0].Id;
+								this.
 								this.schoolCoupon();//获取套餐卡
 								this.Nosubmit = false;
 							}
@@ -734,7 +735,7 @@
 							},
 							res => {
 								if (res.resultCode == 1 ) {
-									if(form.Income>0 || this.payId!=0){
+									if(form.Income>0 || this.PaymentWay!=4){
 										that.submitOrder = false;
 										that.payBtn = true;
 										that.payInfo.OrderId = res.data.OrderId;
@@ -753,7 +754,7 @@
 								}
 								else{
 									that.$refs.uToast.show({
-										title: res.data.message,
+										title: res.message,
 										type: 'warning'
 									});
 								}
@@ -787,7 +788,7 @@
 				this.selecttime = item;
 			},
 			getdesigner(item){//设计师
-				this.selectdesigner = item.Gender
+				this.selectdesigner = item.ServiceId
 			},
 			valChange(e){
 				this.value = e.value;
@@ -813,8 +814,8 @@
 			},
 			radioChange(item) {
 				this.payname=item.name;
-				this.payId=item.Id;
-				this.Income =this.payId==1?this.goods.depositMoney: this.goods.price;
+				this.PaymentWay=item.Id;
+				this.Income =this.PaymentWay==5?this.goods.depositMoney: this.goods.price;
 				this.show = false;
 			},
 		},