From 38130802e3fd55080f518f4128ef20ddfdd907c3 Mon Sep 17 00:00:00 2001
From: zhangwei <1504152376@qq.com>
Date: 星期二, 10 九月 2024 17:11:14 +0800
Subject: [PATCH] -
---
src/pages/order/detail.vue | 51 ++++++++++++++++++++++++++++++++-------------------
1 files changed, 32 insertions(+), 19 deletions(-)
diff --git a/src/pages/order/detail.vue b/src/pages/order/detail.vue
index 79fbfab..9817ca4 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(detailItem.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,18 @@
</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.wordStartTimeName}} 鑷� {{detailItem.wordEndTimeName}}
+ </text>
+ <text class='c-p-l-18 c-p-b-14 c-p-r-18 text-69'>
+ 鏃堕棿锛歿{detailItem.startTimeName}} 鑷� {{detailItem.endTimeName}}
+ </text>
+ </view>
+ <view class="chuany-flex chuany-flex-direction">
+ <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>
@@ -46,15 +53,15 @@
<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">
+ <up-cell :title="item.workerName" :border='false'>
<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 v-if="!item.isSelected">
<up-button class="button-layout__item" text="纭" size="mini" type="success"
@click="selectBtn(item)"></up-button>
</template>
@@ -87,7 +94,7 @@
<view class="coreshop-ff" v-else>
<up-list>
<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>
@@ -122,14 +129,14 @@
$db
} = getCurrentInstance().appContext.config.globalProperties
const detailItem = ref({})
- let orderid = ref('')
+ let orderIdVal = ref('')
onLoad((option) => {
- console.log(option,'========');
let {
orderid
} = option
getOrder(orderid)
- orderid.value = orderid
+ orderIdVal = orderid
+ console.log(option,'========orderid',orderid);
// detailItem.value = JSON.parse($db.get('detailItem'))
})
let state = reactive({
@@ -142,9 +149,15 @@
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)=>{
+ $db.set('toudiItem',JSON.stringify(item))
+ uni.navigateTo({
+ url: `/pages/worker/worker?workerid=${item.workerUserId}`
})
}
const toWorkDetail = (e) => {
@@ -159,7 +172,7 @@
title: "纭鎴愬姛锛�",
icon: "success"
})
- getOrder(orderid.value)
+ getOrder(orderIdVal)
}
})
}
@@ -179,7 +192,7 @@
}
.content {
- height: 430rpx;
+ min-height: 380rpx;
width: 100%;
background-color: #fff;
border-radius: 20rpx;
--
Gitblit v1.9.1