From deb3968f45dbe0cfa2b3f5e8e6ce7c71466bb472 Mon Sep 17 00:00:00 2001
From: tianyi <13521030702@163.com>
Date: Sat, 18 Apr 2026 15:05:05 +0800
Subject: [PATCH] 11

---
 package1/order/orderDetail.vue | 130 ++++++++++++++++++++++++++++++++-
 package1/order/returnOrder.vue |   4 +-
 2 files changed, 131 insertions(+), 3 deletions(-)

diff --git a/package1/order/orderDetail.vue b/package1/order/orderDetail.vue
index 9f08bd7..f0ab4bd 100644
--- a/package1/order/orderDetail.vue
+++ b/package1/order/orderDetail.vue
@@ -433,11 +433,66 @@
 								{{orderDetail.deliveryInfo.finishTime ? orderDetail.deliveryInfo.finishTime : '尽快送达'  | formatTime}}
 							</view>
 						</view>
-						
+						<view style="height: 80rpx;line-height: 80rpx;display: flex;" v-if="orderDetail.deliveryType == 1">
+							<view style="flex: 1;color: #777;font-weight: 700;">
+								我的评价
+							</view>
+							<view style="color: #000;font-weight: 700;" @tap="checkEvaluate">
+								查看评价 >
+							</view>
+						</view>
 					</view>
 				</view>
 			</view>
 		</view>
+		<!-- 评价弹出层 -->
+		<uni-popup ref="evaluatePopup" background-color="#fff">
+			<view class="evaluate-content" @tap="$refs.evaluatePopup.close()">
+				<view class="evaluate-list" v-for="(item,index) in orderDetail.comments" :key="index">
+					<view class="eval-title">
+						<view class="eval-icon">
+							<img :src="item.createByIcon"
+								alt="" />
+						</view>
+						<view class="eval-name">
+							<view class="name1">
+								{{item.createByName}}
+							</view>
+							<view class="eval-time">
+								{{item.createTime}}
+							</view>
+						</view>
+					</view>
+					<view class="eval-content">
+						<view style="display: flex;height: 50rpx;line-height: 50rpx;font-size: 24rpx;">
+							商品
+							<view style="padding: 12rpx 0 0 10rpx;">
+								<uni-rate v-model="item.score" size="12" />
+							</view>
+						</view>
+						<view class="eval-text">
+							{{item.remark}}
+						</view>
+						<view class="eval-img">
+							<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-header">
+								<!-- 回复内容区域（动态类控制展开/折叠） -->
+								<view class="reply-content" :class="{ collapsed: !isExpanded, expanded: isExpanded }">
+									<text>{{item1.createByName}} : {{ item1.remark }}</text>
+								</view>
+								<view class="reply-expand-btn" @click="toggleReply">
+									<text v-if="!isExpanded">展开</text>
+									<text v-else>收起</text>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</uni-popup>
 		<!-- 核销二维码弹出层 -->
 		<uni-popup ref="imgPopup" background-color="#fff">
 			<view class="img-popup-content" @tap="$refs.imgPopup.close()">
@@ -715,6 +770,14 @@
 					phoneNumber: phone
 				});
 			},
+			checkEvaluate(){
+				console.log(this.orderDetail)
+				if(this.orderDetail.comments.length>0){
+					this.$refs.evaluatePopup.open()
+				}else{
+					this.tui.toast("暂无评价");
+				}
+			},
 			orderStatus(item){
 				if(item.status == 0 || item.status == 10 || item.status == 2 || (item.status == 3 && item.deliveryType == 1) || (item.status == 3 && item.deliveryType == 2) || item.status == 4){
 					return true;
@@ -1211,6 +1274,13 @@
 		background: url('https://jewel-shop.oss-cn-beijing.aliyuncs.com/73e684e3319c468d9252461ba3c9e95b.png') no-repeat;
 		background-size: 100%;
 	}
+	.evaluate-content{
+		width: 600rpx;
+		height: 800rpx;
+		background: #fff;
+		border-radius: 10px;
+		padding: 10px;
+	}
 	
 	.title1 {
 		background: url('https://jewel-shop.oss-cn-beijing.aliyuncs.com/69c894452e924bedbb5a24bf978f47c7.png') no-repeat;
@@ -1363,4 +1433,62 @@
 	.kaituan51{
 		margin: 80rpx 0 40rpx;
 	}
+	.evaluate-list {
+		margin-top: 40rpx;
+	}
+	
+	.eval-title {
+		width: 100%;
+		height: 80rpx;
+		display: flex;
+	}
+	
+	.eval-icon {
+		height: 80rpx;
+		width: 80rpx;
+	
+		img {
+			width: 100%;
+			height: 100%;
+			background-size: 100%;
+		}
+	}
+	
+	.eval-name {
+		margin-left: 20rpx;
+	}
+	
+	.name1 {
+		font-size: 28rpx;
+		line-height: 50rpx;
+		font-weight: 700;
+	}
+	
+	.eval-rate {
+		display: flex;
+		margin: 20rpx 0 0 100rpx;
+		height: 48rpx;
+		line-height: 40rpx;
+	}
+	
+	.eval-content {
+		margin-left: 100rpx;
+		font-size: 28rpx;
+		color: #777;
+		line-height: 48rpx;
+	}
+	
+	.eval-img {
+		display: flex;
+		width: 100%;
+		overflow-x: scroll;
+		margin-top: 20rpx;
+	
+		img {
+			width: 100rpx;
+			height: 100rpx;
+			background-size: 100%;
+			margin-right: 20rpx;
+		}
+	}
 </style>
\ No newline at end of file
diff --git a/package1/order/returnOrder.vue b/package1/order/returnOrder.vue
index 73c061b..0106f26 100644
--- a/package1/order/returnOrder.vue
+++ b/package1/order/returnOrder.vue
@@ -24,7 +24,7 @@
 						</view>
 						<view class="goods-content">
 							<view class="goods-name" style="display: flex;">
-								{{item1.productName}}
+								<view style="flex:1">{{item1.productName}}</view>
 								<view class="goods-num" v-if="sellTime == 0">
 									<view class="num-plus" style="background: #999;color: #fff;"
 										@tap="changeValue('minus',index1)">
@@ -339,7 +339,7 @@
 		},
 		onShow() {
 			this.menuButtonInfo = uni.getMenuButtonBoundingClientRect()
-			this.$refs.carPopup.open('bottom');
+			this.$refs.carPopup.open();
 		},
 		methods: {
 			chooseReturnType(){