bug修改

components/timeSelect/timeSelect.vue

@@ -87,10 +87,19 @@ export default {
 				title: '加载中'
 			});
 			var yyshopInfo = uni.getStorageSync("yyshopInfo");
-			this.$http('opendetail/getOrderTimes', {
-				shopId:yyshopInfo.id,
-				stationID:this.stationID
-			}, 'GET').then(res => {
+			if(this.stationID){
+				var cs={
+					shopId:yyshopInfo.id,
+					stationID:this.stationID
+				}
+			}else{
+				var cs={
+					shopId:yyshopInfo.id,
+				}
+			}
+			
+			
+			this.$http('opendetail/getOrderTimes', cs, 'GET').then(res => {
 				uni.hideLoading();
 				this.timeList = res.data || []
 				if (!this.timeList[0]) return

pages/index/confirmRescue.vue

@@ -96,7 +96,7 @@
 	<view style="height: 120rpx;"></view>
 	<view class="bottom-container">
 		<view class="heji">
-		  <span>合计</span> <span  style="font-size: 22rpx;color: #FF0000;">￥</span> <span style="font-size: 32rpx;color: #FF0000;" >759</span>
+		  <!-- <span>合计</span> <span  style="font-size: 22rpx;color: #FF0000;">￥</span> <span style="font-size: 32rpx;color: #FF0000;" >759</span> -->
 		</view>
 	  <view  class="newyyBotbutton" :style="{background:'#'+themeColor}" @click="submitOrder">提交订单</view>
 	  <!-- yuyue 老预约-->

pages/index/discountCard.vue

@@ -59,7 +59,7 @@
 					<view  class="rightJian">使用规则
 					  <image src="../../static/img/little_rightArrow.png" mode="" style="width: 24rpx;height: 24rpx;"></image>
 					</view>
-					<view class="gouse" v-if="item.usedState==0" @click="goUseFn(item)">去使用</view>
+					<view class="gouse" v-if="item.state==0" @click="goUseFn(item)">去使用</view>
 				</view>
 				</view>
 

pages/index/discountCardDetail.vue

@@ -82,7 +82,7 @@
 			</view>
 			
 			<view style="height: 120rpx;"></view>
-			<view class="useBox" v-if="detail.usedState==0">
+			<view class="useBox" v-if="detail.state==0">
 				<view class="useBtn" @click="hxHide">去使用</view>
 			</view>
 				

pages/index/paintSure.vue

@@ -216,7 +216,15 @@
 				console.log(data)
 				this.billDate=data
 			},
-			cktime(){
+			cktime(){
+				if (!this.shopID) {
+					uni.showToast({
+						title: '请选择服务门店',
+						icon: 'none',
+						duration: 3000
+					});
+					return false;
+				}
 				 this.$refs.timeSelect.open();
 			},
 			submit() {