From 58d63637b67a7c565618379268da604e6231fc4c Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期三, 27 八月 2025 18:16:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
small-program/pages/demand-hall/demand-hall.vue | 27 ++++++++++++++++-----------
1 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/small-program/pages/demand-hall/demand-hall.vue b/small-program/pages/demand-hall/demand-hall.vue
index 0a4e6e9..c186875 100644
--- a/small-program/pages/demand-hall/demand-hall.vue
+++ b/small-program/pages/demand-hall/demand-hall.vue
@@ -102,16 +102,20 @@
<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" @click.stop="jumpEdit(item)">淇敼璁㈠崟</view>
- <view class="eidt-btn" v-if="(item.type === 2 && item.status === 0) || (item.type === 2 && item.status === 3)" @click.stop="jumpEdit(item)">缁х画鏀粯</view>
+ <view class="eidt-btn" v-if="(item.type !== 2 && item.status === 0) || (item.type !== 2 && item.status === 3)" @click.stop="jumpEdit(item)">缁х画鏀粯</view>
<!-- <view class="eidt-btn" v-if="item.status === 2" @click.stop="startJobs(item.id)">寮�濮嬩綔涓�</view> -->
- <view class="eidt-btn" v-if="item.status === 3" @click.stop="jumpDesc(item)">瀹屾垚骞舵敮浠�</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 === 3" @click.stop="jumpDesc(item)">瀹屾垚浣滀笟</view>
</view>
</view>
</view>
</view>
<!-- 鎺ュ崟鏂� -->
<view class="index-list" v-if="typeViewId === 1">
- <view class="index-list-item" v-for="(item, index) in orderList" :key="index" @click="jumpDesc(item)">
+ <view class="index-list-wu" v-if="orderList.length === 0">
+ <text>宸插姞杞藉叏閮ㄦ暟鎹�</text>
+ </view>
+ <view class="index-list-item" v-for="(item, index) in orderList" :key="index" @click="jumpDesc(item)" v-else>
<view class="index-list-item-head">
<view class="index-list-item-head-l">
<view class="xoam"></view>
@@ -236,7 +240,7 @@
{ name: '宸叉帴鍗�', id: 2 },
{ name: '杩涜涓�', id: 3 },
{ name: '宸插畬鎴�', id: 4 },
- { name: '宸插彇娑�', id: 99 },
+ // { name: '宸插彇娑�', id: 99 },
],
list1: [
{ name: '鍏ㄩ儴', id: '' },
@@ -246,7 +250,7 @@
{ name: '杩涜涓�', id: 3 },
{ name: '宸插畬鎴�', id: 4 },
{ name: '宸插彇娑�', id: 99 },
- { name: '寰呰瘎浠�', id: [4, 0] }
+ { name: '寰呰瘎浠�', id: 5 }
],
orderId: null,
status: '',
@@ -346,7 +350,8 @@
page: this.page,
model: {
queryMyOrderType: this.userInfo.useIdentity,
- status: this.status,
+ status: this.status === 5 ? 4 : this.status,
+ commentStatus: this.status === 5 ? 0 : '',
queryLat: this.latitude,
queryLgt: this.longitude
}
@@ -374,13 +379,13 @@
})
},
clickOrderType(id) {
- if (typeof id === 'object') {
- this.status = id[0]
- this.commentStatus = id[1]
- } else {
+ // if (typeof id === 5) {
+ // this.status = 5
+ // // this.commentStatus = 0
+ // } else {
this.commentStatus = ''
this.status = id
- }
+ // }
this.orderList = []
this.next = true
this.page = 1
--
Gitblit v1.9.3