diff --git a/common/api/user.js b/common/api/user.js
index a4c2b39..da2a7e7 100644
--- a/common/api/user.js
+++ b/common/api/user.js
@@ -375,10 +375,9 @@ export default {
 				return vm.$u.post('member/getClothesTypeList');
 			},
 			// 送洗评价
-			sendOrderComment({ id, comment }) {
+			sendOrderComment({ id, comment, comment_img }) {
 				return vm.$u.post('member/sendOrderComment', {
-					id: id,
-					comment: comment,
+					id, comment, comment_img
 				});
 			},
 			// 送洗确认完成
diff --git a/components/mine/comment/index.vue b/components/mine/comment/index.vue
index 70c0c0e..c32bd29 100644
--- a/components/mine/comment/index.vue
+++ b/components/mine/comment/index.vue
@@ -6,8 +6,8 @@
 		</view>
 		<view class="user-comment">
 			<view class="text u-line-2">{{ info.comment }}</view>
-			<view class="image">
-				<image v-for="(src, index) in info.images" :key="index" :src="src" mode="aspectFit"></image>
+			<view class="image" v-if="info.comment_img">
+				<image :src="info.comment_img" mode="aspectFit" @click="previewImage(info.comment_img)"></image>
 			</view>
 		</view>
 	</view>
@@ -19,6 +19,14 @@ export default {
 	},
 	props: {
 		info: Object,
+	},
+	methods: {
+		previewImage(urls) {
+			// console.log(urls)
+			uni.previewImage({
+				urls: urls,
+			});
+		},
 	}
 };
 </script>
