From 77b52c06afdb843ee67c6e938afab0458143d76f Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 05 九月 2025 10:48:48 +0800
Subject: [PATCH] 前端

---
 small-program/pages/demand-hall/demand-hall.vue |   35 ++++++++++++++++++++---------------
 1 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/small-program/pages/demand-hall/demand-hall.vue b/small-program/pages/demand-hall/demand-hall.vue
index b92e48e..0ec55e5 100644
--- a/small-program/pages/demand-hall/demand-hall.vue
+++ b/small-program/pages/demand-hall/demand-hall.vue
@@ -60,13 +60,19 @@
 						{{item.categoryName}}锝渰{item.priceNum1}}鏂�
 					</view>
 					<view class="index-list-item-info" v-if="item.type === 0 && item.workType === 1">
-						{{item.categoryName}}锝渰{item.priceNum1}}浜�
+						{{item.categoryName}}锝渰{item.priceNum2}}浜�
 					</view>
-					<view class="index-list-item-info" v-if="item.type === 0 && item.workType === 2">
-						{{item.categoryName}}锝渰{item.priceNum1}}浜�
+					<view class="index-list-item-info" v-if="item.type === 0 && item.workType === 2&& item.carType === 0">
+						{{item.categoryName}}锝渰{item.priceNum1}}澶� 锝渰{item.priceNum2}}浜�
+					</view>
+					<view class="index-list-item-info" v-if="item.type === 0 && item.workType === 2&& item.carType === 1">
+						{{item.categoryName}}锝渰{item.priceNum1}}灏忔椂 锝渰{item.priceNum2}}浜�
+					</view>
+					<view class="index-list-item-info" v-if="item.type === 0 && item.workType === 2&& item.carType === 2">
+						{{item.categoryName}}锝渰{item.priceNum1}}鏂� 
 					</view>
 					<view class="index-list-item-info" v-if="item.type === 1">
-						{{item.carUnit}} | {{item.transportTypeName}} | {{item.transportNum}}{{item.transportUnit}}锝滅敤杞{item.priceNum1}}澶�
+						{{item.carUnit}} | {{item.transportTypeName}} | {{item.transportNum}}{{item.transportUnit}}锝滅敤杞{item.priceNum1}}{{item.carType === 0?"澶�":"娆�"}}
 					</view>
 					<view class="index-list-item-info" v-if="item.type === 2">
 						{{item.wayInfoCopy}}
@@ -90,9 +96,10 @@
 							<text>{{item.startDate}} 鑷� {{item.endDate}}锛坽{item.totalDays}}澶╋級</text>
 						</view>
 					</template>
-					<view class="index-list-item-price">
-						<text>棰勪及锛�</text>
-						<text>楼{{item.estimatedAccount / 100}}</text>
+					<view class="index-list-item-price"> 
+						<text v-if="item.status==4 || item.type==2">宸叉敮浠橈細</text>
+						<text v-if="item.status!=4&& item.type!=2">棰勪及锛�</text>
+						<text>楼{{item.payAccount / 100}}</text>
 					</view>
 					<view class="eidt">
 						<view>
@@ -127,7 +134,7 @@
 							<text v-if="item.type === 0 && item.workType === 0">鐢ㄥ伐鍗� - 閲囨憳宸�</text>
 							<text v-else-if="item.type === 0 && item.workType === 1">鐢ㄥ伐鍗� - 鍒嗘嫞宸�</text>
 							<text v-else-if="item.type === 0 && item.workType === 2">鐢ㄥ伐鍗� - 鍖呰宸�</text>
-							<text v-else-if="item.type === 1">杩愯揣鍗�</text>
+							<text v-else-if="item.type === 1">杩愯揣鍗� - {{item.categoryName}}</text>
 							<text v-else-if="item.type === 2">璁㈤鍗�</text>
 							<view class="tips" v-if="item.acceptType === 1">娲惧崟</view>
 							<view class="tips1" v-if="item.acceptType === 0">鎶㈠崟</view>
@@ -152,12 +159,9 @@
 					</view>
 					<view class="index-list-item-info" v-if="item.type === 0 && item.workType === 2&& item.carType === 2">
 						{{item.categoryName}}锝渰{item.priceNum1}}鏂� 
-					</view>
+					</view> 
 					<view class="index-list-item-info" v-if="item.type === 1">
-						{{item.categoryName}}-{{item.carUnit}}  
-					</view>
-					<view class="index-list-item-info" v-if="item.type === 1">
-						{{item.transportTypeName}} | {{item.transportNum}}{{item.transportUnit}}锝滅敤杞{item.priceNum1}}澶�
+						{{item.carUnit}} | {{item.transportTypeName}} | {{item.transportNum}}{{item.transportUnit}}锝滅敤杞{item.priceNum1}}{{item.carType === 0?"澶�":"娆�"}}
 					</view>
 					<view class="index-list-item-info" v-if="item.type === 2">
 						{{item.wayInfoCopy}}
@@ -182,8 +186,9 @@
 						</view>
 					</template>
 					<view class="index-list-item-price">
-						<text>棰勪及锛�</text>
-						<text>楼{{item.estimatedAccount / 100}}</text>
+						<text v-if="item.status==4">宸叉敮浠橈細</text>
+						<text v-if="item.status!=4">棰勪及锛�</text>
+						<text>楼{{item.payAccount / 100}}</text>
 					</view>
 					<view class="eidt">
 						<view class="eidt-tips" v-if="item.isUpdate === 1">

--
Gitblit v1.9.3