From a1c569d40b5d1d6571a197467a41fd3421c393ce Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 15 九月 2025 09:10:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
small-program/pages/demand-hall/demand-hall.vue | 42 ++++++++++++++++++++++++------------------
1 files changed, 24 insertions(+), 18 deletions(-)
diff --git a/small-program/pages/demand-hall/demand-hall.vue b/small-program/pages/demand-hall/demand-hall.vue
index b92e48e..c7a2ce6 100644
--- a/small-program/pages/demand-hall/demand-hall.vue
+++ b/small-program/pages/demand-hall/demand-hall.vue
@@ -50,7 +50,7 @@
</view>
<view class="index-list-item-head-r" v-if="item.status === 0 || item.status === 5">寰呮敮浠�</view>
<view class="index-list-item-head-r" v-if="item.status === 1">寰呮帴鍗�</view>
- <view class="index-list-item-head-r" v-if="item.status === 2&& item.isUpdate != 1">宸叉帴鍗�</view>
+ <view class="index-list-item-head-r" v-if="item.status === 2">宸叉帴鍗�</view>
<view class="index-list-item-head-r" v-if="item.status === 3">杩涜涓�</view>
<view class="index-list-item-head-r hui" v-if="item.status === 4 && item.commentStatus !== 0">宸插畬鎴�</view>
<view class="index-list-item-head-r hui" v-if="item.status === 99">宸插彇娑�</view>
@@ -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}}鏂� | {{item.priceNum2}}浜�
</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">
@@ -228,8 +233,8 @@
async onShow(options) {
var flag = getApp().globalData.orderStatus
console.log(getApp().globalData,"=====================================")
- this.status = ''
- this.commentStatus=''
+ // this.status = ''
+ // this.commentStatus=''
// status: this.status === 5 ? 4 : this.status,
// commentStatus: this.status === 5 ? 0 : '',
if(flag =='1'){//鍙戝崟鏂瑰緟鎺ュ崟
@@ -273,6 +278,7 @@
{ name: '鍏ㄩ儴', id: '' },
{ name: '宸叉帴鍗�', id: 2 },
{ name: '杩涜涓�', id: 3 },
+ { name: '寰呮敮浠�', id: 5 },
{ name: '宸插畬鎴�', id: 4 },
// { name: '宸插彇娑�', id: 99 },
],
--
Gitblit v1.9.3