From 208b5a9f559dd2c7298759fdfe37d07c926cbd4d Mon Sep 17 00:00:00 2001
From: zhangwei <1504152376@qq.com>
Date: 星期一, 23 九月 2024 17:09:21 +0800
Subject: [PATCH] 完善提现

---
 src/pages/order/detail.vue |   80 ++++++++++++++++++++++------------------
 1 files changed, 44 insertions(+), 36 deletions(-)

diff --git a/src/pages/order/detail.vue b/src/pages/order/detail.vue
index b6a5897..a72afb6 100644
--- a/src/pages/order/detail.vue
+++ b/src/pages/order/detail.vue
@@ -2,35 +2,43 @@
 	<view class="">
 		<scroll-view enable-flex="true">
 			<view class="list chuany-flex chuany-flex-direction chuany-align-center c-p-b-30">
-				<view class="content ">
-					<view class="bgblue c-p-18 chuany-flex chuany-justify-between chuany-font30">
+				<view class="content c-p-b-18">
+					<view class="bgblue c-p-l-18 c-p-r-18 c-p-b-10 c-p-t-10 chuany-flex chuany-justify-between chuany-font30">
 						<view class="chuany-flex chuany-flex-direction">
 							<text class=''>
-								{{$util.formatDate(startTime)}}
+								{{$util.formatDate(detailItem.startTime)}}
 							</text>
 						</view>
 						<text>
 							鎷泏{detailItem.worderCounted}}/{{detailItem.worderCount}}浜�
 						</text>
 					</view>
-					<view class="c-p-l-18 c-p-b-14 c-p-t-14 c-p-r-18 chuany-font34">
+					<view class="c-p-l-18 c-p-t-5 c-p-r-18 chuany-font32">
 						{{detailItem.orderName}}
 					</view>
 					<!-- <view class="chuany-flex c-p-l-18">
 						<up-tag class='c-p-r-14' :text="item" plain v-for="(item,index) in item.tags" :key="index">
 						</up-tag>
 					</view> -->
-					<view class="chuany-flex chuany-flex-direction">
-						<text class='c-p-l-18 c-p-b-14 c-p-r-18 text-69'>
+					<view class="chuany-flex chuany-flex-direction chuany-font28">
+						<text class='c-p-l-18 c-p-r-18 text-69'>
+							鏃ユ湡锛歿{detailItem.wordStartTimeName}} 鑷� {{detailItem.wordEndTimeName}}
+						</text>
+						<text class='c-p-l-18 c-p-r-18 text-69'>
+							鏃堕棿锛歿{detailItem.startTimeName}} 鑷� {{detailItem.endTimeName}}
+						</text>
+					</view>
+					<view class="chuany-flex chuany-flex-direction chuany-font28">
+						<text class='c-p-l-18 c-p-r-18 text-69'>
 							瑕佹眰锛歿{detailItem.demand}}
 						</text>
-						<text class='c-p-l-18 c-p-b-14 c-p-r-18 text-69'>
+						<text class='c-p-l-18 c-p-r-18 text-69'>
 							鍦板潃锛歿{detailItem.worderAddress}}
 						</text>
 					</view>
 					<view class='chuany-flex chuany-justify-between c-p-l-18 c-p-r-18'>
 						<view class="redcla">
-							<text class="chuany-font40 chuany-text-bold">
+							<text class="chuany-font40">
 								{{detailItem.workPrice}}
 							</text>
 							<text class='chuany-font20'>
@@ -42,18 +50,19 @@
 					</view>
 				</view>
 			</view>
-			<view class="coreshop-ff" v-if="detailItem.orderBidding&&detailItem.orderBidding.length>0">
-				<up-list>
-					<up-list-item v-for="(item,index) in detailItem.orderBidding" :key="item.id" @click.stop="toWorkDetail">
-						<up-cell :title="item.workerName">
+			<view class="coreshop-ff" v-if="detailItem.orderBidding">
+				<up-list v-if="detailItem.orderBidding.length>0">
+					<up-list-item v-for="(item,index) in detailItem.orderBidding" :key="item.id"
+						@click.stop="toWorkDetail">
+						<up-cell :title="item.workerName" :border='false'>
 							<template #icon>
