检车流程

pages/order/components/evaluate.vue

@@ -92,6 +92,7 @@
 			}
 		},
 		mounted() {
+			console.log(this.taskId)
 			this.getTag()
 		}
 	}

pages/order/index.vue

@@ -150,7 +150,7 @@
 							车已送达
 						</view>
 						<view class="btn join" @click.stop="evaluate(item)"
-							v-if="(item.statusCode ==6 || item.statusCode ==5) && item.flowStatus !=='17' ">
+							v-if=" item.flowStatus =='16' ">
 							去评价
 						</view>
 					</view>
@@ -414,6 +414,7 @@
 			// 接单
 			receive(item) {
 				console.log(item)
+				
 				let data = {
 					taskId: item.taskId,
 					checkType: item.checkType,
@@ -423,6 +424,7 @@
 				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
@@ -456,6 +458,12 @@
 				// this.upSuccess('07','01')
 				this.paramState = '07'
 				this.serveType = '01'
+				this.serviceList = []
+								let page = {
+									num: 1,
+									size: 10
+								}
+								this.getserviceList(page)
 			},
 			//送车到站————检测完成
 			upSuccess() {
@@ -498,6 +506,12 @@
 				this.isUpload = true
 				this.paramState = '12'
 				this.serveType = '01'
+				this.serviceList = []
+								let page = {
+									num: 1,
+									size: 10
+								}
+								this.getserviceList(page)
 			},
 			//送车到站--确认取车
 			takeCar(item) {
@@ -523,7 +537,7 @@
 			evaluate(item) {
 				console.log(item)
 				this.iseEvaluate = true
-				this.taskId = item.evaluate
+				this.taskId = item.taskId
 				this.userId = item.userId
 				uni.hideTabBar()
 			},
@@ -564,6 +578,12 @@
 				// 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`)
 				// })
+				this.serviceList = []
+				let page = {
+					num: 1,
+					size: 10
+				}
+				this.getserviceList(page)
 				uni.openLocation({
 					longitude: Number(item.userLongitude),
 					latitude: Number(item.userLatitude),
@@ -574,11 +594,7 @@
 						that.$http.post("/ts/merchant/update/Serve", data).then(res => {
 							if (res.data.code == 200) {
 								// this.isReceive = true
-								let page = {
-									num: 1,
-									size: 10
-								}
-								that.getserviceList(page)
+								
 							}
 						})
 					},

pages/order/serviceOrder/orderDetail.vue

@@ -217,18 +217,18 @@
 				<view class="accept" @click="takeCar" v-if="form.flowStatus =='12'&& form.statusCode ==5">
 					确认取车
 				</view>
-				<view class="accept" @click="evaluate" v-if="form.flowStatus =='14'&& form.statusCode ==5">
+				<view class="accept" @click="evaluate" v-if=" form.flowStatus =='16'">
 					去评价
 				</view>
 			</view>
 			<view class="func" v-if="form.checkType==0">
-				<view class="accept" @click="collect" v-if="form.statusCode ==3">
+				<view class="accept" @click="goGetCar" v-if="form.statusCode ==5 && form.flowStatus == 4">
 					去取车
 				</view>
-				<view class="accept" @click="collect" v-if="form.statusCode ==3">
+				<view class="accept" @click="collect" v-if="form.statusCode ==5 && form.flowStatus == 5">
 					确认取车
 				</view>
-				<view class="accept" @click="collect" v-if="form.statusCode ==3">
+				<view class="accept" @click="finish" v-if="form.statusCode ==4 && form.flowStatus==7 || form.flowStatus==8">
 					检测完成
 				</view>
 				<view class="accept" @click.stop="goAlso" v-if="form.statusCode ==3 && form.flowStatus==12">
@@ -237,7 +237,7 @@
 				<view class="accept" @click.stop="delivered" v-if="form.statusCode ==3&& form.flowStatus==13">
 					车已送达
 				</view>
-				<view class="accept" @click.stop="evaluat" v-if="(form.statusCode ==6 || form.statusCode ==5) && form.flowStatus !=='17' ">
+				<view class="accept" @click.stop="evaluat" v-if=" form.flowStatus =='16' ">
 					去评价
 				</view>
 				
@@ -276,16 +276,19 @@
 				isServiceDeatil: false,
 				subOrderId: '',
 				iseEvaluate:false,//评论弹窗显隐
-				userId:''//传值给评论弹窗
-
+				userId:'',//传值给评论弹窗
+				paramState:null,
 			}
 		},
 		methods: {
 			//返回
 			back() {
-				uni.navigateBack({
-					delta: 1
-				});
+				// uni.navigateBack({
+				// 	delta: 1
+				// });
+				uni.switchTab({
+					url:'/pages/order/index'
+				})
 			},
 			refresh() {
 				this.isSuccess = false
@@ -330,6 +333,7 @@
 			},
 			//收车上传照片
 			collect() {
+				this.paramState = '07'
 				this.taskId = this.form.taskId
 				this.checkType = this.form.checkType
 				//0 取车，1送车
@@ -349,7 +353,7 @@
 				let data = {
 					taskId: this.taskId,
 					checkType: this.checkType,
-					paramState: '07',//商户上传图片成功
+					paramState: this.paramState,//商户上传图片成功
 					serveType: '01'
 				}
 				this.$http.post("/ts/merchant/update/Serve", data).then(res => {
@@ -361,6 +365,7 @@
 			},
 			//检测完成上传检测图片
 			finish(item){
+				this.paramState = '12'
 				// this.taskId = item.taskId
 				// this.checkType = item.checkType
 				//0 取车，1送车