diff --git a/components/mine/order-item/index.vue b/components/mine/order-item/index.vue
index 93ea2cf..7dcd6f2 100644
--- a/components/mine/order-item/index.vue
+++ b/components/mine/order-item/index.vue
@@ -15,7 +15,7 @@
 					<view class="goods-sku u-line-1" v-if="order.order_state !== 20 && order.order_state !== 40 && goods.goods_spec">
 						<text v-for="(spec, index) in goods.goods_spec" :key="index">{{ spec + ';' }}</text>
 					</view>
-					<view class="goods-time u-line-1" v-if="order.view_type == 1">结束时间：{{ order.end_time | date('yyyy-mm-dd hh:MM') }}</view>
+					<!-- <view class="goods-time u-line-1" v-if="order.view_type == 1">结束时间：{{ order.end_time | date('yyyy-mm-dd hh:MM') }}</view> -->
 					<view class="goods-price u-line-1" v-if="order.order_state == 20 || order.order_state == 40">总价：￥{{ goods.goods_price }}，实付款￥{{ goods.goods_pay_price }}</view>
 					<view class="goods-date" v-if="order.order_state == 20 || order.order_state == 40">
 						<image src="@/pageE/static/mine/26.png"></image>
diff --git a/components/shop/special-shop/index.vue b/components/shop/special-shop/index.vue
index 2e54829..96749f5 100644
--- a/components/shop/special-shop/index.vue
+++ b/components/shop/special-shop/index.vue
@@ -5,8 +5,8 @@
 			<view class="right">
 				<view class="name u-line-1" @click="spikeGoods">{{ item.goods_name }}</view>
 				<view class="price">
-					<view class="groupbuy-price">{{ item.groupbuy_price }}</view>
-					<view class="goods-price">{{ item.goods_price }}</view>
+					<view class="groupbuy-price">￥{{ item.groupbuy_price }}</view>
+					<view class="goods-price">￥{{ item.goods_price }}</view>
 				</view>
 				<view class="buy">
 					<view class="num">剩余{{ item.inventory }}件</view>
@@ -19,7 +19,7 @@
 			<view class="right">
 				<view class="name u-line-1" @click="toDetailsPage">{{ item.pintuan_goods_name }}</view>
 				<view class="price group">
-					<view class="groupbuy-price">{{ item.pintuan_goods_price }}</view>
+					<view class="groupbuy-price">￥{{ item.pintuan_goods_price }}</view>
 					<view class="btn" @click="toDetailsPage">立即拼团</view>
 				</view>
 			</view>
diff --git a/pageB/sdetails/index.vue b/pageB/sdetails/index.vue
index aa62571..9ab07cb 100644
--- a/pageB/sdetails/index.vue
+++ b/pageB/sdetails/index.vue
@@ -103,7 +103,7 @@
 		</u-popup>
 		<u-popup v-model="showInvolvementUser" mode="center" z-index="10078">
 			<view class="involvement-container" v-if="involvemenGroupInfo.length">
-				<view class="title u-line-1">参与{{ involvemenGroupInfo[0].member_nickname }}的拼团</view>
+				<view class="title">参与<text class="user-name u-line-1">{{ involvemenGroupInfo[0].member_nickname }}</text>的拼团</view>
 				<view class="involvement-view">
 					<view class="item" v-for="(user, i) in involvemenGroupInfo" :key="i">
 						<image class="avatar" :src="user.member_avatar"></image>
