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/myorder.vue | 35 ++++++++++++++++++++++-------------
1 files changed, 22 insertions(+), 13 deletions(-)
diff --git a/src/pages/order/myorder.vue b/src/pages/order/myorder.vue
index 5c778e7..0b010a1 100644
--- a/src/pages/order/myorder.vue
+++ b/src/pages/order/myorder.vue
@@ -2,41 +2,43 @@
<view>
<up-sticky bgColor="#fff">
<view class="coreshop-ff content c-p-10">
- <up-search placeholder="璇风偣鍑婚�夋嫨鏃ユ湡" @clear='clear' @clickIcon='clickTime' @custom='search'
+ <up-search placeholder="璇风偣鍑婚�夋嫨鏃ユ湡" @clear='clear' @click='clickTime' disabled @custom='search'
v-model="workTime" search-icon="calendar" @search='search'></up-search>
</view>
<!-- <up-subsection :list="list" :current="current4" activeColor="#f9ae3d"
@change="sectionChange"></up-subsection> -->
</up-sticky>
<view class="full-page">
- <view class="" v-if="listO.orderList&&listO.orderList.length>0">
- <view class="listrecord c-p-20" v-for="(item,index) in listO.orderList" :key="item.id">
+ <view class="c-p-l-20 c-p-r-20" v-if="listO.orderList&&listO.orderList.length>0">
+ <view class="listrecord c-p-t-20" v-for="(item,index) in listO.orderList" :key="item.id">
<view class="coreshop-ff chuany-bradius20">
<view class="c-p-26">
<view class="chuany-flex chuany-justify-between">
- <text class="chuany-font34 chuany-text-bold">
- {{item.orderName}}
+ <text class="chuany-font34">
+ {{item.orderComName}}
</text>
<view class="chuany-flex chuany-justify-between">
<!-- 鎷涘伐浜烘暟锛歿{item.worderCount}}浜� -->
<!-- <text class="c-p-r-20">
</text> -->
- <up-tag class='c-m-r-10' text="鍘绘墦鍗�" shape="circle" type="success"
+ <up-tag class='c-m-r-10' text="涓婄彮鎵撳崱" shape="circle" type="success"
v-if="item.isSelected" @click="pageToDetail(item)" size='mini'></up-tag>
<up-tag class='c-m-r-10' :text="item.isSelectedName" shape="circle" type="warning"
v-else size='mini'></up-tag>
</view>
</view>
- <view class="c-p-t-20">
- {{$util.formatDate(item.wordStartTime,true)}}鑷�
- {{$util.formatDate(item.wordEndTime,true)}}
-
+ <view class="c-p-t-10">
+ 鏃ユ湡锛歿{item.wordStartTimeName}} 鑷� {{item.wordEndTimeName}}
</view>
- <view class="chuany-flex chuany-justify-between c-p-t-20">
+ <!-- <view class="c-p-t-14">
+ 鏃堕棿锛歿{item.startTimeName}} 鑷� {{item.endTimeName}}
+ </view> -->
+ <view class="chuany-flex chuany-justify-between c-p-t-10">
<view class="chuany-width50">
<text>
- 鏂瑰紡锛歿{item.workerType==0?'璁℃椂':'璁′欢'}}
+ <!-- 鏂瑰紡锛歿{item.workerType==0?'璁℃椂':'璁′欢'}} -->
+ 鏃堕棿锛歿{item.startTimeName}} 鑷� {{item.endTimeName}}
</text>
</view>
<view class="chuany-width50">
@@ -54,7 +56,7 @@
</up-empty>
</view>
</view>
- <fui-date-picker range :show="datePickerShow" type="5" @change="changePicker"
+ <fui-date-picker range :show="datePickerShow" :value="$util.formatDate(new Date())" type="3" @change="changePicker"
@cancel="cancel"></fui-date-picker>
</view>
</template>
@@ -96,7 +98,9 @@
onPullDownRefresh(() => {
state.pageIndex = 1
state.pageSize = 20
+ loadStatus.value = 'loadmore'
PostMyListPage()
+ uni.stopPullDownRefresh();
})
onLoad(() => {
PostMyListPage()
@@ -108,6 +112,7 @@
workTime.value = val.startDate.result + '鑷�' + val.endDate.result
state.wordStartTime = new Date(val.startDate.result) //宸ヤ綔寮�濮嬫椂闂�
state.wordEndTime = new Date(val.endDate.result)
+ datePickerShow.value = !datePickerShow.value
}
const search = (index) => {
@@ -126,6 +131,10 @@
const clickTime = () => {
datePickerShow.value = !datePickerShow.value
}
+
+ const cancel=()=>{
+ datePickerShow.value = !datePickerShow.value
+ }
const PostMyListPage = (orderStatus) => {
let data = {
pageIndex: state.pageIndex,
--
Gitblit v1.9.1