bug修复

manifest.json

@@ -2,8 +2,8 @@
     "name" : "掌柜生活商户版",
     "appid" : "__UNI__E0EA6E1",
     "description" : "",
-    "versionName" : "1.0.9",
-    "versionCode" : 109,
+    "versionName" : "1.0.9.2",
+    "versionCode" : 1092,
     "transformPx" : false,
     "app-plus" : {
         /* 5+App特有相关 */

pages/evaluate/evaluate.vue

@@ -48,7 +48,8 @@
 						<view class=" headr">
 							<view class="left">
 								<view class="img">
-									<image :src="item.commentsReply" mode=""></image>
+									<image :src="item.commentsReply" mode="" v-if="item.commentsReply"></image>
+									<image src="/static/avatar_boy.png" mode="" v-else></image>
 								</view>
 								<view class="name">
 									{{item.userName}}<br />

pages/order/serviceOrder/orderDetail.vue

@@ -208,7 +208,10 @@
 			<view class="customer">
 				联系客服
 			</view>
-			<view class="accept" @click="receive" v-if="form.statusCode == 2">
+			<view class="accept" @click="receive" v-if="form.checkType<20 &&form.statusCode == 2">
+				接单
+			</view>
+			<view class="accept" @click.stop="receive" v-if="form.checkType>20 && form.flowStatus =='03'" style="margin-left: 16rpx;">
 				接单
 			</view>
 			<view class="func" v-if="form.checkType == 1">
@@ -269,7 +272,7 @@
 			</view>
 
 		</view>
-		<receive v-if="isSuccess" @cut="refresh" />
+		<receive v-if="isSuccess" @cut="refresh" :titleCheckType="titleCheckType"/>
 		<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" />
@@ -303,6 +306,8 @@
 				iseEvaluate: false, //评论弹窗显隐
 				userId: '', //传值给评论弹窗
 				paramState: null,
+				titleCheckType:null,//接单提示区分
+					serveType: '', //服务类型
 			}
 		},
 		methods: {
@@ -343,13 +348,14 @@
 			},
 			// 接单
 			receive() {
+				this.titleCheckType = this.form.checkType
 				let data = {
 					taskId: this.taskId,
 					checkType: this.checkType,
 					paramState: '04',
 					// serveType: '01'
 				}
-				item.checkType < 20 ? data.serveType = '01' : data.serveType = '02'
+				this.form.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) {
@@ -381,8 +387,10 @@
 					taskId: this.taskId,
 					checkType: this.checkType,
 					paramState: this.paramState, //商户上传图片成功
-					serveType: '01'
+					// serveType: '01'
+					serveType: this.serveType
 				}
+				
 				this.$http.post("/ts/merchant/update/Serve", data).then(res => {
 					if (res.data.code == 200) {
 						this.isUpload = false
@@ -543,7 +551,7 @@
 				this.paramState = '06'
 				this.serveType = '02'
 				this.isUpload = true
-				this.getDeatil()
+				// this.getDeatil()
 			},
 			help() {
 				this.taskId = this.form.taskId

pages/scan/check.vue

@@ -18,13 +18,13 @@
 				</view>
 				<view class="center">
 					<view class="img">
-						<image src="/static/avatar_girl.png" mode=""></image>
+						<image :src="form.productImage" mode=""></image>
 					</view>
 					<view class="name">
-						一次普通洗车兑换服务代金券（限7座以下的轿车使用）
+						{{form.productName}}
 						<view class="price">
-							￥228.3/份
-							<span>实付款:¥ 228.3</span>
+							￥{{form.costPrice}}/份
+							<span>实付款:¥ {{form.orderPrice}}</span>
 						</view>
 					</view>
 				</view>
@@ -35,35 +35,35 @@
 				</view>
 				<view class="data">
 					<span>订单号</span>
-					1544566553265864656515
+					{{form.orderId}}
 				</view>
 				<view class="data">
 					<span>券码</span>
-					1544566553265864656515
+					{{form.voucherCode}}
 				</view>
 				<view class="data">
 					<span>支付流水号</span>
-					1544566553265864656515
+					{{form.tradeId}}
 				</view>
 				<view class="data">
 					<span>提交人</span>
-					1544566553265864656515
+					{{form.linkName}}
 				</view>
 				<view class="data">
 					<span>联系电话</span>
-					1544566553265864656515
+					{{form.phone}}
 				</view>
 				<view class="data">
 					<span>下单时间</span>
-					1544566553265864656515
+					{{form.buyTime}}
 				</view>
 				<view class="data">
 					<span>付款时间</span>
-					1544566553265864656515
+					{{form.payTime}}
 				</view>
 				<view class="data">
 					<span>使用时间</span>
-					1544566553265864656515
+					{{form.writeOffTime}}
 				</view>
 			</view>
 		</view>
@@ -74,7 +74,7 @@
 	export default{
 		data(){
 			return{
-				
+				form:{}
 			}
 		},
 		methods:{
@@ -84,6 +84,26 @@
 					delta: 1
 				});
 			},
+			getDeatil(){
+				this.$http.get("app/writeOff/writeDetails?id="+this.writeOffId , ).then(res => {
+					
+				  if (res.data.code == 200) {
+				    this.form = res.data.result
+						console.log(res)
+				  }else{
+					}
+				})
+				.catch(()=>{
+					this.mescroll.endErr()
+				})
+			}
+		},
+		onLoad(options) {
+			this.writeOffId = options.writeOffId
+			console.log(this.writeOffId )
+		},
+		onShow() {
+			this.getDeatil()
 		}
 	}
 </script>

pages/scan/record.vue

@@ -178,7 +178,7 @@
       },
       goDetail(item) {
         uni.navigateTo({
-          url: '/pages/scan/check'
+          url: '/pages/scan/check?writeOffId='+item.writeOffId
         })
       },
       confirm(e) {