bug修改

components/timeSelect/timeSelect.vue

@@ -150,9 +150,10 @@ export default {
 	.time-select-popup-body-left{
 		height: calc(50vh - 120rpx);
 		    overflow-y: auto;
+			width: 200rpx;
 	}
 	.time-select-popup-body-left-item{
-	  width: 172rpx;
+	  width: 168rpx;
 	  height: 94rpx;
 	  display: block;
 	  font-size:26rpx;

pages/index/confirmYuyue.vue

@@ -54,7 +54,7 @@
 	<view style="height: 120rpx;"></view>
 	<view class="bottom-container">
 		<view>
-			<view class="bottom-container-price"><span class="qianhaospan"v-if="totalPrice" >￥</span> {{totalPrice}} <span></span></view>
+			<view class="bottom-container-price"><span class="qianhaospan" v-if="totalPrice" >￥</span> {{totalPrice}} <span></span></view>
 			<view class="ckj">参考价格（到店支付）</view>
 		</view>
 	  <view  class="newyyBotbutton" :style="{background:'#'+themeColor}" @click="yuyue">立即预约</view>
@@ -85,11 +85,12 @@
 				stationID:'',
 			}
 		},
-		onLoad() {
+		onLoad(opt) {
 			this.themeColor = uni.getStorageSync("themeColor");
 			console.log(this.$store.state.yuyueData)
 			this.yuyueData=this.$store.state.yuyueData;
 			this.stationID=this.yuyueData[0].StationID
+			this.totalPrice=opt.totalPrice
 			//this.carInfo=this.$store.state.carInfo
 			this.userInfo = uni.getStorageSync("userInfo");
 			this.yyshopInfo=uni.getStorageSync("yyshopInfo")

pages/index/discountCard.vue

@@ -42,7 +42,7 @@
 						 <span>{{item.actName}}</span>
 						</view>
 						<view class="plateNumer" v-if="item.plateNumer">限鲁{{item.plateNumer}}使用</view>
-						<view class="time" v-if="item.startTime">有效期：{{item.startTime.slice(0,10)}}-{{item.endTime.slice(0,10)}}</view>
+						<view class="time" v-if="item.startTime">有效期：{{item.startTime.slice(0,10)}}至{{item.endTime.slice(0,10)}}</view>
 						<view class="time" v-else>有效期：领取后{{item.endOffsetDays}}天</view>
 					</view>
 					<view class="rightB">
@@ -347,7 +347,7 @@
 	}
 
 	.use2 {
-
+        padding-right: 8rpx;
 		font-size: 40rpx;
 		font-weight: 500;
 		color: #FF0000;

pages/index/onlineBooking.vue

@@ -432,7 +432,7 @@
 					} else {
 						this.$store.commit('mutationsyuyueData', this.selectedItems)
 						uni.navigateTo({
-							url: 'confirmYuyue'
+							url: 'confirmYuyue?totalPrice='+this.totalPrice
 						})
 					}
 				}

pages/index/rescue.vue

@@ -224,7 +224,29 @@
 				this.$http('openShopHelpSheetOrder/help-type-setting', {
 				 
 				 },'POST').then(res => {
-					this.setting=res.data	
+					this.setting=res.data
+					if(!this.setting){
+						uni.showModal({
+						    title: '提示',
+						    content: '门店不支持救援服务',
+							confirmText:'我知道了',
+							showCancel:false,
+						    success: function (res) {
+																	
+						        if (res.confirm) {
+								   uni.switchTab({
+								   	url:'index'
+								   })
+						        } /* else if (res.cancel) {
+															// uni.hideLoading();
+						          uni.redirectTo({
+						          		url:'../subPack/rescueOrderOrderDetail?id='+id
+						          }) 
+								   
+						        } */
+						    }
+						});
+					}
 				 })
 			},
 			decryptPhoneNumber: function(e) {

pages/subPack/depositDetail.vue

@@ -72,7 +72,8 @@
 			</view>
 		</view>
 		
-		<view style="height: 50rpx;background-color: #F4F5F7;"></view>
+		<view style="height: 110rpx;background-color: #F4F5F7;padding-bottom: constant(safe-area-inset-bottom);
+		padding-bottom: env(safe-area-inset-bottom);"></view>
 		
 		<view class="bottom">
 		 	<view class="defer" :style="{border:'1rpx solid #'+themeColor,color:'#'+themeColor}" @click="seeBy" >查看保养单</view>

pages/subPack/rescueOrderOrderDetail.vue

@@ -182,8 +182,8 @@
 		<view class="bottom">
            <!-- <view class="cancel" @click="cancelBespeak" v-if="orderData.data.groupType==1">取消订单</view> -->
 			<view class="cancel" v-if="orderData.openShopHelpSheet.sheetState == 0" @click="cancelBespeak" >取消订单</view>
-		<!--  -->	<view class="defer" v-if="orderData.openShopHelpSheet.sheetState == 3"  :style="{border:'1rpx solid #'+themeColor,color:'#'+themeColor}" @click="orderevaluate">评价</view>
-			<view class="defer"  v-if="orderData.openShopHelpSheet.sheetState == 5" :style="{border:'1rpx solid #'+themeColor,color:'#'+themeColor}" @click="seeevaluate">查看评价</view>
+		<!--  -->	<view class="defer" v-if="orderData.openShopHelpSheet.sheetState == 3||orderData.openShopHelpSheet.sheetState == 1||orderData.openShopHelpSheet.sheetState == 2"  :style="{border:'1rpx solid #'+themeColor,color:'#'+themeColor}" @click="orderevaluate">评价</view>
+			<!-- <view class="defer"  v-if="orderData.openShopHelpSheet.sheetState == 5" :style="{border:'1rpx solid #'+themeColor,color:'#'+themeColor}" @click="seeevaluate">查看评价</view> -->
 		</view>
 		
 

pages/user/bespeakDetail.vue

@@ -71,7 +71,7 @@
 			<view class="detailedLineBox">
 				<view class="detailedLine" v-for="(v,index) in orderData.orderDetails">
 						<view class="detailedName">{{v.itemName}}</view>
-						<span>￥{{v.amountMoney}}</span>
+						<span v-if="v.amountMoney">￥{{v.amountMoney}}</span>
 				</view>
 				<view class="detailedLine" v-if=" orderData.orderDetails.length!=0">
 						<view class="detailedName">预估总价</view>