bug修复

manifest.json

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

pages/order/components/upload.vue

@@ -123,31 +123,62 @@
 			//上传图片
 			submit(){
 				let data = []
+				console.log(this.upList)
+				const hasEmptyImg = this.upList.some(item => item.imgUrl === '');
+				
+				if (hasEmptyImg) {
+				    uni.showToast({
+				        icon: 'none',
+				        title: '请上传全部图片'
+				    });
+				    return; // 直接终止函数执行
+				}
+				
+				// 所有图片都有内容，处理数据并发送请求
 				this.upList.forEach(item => {
-					if(item.imgUrl == ''){
-						uni.showToast({
-							icon:'none',
-							title:'请上传全部图片'
-						})
-						return
-					}else{
-						item.merchantId = uni.getStorageSync('login_user_info').merchantId,
-						item.merchantName = uni.getStorageSync('login_user_info').merchantName,
-						item.merchantUserId = uni.getStorageSync('login_user_info').id
-						item.businessType = this.type
-						item.taskId = this.taskId
-					}
-				})
+				    item.merchantId = uni.getStorageSync('login_user_info').merchantId;
+				    item.merchantName = uni.getStorageSync('login_user_info').merchantName;
+				    item.merchantUserId = uni.getStorageSync('login_user_info').id;
+				    item.businessType = this.type;
+				    item.taskId = this.taskId;
+				});
+				
 				this.$http.post("/ts/merchant/addImg", this.upList).then(res => {
-					console.log(res)
-					if (res.data.code == 200) {
-						uni.showToast({
-							icon:'none',
-							title:'上传成功'
-						})
-						this.$emit('upSuccess')
-					}
-				})
+				    console.log(res);
+				    if (res.data.code == 200) {
+				        uni.showToast({
+				            icon: 'none',
+				            title: '上传成功'
+				        });
+				        this.$emit('upSuccess');
+				    }
+				});
+				// this.upList.forEach(item => {
+				// 	if(item.imgUrl == ''){
+				// 		uni.showToast({
+				// 			icon:'none',
+				// 			title:'请上传全部图片'
+				// 		})
+				// 		return
+				// 	}else{
+				// 		item.merchantId = uni.getStorageSync('login_user_info').merchantId,
+				// 		item.merchantName = uni.getStorageSync('login_user_info').merchantName,
+				// 		item.merchantUserId = uni.getStorageSync('login_user_info').id
+				// 		item.businessType = this.type
+				// 		item.taskId = this.taskId
+				// 	}
+				// 	this.$http.post("/ts/merchant/addImg", this.upList).then(res => {
+				// 		console.log(res)
+				// 		if (res.data.code == 200) {
+				// 			uni.showToast({
+				// 				icon:'none',
+				// 				title:'上传成功'
+				// 			})
+				// 			this.$emit('upSuccess')
+				// 		}
+				// 	})
+				// })
+				
 			},
 			cut(){
 				this.$emit('cut')

pages/order/index.vue

@@ -7,9 +7,11 @@
 				<view class="case">
 					<view class="select_type">
 						<div class="tab-item" :class="tabIndex == 0?'active':''"
-							@click="getList(servicePage),tabIndex=0;productName='';productStatus=0;">普通订单</div>
+							@click="getList(servicePage),tabIndex=0;productName='';productStatus=0;merchantUserInfo = '';orderList = [];buyStartTime = '';buyEndTime = ''">
+							普通订单</div>
 						<div class="tab-item" :class="tabIndex == 1?'active':''"
-							@click="getserviceList(servicePage),tabIndex=1;productName='';productStatus=0;">服务订单</div>
+							@click="getserviceList(servicePage),tabIndex=1;productName='';productStatus=0;merchantUserInfo = '';serviceList = [];buyStartTime = '';buyEndTime = ''">
+							服务订单</div>
 					</view>
 				</view>
 
@@ -91,12 +93,12 @@
 				</view>
 				<view class="car_id">
 					{{item.licenseNo}}
-				<!-- 	<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>
+					<!-- 	<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}}
@@ -107,20 +109,22 @@
 					<span> <text>￥</text> {{item.price}}</span>
 				</view>
 				<view class="btn_box">