-								<up-avatar shape="square" size="35" :src="item.workerAvatar" @click='toWorkerDetail(item)'
-									customStyle="margin: -3px 5px -3px 0"></up-avatar>
+								<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(item)"></up-button>
 							</template> -->
-							<template #right-icon>
+							<template #right-icon v-if="!item.isSelected">
 								<up-button class="button-layout__item" text="纭" size="mini" type="success"
 									@click="selectBtn(item)"></up-button>
 							</template>
@@ -82,11 +91,9 @@
 						</up-cell>
 					</up-list-item> -->
 				</up-list>
-			</view>
-			<view class="coreshop-ff" v-else>
-				<up-list>
+				<up-list v-else>
 					<up-list-item>
-						<up-cell title="鏆傛棤鎶曢��" class="u-cell__title-text_wu">
+						<up-cell title="鏆傛棤鎶曢��" class="u-cell__title-text_wu" :border='false'>
 							<!-- <template #icon>
 								<up-avatar shape="square" size="35" src="https://uview-plus.jiangruyi.com/album/1.jpg"
 									customStyle="margin: -3px 5px -3px 0"></up-avatar>
@@ -99,7 +106,6 @@
 				</up-list>
 			</view>
 		</scroll-view>
-
 	</view>
 </template>
 
@@ -121,32 +127,28 @@
 		$db
 	} = getCurrentInstance().appContext.config.globalProperties
 	const detailItem = ref({})
-	let orderid = ref('')
+	let orderIdVal = ref('')
 	onLoad((option) => {
 		let {
 			orderid
 		} = option
 		getOrder(orderid)
-		orderid = orderid
-		console.log(option,'========orderid',orderid);
+		orderIdVal = orderid
+		console.log(option, '========orderid', orderid);
 		// detailItem.value = JSON.parse($db.get('detailItem'))
 	})
-	let state = reactive({
-		currentIdex: 0
-	})
-
+	
 	const click = () => {
 
 	}
-	const change = (e) => {
-		state.currentIdex = e.index
-	}
+	
 	const toView = (item) => {
 		uni.navigateTo({
 			url: `/pages/company/index?workerid=${item.WorkerUserId}&workname=${item.WorkerName}`
 		})
 	}
-	const toWorkerDetail = (item)=>{
+	const toWorkerDetail = (item) => {
+		$db.set('toudiItem', JSON.stringify(item))
 		uni.navigateTo({
 			url: `/pages/worker/worker?workerid=${item.workerUserId}`
 		})
@@ -157,17 +159,23 @@
 		})
 	}
 	const selectBtn = (item) => {
-		$api.saveQueRen({orderBiddingId:item.id}).then(res => {
-			if(res.code==1){
+		$api.saveQueRen({
+			orderBiddingId: item.id
+		}).then(res => {
+			if (res.code == 1) {
 				$util.showToast({
 					title: "纭鎴愬姛锛�",
 					icon: "success"
 				})
-				getOrder(orderid)
+				getOrder(orderIdVal)
+			} else {
+				this.$util.showToast({
+					title: res.error ? res.error : '澶辫触锛�'
+				})
 			}
 		})
 	}
-	const getOrder=(orderid) =>{
+	const getOrder = (orderid) => {
 		$api.getOrder(orderid).then(res => {
 			if (res.code == 1) {
 				detailItem.value = res.data
@@ -183,7 +191,7 @@
 	}
 
 	.content {
-		height: 430rpx;
+		min-height: 200rpx;
 		width: 100%;
 		background-color: #fff;
 		border-radius: 20rpx;

--
Gitblit v1.9.1