@@ -47,12 +55,12 @@ export default {
 			font-size: 26rpx;
 			color: rgba(51,51,51,1);
 			line-height: 40rpx;
-			margin-bottom: 19rpx;
 		}
 		.image {
 			display: flex;
 			flex-wrap: wrap;
 			> image {
+				margin-top: 20rpx;
 				width: 210rpx;
 				height: 210rpx;
 				border-radius: 10rpx;
diff --git a/components/shop/recommend/pintuan.vue b/components/shop/recommend/pintuan.vue
index fb5bac7..5b5d625 100644
--- a/components/shop/recommend/pintuan.vue
+++ b/components/shop/recommend/pintuan.vue
@@ -110,7 +110,6 @@ export default {
 						left: 0;
 						top: 0;
 						z-index: 8;
-						background-color: aqua;
 					}
 					&:last-child {
 						left: 32rpx;
diff --git a/pageC/merchant/index.vue b/pageC/merchant/index.vue
index 8254980..fb9e050 100644
--- a/pageC/merchant/index.vue
+++ b/pageC/merchant/index.vue
@@ -236,6 +236,13 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+/*坑：解决iphoneX等大屏手机底部小黑条挡住tab的解决方法：安全区域距离底部边界距离env() 跟 constant() 需要同时存在，而且顺序不能换。*/
+/* #ifdef H5 */
+body {
+  padding-bottom: constant(safe-area-inset-bottom);/* 兼容 iOS < 11.2 */
+  padding-bottom: env(safe-area-inset-bottom); /* 兼容 iOS >= 11.2 */
+}
+/* #endif */
 .merchant {
 	// min-height: 100vh;
 	background-color: #ECECEC;
diff --git a/pageE/order/Details.vue b/pageE/order/Details.vue
index 3681d78..20017a4 100644
--- a/pageE/order/Details.vue
+++ b/pageE/order/Details.vue
@@ -3,7 +3,7 @@
 		<view class="status" v-if="orderstate">
 			<view class="text">
 				<view class="status-text">{{ s_object[orderstate].text }}</view>
-				<view class="time" v-if="orderInfo.view_type == 1 || orderInfo.view_type == 9">距离结束：{{ countdown }}</view>
+				<!-- <view class="time" v-if="orderInfo.view_type == 1 || orderInfo.view_type == 9">距离结束：{{ countdown }}</view> -->
 			</view>
 			<image :src="s_object[orderstate].image"></image>
 		</view>
@@ -209,8 +209,8 @@ export default {
 				if(res.errCode == 0) {
 					this.orderInfo = res.data;
 					this.setTitle(this.orderInfo.view_type);
-					if(res.data.view_type == 1) this.setSpikeTime(res.data.end_time);
-					else if(res.data.view_type == 9) this.setSpikeTime(res.data.pintuangroup_endtime);
+					// if(res.data.view_type == 1) this.setSpikeTime(res.data.end_time);
+					// else if(res.data.view_type == 9) this.setSpikeTime(res.data.pintuangroup_endtime);
 				}
 				uni.stopPullDownRefresh(); // 结束刷新
 			})
diff --git a/pageE/tool/MineHistory.vue b/pageE/tool/MineHistory.vue
index 6c333df..2cfd3ba 100644
--- a/pageE/tool/MineHistory.vue
+++ b/pageE/tool/MineHistory.vue
@@ -3,7 +3,7 @@
 		<scroll-view scroll-y class="history-box" @scrolltolower="reachBottom">
 			<view class="item-box">
 				<!-- 需求：只显示最近五十条数据　后台未作限制 -->
-				<view v-for="(item, index) in historyList.slice(0, 50)" :key="index" class="history-item">
+				<view v-for="(item, index) in historyList" :key="index" class="history-item">
 					<view class="item-title" @click="viewStoreDetails(item.store_id)">
 						<image :src="item.store_avatar"></image>
 						<view class="u-line-1">{{ item.store_name }}</view>
diff --git a/pageE/tool/WashOrder.vue b/pageE/tool/WashOrder.vue
index e3c46de..488bb79 100644
--- a/pageE/tool/WashOrder.vue
+++ b/pageE/tool/WashOrder.vue
@@ -57,10 +57,6 @@
 						<view class="order-view order-area" @click="showAddress=true">
 							<view class="title">省市区:</view>
 							<input type="text" v-model="area" disabled />
-							<!-- <view class="location">
-								<image src="../static/mine/28.png"></image>
-								<view>定位</view>
-							</view> -->
 						</view>
 						<view class="order-view order-address">
 							<view class="title">详细地址:</view>
@@ -113,10 +109,6 @@
 					<view class="order-view order-area" @click="showAddress=true">
 						<view class="title">省市区:</view>
 						<input type="text" v-model="area" disabled />
-						<!-- <view class="location">
-							<image src="../static/mine/28.png"></image>
-							<view>定位</view>
-						</view> -->
 					</view>
 					<view class="order-view order-address">
 						<view class="title">详细地址:</view>
@@ -254,7 +246,6 @@ export default {
 		// this.current = 0;
 		// this.swiperCurrent = 0;
 		this.showPopup = false;
-		this.choose = false;
 	},
 	onLoad() {
 		this.getOrderList();
@@ -270,6 +261,7 @@ export default {
 			this.phone = '';
 			this.area = '';
 			this.address = '';
+			this.choose = false;
 		}
 	},
 	methods: {
diff --git a/pageE/tool/washComment.vue b/pageE/tool/washComment.vue
index 17cc029..6dc11f3 100644
--- a/pageE/tool/washComment.vue
+++ b/pageE/tool/washComment.vue
@@ -2,20 +2,25 @@
 	<view class="comment">
 		<view class="main-container">
 			<u-input v-model="content" type="textarea" height="300" maxlength="200" />
-			<!-- <u-upload 
+			<u-upload 
 				ref="uUpload" 
-				@on-uploaded="onUploaded" 
 				:custom-btn="true" 
 				:max-count="count" 
 				:auto-upload="false"
+				:action="action"
+				:header="header"
+				:form-data="formData"
+				:name="fileName"
+				:size-type="['original']"
+				@on-uploaded="setImageList"
 			>
 				<view slot="addBtn" class="slot-btn" hover-class="slot-btn__hover" hover-stay-time="150">
 					<image src="../static/mine/27.png"></image>
 				</view>
-			</u-upload> -->
+			</u-upload>
 		</view>
 		<u-toast ref="uToast" />
-		<view class="write-btn" @click="addWashEvaluate">发表评价</view>
+		<view class="write-btn" @click="setLoaclList">发表评价</view>
 	</view>
 </template>
 <script>
@@ -23,8 +28,17 @@ export default {
 	data() {
 		return {
 			washId: '',
-			// count: 4, // 最大图片数量
+			count: 1,
+			action: this.$u.http.config.baseUrl + '/Upload/uploadfile',
+			header: {
+				"authorization": 'Bearer' + " " + uni.getStorageSync('token')
+			},
+			fileName: 'common',　// 与formData name 一样
+			formData: {
+				name: 'common', // 其他图片
+			},
 			content: '',
+			imageList: [],
 		}
 	},
 	onLoad(option) {
@@ -38,11 +52,22 @@ export default {
 			}
 			return true;
 		},
+		setLoaclList() {
+			this.$refs.uUpload.upload();
+		},
+		setImageList(lists) {
+			// console.log(lists);
+			lists.forEach(item => {
+				this.imageList.push(item.response.data.file_name);
+			})
+			this.addWashEvaluate();
+		},
 		addWashEvaluate() {
 			if(!this.verifyParams()) return false;
 			this.$u.api.sendOrderComment({
 				id: this.washId,
 				comment: this.content,
+				comment_img: this.imageList[0]
 			}).then(res => {
 				this.$refs.uToast.show({
 					title: res.message,
@@ -65,23 +90,23 @@ export default {
 		background-color: #ffffff;
 		padding: 30rpx;
 		margin-bottom: 10rpx;
-		// textarea {
-		// 	width: 100% !important;
-		// 	height: 500rpx;
-		// 	margin-bottom: 60rpx;
-		// }
-		// .slot-btn {
-		// 	width: 140rpx;
-		// 	height: 140rpx;
-		// 	background: rgba(236,236,236,1);
-		// 	border-radius: 10rpx;
-		// 	text-align: center;
-		// 	> img {
-		// 		margin-top: 48rpx;
-		// 		width: 54rpx;
-		// 		height: 49rpx;
-		// 	}
-		// }
+		textarea {
+			width: 100% !important;
+			height: 500rpx;
+			margin-bottom: 60rpx;
+		}
+		.slot-btn {
+			width: 140rpx;
+			height: 140rpx;
+			background: rgba(236,236,236,1);
+			border-radius: 10rpx;
+			text-align: center;
+			> image {
+				margin-top: 48rpx;
+				width: 54rpx;
+				height: 49rpx;
+			}
+		}
 	}
 	.write-btn {
 		margin: 120rpx auto 0;