bug修改

components/timeSelect/timeSelect.vue

@@ -38,7 +38,7 @@
 
 <script>
 export default {
-	props:['timedata','themeColor'],
+	props:['timedata','themeColor','stationID'],
 	data() {
 		return {
 			show: false,
@@ -89,6 +89,7 @@ export default {
 			var yyshopInfo = uni.getStorageSync("yyshopInfo");
 			this.$http('opendetail/getOrderTimes', {
 				shopId:yyshopInfo.id,
+				stationID:this.stationID
 			}, 'GET').then(res => {
 				uni.hideLoading();
 				this.timeList = res.data || []

pages/index/confirmRescue.vue

@@ -195,7 +195,7 @@
 				  carModel:this.carInfo.carModel,
 				  hEndAddress:this.opt.endAddress,
 				  hStartAddress:this.opt.currentAddress,
-				  orderType:1,
+				  orderType:this.opt.orderType,
 				  hTime:this.opt.time,
 				  hscene:this.jykkNum,
 				  startLng:this.opt.lng,

pages/index/confirmYuyue.vue

@@ -59,7 +59,7 @@
 		</view>
 	  <view  class="newyyBotbutton" :style="{background:'#'+themeColor}" @click="yuyue">立即预约</view>
 	</view>
-	<timeSelect ref="timeSelect" :timedata="timedata" :themeColor="themeColor" @changeTime="changeTime"></timeSelect>
+	<timeSelect ref="timeSelect" :stationID="stationID" :timedata="timedata" :themeColor="themeColor" @changeTime="changeTime"></timeSelect>
 </view>
 </template>
 
@@ -82,12 +82,14 @@
 				yyshopInfo:'',
 				themeColor:'',
 				isgo:true,
+				stationID:'',
 			}
 		},
 		onLoad() {
 			this.themeColor = uni.getStorageSync("themeColor");
 			console.log(this.$store.state.yuyueData)
 			this.yuyueData=this.$store.state.yuyueData;
+			this.stationID=this.yuyueData[0].StationID
 			//this.carInfo=this.$store.state.carInfo
 			this.userInfo = uni.getStorageSync("userInfo");
 			this.yyshopInfo=uni.getStorageSync("yyshopInfo")
@@ -139,7 +141,8 @@
 				  carID: this.carInfo.id,
 				  orderItem: this.yuyueData.map(item => item.ID).join(),
 				  shopId: this.yyshopInfo.id,
-				  unionId: this.userInfo.unionId
+				  unionId: this.userInfo.unionId,
+				  stationID:this.stationID
 				 },'POST').then(res => {
 					    this.isgo=true;
 					    var id=res.data

pages/index/onlineBooking.vue

@@ -353,12 +353,25 @@
 				})
 			},
 			checkItem(item) {
+				item.bizTagId=this.bizTagId;
+				var bizTagId=this.bizTagId;
+				console.log(item)
 				let index = this.selectedItems.findIndex(i => i.ID === item.ID)
 				if (index !== -1) {
 					this.selectedItems.splice(index, 1)
 				} else {
-					this.selectedItems.push(item)
+					this.selectedItems.push(item);
+					this.selectedItems = this.selectedItems.filter(function(i) {
+					  return i.bizTagId==bizTagId
+					})
+					/* this.selectedItems.forEach(i=>{
+						if(i.bizTagId!=this.bizTagId){
+						 
+						}
+					}) */
+					
 				}
+				console.log(this.selectedItems)
 			},
 			goLocation() {
 				var that = this;

pages/index/rescue.vue

@@ -348,10 +348,13 @@
 					});
 					return false
 				} 
-			
+			     var orderType=1;
+				 if(this.tabIndex==1){
+					 orderType=2
+				 }
 				
 				uni.navigateTo({
-					url:'confirmRescue?lat='+this.latitude+"&lng="+this.longitude+"&shopId="+this.shopInfo.ID+'&shopName='+this.shopInfo.ShopName+'&type='+this.typeIndex+'&time='+time+'&currentAddress='+this.currentAddress+'&endAddress='+this.endAddress+'&endLat='+this.endLat+'&endLng='+this.endLng
+					url:'confirmRescue?lat='+this.latitude+"&lng="+this.longitude+"&shopId="+this.shopInfo.ID+'&shopName='+this.shopInfo.ShopName+'&type='+this.typeIndex+'&time='+time+'&currentAddress='+this.currentAddress+'&endAddress='+this.endAddress+'&endLat='+this.endLat+'&endLng='+this.endLng+'&orderType='+orderType
 				})
 				
 				})

