diff --git a/package1/group/shopEvaluate.vue b/package1/group/shopEvaluate.vue
index 47cb1a2..d06cc6d 100644
--- a/package1/group/shopEvaluate.vue
+++ b/package1/group/shopEvaluate.vue
@@ -68,6 +68,7 @@
 							<!-- 回复内容区域（动态类控制展开/折叠） -->
 							<view class="reply-content" :class="{ collapsed: !isExpanded, expanded: isExpanded }">
 								<text>{{item1.createByName}} : {{ item1.remark }}</text>
+								<img :src="item1.picture" alt="" class="upload-img" style="margin-top: 10px;border-radius: 10px;">
 							</view>
 							<view class="reply-expand-btn" @click="toggleReply">
 								<text v-if="!isExpanded">展开</text>
@@ -190,6 +191,12 @@
 		onLoad(option) {
 			this.isMerchant = option.isMerchant
 			this.shopItem = JSON.parse(option.item)
+			if(option.isCha == 1){ //待回复差评进来的
+				this.searchForm.score = 1
+				this.searchForm.hasAnswer= 0
+				this.menuList[0].checked = false
+				this.menuList[2].checked = true
+			}
 			this.getshopComments(this.shopItem.id)
 		},
 		onShow() {
@@ -228,8 +235,8 @@
 					leve:1,
 					remark:this.replyText,
 					picture:this.replyPicture,
-					createBy:this.shopComments[v].createBy,
-					createByName:'微信用户',
+					createBy:this.shopComments[v].shopId,
+					createByName:'商家',
 					createByIcon:'https://ooo.0o0.ooo/2019/04/28/5cc5a71a6e3b6.png',
 					orderId:this.shopComments[v].orderId,
 					shopId:this.shopComments[v].shopId,
@@ -547,7 +554,7 @@
 		font-size: 26rpx;
 		color: #555;
 		padding: 12rpx;
-		transition: all 0.2s;
+		transition: all 1s;
 		height: 70rpx;
 		flex: 1;
 	}
@@ -564,7 +571,7 @@
 	/* 展开状态：固定高度100px，可滚动 */
 	.reply-content.expanded {
 		display: block;
-		height: 200rpx;
+		height: auto;
 		/* 固定高度100px */
 		overflow-y: auto;
 		/* 内容超长时滚动 */
@@ -572,6 +579,7 @@
 		-webkit-line-clamp: unset;
 		-webkit-box-orient: unset;
 		text-overflow: clip;
+		padding-bottom: 10px;
 	}
 
 	/* 滚动条美化（可选） */