diff --git a/package1/group/shopEvaluate.vue b/package1/group/shopEvaluate.vue
index 440941a..5a74243 100644
--- a/package1/group/shopEvaluate.vue
+++ b/package1/group/shopEvaluate.vue
@@ -62,21 +62,21 @@
 					<view class="eval-img" v-if="item.picture">
 						<img @tap="largeImg" :src="item.picture" alt="">
 					</view>
-					<view class="reply-card" :class="{'expanded': isExpanded}" v-for="(item1,index1) in item.comments" :key="index1">
+					<view class="reply-card" v-for="(item1,index1) in item.comments" :key="index1" :class="{'expanded': item1.isOpen}">
 						<!-- 标题行：商家回复 + 展开/收起按钮 -->
 						<view class="reply-header">
 							<!-- 回复内容区域（动态类控制展开/折叠） -->
-							<view class="reply-content" :class="{ collapsed: !isExpanded, expanded: isExpanded }">
+							<view class="reply-content" :class="{ collapsed: !item1.isOpen, expanded: item1.isOpen }">
 								<text>{{item1.createByName}} : {{ item1.remark }}</text>
-								<img :src="item1.picture" alt="" class="upload-img" style="margin-top: 10px;border-radius: 10px;">
+								<img :src="item1.picture" v-if="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>
+							<view class="reply-expand-btn" @click="toggleReply(index,index1)">
+								<text v-if="!item1.isOpen">展开</text>
 								<text v-else>收起</text>
 							</view>
 						</view>
 					</view>
-					<view class="" v-if="isMerchant == 1">
+					<view class="" v-if="(isMerchant == 1 || isMerchant == 2)">
 						<view @tap="changeStatus(index)" class="reply-card" v-if="!item.isReply" style="text-align: right;padding-right: 10px;color: #00BFFF;">
 							回复
 						</view>
@@ -111,6 +111,7 @@
 					</view>
 				</view>
 			</view>
+			<view style="width: 100%;height: 100rpx;"></view>
 		</view>
 		<!-- 查看大图弹出层 -->
 		<uni-popup ref="imgPopup" background-color="#fff">
@@ -128,7 +129,6 @@
 				replyText:'',
 				isMerchant:0,
 				replyPicture:"",
-				isExpanded: false,
 				menuButtonInfo: {},
 				isPintuan: true,
 				bigImg: '',
@@ -216,6 +216,11 @@
 						}
 						for(let i=0;i<that.shopComments.length;i++){
 							that.shopComments[i].isReply=false
+							if(that.shopComments[i].comments.length > 0){
+								for(let m=0;m<that.shopComments[i].comments.length;m++){
+									that.shopComments[i].comments[m].isOpen = false
+								}
+							}
 						}
 						that.$forceUpdate()
 						if(this.searchAll){
@@ -236,7 +241,7 @@
 					remark:this.replyText,
 					picture:this.replyPicture,
 					createBy:this.shopComments[v].shopId,
-					createByName:'商家',
+					createByName:this.isMerchant == 1?'商家':'配送员',
 					createByIcon:'https://ooo.0o0.ooo/2019/04/28/5cc5a71a6e3b6.png',
 					orderId:this.shopComments[v].orderId,
 					shopId:this.shopComments[v].shopId,
@@ -257,8 +262,11 @@
 					uni.hideLoading();
 				}).catch((res) => {});
 			},
-			toggleReply() {
-				this.isExpanded = !this.isExpanded;
+			toggleReply(i,m) {
+				
+				this.shopComments[i].comments[m].isOpen = !this.shopComments[i].comments[m].isOpen;
+				console.log("11111",this.shopComments)
+				this.$forceUpdate()
 			},
 			changeStatus(v){
 				this.shopComments[v].isReply = !this.shopComments[v].isReply
diff --git a/package1/order/orderEvaluate.vue b/package1/order/orderEvaluate.vue
index 29864ec..4858030 100644
--- a/package1/order/orderEvaluate.vue
+++ b/package1/order/orderEvaluate.vue
@@ -216,7 +216,7 @@
 					data.push({  //配送员
 						parentId:'',
 						leve:0,
-						remark:this.shopRemark,
+						remark:this.manRemark,
 						picture:this.manPicture,
 						createBy:uni.getStorageSync('id'),
 						createByName:'微信用户',