@@ -988,6 +988,13 @@ export default {
 			font-size: 32rpx;
 			color: rgba(51,51,51,1);
 			position: relative;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			.user-name {
+				display: inline-block;
+				max-width: 200rpx;
+			}
 			&::after {
 				content: '';
 				position: absolute;
diff --git a/pageC/merchant/goods.vue b/pageC/merchant/goods.vue
index 51f25b2..845e730 100644
--- a/pageC/merchant/goods.vue
+++ b/pageC/merchant/goods.vue
@@ -14,7 +14,7 @@
 		</view>
 		<scroll-view scroll-y class="scroll-container" :style="{ height: scrollHeight }" @scrolltolower="loadMore">
 			<view class="goods-container">
-				<view v-for="(goods, index) in goodsList" :key="index" class="goods-view" @click="toDetailsPage(goods.goods_id)">
+				<view v-for="(goods, index) in goodsList" :key="index" class="goods-view">
 					<goodsItem :info="goods"></goodsItem>
 				</view>
 			</view>
@@ -28,7 +28,7 @@ import goodsItem from "@/components/shop/list/item"
 export default {
 	data() {
 		return {
-			pageSize: 15,
+			pageSize: 5,
 			cid: '',
 			page: 1,
 			current: 0,
@@ -83,7 +83,7 @@ export default {
 				page: this.page,
 				order: sort,
 			})
-			this.timer = true;
+			// this.timer = true;
 			if(res.errCode == 0) {
 				this.pageSize = res.data.per_page;
 				if(load == 'reload') this.goodsList = res.data.data;
@@ -92,8 +92,8 @@ export default {
 			return res.data.data.length;
 		},
 		loadMore() {
-			if(this.goodsList.length < this.pageSize) return false;
-			if(!this.timer) return false;
+			// if(this.goodsList.length < this.pageSize) return false;
+			// if(!this.timer) return false;
 			this.loadStatus = "loading";
 			this.page++;
 			this.getStoreGoodsList({  load: 'loadmore' }).then(length => {
@@ -118,12 +118,6 @@ export default {
 			this.scrollHeight = res.windowHeight - (res.windowWidth / 750) * otherHeight + 'px';
 			// console.log(this.scrollHeight);
 		},
-		toDetailsPage(id) {
-			this.$u.route('/pageB/sdetails/index', {
-				id: id,
-				type: 1 // 商品详情 商品类型 1普通 2拼团 3秒杀 4优惠券
-			});
-		}
 	}
 };
 </script>
diff --git a/pageC/merchant/index.vue b/pageC/merchant/index.vue
index febbe51..858e903 100644
--- a/pageC/merchant/index.vue
+++ b/pageC/merchant/index.vue
@@ -14,15 +14,18 @@
 				<view>我的</view>
 			</view>
 		</view> -->
-		<view class="top" :style="{'background-image':'url(' + info.store_banner + ')'}">
-			<image :src="info.store_avatar"></image>
-			<view class="info">
-				<view class="name u-line-1">{{info.store_name}}</view>
-				<view class="num">粉丝数：{{info.store_collect}}</view>
-			</view>
-			<view class="btn" @click="attentionMember">
-				<image src="/static/image/shop/8.png"></image>
-				<view>{{ info.is_attention == 0 ? "关注" : "已关注" }}</view>
+		<view class="top" :style="{'background':'url(' + info.store_banner + ') 100% 100% no-repeat' }">
+			<view class="mantle"></view>
+			<view class="main-container">
+				<image :src="info.store_avatar"></image>
+				<view class="info">
+					<view class="name u-line-1">{{info.store_name}}</view>
+					<view class="num">粉丝数：{{info.store_collect}}</view>
+				</view>
+				<view class="btn" @click="attentionMember">
+					<image :src="info.is_attention == 0 ? '/static/image/shop/14.png' : '/static/image/shop/8.png'"></image>
+					<view>{{ info.is_attention == 0 ? "关注" : "已关注" }}</view>
+				</view>
 			</view>
 		</view>
 		<view class="follow" v-if="info.attention_member && info.attention_member.length">
@@ -104,8 +107,8 @@ export default {
 		// this.getStoreImgVideoList();
 	},
 	onNavigationBarButtonTap(e) {
-		// console.log(e.index);
-		if(e.index == 1) this.$u.route('/pageC/cart/index');
+		console.log(e.index);
+		if(e.index == 0) this.$u.route('/pageC/cart/index');
 		// if(e.index == 0) this.show = true;
 	},
 	methods: {
@@ -127,7 +130,7 @@ export default {
 					this.time = time;
 					this.date = date
 				}
-				console.log(123)
+				// console.log(123)
 				this.$u.api.getAtwillUserInfo({
 					id:this.sid
 				}).then((res)=>{
@@ -232,48 +235,66 @@ export default {
 		z-index: 9;
 		width: 750rpx;
 		height: 350rpx;
-		background-color: #999999;
-		display: flex;
-		align-items: center;
-		padding: 168rpx 60rpx 0 30rpx;
-		> image {
-			margin-right: 40rpx;
-			width: 140rpx;
-			height: 140rpx;
-			border-radius: 50%;
-			background-color: aqua;
+		// background-color: #999999;
+		.mantle {
+			width: 750rpx;
+			height: 350rpx;
+			position: absolute;
+			top: 0;
+			left: 0;
+			z-index: 10;
+			background-color: #999999;
+			opacity: 0.7;
 		}
-		.info {
-			width: 220rpx;
-			color: rgba(255,255,255,1);
-			.name {
-				margin-bottom: 30rpx;
-				font-size: 28rpx;
-				font-weight: 500;
-			}
-			.num {
-				font-size: 24rpx;
-			}
-		}
-		.btn {
-			margin-left: auto;
-			width: 162rpx;
-			height: 60rpx;
-			border: 2rpx solid rgba(255,255,255,1);
-			border-radius: 30rpx;
+		.main-container {
 			display: flex;
 			align-items: center;
-			justify-content: center;
+			padding: 54rpx 60rpx 0 30rpx;
+			position: absolute;
+			top: 0;
+			left: 0;
+			z-index: 19;
+			width: 750rpx;
+			height: 350rpx;
 			> image {
-				width: 28rpx;
-				height: 28rpx;
-				flex-shrink: 0;
-				margin-right: 14rpx;
+				margin-right: 40rpx;
+				width: 140rpx;
+				height: 140rpx;
+				border-radius: 50%;
+				// background-color: aqua;
 			}
-			> view {
-				white-space: nowrap;
-				font-size: 26rpx;
+			.info {
+				width: 220rpx;
 				color: rgba(255,255,255,1);
+				.name {
+					margin-bottom: 30rpx;
+					font-size: 28rpx;
+					font-weight: 500;
+				}
+				.num {
+					font-size: 24rpx;
+				}
+			}
+			.btn {
+				margin-left: auto;
+				width: 162rpx;
+				height: 60rpx;
+				border: 2rpx solid rgba(255,255,255,1);
+				border-radius: 30rpx;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				> image {
+					width: 28rpx;
+					height: 28rpx;
+					flex-shrink: 0;
+					margin-right: 14rpx;
+				}
+				> view {
+					white-space: nowrap;
+					font-size: 26rpx;
+					color: rgba(255,255,255,1);
+				}
 			}
 		}
 	}
@@ -312,7 +333,7 @@ export default {
 						margin-right: 35rpx;
 					}
 					text-align: center;
-					width: 90rpx;
+					width: 96rpx;
 					> image {
 						width: 60rpx;
 						height: 60rpx;
diff --git a/pageE/order/Comment.vue b/pageE/order/Comment.vue
index 0540318..fb376b0 100644
--- a/pageE/order/Comment.vue
+++ b/pageE/order/Comment.vue
@@ -8,14 +8,15 @@
 		<view class="order-rate">
 			<view class="rate">
 				<view class="title">物流评分</view>
-				<u-rate :count="5" active-color="#FF780F" inactive-color="#CCCCCC" v-model="logistics" gutter="20" size="32"></u-rate>
+				<u-rate :count="5" min-count="1" active-color="#FF780F" inactive-color="#CCCCCC" v-model="logistics" gutter="20" size="32"></u-rate>
 			</view>
 			<view class="rate">
 				<view class="title">服务态度</view>
-				<u-rate :count="5" v-model="service" active-color="#FF780F" inactive-color="#CCCCCC" gutter="20" size="32"></u-rate>
+				<u-rate :count="5" min-count="1" v-model="service" active-color="#FF780F" inactive-color="#CCCCCC" gutter="20" size="32"></u-rate>
 			</view>
 		</view>
 		<view class="write-btn" @click="submitComment">发表意见</view>
+		<u-toast ref="uToast" />
 	</view>
 </template>
 <script>
@@ -26,13 +27,14 @@ export default {
 		return {
 			orderId: '',
 			count: 3, // 最大图片数量
-			logistics: 0, // 物流服务
-			service: 0, // 服务态度
+			logistics: 1, // 物流服务
+			service: 1, // 服务态度
 			describe: [],
 			content: [],
 			imageList: [], // 本地图片路径
 			goodsList: [],
 			uploadImageList: [], // 线上图片名字
+			debounce: true, // 防止多次提交
 		}
 	},
 	components: {
@@ -76,7 +78,7 @@ export default {
 		setModelKey(data) {
 			data.forEach(() => {
 				this.content.push('');
-				this.describe.push(0);
+				this.describe.push(1);
 				this.imageList.push([]);
 			})
 		},
@@ -123,29 +125,28 @@ export default {
 			})
 		},
 		verifyParams() {
+			let status = true;
 			this.goodsList.forEach((_, index) => {
 				if(this.$u.test.isEmpty(this.content[index])) {
 					this.$u.toast('内容不可为空');
-					return false;
+					status = false;
 				}
 			})
-			return true;
+			return status;
 		},
 		submitComment() {
 			// console.log(this.content);
 			// console.log(this.describe);
 			// console.log(this.imageList);
 			this.uploadImage();
-			// this.goodsList.forEach((_, index) => {
-				
-			// })
 		},
 		addOrderEvaluate() {
 			if(!this.verifyParams()) return false;
+			if(!this.debounce) return false;
 			let files = [];
 			// console.log(this.uploadImageList);
 			this.uploadImageList.forEach((item, index) => {
-				files[index] = '';
+				// files[index] = '';
 				// console.log(item);
 				item.forEach((img, idx) => {
 					if(idx < item.length-1) {
@@ -161,11 +162,21 @@ export default {
 				scores_one: this.logistics,
 				scores_two: this.service,
 				scores_three: this.describe,
-				file: files,
 			};
-			console.log(params);
+			if(files.length) {
+				Object.assign(params, { file: files })
+			}
+			// console.log(params);
 			this.$u.api.updateOrderEvaluate(params).then(res => {
-				this.$u.toast(res.message);
+				if(res.errCode == 0) {
+					this.$refs.uToast.show({
+						title: res.message,
+						back: true,
+					})
+				} else {
+					this.$u.toast(res.message);
+					this.debounce = true;
+				}
 			})
 		},
 	},
diff --git a/pageE/order/Details.vue b/pageE/order/Details.vue
index 5667811..540398d 100644
--- a/pageE/order/Details.vue
+++ b/pageE/order/Details.vue
@@ -128,7 +128,7 @@ export default {
 			orderInfo: {},
 			oid: '',
 			timer: '',
-			countdown: '', // 倒计时
+			countdown: '00:00:00', // 倒计时
 			isSpike: false, // 倒计时是否结束
 		}
 	},
diff --git a/pageE/order/commentItem.vue b/pageE/order/commentItem.vue
index 841f5b7..92653be 100644
--- a/pageE/order/commentItem.vue
+++ b/pageE/order/commentItem.vue
@@ -10,7 +10,7 @@
 			</view>
 			<view class="rate">
 				<view class="title">描述相符</view>
-				<u-rate :count="5" v-model="describe" active-color="#FF780F" inactive-color="#CCCCCC" gutter="20" size="32"></u-rate>
+				<u-rate :count="5" min-count="1" v-model="describe" active-color="#FF780F" inactive-color="#CCCCCC" gutter="20" size="32"></u-rate>
 			</view>
 			<u-input v-model="content" type="textarea" height="100" :auto-height="true" placeholder="发表你的评价吧，收货时心情如何？" />
 			<u-upload 
@@ -45,7 +45,7 @@ export default {
 				name: 'common', // 其他图片
 			},
 			content: '',
-			describe: '',
+			describe: 1,
 			imageList: [],
 		}
 	},
@@ -68,7 +68,7 @@ export default {
 			lists.forEach(item => {
 				this.imageList.push(item.url);
 			})
-			console.log(this.imageList);
+			// console.log(this.imageList);
 			this.$emit('setLocalImage', { list: this.imageList, index: this.index });
 		}
 	}
diff --git a/pages.json b/pages.json
index ca01654..9c9737c 100644
--- a/pages.json
+++ b/pages.json
@@ -850,6 +850,7 @@
 					"style": {
 						"navigationBarTitleText": "勋章介绍",
 						"app-plus": {
+							"type": "transparent",
 							"titleSize": "36px",
 							"titleNView": {
 								"backgroundColor": "rgba(255,255,255,0)",
diff --git a/pages/mine/index.vue b/pages/mine/index.vue
index 689adba..767891a 100644
--- a/pages/mine/index.vue
+++ b/pages/mine/index.vue
@@ -180,7 +180,7 @@ export default {
     .mine-top {
 		// width: 100%;
 		height: 272rpx;
-		background-color: #F0AD4E;
+		background-color: #FF7807;
 		.top {
 			padding: 40rpx 0 0 30rpx;
 			display: flex;
diff --git a/static/image/shop/14.png b/static/image/shop/14.png
new file mode 100644
index 0000000..03b09f4
Binary files /dev/null and b/static/image/shop/14.png differ
diff --git a/static/image/tabbar/mine2.png b/static/image/tabbar/mine2.png
index fb3c9a7..bf057b9 100644
Binary files a/static/image/tabbar/mine2.png and b/static/image/tabbar/mine2.png differ