From a2ddd3bec584b6eb91ab8845353fdb40c9b37ebe Mon Sep 17 00:00:00 2001
From: zhangwei <1504152376@qq.com>
Date: 星期一, 02 九月 2024 17:22:17 +0800
Subject: [PATCH] 初步完成

---
 src/pages/order/detail.vue |   34 +++++++++++++++++++---------------
 1 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/src/pages/order/detail.vue b/src/pages/order/detail.vue
index 79fbfab..b6a5897 100644
--- a/src/pages/order/detail.vue
+++ b/src/pages/order/detail.vue
@@ -6,15 +6,14 @@
 					<view class="bgblue c-p-18 chuany-flex chuany-justify-between chuany-font30">
 						<view class="chuany-flex chuany-flex-direction">
 							<text class=''>
-								{{$util.formatDate(detailItem.wordStartTime,true)}}
+								{{$util.formatDate(startTime)}}
 							</text>
-							<text>{{$util.formatDate(detailItem.wordEndTime,true)}}</text>
 						</view>
 						<text>
 							鎷泏{detailItem.worderCounted}}/{{detailItem.worderCount}}浜�
 						</text>
 					</view>
-					<view class="c-p-18 chuany-font34">
+					<view class="c-p-l-18 c-p-b-14 c-p-t-14 c-p-r-18 chuany-font34">
 						{{detailItem.orderName}}
 					</view>
 					<!-- <view class="chuany-flex c-p-l-18">
@@ -22,10 +21,10 @@
 						</up-tag>
 					</view> -->
 					<view class="chuany-flex chuany-flex-direction">
-						<text class='c-p-18'>
+						<text class='c-p-l-18 c-p-b-14 c-p-r-18 text-69'>
 							瑕佹眰锛歿{detailItem.demand}}
 						</text>
-						<text class='c-p-l-18 c-p-b-16'>
+						<text class='c-p-l-18 c-p-b-14 c-p-r-18 text-69'>
 							鍦板潃锛歿{detailItem.worderAddress}}
 						</text>
 					</view>
@@ -48,13 +47,13 @@
 					<up-list-item v-for="(item,index) in detailItem.orderBidding" :key="item.id" @click.stop="toWorkDetail">
 						<up-cell :title="item.workerName">
 							<template #icon>
-								<up-avatar shape="square" size="35" :src="item.workerAvatar"
+								<up-avatar shape="square" size="35" :src="item.workerAvatar" @click='toWorkerDetail(item)'
 									customStyle="margin: -3px 5px -3px 0"></up-avatar>
 							</template>
-							<template #right-icon v-if="item.isSelected">
-								<up-button class="button-layout__item" text="鏌ョ湅" size="mini" type="primary" @click="toView"></up-button>
-							</template>
-							<template #right-icon v-else>
+							<!-- <template #right-icon v-if="item.isSelected">
+								<up-button class="button-layout__item" text="鏌ョ湅" size="mini" type="primary" @click="toView(item)"></up-button>
+							</template> -->
+							<template #right-icon>
 								<up-button class="button-layout__item" text="纭" size="mini" type="success"
 									@click="selectBtn(item)"></up-button>
 							</template>
@@ -124,12 +123,12 @@
 	const detailItem = ref({})
 	let orderid = ref('')
 	onLoad((option) => {
-		console.log(option,'========');
 		let {
 			orderid
 		} = option
 		getOrder(orderid)
-		orderid.value = orderid
+		orderid = orderid
+		console.log(option,'========orderid',orderid);
 		// detailItem.value = JSON.parse($db.get('detailItem'))
 	})
 	let state = reactive({
@@ -142,9 +141,14 @@
 	const change = (e) => {
 		state.currentIdex = e.index
 	}
-	const toView = (e) => {
+	const toView = (item) => {
 		uni.navigateTo({
-			url: '/pages/company/index'
+			url: `/pages/company/index?workerid=${item.WorkerUserId}&workname=${item.WorkerName}`
+		})
+	}
+	const toWorkerDetail = (item)=>{
+		uni.navigateTo({
+			url: `/pages/worker/worker?workerid=${item.workerUserId}`
 		})
 	}
 	const toWorkDetail = (e) => {
@@ -159,7 +163,7 @@
 					title: "纭鎴愬姛锛�",
 					icon: "success"
 				})
-				getOrder(orderid.value)
+				getOrder(orderid)
 			}
 		})
 	}

--
Gitblit v1.9.1