From 202d13acd6f02b6573213e49326bc1f092d57b99 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期五, 12 九月 2025 18:22:13 +0800
Subject: [PATCH] 优化
---
small-program/pages/demand-hall/demand-hall.vue | 86 +++++++++++++++++++++++++------------------
1 files changed, 50 insertions(+), 36 deletions(-)
diff --git a/small-program/pages/demand-hall/demand-hall.vue b/small-program/pages/demand-hall/demand-hall.vue
index 5fd1ef8..638a127 100644
--- a/small-program/pages/demand-hall/demand-hall.vue
+++ b/small-program/pages/demand-hall/demand-hall.vue
@@ -45,13 +45,13 @@
<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>
- <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 === 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">宸叉帴鍗�</view>
<view class="index-list-item-head-r" v-if="item.status === 3">杩涜涓�</view>
- <view class="index-list-item-head-r" v-if="item.status === 2 && item.isUpdate == 1">宸蹭慨鏀癸紝寰呮帴鍗曟柟纭</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>
<view class="index-list-item-head-r" v-if="item.status === 4 && item.commentStatus === 0">寰呰瘎浠�</view>
@@ -60,16 +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.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}}
@@ -93,20 +96,27 @@
<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></view>
+ <view>
+ <view class="eidt-tips" v-if="item.status === 2 && item.isUpdate == 1"><text>宸蹭慨鏀癸紝寰呮帴鍗曟柟纭</text></view>
+ <view class="eidt-tips" v-if="item.status === 5">
+ <image src="/static/icon/ic_tip@2x.png" mode="widthFix"></image>
+ <text>鎺ュ崟鏂瑰凡纭璐圭敤锛岃鏀粯</text>
+ </view>
+ </view>
<view class="eidt-right">
<view class="eidt-close" v-if="[0,1,2].includes(item.status)" @click.stop="orderId = item.id, show = true">鍙栨秷璁㈠崟</view>
<view class="eidt-phone" v-if="[2].includes(item.status)">鑱旂郴甯堝倕</view>
<view class="eidt-phone" v-if="item.status === 4 && item.commentStatus === 0">璇勪环璁㈠崟</view>
<view class="eidt-btn" v-if="[0,1,2].includes(item.status) && item.type !== 2 && item.isUpdate!=1" @click.stop="jumpEdit(item)">淇敼璁㈠崟</view>
- <view class="eidt-btn" v-if="(item.type == 2 && item.status === 0)" @click.stop="jumpEdit(item)">缁х画鏀粯</view>
+ <view class="eidt-btn" v-if="(item.type == 2 && item.status === 0)" @click.stop="jumpDesc(item,1)">缁х画鏀粯</view>
<!-- <view class="eidt-btn" v-if="item.status === 2" @click.stop="startJobs(item.id)">寮�濮嬩綔涓�</view> -->
- <view class="eidt-btn" v-if="item.type != 2 && item.status === 3" @click.stop="jumpDesc(item)">瀹屾垚骞舵敮浠�</view>
+ <view class="eidt-btn" v-if="item.type != 2 && item.status === 5" @click.stop="jumpDesc(item,2)">绔嬪嵆鏀粯</view>
<view class="eidt-btn" v-if="item.type == 2 && item.status === 3" @click.stop="jumpDesc(item)">瀹屾垚浣滀笟</view>
</view>
</view>
@@ -124,11 +134,12 @@
<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>
+ <view class="tips" v-if="item.acceptType === 1">娲惧崟</view>
+ <view class="tips1" v-if="item.acceptType === 0">鎶㈠崟</view>
</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 === 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">宸插畬鎴�</view>
@@ -138,16 +149,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.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}}
@@ -172,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">
@@ -218,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'){//鍙戝崟鏂瑰緟鎺ュ崟
@@ -271,8 +286,7 @@
{ name: '寰呮敮浠�', id: 0 },
{ name: '寰呮帴鍗�', id: 1 },
{ name: '宸叉帴鍗�', id: 2 },
- { name: '杩涜涓�', id: 3 },
- { name: '纭璐圭敤', id: 5 },
+ { name: '杩涜涓�', id: 3 },
{ name: '宸插畬鎴�', id: 4 },
{ name: '宸插彇娑�', id: 99 },
{ name: '寰呰瘎浠�', id: 6 }
@@ -323,9 +337,9 @@
})
},
- jumpDesc(item) {
+ jumpDesc(item,flag) {
uni.navigateTo({
- url: `/pages/order-details/order-details?id=${item.id}`
+ url: `/pages/order-details/order-details?id=${item.id}&flag=${flag}`
})
},
// 淇敼
@@ -488,7 +502,7 @@
margin-top: 40rpx;
text-align: center;
text {
- font-size: 30rpx;
+ font-size: 24rpx;
color: #666666;
}
}
--
Gitblit v1.9.3