1.1.0.5

manifest.json

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

pages/order/components/upload.vue

@@ -117,8 +117,10 @@
 				console.log(this.upList)
 			},
 			// 移除封面图文件回调
-			handleRemove(index, lists) {
-				this.imgUrl = lists
+			handleRemove(file, index) {
+			  // 清空当前项的 imgUrl
+			  this.$set(this.upList[index], 'imgUrl', '');
+			  console.log('删除后:', this.upList);
 			},
 			//上传图片
 			submit(){
@@ -153,31 +155,6 @@
 				        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(){

pages/order/index.vue

@@ -190,7 +190,7 @@
 					<span>添加收费服务</span>
 				</view>
 				<!-- 救援 -->
-				<view class="add_service" @click.stop="addService(item)" v-if="item.checkType>20&&item.flowStatus== '06' ">
+				<view class="add_service" @click.stop="addService(item)" v-if="item.checkType>20&&(item.flowStatus== '06'||item.flowStatus== '07'||item.flowStatus== '08') ">
 					<span>添加收费服务</span>
 				</view>
 				<view class="child_order">
@@ -212,7 +212,7 @@
 							{{row.date}}
 						</view>
 						<view class="row_btn" @click.stop="editProject(row)"
-							v-if="row.statusCode == '0'|| row.statusCode == '7' || row.statusCode == '11' ">
+							v-if="row.statusCode == '0'|| row.statusCode == '7' ">
 							<span>修改收费服务</span>
 						</view>
 					</view>

pages/order/serviceOrder/orderDetail.vue

@@ -44,7 +44,7 @@
 				<view class="car_address">
 					<view class="address">
 						送/取车地址:{{form.carAddress}}
-						<image src="/static/order/address.png" mode="" @click="navigation(form.userLongitude,form.userLatitude)"></image>
+						<image src="/static/order/address.png" mode="" @click="navigation(form.userLongitude,form.userLatitude,form.carAddress)"></image>
 					</view>
 					<view class="car_license">
 						车牌号:{{form.licenseNo}}
@@ -69,7 +69,17 @@
 					<span style="font-weight: 600;">救援地址：</span>
 					{{form.carAddress}}
 				</view>
-				<view class="go" @click="navigation(form.userLongitude,form.userLatitude)">
+				<view class="go" @click="navigation(form.userLongitude,form.userLatitude,form.carAddress)">
+					<image src="/static/order/address.png" mode=""></image>
+					导航
+				</view>
+			</view>
+			<view class="address" v-if="form.checkType==23" style="margin-top: 20rpx;">
+				<view class="location">
+					<span style="font-weight: 600;">送达地址：</span>
+					{{form.deliveryAddr}}
+				</view>
+				<view class="go" @click="navigation(form.deliveryLongitude,form.deliveryLatitude,form.deliveryAddr)">
 					<image src="/static/order/address.png" mode=""></image>
 					导航
 				</view>
@@ -323,7 +333,7 @@
 					到达现场
 				</view>
 				<view class="accept" @click.stop="help"
-					v-if="form.statusCode ==4 && form.flowStatus=='07' || form.flowStatus=='06'|| form.flowStatus=='08'">
+					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' ">
@@ -586,7 +596,7 @@
 				})
 			},
 			//导航
-			navigation(longitude,latitude){
+			navigation(longitude,latitude,name){
 				console.log(this.form)
 				// uni.openLocation({
 				// 	longitude: Number(this.form.userLongitude),
@@ -603,7 +613,8 @@
 				uni.openLocation({
 					longitude: Number(longitude),
 					latitude: Number(latitude),
-					name: this.form.carAddress, // 位置名称
+					name:name,
+					// name: this.form.carAddress, // 位置名称
 					// address: e.F_Address, // 位置地点
 					success: function(res) {
 						console.log('打开系统位置地图成功')

pages/order/serviceOrder/photo.vue

@@ -146,7 +146,7 @@
 		}
 
 		.content {
-			flex: 1;
+			// flex: 1;
 			overflow-y: auto;
 			padding: 24rpx 28rpx;
 			display: flex;
@@ -185,6 +185,8 @@
 		}
 
 		.btn {
+			position: fixed;
+			bottom: 0;
 			width: 100%;
 			height: 112rpx;
 			background: #FFFFFF;

pages/product/creatProduct.vue

@@ -326,30 +326,27 @@
 			//上传详情图
 			detailsSuccess(res, index, lists) {
 				console.log(lists)
+				 this.processImageList(lists);
 				this.xqImage = lists
-				let temp = []
-				lists.forEach((item => {
-					// temp.push(item.url)
-					if (item.response.message) {
-				
-						temp.push( this.imageHttp + item.response.message)
-					}
-				}))
-				this.form.detailImages = temp.join(',')
-
 			},
 			detailsRemove(index, lists) {
 				this.xqImage = lists
-				let temp = []
-				lists.forEach((item => {
-					// temp.push(item.url)
-					if (item.response.message) {
-				
-						temp.push( this.imageHttp + item.response.message)
-					}
-				}))
-				this.form.detailImages = temp.join(',')
+				 this.processImageList(lists);
 			},
+			  // 处理图片列表，生成URL字符串
+			    processImageList(lists) {
+			      let temp = [];
+			      lists.forEach(item => {
+			        if (item.response && item.response.message) {
+			          temp.push(this.imageHttp + item.response.message);
+			        } else if (item.url) {
+			          // 处理已存在的图片
+			          temp.push(item.url);
+			        }
+			      });
+			      this.form.detailImages = temp.join(',');
+			      console.log('当前图片URL字符串:', this.form.detailImages);
+			    },
 			//下一步
 			next() {
 				console.log(this.xqImage);
@@ -618,10 +615,10 @@
 									icon: 'none'
 								});
 								this.back()
-							}else{
+							} else {
 								uni.showToast({
-									icon:'none',
-									title:res.data.sessage
+									icon: 'none',
+									title: res.data.sessage
 								})
 							}
 							uni.removeStorage({
@@ -630,7 +627,7 @@
 							uni.removeStorage({
 								key: 'group',
 							});
-							
+
 						})
 					}