From f33e38f87c0240c288ad571d6dac75f78e8fcca7 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期六, 19 七月 2025 11:14:41 +0800
Subject: [PATCH] 调接口

---
 small-program/pages/demand-hall/demand-hall.vue |   39 ++++++++++++++++++++++++++++++++-------
 1 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/small-program/pages/demand-hall/demand-hall.vue b/small-program/pages/demand-hall/demand-hall.vue
index 7503f8a..9212cb6 100644
--- a/small-program/pages/demand-hall/demand-hall.vue
+++ b/small-program/pages/demand-hall/demand-hall.vue
@@ -36,7 +36,7 @@
 			</view>
 			<!-- 鍙戝崟鏂� -->
 			<view class="index-list" v-if="typeViewId === 0">
-				<view class="index-list-item" v-for="(item, index) in orderList" :key="index">
+				<view class="index-list-item" v-for="(item, index) in orderList" :key="index" @click="jumpDesc(item)">
 					<view class="index-list-item-head">
 						<view class="index-list-item-head-l">
 							<view class="xoam"></view>
@@ -85,7 +85,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">
@@ -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,22 @@
 			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}`
+				})
+			},
 			// 淇敼
 			jumpEdit(item) {
 				if (item.type === 0 && item.workType === 0) {
@@ -357,6 +375,10 @@
 				} else if (item.type === 0 && item.workType === 2) {
 					uni.navigateTo({
 						url: `/pages/packaging-worker/packaging-worker?id=${item.id}`
+					})
+				} else if (item.type === 1) {
+					uni.navigateTo({
+						url: `/pages/freight/freight?id=${item.id}`
 					})
 				}
 			},
@@ -404,6 +426,8 @@
 					
 					if (this.orderList.length === res.data.total) {
 						this.next = false
+					} else {
+						this.page += 1
 					}
 				})
 			},
@@ -522,6 +546,7 @@
 						display: flex;
 						align-items: center;
 						justify-content: flex-end;
+						flex-wrap: wrap;
 						.eidt-close {
 							width: 160rpx;
 							height: 64rpx;

--
Gitblit v1.9.3