1

package1/group/shopEvaluate.vue

@@ -263,9 +263,7 @@
 				}).catch((res) => {});
 			},
 			toggleReply(i,m) {
-				
 				this.shopComments[i].comments[m].isOpen = !this.shopComments[i].comments[m].isOpen;
-				console.log("11111",this.shopComments)
 				this.$forceUpdate()
 			},
 			changeStatus(v){

package1/order/orderDetail.vue

@@ -519,22 +519,43 @@
 					选择退款原因
 				</view>
 				<view class="" style="padding: 0 20rpx;">
-					<view  style="height:80rpx;" v-if="orderDetail.otherOrder != 1">
+					<view style="height:80rpx;" v-if="orderDetail.otherOrder != 1">
 						<radio :checked="sellTime==2"  name="sellTime" @click="checkSellTime(2)" />
 						全额退款（商家原因）
 					</view>
-					<view  style="height:80rpx;"  v-if="payData.deliveryType ==1">
+					<view style="height:80rpx;"  v-if="payData.deliveryType ==1">
 						<radio :checked="sellTime==3" name="sellTime" @click="checkSellTime(3)" />
 						全额退款（配送员原因）
 					</view>
-					<view  style="height:80rpx;"  v-if="payData.deliveryType ==1 && orderDetail.otherOrder != 1">
+					<view style="height:80rpx;"  v-if="payData.deliveryType ==1 && orderDetail.otherOrder != 1">
 						<radio :checked="sellTime==4" name="sellTime" @click="checkSellTime(4)" />
 						全额退款（商家+配送员原因）
 					</view>
+					<view style="height:80rpx;">
+						<radio :checked="sellTime==5" name="sellTime" @click="checkSellTime(5)" />
+						其他
+					</view>
 				</view>
-				<view class="guize-list">
+				<view class="guize-list" style="border-top: 5px solid #eee;padding: 10px;">
+					<view style="border-bottom: 5px solid #eee;">
+						<view style="flex: 1;color: #777;font-weight: 700;">
+							申请说明
+						</view>
+						<view style="">
+							<textarea name="" id="" cols="30" rows="10" placeholder="请填写备注" v-model="returnData.reason"
+								style="width: 100%;height: 100px;padding: 5px;margin-top: 10px;"></textarea>
+							<view style="width: 60px;height: 60px;border: 1px solid #eee;text-align: center;line-height: 60px;">
+								<view class="upload-img" @tap="pictureAdd" style="">
+									<uni-icons type="camera" size="28" color="#777"></uni-icons>
+								</view>
+								<view v-if="returnData.pictures !=''" style="">
+									<img :src="returnData.pictures" alt="" class="upload-img">
+								</view>
+							</view>
+						</view>
+					</view>
 					<view style="height: 180rpx;line-height: 80rpx;font-size: 28rpx;font-weight: 700;text-align: center;">
-						确定要取消订单吗
+						
 						<text v-if="(((payData.orderType == 2 || payData.orderType == 3) && payData.status == 2) || ((payData.orderType == 2 || payData.orderType == 3) && payData.status == 3)  || (payData.deliveryType == 1 && payData.status == 3) || payData.status == 4) && payData.otherOrder == null">取消订单需要商家同意</text>
 						<view v-if="(payData.status == 3 && payData.deliveryType ==1) || payData.status == 4">
 							<text v-if="payData.shopMakeTime == null && payData.otherOrder == null">商家还未出餐</text>
@@ -734,6 +755,52 @@
 					}
 				});
 			},
+			pictureAdd(id, huan) {
+				let that = this
+				uni.chooseMedia({
+					count: 9,
+					mediaType: ['image'],
+					sourceType: ['album', 'camera'],
+					success(res) {
+						uni.showLoading({
+							title: '加载中...',
+							mask: true
+						})
+						for (let i = 0; i < res.tempFiles.length; i++) {
+							that.upLoadFile(res.tempFiles[i].tempFilePath)
+						}
+					}
+				})
+			},
+			async upLoadFile(path) {
+				let that = this;
+				let hiver_token = uni.getStorageSync("hiver_token")
+				await uni.uploadFile({
+					url: that.tui.interfaceUrl() + '/upload/file',
+					filePath: path,
+					name: 'file',
+					header: {
+						"content-type": "multipart/form-data",
+						'accessToken': hiver_token
+					},
+					formData: {},
+					success: (uploadFileRes) => {
+						let pathData = JSON.parse(uploadFileRes.data)
+						that.returnData.pictures = pathData.result
+						that.$forceUpdate()
+					},
+					fail: (err) => {
+						uni.hideLoading();
+						uni.showToast({
+							title: JSON.stringify(err),
+							icon: 'none'
+						})
+					}
+				});
+				await setTimeout(res => {
+					uni.hideLoading();
+				}, 1000)
+			},
 			//立即备餐
 			makeMeal(){
 				let that = this;