-					<view class="btn">
+					<view class="btn" @click.stop="goLive(item)">
 						实况记录
 					</view>
-					<view class="btn" style="margin-left: 16rpx;">
+					<view class="btn" style="margin-left: 16rpx;" @click.stop="callService(item)">
 						联系客服
 					</view>
-					<view class="btn border">
+					<view class="btn border" @click.stop="callUser(item)">
 						联系客户
 					</view>
 					<!-- 03显示救援接单 -->
-					<view class="btn join" @click.stop="receive(item)" v-if="item.checkType<20 && item.statusCode ==2" style="margin-left: 16rpx;">
+					<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 class="btn join" @click.stop="receive(item)" v-if="item.checkType>20 && item.flowStatus =='03'"
+						style="margin-left: 16rpx;">
 						接单
 					</view>
 					<!-- 送车到站按钮区域开始item.checkType==1 -->
@@ -161,10 +165,10 @@
 							去评价
 						</view>
 					</view>
-					
+
 					<!-- 上门取车按钮区域结束 -->
 					<!-- 救援相关按钮 -->
-					<view class=""v-if="item.checkType >20 " style="flex:1;display: flex;justify-content: space-around;">
+					<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'">
 							出发
@@ -208,7 +212,7 @@
 							{{row.date}}
 						</view>
 						<view class="row_btn" @click.stop="editProject(row)"
-							v-if="row.statusCode == '0' || row.statusCode == '11' ">
+							v-if="row.statusCode == '0'|| row.statusCode == '7' || row.statusCode == '11' ">
 							<span>修改收费服务</span>
 						</view>
 					</view>
@@ -216,7 +220,7 @@
 			</view>
 		</mescroll-uni>
 		<rangTime ref="rangTime" :mode="mode" :isYear="true" @onSubmit="onEndTimeChange" @cut="cutPopup" />
-		<receive @cut="isReceive =false" v-if="isReceive" :titleCheckType="titleCheckType"/>
+		<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" />
@@ -319,26 +323,76 @@
 					num: 1,
 					size: 10
 				},
-				titleCheckType:null,//接单提示区分
+				titleCheckType: null, //接单提示区分
 			}
 		},
 		methods: {
+
+			//联系客户
+			callUser(item) {
+				uni.makePhoneCall({
+					phoneNumber: item.contactsPhone,
+					success: () => {
+						uni.showToast({
+							title: '正在拨号',
+							icon: 'none'
+						})
+					},
+					fail: (err) => {
+						uni.showToast({
+							title: '拨打失败: ' + err.errMsg,
+							icon: 'none'
+						})
+					}
+				})
+			},
+			//俩系客服
+			callService(item) {
+				uni.makePhoneCall({
+					phoneNumber: item.custSerPhone,
+					success: () => {
+						uni.showToast({
+							title: '正在拨号',
+							icon: 'none'
+						})
+					},
+					fail: (err) => {
+						uni.showToast({
+							title: '拨打失败: ' + err.errMsg,
+							icon: 'none'
+						})
+					}
+				})
+			},
+			//跳转实况记录
+			goLive(item) {
+				console.log(item)
+				uni.navigateTo({
+					url: '/pages/order/serviceOrder/live?taskId=' + item.taskId
+				})
+			},
 			selectTime() {
 				this.$refs.rangTime.open()
 				uni.hideTabBar()
 			},
 			onEndTimeChange(val) {
+				this.buyStartTime = val.startDate
+				this.buyEndTime = val.endDate
 				if (this.tabIndex == 0) {
 					this.orderList = []
-					this.buyStartTime = val.startDate
-					this.buyEndTime = val.endDate
+					
 					let page = {
 						num: 1,
 						size: 10
 					}
 					this.getList(page)
 				} else {
-
+					this.serviceList = []
+					let page = {
+						num: 1,
+						size: 10
+					}
+					this.getserviceList(page)
 				}
 
 			},
@@ -385,7 +439,12 @@
 					this.orderList = []
 					this.getList(page)
 				} else {
-
+					this.serviceList = []
+					let page = {
+						num: 1,
+						size: 10
+					}
+					this.getserviceList(page)
 				}
 
 			},
