From 2e61c194b816364fe4fbab967fee13dbefe86216 Mon Sep 17 00:00:00 2001
From: zhangwei <1504152376@qq.com>
Date: 星期一, 30 九月 2024 16:35:47 +0800
Subject: [PATCH] -
---
src/pages/order/myorder.vue | 76 ++++++++++++++++++++++++--------------
1 files changed, 48 insertions(+), 28 deletions(-)
diff --git a/src/pages/order/myorder.vue b/src/pages/order/myorder.vue
index e6800b9..e48c389 100644
--- a/src/pages/order/myorder.vue
+++ b/src/pages/order/myorder.vue
@@ -1,48 +1,62 @@
<template>
- <view>
+ <scroll-view class="full-page" scroll-y using-sticky>
<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-subsection :list="list" current='1' activeColor="#f9ae3d" @change="sectionChange"></up-subsection> -->
</up-sticky>
- <view class="full-page">
+ <view class="full-page-content">
<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="c-p-24">
<view class="chuany-flex chuany-justify-between">
- <text class="chuany-font34 chuany-text-bold">
- {{item.orderName}}
+ <text class="chuany-font32">
+ {{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 class="" v-else>
+ <up-text :type="item.isSelectedName=='瀹℃牳涓�'?'info':'error'" :text="item.isSelectedName" size='14'></up-text>
+ <!-- <up-tag v-if="item.isSelectedName=='瀹℃牳涓�'" class='c-m-r-10' bgColor='#909399' borderColor='#909399'
+ v-if="item.isSelectedName=='瀹℃牳涓�'" :text="item.isSelectedName" shape="circle"
+ size='mini'></up-tag>
+ <up-tag class='c-m-r-10' v-else :text="item.isSelectedName" shape="circle"
+ type="error" size='mini'></up-tag> -->
+ </view>
+
</view>
</view>
- <view class="c-p-t-14">
- 鏃ユ湡锛歿{$util.formatDate(item.wordStartTime)}} 鑷� {{$util.formatDate(item.wordEndTime)}}
- </view>
- <view class="c-p-t-14">
- 鏃堕棿锛歿{item.startTimeName}} 鑷� {{item.endTimeName}}
- </view>
- <view class="chuany-flex chuany-justify-between c-p-t-14">
- <view class="chuany-width50">
- <text>
- 鏂瑰紡锛歿{item.workerType==0?'璁℃椂':'璁′欢'}}
- </text>
+ <view class="text-69 chuany-font28">
+ <view class="c-p-t-6">
+ 鏃ユ湡锛歿{item.wordStartTimeName}} 鑷� {{item.wordEndTimeName}}
</view>
- <view class="chuany-width50">
- 宸ヤ环锛歿{item.workPrice}}{{item.workerType==0?'鍏�/灏忔椂':'鍏�/浠�'}}
- <text></text>
+ <!-- <view class="c-p-t-14">
+ 鏃堕棿锛歿{item.startTimeName}} 鑷� {{item.endTimeName}}
+ </view> -->
+ <view class="chuany-flex chuany-justify-between c-p-t-6">
+ <view class="chuany-width50">
+ <view class="c-p-l-18 c-p-r-18 text-69 c-p-b-10" v-if="item.zixinganpai">
+ 鏃堕棿锛歿{item.zixinganpaiName}}
+ </view>
+ <text v-else>
+ <!-- 鏂瑰紡锛歿{item.workerType==0?'璁℃椂':'璁′欢'}} -->
+ 鏃堕棿锛歿{item.startTimeName}} 鑷� {{item.endTimeName}}
+ </text>
+ </view>
+ <view class="chuany-width50">
+ 宸ヤ环锛歿{item.workPrice}}{{item.workerType==0?'鍏�/灏忔椂':'鍏�/浠�'}}
+ <text></text>
+ </view>
</view>
</view>
</view>
@@ -55,9 +69,9 @@
</up-empty>
</view>
</view>
- <fui-date-picker range :show="datePickerShow" type="5" @change="changePicker"
- @cancel="cancel"></fui-date-picker>
- </view>
+ <fui-date-picker range :show="datePickerShow" :value="$util.formatDate(new Date())" type="3"
+ @change="changePicker" @cancel="cancel"></fui-date-picker>
+ </scroll-view>
</template>
<script setup>
@@ -99,17 +113,19 @@
state.pageSize = 20
loadStatus.value = 'loadmore'
PostMyListPage()
+ uni.stopPullDownRefresh();
})
onLoad(() => {
PostMyListPage()
})
const current4 = ref(0);
- const list = ref(['鍏ㄩ儴', '鍙戝竷', '鎷涘伐瀹屾瘯', '缁撶畻瀹屾瘯']);
+ // const list = ref(['鍏ㄩ儴', '瀹℃牳涓�', '宸插綍鐢�', '鏈綍鐢�']);
const changePicker = (val) => {
console.log(val);
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 +142,10 @@
state.wordEndTime = ""
}
const clickTime = () => {
+ datePickerShow.value = !datePickerShow.value
+ }
+
+ const cancel = () => {
datePickerShow.value = !datePickerShow.value
}
const PostMyListPage = (orderStatus) => {
@@ -147,7 +167,7 @@
if (state.pageIndex == 1) {
listO.orderList = res.data.items
} else {
- listO.orderList.concat(...res.data.items)
+ listO.orderList = listO.orderList.concat(...res.data.items)
}
console.log(listO.orderList, 'listO.orderList鈥�');
// totalPages.value = res.data.totalCount
--
Gitblit v1.9.1