From eb7a808aaf7dd0a6dd2ff70f9ef3f8ce0b1e31d1 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期五, 22 五月 2026 18:27:32 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/gtzxinglijicun

---
 small-program/pages/evaluate/evaluate.vue |   66 ++++++++++++++++++++++++---------
 1 files changed, 48 insertions(+), 18 deletions(-)

diff --git a/small-program/pages/evaluate/evaluate.vue b/small-program/pages/evaluate/evaluate.vue
index 75cfd80..497cb5b 100644
--- a/small-program/pages/evaluate/evaluate.vue
+++ b/small-program/pages/evaluate/evaluate.vue
@@ -20,9 +20,9 @@
 				</view>
 			</view>
 
-			<view class="divider"></view>
+			<view class="divider" v-if="showDriver"></view>
 
-			<view class="rate-block">
+			<view class="rate-block" v-if="showDriver">
 				<view class="title-row">
 					<text class="title-label">閰嶉�佸徃鏈猴細</text>
 					<text class="title-value">{{info.driverName || ''}}</text>
@@ -40,13 +40,11 @@
 					<text class="rate-text">{{ form.driverScore }}鏄�</text>
 				</view>
 			</view>
-
-			<view class="divider"></view>
-
-			<view class="rate-block" v-if="info.type ===1 && info.takeShopId ">
+			<view class="divider" v-if="showTakeShop"></view>
+			<view class="rate-block" v-if="showTakeShop">
 				<view class="title-row">
 					<text class="title-label">鏀朵欢闂ㄥ簵锛�</text>
-					<text class="title-value">{{info.takeShopName || 0}}</text>
+					<text class="title-value">{{info.takeShopName || ''}}</text>
 				</view>
 				<view class="star-row">
 					<view class="star-list">
@@ -95,6 +93,10 @@
 		data() {
 			return {
 				id:null,
+				type:null,
+				takeShopId:null,
+				showDriver: false,
+				showTakeShop: false,
 				info:{},
 				form:{
 				   content: "",
@@ -110,21 +112,49 @@
 				]
 			}
 		},
-		onShow() {
-			this.info={}
-			this.getUserDetail() 
-		},
+		// onShow() {
+		// 	this.info={}
+			
+		// },
 		onLoad(options) {
 			this.id = options.id
+			this.type = Number(options.type)
+			this.takeShopId = options.takeShopId
 			this.photoList=[]
-			this.form={
-			   content: "",
-			   depositScore: 5,
-			   driverScore: 5,
-			   orderId: this.id,
-			   takeScore: 5,
-			   images:[]
+			
+			if (this.type === 1) {
+				this.showDriver = true
+				if (this.takeShopId) {
+					this.showTakeShop = true
+					this.form = {
+						content: "",
+						depositScore: 5,
+						driverScore: 5,
+						orderId: this.id,
+						takeScore: 5,
+						images: []
+					}
+				} else {
+					this.form = {
+						content: "",
+						depositScore: 5,
+						driverScore: 5,
+						orderId: this.id,
+						images: []
+					}
+				}
+			} else {
+				this.showDriver = false
+				this.showTakeShop = false
+				this.form={
+				   content: "",
+				   depositScore: 5,
+				   orderId: this.id,
+				   images:[]
+				}
 			}
+
+			this.getUserDetail() 
 		},
 		methods:{
 			deleteImage(index) {

--
Gitblit v1.9.3