@@ -431,7 +490,10 @@
 					merchantId: this.merchantId,
 					pageSize: page.size,
 					pageNo: page.num,
-					status: this.statusCode
+					status: this.statusCode,
+					searchContent: this.merchantUserInfo,
+					buyStartTime: this.buyStartTime,
+					buyEndTime: this.buyEndTime
 				}
 				this.$http.post("/ts/merchant/serviceOrder", data).then(res => {
 						this.serviceList = this.serviceList.concat(res.data.result.records)
@@ -452,7 +514,7 @@
 					paramState: '04', //商户接单成功
 					// serveType: '01'//救援02
 				}
-				item.checkType<20?data.serveType = '01':data.serveType = '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
@@ -474,7 +536,7 @@
 				if (item.checkType == 0) {
 					//收车
 					// if (item.statusCode == 5) {
-						this.uptype = 1
+					this.uptype = 1
 					// }
 					//  else if (item.statusCode == 4) {
 					// 	this.uptype = 3
@@ -482,7 +544,7 @@
 				} else if (item.checkType == 1) {
 					//客户送车，商户收车
 					// if (item.statusCode == 3) {
-						this.uptype = 2
+					this.uptype = 2
 					// }
 					/* else {
 						this.uptype = 3
@@ -492,7 +554,7 @@
 				this.serveType = '01'
 				this.isUpload = true
 				// this.upSuccess('07','01')
-				
+
 
 			},
 			//送车到站————检测完成
@@ -655,7 +717,7 @@
 				})
 			},
 			//救援出发
-			depart(item){
+			depart(item) {
 				console.log(item)
 				let data = {
 					taskId: item.taskId,
@@ -666,27 +728,27 @@
 				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)
+						this.serviceList = []
+						let page = {
+							num: 1,
+							size: 10
+						}
+						this.getserviceList(page)
 					}
 				})
-				
+
 			},
 			//救援到达现场
-			arrive(item){
+			arrive(item) {
 				this.taskId = item.taskId
 				this.checkType = item.checkType
-				this.uptype = 4//道路救援
+				this.uptype = 4 //道路救援
 				this.paramState = '06'
 				this.serveType = '02'
 				this.isUpload = true
 			},
 			//救援完成拍照
-			help(item){
+			help(item) {
 				console.log(item)
 				this.taskId = item.taskId
 				this.checkType = item.checkType
@@ -703,10 +765,21 @@
 			},
 			//添加收费服务
 			addService(item) {
-				uni.navigateTo({
-					url: '/pages/order/serviceOrder/project?checkType=' + item.checkType + '&taskId=' + item.taskId +
-						'&orderNo=' + item.orderNo + '&productName=' + item.productName + '&type=' + 1
+				this.$http.get("/ts/merchant/addPaidServiceCheck?taskId=" + item.taskId).then(res => {
+					console.log(res)
+					if (res.data.result) {
+						uni.navigateTo({
+							url: '/pages/order/serviceOrder/project?checkType=' + item.checkType + '&taskId=' + item.taskId +
+								'&orderNo=' + item.orderNo + '&productName=' + item.productName + '&type=' + 1
+						})
+					} else {
+						uni.showToast({
+							icon: 'none',
+							title: '存在未支付服务项'
+						})
+					}
 				})
+
 			},
 			//去送车修改状态
 			goAlso(item) {

pages/order/serviceOrder/live.vue

@@ -33,8 +33,8 @@
 									<span>{{item.createTime}}</span>
 								</view>
 							</view>
-							<view class="play" v-if="item.recordUrl.length>0">
-								<image src="/static/pause.png" mode="" @click="exchangeStatus(item),play(item)" v-if=" item.isPlay"></image>
+							<view class="play" v-if="item.recordUrl">
+								<image src="/static/pause.png" mode="" @click="exchangeStatus(item),play(item)" v-if="item.isPlay"></image>
 								<image src="/static/play.png" mode="" @click="exchangeStatus(item),play(item)" v-else></image>
 							</view>
 						</view>
@@ -122,13 +122,15 @@
 					taskId: this.taskId
 				}
 				this.$http.post('/merchant/localTsCustomerServiceTaskMsg/queryList', data).then((res) => {
+					console.log(res.data.result)
 					this.historyList = res.data.result
 					this.historyList.forEach(item => {
 						if (item.recordUrl) {
 							item.isPlay = false
+						}else{
+							item.isPlay = null
 						}
 					})
-					console.log(this.historyList);
 				})
 			},
 		},
@@ -138,6 +140,7 @@
 		mounted() {
 			this.getLive()
 			this.getHistroyList()
+			
 		}
 	}
 </script>

pages/order/serviceOrder/orderDetail.vue

@@ -26,7 +26,7 @@
 				</view>
 				<view class="car_name">
 					<span>用户姓名：{{form.contactsName}}</span>
-					<view class="call">
+					<view class="call" @click="callUser">
 						<image src="/static/order/call.png" mode=""></image>
 						联系客户
 					</view>
@@ -55,7 +55,7 @@
 			<view class="product">
 				<view class="fat_product">
 					<view class="product_img">
-						<image src="/static/login3.png" mode=""></image>
+						<image :src="form.productImage" mode=""></image>
 					</view>
 					<view class="product_name">
 						{{form.productName}}
@@ -97,10 +97,8 @@
 										@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>
+									<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>
@@ -146,24 +144,47 @@
 					<view class="item_child">
 						<span>联系方式：</span>
 						<view class="center">
-							{{form.contactsMerPhone}}
+							{{form.contactsPhone}}
 						</view>
 					</view>
 				</view>
 				<view class="order_item">
+					<view class="item_title">
+						商户信息
+					</view>
+					<view class="item_child">
+						<span>商家名称：</span>
+						<view class="center">
+							{{form.merchantName}}
+						</view>
+					</view>
+					<view class="item_child">
+						<span>商家地址：</span>
+						<view class="center">
+							 {{form.merAddress}}
+						</view>
+					</view>
+					<view class="item_child">
+						<span>联系方式：</span>
+						<view class="center">
+							{{form.merchantPhone}}
+						</view>
+					</view>
+				</view>
+				<view class="order_item" v-if="this.form.checkType == 1">
 					<view class="item_title">
 						站点信息
 					</view>
 					<view class="item_child">
 						<span>站点名称：</span>
 						<view class="center">
-							{{form.contactsName}}
+							{{form.inspectionStationName}}
 						</view>
 					</view>
 					<view class="item_child">
 						<span>站点地址：</span>
 						<view class="center">
-							{{form.contactsMerPhone}}
+							{{form.detailedAddress}}
 						</view>
 					</view>
 				</view>
@@ -183,6 +204,12 @@
 							{{form.orderTime}}
 						</view>
 					</view>
+					<view class="item_child">
+						<span>付款时间：</span>
+						<view class="center">
+							{{form.payTime}}
+						</view>
+					</view>
 				</view>
 				<view class="order_item" v-for="item in form.childrenOrder" :key="item.orderNo">
 					<view class="item_title">
@@ -197,7 +224,13 @@
 					<view class="item_child">
 						<span>下单时间：</span>
 						<view class="center">
-							{{item.orderTime}}
+							{{item.date}}
+						</view>
+					</view>
+					<view class="item_child">
+						<span>付款时间：</span>
+						<view class="center">
+							{{item.payTime}}
 						</view>
 					</view>
 				</view>
@@ -205,13 +238,14 @@
 
 		</view>
 		<view class="btn">
-			<view class="customer">
+			<view class="customer" @click="callService">
 				联系客服
 			</view>
 			<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 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">
@@ -272,7 +306,7 @@
 			</view>
 
 		</view>
-		<receive v-if="isSuccess" @cut="refresh" :titleCheckType="titleCheckType"/>
+		<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" />
@@ -306,8 +340,8 @@
 				iseEvaluate: false, //评论弹窗显隐
 				userId: '', //传值给评论弹窗
 				paramState: null,
-				titleCheckType:null,//接单提示区分
-					serveType: '', //服务类型
+				titleCheckType: null, //接单提示区分
+				serveType: '', //服务类型
 			}
 		},
 		methods: {
@@ -320,6 +354,42 @@
 					url: '/pages/order/index'
 				})
 			},
+			//联系客户
+			callUser() {
+				uni.makePhoneCall({
+					phoneNumber: this.form.contactsPhone,
+					success: () => {
+						uni.showToast({
+							title: '正在拨号',
+							icon: 'none'
+						})
+					},
+					fail: (err) => {
+						uni.showToast({
+							title: '拨打失败: ' + err.errMsg,
+							icon: 'none'
+						})
+					}
+				})
+			},
+			//俩系客服
+			callService(){
+				uni.makePhoneCall({
+					phoneNumber: this.form.custSerPhone,
+					success: () => {
+						uni.showToast({
+							title: '正在拨号',
+							icon: 'none'
+						})
+					},
+					fail: (err) => {
+						uni.showToast({
+							title: '拨打失败: ' + err.errMsg,
+							icon: 'none'
+						})
+					}
+				})
+			},
 			refresh() {
 				this.isSuccess = false
 				this.getDeatil()
@@ -369,6 +439,7 @@
 				this.paramState = '07'
 				this.taskId = this.form.taskId
 				this.checkType = this.form.checkType
+				this.serveType = '01'
 				//0 取车，1送车
 				if (this.form.checkType == 0) {
 					this.uptype = 1
@@ -390,7 +461,7 @@
 					// serveType: '01'
 					serveType: this.serveType
 				}
-				
+
 				this.$http.post("/ts/merchant/update/Serve", data).then(res => {
 					if (res.data.code == 200) {
 						this.isUpload = false
@@ -404,7 +475,7 @@
 				})
 			},
 			//检测完成上传检测图片
-			finish(item) {
+			finish() {
 				this.paramState = '12'
 				// this.taskId = item.taskId
 				// this.checkType = item.checkType
@@ -412,7 +483,7 @@
 				this.uptype = 3
 				this.isUpload = true
 				// this.paramState = '12'
-				// this.serveType = '01'
+				this.serveType = '01'
 				this.getDeatil()
 			},
 			//送车到站--确认取车
@@ -644,7 +715,8 @@
 
 					span {
 						display: inline-block;
-						width: 120rpx;
+						// width: 120rpx;
+						padding: 0 24rpx;
 						height: 40rpx;
 						background: #F3F3F3;
 						border-radius: 8rpx;

pages/order/serviceOrder/project.vue

@@ -17,7 +17,7 @@
 				</view>
 				<view class="price" v-if="item.checked">
 					<span>服务价格</span>
-					<span><u-input v-model="item.itemMoney" type="number"
+					<span><u-input v-model="item.itemMoney" type="number" @blur="validateInput(item)"
 							style="width: 260rpx;height: 62rpx;background-color: #f7f8fc;padding: 0rpx 20rpx;margin-right: 16rpx;" />元</span>
 				</view>
 				<view class="explain" v-if="item.checked">
@@ -54,44 +54,44 @@
 						itemName: '车辆维修费',
 						checked: false,
 						delFlag: '',
-						itemMoney: '',
+						itemMoney: null,
 						itemContent: ''
 					},
 					{
 						itemName: '喷漆费',
 						checked: false,
 						delFlag: '',
-						itemMoney: '',
+						itemMoney: null,
 						itemContent: ''
 					},
 					{
 						itemName: '零配件',
 						checked: false,
 						delFlag: '',
-						itemMoney: '',
+						itemMoney: null,
 						itemContent: ''
 					},
 					{
 						itemName: '车辆清洁费',
 						checked: false,
 						delFlag: '',
-						itemMoney: '',
+						itemMoney: null,
 						itemContent: ''
 					},
 					{
 						itemName: '其他费用',
 						checked: false,
 						delFlag: '',
-						itemMoney: '',
+						itemMoney: null,
 						itemContent: ''
 					}
 				],
 				type: '',
-				editId:''
+				editId: ''
 			}
 		},
 		methods: {
-			
+
 			//返回
 			back() {
 				// uni.navigateBack();
@@ -99,9 +99,10 @@
 				// 	delta: 1
 				// });
 				uni.switchTab({
-					url:'/pages/order/index'
+					url: '/pages/order/index'
 				})
 			},
+
 			//关闭时置空
 			change(item) {
 				console.log(item)
@@ -110,11 +111,21 @@
 					item.itemMoney = ''
 				}
 			},
+			//输入金额
+			validateInput(item) {
+				if (Number(item.itemMoney) <= 0) {
+					uni.showToast({
+						title: '金额必须大于0',
+						icon: 'none'
+					});
+					item.itemMoney = ''; // 清空或设置为默认最小值
+				}
+			},
 			submit() {
-				console.log(this.checkType)
+				
 				let list = []
 				this.projectList.forEach(item => {
-					if (item.checked) {
+					if (item.checked ) {
 						item.delFlag = 0
 					} else {
 						item.delFlag = 1
@@ -127,36 +138,43 @@
 						itemName: item.itemName
 					})
 				})
-				let data = {
-					checkType: this.checkType,
-					taskId: this.taskId,
-					orderNo: this.orderNo,
-					orderName: this.productName,
-					merchantId: uni.getStorageSync('login_user_info').merchantId,
-					id : this.editId,
-					// id : uni.getStorageSync('login_user_info').id,
-					addMerchantServiceVoList: list
-				}
-				this.$http.post("/ts/merchant/addPaidService", data).then(res => {
-					console.log(res)
-					if (res.data.code == 200) {
-						// this.$emit('upSuccess')
-						uni.showToast({
-							icon: 'none',
-							title: '添加成功'
-						})
-						this.back()
+				console.log(list)
+					let data = {
+						checkType: this.checkType,
+						taskId: this.taskId,
+						orderNo: this.orderNo,
+						orderName: this.productName,
+						merchantId: uni.getStorageSync('login_user_info').merchantId,
+						id: this.editId,
+						// id : uni.getStorageSync('login_user_info').id,
+						addMerchantServiceVoList: list
 					}
-				})
+					this.$http.post("/ts/merchant/addPaidService", data).then(res => {
+						console.log(res)
+						if (res.data.code == 200) {
+							// this.$emit('upSuccess')
+							uni.showToast({
+								icon: 'none',
+								title: '添加成功'
+							})
+							this.back()
+						}else{
+							uni.showToast({
+								icon: 'none',
+								title: res.data.message
+							})
+						}
+					})
+				
 			},
 			//回显
 			getChange() {
-				this.$http.get("/ts/merchant/servicesDetails?subOrderId="+ this.orderNo).then(res => {
+				this.$http.get("/ts/merchant/servicesDetails?subOrderId=" + this.orderNo).then(res => {
 					if (res.data.code == 200) {
-						
+
 						this.editId = res.data.result.id
-						res.data.result.serviceDetails.forEach(item=> {
-							item.delFlag == 0?item.checked = true:item.checked = false
+						res.data.result.serviceDetails.forEach(item => {
+							item.delFlag == 0 ? item.checked = true : item.checked = false
 						})
 						this.projectList = res.data.result.serviceDetails
 					}