From 6cf23866d33b9c456821ef93cccbee73eaa8782a Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期六, 19 七月 2025 11:20:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
small-program/pages/demand-hall/demand-hall.vue | 24 +++++++++++++++++++-----
small-program/pages/index/index.vue | 4 +++-
2 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/small-program/pages/demand-hall/demand-hall.vue b/small-program/pages/demand-hall/demand-hall.vue
index cb5b86a..9212cb6 100644
--- a/small-program/pages/demand-hall/demand-hall.vue
+++ b/small-program/pages/demand-hall/demand-hall.vue
@@ -95,11 +95,13 @@
<view class="eidt">
<view></view>
<view class="eidt-right">
- <view class="eidt-close" v-if="[0,1,2].includes(item.status)" @click="orderId = item.id, show = true">鍙栨秷璁㈠崟</view>
+ <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)" @click="jumpEdit(item)">淇敼璁㈠崟</view>
- <view class="eidt-btn" v-if="(item.type === 2 && item.status === 0) || (item.type === 2 && item.status === 3)" @click="jumpEdit(item)">缁х画鏀粯</view>
+ <view class="eidt-btn" v-if="[0,1,2].includes(item.status)" @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-close">鍒犻櫎璁㈠崟</view>
<view class="eidt-phone">鑱旂郴甯堝倕</view>
<view class="eidt-phone">璇勪环璁㈠崟</view>
@@ -174,8 +176,8 @@
<view class="eidt-tips" v-else></view>
<view class="eidt-right">
- <view class="eidt-close" v-if="item.status === 2" @click="orderId = item.id, show = true">鍙栨秷璁㈠崟</view>
- <view class="eidt-phone" v-if="[2,3].includes(item.status)" @click="phoneCall(item.linkPhone)">鑱旂郴涓氫富</view>
+ <view class="eidt-close" v-if="item.status === 2" @click.stop="orderId = item.id, show = true">鍙栨秷璁㈠崟</view>
+ <view class="eidt-phone" v-if="[2,3].includes(item.status)" @click.stop="phoneCall(item.linkPhone)">鑱旂郴涓氫富</view>
<!-- <view class="eidt-close">鍒犻櫎璁㈠崟</view>
<view class="eidt-phone">鑱旂郴甯堝倕</view>
@@ -344,6 +346,17 @@
this.getOrderList()
},
methods: {
+ startJobs(orderId) {
+ this.$u.api.begin({ orderId })
+ .then(res => {
+ this.status = ''
+ this.commentStatus = ''
+ this.orderList = []
+ this.next = true
+ this.page = 1
+ this.getOrderList()
+ })
+ },
jumpDesc(item) {
uni.navigateTo({
url: `/pages/order-details/order-details?id=${item.id}`
@@ -533,6 +546,7 @@
display: flex;
align-items: center;
justify-content: flex-end;
+ flex-wrap: wrap;
.eidt-close {
width: 160rpx;
height: 64rpx;
diff --git a/small-program/pages/index/index.vue b/small-program/pages/index/index.vue
index 880b9c9..23f4457 100644
--- a/small-program/pages/index/index.vue
+++ b/small-program/pages/index/index.vue
@@ -66,7 +66,7 @@
</view>
<view class="index-list-item-dz">
<image src="/static/icon/order_ic_time@2x.png" mode="widthFix"></image>
- <text>{{item.startDate}} 鑷� {{item.endDate}}锛坽{item.priceNum1}}澶╋級</text>
+ <text>{{item.startDate}} 鑷� {{item.endDate}}锛坽{item.totalDays}}澶╋級</text>
</view>
</template>
<view class="index-list-item-price">
@@ -511,6 +511,8 @@
if (this.orderList.length === res.data.total) {
this.next = false
+ } else {
+ this.page += 1
}
})
},
--
Gitblit v1.9.3