pages/subPack/rescueOrder.vue

@@ -39,7 +39,8 @@
 					<view class="renMobilePhone">{{item.MobilePhone}}</view>
 					<view class="renNickName">{{item.NickName?item.NickName:''}}</view>
 				 </view> -->
-				<view class="itemName">{{item.HTime}}</view>
+				<view class="itemName" v-if="item.orderType==1">立刻</view>
+				<view class="itemName" v-else>{{item.HTime}}</view>
                 <view class="itemName" style="padding-top: 2rpx;padding-bottom: 0;">{{item.ShopName}}</view>
 				
 			</view>

pages/subPack/rescueOrderOrderDetail.vue

@@ -69,12 +69,21 @@
 				<view class="informationNum">{{orderData.openShopHelpSheet.code}}<span class="codeCopy"
 						@click="copy(orderData.openShopHelpSheet.code)">复制</span></view>
 			</view>
+			<view class="informationLine">
+				<view class="informationTxt">救援时间：</view>
+				<view class="informationNum" v-if="orderData.openShopHelpSheet.orderType==1">立刻</view>
+				<view class="informationNum" v-else>{{orderData.openShopHelpSheet.hTime}}</view>
+			</view>
 			<view class="informationLine">
 				<view class="informationTxt">救援类型：</view>
-				<view class="informationNum" v-if="orderData.openShopHelpSheet.helpType==1">搭电</view>
-				<view class="informationNum" v-if="orderData.openShopHelpSheet.helpType==2">拖车</view>
-				<view class="informationNum" v-if="orderData.openShopHelpSheet.helpType==3">换胎</view>
-				<view class="informationNum" v-if="orderData.openShopHelpSheet.helpType==4">未知原因</view>
+				<view class="informationNum2" v-if="orderData.openShopHelpSheet.helpType==1">搭电</view>
+				<view class="informationNum2" v-if="orderData.openShopHelpSheet.helpType==2">拖车</view>
+				<view class="informationNum2" v-if="orderData.openShopHelpSheet.helpType==3">换胎</view>
+				<view class="informationNum2" v-if="orderData.openShopHelpSheet.helpType==4">未知原因</view>
+				-
+				<view class="informationNum2" v-if="orderData.openShopHelpSheet.hscene==1">地面</view>
+				<view class="informationNum2" v-if="orderData.openShopHelpSheet.hscene==2">车库</view>
+				<view class="informationNum2" v-if="orderData.openShopHelpSheet.hscene==3">其他</view>
 			</view>
 			<view class="informationLine" v-if="orderData.openShopHelpSheet.plateNumber">
 				<view class="informationTxt">车牌号：</view>
@@ -1179,7 +1188,10 @@ color: #764D49;font-size: 26rpx;padding-top:20rpx;
 		font-size: 26rpx;
 		width: 500rpx;
 	}
-
+.informationNum2{
+	color: #333333;
+	font-size: 26rpx;
+}
 	.codeCopy {
 		width: 77rpx;
 		height: 36rpx;

pages/user/bespeakDetail.vue

@@ -89,7 +89,7 @@
 		</view>
 		
 		<!-- 预约时间 -->
-		<timeSelect ref="timeSelect" :timedata="timedata" @changeTime="changeTime"></timeSelect>	
+		<timeSelect ref="timeSelect" :stationID="stationID" :timedata="timedata" @changeTime="changeTime"></timeSelect>	
 
 	</view>
 </template>
@@ -111,6 +111,7 @@
 				billDate:'',
 				 themeColor:'',
                 iStatusBarHeight:'',
+				stationID:'',
 			}
 		},
 		onLoad(opt) {
@@ -229,6 +230,14 @@
 				}, 'GET').then(res => {
 					uni.hideLoading();
 					this.orderData = res.data;
+					this.stationID=res.data.orderSheet.stationID;
+					uni.setStorage({
+						key: 'yyshopInfo',
+						data: this.orderData.shopInfo,
+						success: function() {
+					
+						}
+					});