拖车救援相关

pages/order/components/receiveOrder.vue

@@ -11,7 +11,12 @@
 
 				<view class="modal-body">
 					<text class="tip-text">特别提示：</text>
-					<text class="tip-content">请在接车时，车辆检测时，检测结束后分别拍照留存，完成服务时上传</text>
+					<text class="tip-content" v-if="titleCheckType<20">请在接车时，车辆检测时，检测结束后分别拍照留存，完成服务时上传</text>
+					<text class="tip-content" v-if="titleCheckType>20">1.请在到达现场后拍摄至少3张现场照片，照片中需明确包含救援车辆以及车牌照，并上传；</text>
+					<text class="tip-content" v-if="titleCheckType>20">2.服务过程中拍摄服务照片（含救援车辆的现场照片一张，救援过程中含救援人员的服务照片一张,需送达指定地点时，到达送达地点时照片一张），完成服务时上传。</text>
+
+
+
 				</view>
 
 				<view class="modal-footer">
@@ -25,16 +30,24 @@
 <script>
 	export default {
 		name: 'receive',
-		data() {
-			return {
+		props:{
+			titleCheckType:{
+				type:String,
+				default:''
 			}
 		},
+		data() {
+			return {}
+		},
 		methods: {
 			confirm() {
 				// 这里可以添加确定后的逻辑
-			
+
 				this.$emit('cut')
 			}
+		},
+		mounted() {
+			console.log(this.titleCheckType)
 		}
 	}
 </script>

pages/order/index.vue

@@ -91,7 +91,12 @@
 				</view>
 				<view class="car_id">
 					{{item.licenseNo}}
-					<span>{{item.checkType==0?'上门取车':'送车到站'}}</span>
+				<!-- 	<span>{{item.checkType==0?'上门取车':'送车到站'}}</span> -->
+				<span v-if="item.checkType==0">上门取车</span>
+				<span v-if="item.checkType==1">送车到站</span>
+				<span v-if="item.checkType==21">搭电救援</span>
+				<span v-if="item.checkType==22">换胎救援</span>
+				<span v-if="item.checkType==23">拖车救援</span>
 				</view>
 				<view class="name">
 					{{item.productName}}
@@ -111,12 +116,16 @@
 					<view class="btn border">
 						联系客户
 					</view>
-					<view class="btn join" @click.stop="receive(item)" v-if="item.statusCode ==2" style="margin-left: 16rpx;">
+					<!-- 03显示救援接单 -->
+					<view class="btn join" @click.stop="receive(item)" v-if="item.checkType<20 && item.statusCode ==2" style="margin-left: 16rpx;">
+						接单
+					</view>
+					<view class="btn join" @click.stop="receive(item)" v-if="item.checkType>20 && item.flowStatus =='03'" style="margin-left: 16rpx;">
 						接单
 					</view>
 					<!-- 送车到站按钮区域开始item.checkType==1 -->
 					<view class="" v-if="item.checkType==1" style="flex:1;display: flex;justify-content: space-around;">
-						<view class="btn join" @click.stop="collect(item)" v-if="item.statusCode ==3">
+						<view class="btn join" @click.stop="collect(item)" v-if="item.statusCode ==3 && item.flowStatus =='05'">
 							确认收车
 						</view>
 						<view class="btn join" @click.stop="finish(item)" v-if="item.statusCode ==4">
@@ -125,8 +134,7 @@
 						<view class="btn join" @click.stop="takeCar(item)" v-if="item.statusCode ==5 && item.flowStatus =='12'">
 							确认取车
 						</view>
-						<view class="btn join" @click.stop="evaluate(item)"
-							v-if="(item.statusCode ==6 || item.statusCode ==5) && item.flowStatus !=='17' ">
+						<view class="btn join" @click.stop="evaluate(item)" v-if="item.flowStatus =='16' ">
 							去评价
 						</view>
 					</view>
@@ -149,14 +157,36 @@
 						<view class="btn join" @click.stop="delivered(item)" v-if="item.statusCode ==3&& item.flowStatus==13">
 							车已送达
 						</view>
-						<view class="btn join" @click.stop="evaluate(item)"
-							v-if=" item.flowStatus =='16' ">
+						<view class="btn join" @click.stop="evaluate(item)" v-if=" item.flowStatus =='16' ">
 							去评价
 						</view>
 					</view>
+					
 					<!-- 上门取车按钮区域结束 -->
+					<!-- 救援相关按钮 -->
+					<view class=""v-if="item.checkType >20 " style="flex:1;display: flex;justify-content: space-around;">
+						<!--flowStatus == 04 显示-->
+						<view class="btn join" @click.stop="depart(item)" v-if="item.flowStatus == '04'">
+							出发
+						</view>
+						<view class="btn join" @click.stop="arrive(item)" v-if="item.flowStatus == '05'">
+							到达现场
+						</view>
+						<view class="btn join" @click.stop="help(item)"
+							v-if="item.statusCode ==4 && item.flowStatus=='07' || item.flowStatus=='06'|| item.flowStatus=='08'">
+							救援完成
+						</view>
+						<view class="btn join" @click.stop="evaluate(item)" v-if=" item.flowStatus =='12' ">
+							去评价
+						</view>
+					</view>
+				</view>
+				<!-- 年审 -->
+				<view class="add_service" @click.stop="addService(item)" v-if="item.checkType<20 &&item.statusCode==4 ">
+					<span>添加收费服务</span>
 				</view>
-				<view class="add_service" @click.stop="addService(item)" v-if="item.statusCode==4 ||item.statusCode==3 ">
+				<!-- 救援 -->
+				<view class="add_service" @click.stop="addService(item)" v-if="item.checkType>20&&item.flowStatus== '06' ">
 					<span>添加收费服务</span>
 				</view>
 				<view class="child_order">
@@ -186,7 +216,7 @@
 			</view>
 		</mescroll-uni>
 		<rangTime ref="rangTime" :mode="mode" :isYear="true" @onSubmit="onEndTimeChange" @cut="cutPopup" />
-		<receive @cut="isReceive =false" v-if="isReceive" />
+		<receive @cut="isReceive =false" v-if="isReceive" :titleCheckType="titleCheckType"/>
 		<serviceDetail :subOrderId="subOrderId" @cut="cutsubOrderId" v-if="isServiceDeatil" />
 		<upload :type="uptype" :taskId="taskId" v-if="isUpload" @cut="isUpload = false" @upSuccess="upSuccess" />
 		<evaluate :userId="userId" :taskId="taskId" v-if="iseEvaluate" @cut="cutEvaluate" />
@@ -288,7 +318,8 @@
 				servicePage: {
 					num: 1,
 					size: 10
-				}
+				},
+				titleCheckType:null,//接单提示区分
 			}
 		},
 		methods: {
@@ -414,13 +445,14 @@
 			// 接单
 			receive(item) {
 				console.log(item)
-				
+				this.titleCheckType = item.checkType
 				let data = {
 					taskId: item.taskId,
 					checkType: item.checkType,
 					paramState: '04', //商户接单成功
-					serveType: '01'
+					// serveType: '01'//救援02
 				}
+				item.checkType<20?data.serveType = '01':data.serveType = '02'
 				this.$http.post("/ts/merchant/update/Serve", data).then(res => {
 					if (res.data.code == 200) {
 						this.isReceive = true
@@ -441,29 +473,27 @@
 				//0 取车，1送车
 				if (item.checkType == 0) {
 					//收车
-					if (item.statusCode == 5) {
+					// if (item.statusCode == 5) {
 						this.uptype = 1
-					} else if (item.statusCode == 4) {
-						this.uptype = 3
-					}
+					// }
+					//  else if (item.statusCode == 4) {
+					// 	this.uptype = 3
+					// }
 				} else if (item.checkType == 1) {
 					//客户送车，商户收车
-					if (item.statusCode == 3) {
+					// if (item.statusCode == 3) {
 						this.uptype = 2
-					} else {
+					// }
+					/* else {
 						this.uptype = 3
-					}
+					} */
 				}
-				this.isUpload = true
-				// this.upSuccess('07','01')
 				this.paramState = '07'
 				this.serveType = '01'
-				this.serviceList = []
-								let page = {
-									num: 1,
-									size: 10
-								}
-								this.getserviceList(page)
+				this.isUpload = true
+				// this.upSuccess('07','01')
+				
+
 			},
 			//送车到站————检测完成
 			upSuccess() {
@@ -477,11 +507,24 @@
 				this.$http.post("/ts/merchant/update/Serve", data).then(res => {
 					if (res.data.code == 200) {
 						this.isUpload = false
+						this.serviceList = []
+						let page = {
+							num: 1,
+							size: 10
+						}
+						this.getserviceList(page)
+					} else {
+						this.isUpload = false
+						this.serviceList = []
 						let page = {
 							num: 1,
 							size: 10
 						}
 						this.getserviceList(page)
+						uni.showToast({
+							icon: 'none',
+							title: res.data.message
+						})
 					}
 				})
 			},
@@ -490,28 +533,29 @@
 				console.log(item)
 				this.taskId = item.taskId
 				this.checkType = item.checkType
+				this.uptype = 3
 				//0 取车，1送车
-				if (item.checkType == 0) {
-					if (item.statusCode == 5) {
-						this.uptype = 1
-					}
+				// if (item.checkType == 0) {
+				// 	// if (item.statusCode == 5) {
+				// 		this.uptype = 1
+				// 	// }
 
-				} else if (item.checkType == 1) {
-					//客户送车，商户收车
-					if (item.statusCode == 4) {
-						this.uptype = 3
+				// } else if (item.checkType == 1) {
+				// 	//客户送车，商户收车
+				// 	if (item.statusCode == 4) {
+				// 		this.uptype = 3
 
-					}
-				}
+				// 	}
+				// }
 				this.isUpload = true
 				this.paramState = '12'
 				this.serveType = '01'
 				this.serviceList = []
-								let page = {
-									num: 1,
-									size: 10
-								}
-								this.getserviceList(page)
+				let page = {
+					num: 1,
+					size: 10
+				}
+				this.getserviceList(page)
 			},
 			//送车到站--确认取车
 			takeCar(item) {
@@ -525,6 +569,7 @@
 				this.$http.post("/ts/merchant/update/Serve", data).then(res => {
 					if (res.data.code == 200) {
 						this.isUpload = false
+						this.serviceList = []
 						let page = {
 							num: 1,
 							size: 10
@@ -545,6 +590,12 @@
 			cutEvaluate() {
 				this.iseEvaluate = false
 				uni.showTabBar()
+				this.serviceList = []
+				let page = {
+					num: 1,
+					size: 10
+				}
+				this.getserviceList(page)
 			},
 			//查看收费服务明细
 			lookDetail(item) {
@@ -594,7 +645,7 @@
 						that.$http.post("/ts/merchant/update/Serve", data).then(res => {
 							if (res.data.code == 200) {
 								// this.isReceive = true
-								
+
 							}
 						})
 					},
@@ -603,6 +654,53 @@
 					},
 				})
 			},
+			//救援出发
+			depart(item){
+				console.log(item)
+				let data = {
+					taskId: item.taskId,
+					checkType: item.checkType,
+					paramState: '05', //商户出发成功
+					serveType: '02'
+				}
+				this.$http.post("/ts/merchant/update/Serve", data).then(res => {
+					if (res.data.code == 200) {
+						// this.isReceive = true
+								this.serviceList = []
+								let page = {
+									num: 1,
+									size: 10
+								}
+								this.getserviceList(page)
+					}
+				})
+				
+			},
+			//救援到达现场
+			arrive(item){
+				this.taskId = item.taskId
+				this.checkType = item.checkType
+				this.uptype = 4//道路救援
+				this.paramState = '06'
+				this.serveType = '02'
+				this.isUpload = true
+			},
+			//救援完成拍照
+			help(item){
+				console.log(item)
+				this.taskId = item.taskId
+				this.checkType = item.checkType
+				this.uptype = 3
+				this.isUpload = true
+				this.paramState = '11'
+				this.serveType = '02'
+				this.serviceList = []
+				let page = {
+					num: 1,
+					size: 10
+				}
+				this.getserviceList(page)
+			},
 			//添加收费服务
 			addService(item) {
 				uni.navigateTo({
@@ -620,6 +718,7 @@
 				}
 				this.$http.post("/ts/merchant/update/Serve", data).then(res => {
 					if (res.data.code == 200) {
+						this.serviceList = []
 						let page = {
 							num: 1,
 							size: 10
@@ -638,6 +737,7 @@
 				}
 				this.$http.post("/ts/merchant/update/Serve", data).then(res => {
 					if (res.data.code == 200) {
+						this.serviceList = []
 						let page = {
 							num: 1,
 							size: 10
@@ -652,14 +752,21 @@
 			// this.getList()
 		},
 		onShow() {
+
 			let that = this
 			uni.getStorage({
 				key: 'login_user_info',
 				success: function(res) {
 					that.merchantId = res.data.merchantId
+					that.serviceList = []
+					let page = {
+						num: 1,
+						size: 10
+					}
+					that.getserviceList(page)
 				}
 			})
-		}
+		},
 	}
 </script>
 

pages/order/serviceOrder/orderDetail.vue

@@ -91,9 +91,16 @@
 								<view class="button">
 									<u-button size="mini" shape="square" v-if="index+1 == form.flowRecordList.length"
 										@click="goLive">实况记录</u-button>
-									<u-button size="mini" shape="square" v-if="item.content=='商户确认收车'" @click="goPhoto(checkType == 0 ? 1 : 2)">车辆交接照片</u-button>
-									<u-button size="mini" shape="square" v-if="checkType== 1 && item.content=='检测完毕，等待用户取车'" @click="goPhoto(3)">服务照片</u-button>
-									<u-button size="mini" shape="square" v-if="checkType== 0 && item.content=='检测完成，准备送车'" @click="goPhoto(3)">服务照片</u-button>
+									<u-button size="mini" shape="square" v-if="item.content=='商户确认收车'"
+										@click="goPhoto(checkType == 0 ? 1 : 2)">车辆交接照片</u-button>
+									<u-button size="mini" shape="square" v-if="checkType== 1 && item.content=='检测完毕，等待用户取车'"
+										@click="goPhoto(3)">服务照片</u-button>
+									<u-button size="mini" shape="square" v-if="checkType== 0 && item.content=='检测完成，准备送车'"
+										@click="goPhoto(3)">服务照片</u-button>
+									<u-button size="mini" shape="square" v-if="item.content=='正在救援中'"
+										@click="goPhoto(4)">现场照片</u-button>
+									<u-button size="mini" shape="square" v-if="item.content=='等待用户确认'"
+										@click="goPhoto(3)">服务照片</u-button>
 								</view>
 							</view>
 						</template>
@@ -181,7 +188,7 @@
 					<view class="item_title">
 						附订单信息
 					</view>
-					<view class="item_child" >
+					<view class="item_child">
 						<span>订单号：</span>
 						<view class="center">
 							{{item.orderNo}}
@@ -205,7 +212,7 @@
 				接单
 			</view>
 			<view class="func" v-if="form.checkType == 1">
-				<view class="accept" @click="collect" v-if="form.statusCode ==3">
+				<view class="accept" @click="collect" v-if="form.statusCode ==3 && form.flowStatus =='05'">
 					确认收车
 				</view>
 				<view class="accept" @click="goProject" v-if=" form.statusCode ==4">
@@ -228,6 +235,9 @@
 				<view class="accept" @click="collect" v-if="form.statusCode ==5 && form.flowStatus == 5">
 					确认取车
 				</view>
+				<view class="accept" @click="goProject" v-if=" form.statusCode ==4">
+					添加收费服务
+				</view>
 				<view class="accept" @click="finish" v-if="form.statusCode ==4 && form.flowStatus==7 || form.flowStatus==8">
 					检测完成
 				</view>
@@ -237,17 +247,32 @@
 				<view class="accept" @click.stop="delivered" v-if="form.statusCode ==3&& form.flowStatus==13">
 					车已送达
 				</view>
-				<view class="accept" @click.stop="evaluat" v-if=" form.flowStatus =='16' ">
+				<view class="accept" @click.stop="evaluate" v-if=" form.flowStatus =='16' ">
+					去评价
+				</view>
+
+			</view>
+			<view class="func" v-if="form.checkType>20">
+				<view class="accept" @click.stop="depart" v-if="form.flowStatus == '04'">
+					出发
+				</view>
+				<view class="accept" @click.stop="arrive" v-if="form.flowStatus == '05'">
+					到达现场
+				</view>
+				<view class="accept" @click.stop="help"
+					v-if="form.statusCode ==4 && form.flowStatus=='07' || form.flowStatus=='06'|| form.flowStatus=='08'">
+					救援完成
+				</view>
+				<view class="accept" @click.stop="evaluate" v-if=" form.flowStatus =='12' ">
 					去评价
 				</view>
-				
 			</view>
-			
+
 		</view>
 		<receive v-if="isSuccess" @cut="refresh" />
 		<upload :type="uptype" :taskId="taskId" v-if="isUpload" @cut="isUpload = false" @upSuccess="upSuccess" />
 		<serviceDetail :subOrderId="subOrderId" @cut="isServiceDeatil =false" v-if="isServiceDeatil" />
-		<evaluate :userId="userId" :taskId="taskId" v-if="iseEvaluate" @cut="cutEvaluate"/>
+		<evaluate :userId="userId" :taskId="taskId" v-if="iseEvaluate" @cut="cutEvaluate" />
 	</view>
 </template>
 
@@ -275,9 +300,9 @@
 				checkType: '', //上传图片修改状态用
 				isServiceDeatil: false,
 				subOrderId: '',
-				iseEvaluate:false,//评论弹窗显隐
-				userId:'',//传值给评论弹窗
-				paramState:null,
+				iseEvaluate: false, //评论弹窗显隐
+				userId: '', //传值给评论弹窗
+				paramState: null,
 			}
 		},
 		methods: {
@@ -287,7 +312,7 @@
 				// 	delta: 1
 				// });
 				uni.switchTab({
-					url:'/pages/order/index'
+					url: '/pages/order/index'
 				})
 			},
 			refresh() {
@@ -313,7 +338,7 @@
 			goPhoto(type) {
 				console.log(type)
 				uni.navigateTo({
-					url: '/pages/order/serviceOrder/photo?taskId='+this.taskId+'&businessType='+type
+					url: '/pages/order/serviceOrder/photo?taskId=' + this.taskId + '&businessType=' + type
 				})
 			},
 			// 接单
@@ -322,12 +347,14 @@
 					taskId: this.taskId,
 					checkType: this.checkType,
 					paramState: '04',
-					serveType: '01'
+					// serveType: '01'
 				}
+				item.checkType < 20 ? data.serveType = '01' : data.serveType = '02'
 				this.$http.post("/ts/merchant/update/Serve", data).then(res => {
 					console.log(res)
 					if (res.data.code == 200) {
 						this.isSuccess = true
+						this.getDeatil()
 					}
 				})
 			},
@@ -338,57 +365,54 @@
 				this.checkType = this.form.checkType
 				//0 取车，1送车
 				if (this.form.checkType == 0) {
-
+					this.uptype = 1
 				} else if (this.form.checkType == 1) {
 					//客户送车，商户收车
-					if (this.form.statusCode == 3) {
-						this.uptype = 2
+					// if (this.form.statusCode == 3) {
+					this.uptype = 2
 
-					}
+					// }
 				}
 				this.isUpload = true
 			},
 			//送车到站————收车上传图片后修改状态
-			upSuccess(){
+			upSuccess() {
 				let data = {
 					taskId: this.taskId,
 					checkType: this.checkType,
-					paramState: this.paramState,//商户上传图片成功
+					paramState: this.paramState, //商户上传图片成功
 					serveType: '01'
 				}
 				this.$http.post("/ts/merchant/update/Serve", data).then(res => {
 					if (res.data.code == 200) {
 						this.isUpload = false
 						this.getDeatil()
+					} else {
+						uni.showToast({
+							icon: 'none',
+							title: res.data.message
+						})
 					}
 				})
 			},
 			//检测完成上传检测图片
-			finish(item){
+			finish(item) {
 				this.paramState = '12'
 				// this.taskId = item.taskId
 				// this.checkType = item.checkType
 				//0 取车，1送车
-				if (item.checkType == 0) {
-					
-				}else if(item.checkType == 1 ){
-					//客户送车，商户收车
-					if (item.statusCode == 4) {
-						this.uptype=3
-						
-					}
-				}
+				this.uptype = 3
 				this.isUpload = true
 				// this.paramState = '12'
 				// this.serveType = '01'
 				this.getDeatil()
 			},
 			//送车到站--确认取车
-			takeCar(item){
+			takeCar(item) {
 				let data = {
 					taskId: this.form.taskId,
 					checkType: this.form.checkType,
-					paramState: '14',//
+					paramState: '14', //
 					serveType: '01'
 				}
 				this.$http.post("/ts/merchant/update/Serve", data).then(res => {
@@ -416,14 +440,120 @@
 				this.isServiceDeatil = true
 			},
 			//评价弹窗显示
-			evaluate(){
+			evaluate() {
 				this.iseEvaluate = true
-				this.userId =this.form.userId
+				this.userId = this.form.userId
 			},
-			cutEvaluate(){
+			cutEvaluate() {
 				this.iseEvaluate = false
 				this.getDeatil()
-			}
+			},
+			//商户去取车
+			goGetCar(item) {
+				console.log(item)
+				let data = {
+					taskId: this.form.taskId,
+					checkType: this.form.checkType,
+					paramState: '05', //商户接单成功
+					serveType: '01'
+				}
+
+
+				let that = this
+				// uni.navigateTo({
+				// 		url: (window.location.href = `https://uri.amap.com/navigation?to=${item.userLongitude},${item.userLatitude},${item.carAddress}&mode=car&policy=1&src=https://gawl.gazhcs.com/wap/index.html&callnative=0`)
+				// })
+
+				uni.openLocation({
+					longitude: Number(item.userLongitude),
+					latitude: Number(item.userLatitude),
+					name: item.carAddres, // 位置名称
+					// address: e.F_Address, // 位置地点
+					success: function(res) {
+						console.log('打开系统位置地图成功')
+						that.$http.post("/ts/merchant/update/Serve", data).then(res => {
+							if (res.data.code == 200) {
+								// this.isReceive = true
+								that.getDeatil()
+
+							}
+						})
+					},
+					fail: function(error) {
+						console.log(error)
+					},
+				})
+			},
+			goAlso() {
+				let data = {
+					taskId: this.form.taskId,
+					checkType: this.form.checkType,
+					paramState: '13', //商户点击去送车
+					serveType: '01'
+				}
+				this.$http.post("/ts/merchant/update/Serve", data).then(res => {
+					if (res.data.code == 200) {
+						let page = {
+							num: 1,
+							size: 10
+						}
+						this.getDeatil()
+					}
+				})
+			},
+			//商户点击车已送达
+			delivered() {
+				let data = {
+					taskId: this.form.taskId,
+					checkType: this.form.checkType,
+					paramState: '14', //商户点击车已送达
+					serveType: '01'
+				}
+				this.$http.post("/ts/merchant/update/Serve", data).then(res => {
+					if (res.data.code == 200) {
+						let page = {
+							num: 1,
+							size: 10
+						}
+						this.getDeatil()
+					}
+				})
+			},
+			//救援出发
+			depart() {
+				let data = {
+					taskId: this.form.taskId,
+					checkType: this.form.checkType,
+					paramState: '05', //商户出发成功
+					serveType: '02'
+				}
+				this.$http.post("/ts/merchant/update/Serve", data).then(res => {
+					if (res.data.code == 200) {
+						// this.isReceive = true
+						this.getDeatil()
+					}
+				})
+
+			},
+			//救援到达现场
+			arrive() {
+				this.taskId = this.form.taskId
+				this.checkType = this.form.checkType
+				this.uptype = 4 //道路救援
+				this.paramState = '06'
+				this.serveType = '02'
+				this.isUpload = true
+				this.getDeatil()
+			},
+			help() {
+				this.taskId = this.form.taskId
+				this.checkType = this.form.checkType
+				this.uptype = 3
+				this.isUpload = true
+				this.paramState = '11'
+				this.serveType = '02'
+				this.getDeatil()
+			},
 		},
 		mounted() {
 			this.getDeatil()
@@ -656,11 +786,12 @@
 				.sun_product {
 					width: 100%;
 					// height: 126rpx;
-					
-				
+
+
 					border-radius: 12rpx;
 					margin-top: 20rpx;
-					.item{
+
+					.item {
 						margin-bottom: 20rpx;
 						padding: 12rpx 16rpx;
 						background: linear-gradient(180deg, #EEF7FF 0%, #F6FBFF 100%);
@@ -777,6 +908,7 @@
 			margin-top: 10rpx;
 			font-size: 28rpx;
 			padding-right: 24rpx;
+
 			.customer {
 				border-radius: 49rpx;
 				border: 1px solid #2D88F4;
@@ -797,11 +929,13 @@
 				margin: 0 24rpx;
 				color: #FFFFFF;
 			}
-			.func{
+
+			.func {
 				// flex: 1;
 				display: flex;
 				align-items: center;
 				justify-content: end;
+
 				.accept {
 					display: flex;
 					align-items: center;

pages/order/serviceOrder/photo.vue

@@ -5,22 +5,23 @@
 		<view class="head">
 			<span class="cuIcon-back" @click="back"></span>
 			<view class="case">
-				车辆照片
+				
+				{{businessType==3?'车辆照片':'现场照片'}}
 			</view>
 		</view>
 		<view class="content">
 			<view class="img" v-for="(item,index) in imgList" :key="index">
 				<image :src="item.imgUrl" mode=""></image>
-				<span v-if="item.imgType == 1">正前方</span>
-				<span v-if="item.imgType == 4">车辆后侧</span>
-				<span v-if="item.imgType == 2">车辆左侧</span>
-				<span v-if="item.imgType == 3">车辆右侧</span>
-				<span v-if="item.imgType == 6">驾驶室</span>
-				<span v-if="item.imgType == 5">左前方45度全车照</span>
-				<span v-if="item.imgType == 7">后排座</span>
-				<span v-if="item.imgType == 8">服务前</span>
-				<span v-if="item.imgType == 9">服务中</span>
-				<span v-if="item.imgType == 10">服务后</span>
+					<span v-if="item.imgType == 1 &&businessType != 4">正前方</span>
+					<span v-if="item.imgType == 4 &&businessType != 4">车辆后侧</span>
+					<span v-if="item.imgType == 2  &&businessType != 4">车辆左侧</span>
+					<span v-if="item.imgType == 3  &&businessType != 4">车辆右侧</span>
+					<span v-if="item.imgType == 6  &&businessType != 4">驾驶室</span>
+					<span v-if="item.imgType == 5  &&businessType != 4">左前方45度全车照</span>
+					<span v-if="item.imgType == 7  &&businessType != 4">后排座</span>
+					<span v-if="item.imgType == 8  &&businessType != 4">服务前</span>
+					<span v-if="item.imgType == 9  &&businessType != 4">服务中</span>
+					<span v-if="item.imgType == 10  &&businessType != 4">服务后</span>
 			</view>
 		</view>
 		<view class="btn">
@@ -32,44 +33,43 @@
 </template>
 
 <script>
-	export default{
-		data(){
-			return{
-				taskId:'',
-				businessType:'',
-				imgList:[
-					{
-						url:'/static/blue.png',
-						address:'正前方'
+	export default {
+		data() {
+			return {
+				taskId: '',
+				businessType: '',
+				imgList: [{
+						url: '/static/blue.png',
+						address: '正前方'
 					},
 					{
-						url:'/static/blue.png',
-						address:'车辆后侧'
+						url: '/static/blue.png',
+						address: '车辆后侧'
 					},
 					{
-						url:'/static/blue.png',
-						address:'车辆左侧'
+						url: '/static/blue.png',
+						address: '车辆左侧'
 					},
 					{
-						url:'/static/blue.png',
-						address:'正前方'
+						url: '/static/blue.png',
+						address: '正前方'
 					},
 					{
-						url:'/static/blue.png',
-						address:'正前方'
+						url: '/static/blue.png',
+						address: '正前方'
 					},
 					{
-						url:'/static/blue.png',
-						address:'正前方'
+						url: '/static/blue.png',
+						address: '正前方'
 					},
 					{
-						url:'/static/blue.png',
-						address:'正前方'
+						url: '/static/blue.png',
+						address: '正前方'
 					}
 				]
 			}
 		},
-		methods:{
+		methods: {
 			//返回
 			back() {
 				uni.navigateBack({
@@ -77,24 +77,26 @@
 				});
 			},
 			//查看照片
-			getImg(){
+			getImg() {
 				let data = {
-					taskId : this.taskId,
-					businessType : Number(this.businessType)
+					taskId: this.taskId,
+					businessType: Number(this.businessType)
 				}
-				this.$http.get("/ts/merchant/selectImg?taskId="+this.taskId+'&businessType='+Number(this.businessType)).then(res => {
-					console.log(res)
-					if (res.data.code == 200) {
-						// this.isSuccess = true
-						this.imgList = res.data.result
-						
-					}
-				})
+				this.$http.get("/ts/merchant/selectImg?taskId=" + this.taskId + '&businessType=' + Number(this.businessType))
+					.then(res => {
+						console.log(res)
+						if (res.data.code == 200) {
+							// this.isSuccess = true
+							this.imgList = res.data.result
+
+						}
+					})
 			}
 		},
 		onLoad(options) {
 			this.taskId = options.taskId
 			this.businessType = options.businessType
+			console.log(options.businessType)
 		},
 		onShow() {
 			this.getImg()
@@ -103,7 +105,7 @@
 </script>
 
 <style lang="scss" scoped>
-	.photo{
+	.photo {
 		width: 100vw;
 		height: 100vh;
 		background: #F8F8FA;
@@ -142,15 +144,17 @@
 				font-weight: 600;
 			}
 		}
-		.content{
+
+		.content {
 			flex: 1;
 			overflow-y: auto;
 			padding: 24rpx 28rpx;
 			display: flex;
 			justify-content: space-between;
 			flex-wrap: wrap;
-			 // gap: 24rpx;
-			.img{
+
+			// gap: 24rpx;
+			.img {
 				width: 320rpx;
 				height: 194rpx;
 				border-radius: 4rpx;
@@ -158,11 +162,15 @@
 				position: relative;
 				margin-bottom: 33rpx;
 				display: flex;
-				image{
+
+				image {
 					width: 100%;
 					height: 100%;
 				}
-				span{
+
+				.tag {}
+
+				span {
 					position: absolute;
 					display: block;
 					padding: 2px 4px;
@@ -175,7 +183,8 @@
 				}
 			}
 		}
-		.btn{
+
+		.btn {
 			width: 100%;
 			height: 112rpx;
 			background: #FFFFFF;
@@ -185,10 +194,11 @@
 			margin-top: 10rpx;
 			font-size: 28rpx;
 			padding: 24rpx 16rpx;
-			.back{
+
+			.back {
 				width: 100%;
 				height: 100%;
-				background: linear-gradient( 90deg, #77B6FF 0%, #449AFF 100%);
+				background: linear-gradient(90deg, #77B6FF 0%, #449AFF 100%);
 				border-radius: 53rpx;
 				display: flex;
 				align-items: center;

pages/order/serviceOrder/project.vue

@@ -91,11 +91,16 @@
 			}
 		},
 		methods: {
+			
 			//返回
 			back() {
-				uni.navigateBack({
-					delta: 1
-				});
+				// uni.navigateBack();
+				// uni.navigateBack({
+				// 	delta: 1
+				// });
+				uni.switchTab({
+					url:'/pages/order/index'
+				})
 			},
 			//关闭时置空
 			change(item) {