From 0c9b00f333f9baaffa9140fd1808a26e0af8416b Mon Sep 17 00:00:00 2001
From: zhangwei <1504152376@qq.com>
Date: 星期四, 05 九月 2024 17:19:07 +0800
Subject: [PATCH] 一些错误更改
---
src/pages/index/index.vue | 139 ++++++++++++++++++++++++++++++----------------
1 files changed, 91 insertions(+), 48 deletions(-)
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index f363e5f..67bfd8c 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -2,20 +2,23 @@
<view class="full-page">
<up-sticky bgColor="#fff">
<view class="coreshop-ff c-p-10">
- <up-search placeholder="璇风偣鍑婚�夋嫨鏃ユ湡" @clear='clear' @clickIcon='clickTime' @custom='search'
- v-model="workTime" search-icon="calendar" @search='search'></up-search>
+ <!-- <up-search placeholder="璇风偣鍑婚�夋嫨鏃ユ湡" @clear='clear' @clickIcon='clickTime' @custom='search'
+ v-model="workTime" search-icon="calendar" @search='search'></up-search> -->
+ <up-search placeholder="璇疯緭鍏ュ伐浣滃悕绉�" @clear='clear' @clickIcon='clickTime' @custom='search'
+ v-model="state.orderName" @search='search'></up-search>
</view>
</up-sticky>
<scroll-view enable-flex="true">
<view class="list chuany-flex chuany-flex-direction chuany-align-center c-p-b-30 "
v-if="listO.orderList&&listO.orderList.length>0">
- <view class="content c-p-b-18" v-for="(item,index) in listO.orderList" @click='toDetail(item.id)' :key='item.id'>
- <view class="bgblue c-p-l-18 c-p-r-18 c-p-t-10 c-p-b-10 chuany-flex chuany-justify-between chuany-font30">
+ <view class="content c-p-b-18" v-for="(item,index) in listO.orderList" @click='toDetail(item.id)'
+ :key='item.id'>
+ <view
+ class="bgblue c-p-l-18 c-p-r-18 c-p-t-10 c-p-b-10 chuany-flex chuany-justify-between chuany-font30">
<view class="chuany-flex chuany-flex-direction">
<text class=''>
- {{$util.formatDate(item.wordStartTime,true)}}
+ {{$util.formatDate(item.startTime)}}
</text>
- <text>{{$util.formatDate(item.wordEndTime,true)}}</text>
</view>
<text>
鎷泏{item.worderCounted}}/{{item.worderCount}}浜�
@@ -29,10 +32,10 @@
</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 class='c-p-l-18 c-p-b-14 c-p-r-18 text-69'>
瑕佹眰锛歿{item.demand}}
</text>
- <text class='c-p-l-18 c-p-b-14 c-p-r-18'>
+ <text class='c-p-l-18 c-p-b-14 c-p-r-18 text-69'>
鍦板潃锛歿{item.worderAddress}}
</text>
</view>
@@ -45,7 +48,8 @@
{{item.workerType==0?'鍏�/灏忔椂':'鍏�/浠�'}}
</text>
</view>
- <up-tag text="鍘绘姠娲�" type="warning" shape="circle" @click.stop='deliver(item.id)'></up-tag>
+ <up-tag text="鍘绘姠娲�" v-if="identity !== 'enterprise'" type="warning" shape="circle"
+ @click.stop='deliver(item.id)'></up-tag>
<!-- <up-tag text="鍘绘姠娲�" type="warning" shape="circle"></up-tag> -->
</view>
</view>
@@ -66,7 +70,8 @@
onLoad,
onShow,
onReachBottom,
- onPullDownRefresh
+ onPullDownRefresh,
+ onHide
} from "@dcloudio/uni-app";
import {
reactive,
@@ -79,26 +84,29 @@
$util,
$db
} = getCurrentInstance().appContext.config.globalProperties
-
+ const userToken = $db.get("userToken");
+ let identity = ref('')
let workTime = ref('')
let datePickerShow = ref(false)
const state = reactive({
pageIndex: 1,
pageSize: 20,
+ orderName: ''
})
let listO = reactive({
orderList: []
})
const search = (index) => {
- console.log(index, '------鈥�');
- if (index == 0) {
- PostListPage()
- } else {
- PostListPage(index - 1)
- }
-
+ PostListPage()
+ }
+ 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)
}
const clear = () => {
+ state.orderName = ''
state.wordStartTime = ""
state.wordEndTime = ""
}
@@ -106,14 +114,6 @@
datePickerShow.value = !datePickerShow.value
}
let loadStatus = ref('loadmore')
- // 鍒涘缓鍝嶅簲寮忔暟鎹�
- const list1 = reactive([{
- name: '鏂颁换鍔�'
- },
- {
- name: '鎴戠殑璁㈠崟'
- },
- ]);
onReachBottom(() => {
if (loadStatus.value != 'nomore') {
PostListPage();
@@ -123,12 +123,20 @@
onPullDownRefresh(() => {
state.pageIndex = 1
state.pageSize = 20
+ loadStatus.value = 'loadmore'
PostListPage();
+ uni.stopPullDownRefresh();
})
- onLoad(() => {
+ onShow(() => {
+ identity.value = $db.get('identity')
+ console.log(identity.value);
PostListPage()
})
+ onHide(()=>{
+ listO.orderList = []
+ })
const PostListPage = (orderStatus) => {
+ console.log(identity.value, 'identity----------');
let data = {
pageIndex: state.pageIndex,
pageSize: state.pageSize,
@@ -136,29 +144,58 @@
if (orderStatus) {
data.orderStatus = orderStatus
}
+ if (state.orderName) {
+ data.orderName = state.orderName
+ }
loadStatus.value = 'loading';
- $api.PostListPage(data).then(res => {
- if (res.code == 1) {
- console.log(res, res.code, '-----------123鈥�');
- if (state.pageIndex == 1) {
- listO.orderList = res.data.items
+ if (identity.value == 'enterprise') {
+ $api.PostMyListPageCompany(data).then(res => {
+ if (res.code == 1) {
+ console.log(res, res.code, '-----------123鈥�');
+ if (state.pageIndex == 1) {
+ listO.orderList = res.data.items
+ } else {
+ listO.orderList.concat(...res.data.items)
+ }
+ console.log(listO.orderList, 'listO.orderList鈥�');
+ // totalPages.value = res.data.totalCount
+ // 鏍规嵁count鏁伴噺鍒ゆ柇鏄惁杩樻湁鏁版嵁
+ if (res.data.totalCount > listO.orderList.length) {
+ loadStatus.value = 'loadmore'
+ state.pageIndex++
+ } else {
+ // 鏁版嵁宸插姞杞藉畬姣�
+ loadStatus.value = 'nomore'
+ }
} else {
- listO.orderList.concat(...res.data.items)
+ // _that.$refs.uToast.show({ message: res.msg, type: 'error' });
}
- console.log(listO.orderList, 'listO.orderList鈥�');
- // totalPages.value = res.data.totalCount
- // 鏍规嵁count鏁伴噺鍒ゆ柇鏄惁杩樻湁鏁版嵁
- if (res.data.totalCount > listO.orderList.length) {
- loadStatus.value = 'loadmore'
- state.pageIndex++
+ })
+ } else {
+ $api.PostListPage(data).then(res => {
+ if (res.code == 1) {
+ console.log(res, res.code, '-----------123鈥�');
+ if (state.pageIndex == 1) {
+ listO.orderList = res.data.items
+ } else {
+ listO.orderList.concat(...res.data.items)
+ }
+ console.log(listO.orderList, 'listO.orderList鈥�');
+ // totalPages.value = res.data.totalCount
+ // 鏍规嵁count鏁伴噺鍒ゆ柇鏄惁杩樻湁鏁版嵁
+ if (res.data.totalCount > listO.orderList.length) {
+ loadStatus.value = 'loadmore'
+ state.pageIndex++
+ } else {
+ // 鏁版嵁宸插姞杞藉畬姣�
+ loadStatus.value = 'nomore'
+ }
} else {
- // 鏁版嵁宸插姞杞藉畬姣�
- loadStatus.value = 'nomore'
+ // _that.$refs.uToast.show({ message: res.msg, type: 'error' });
}
- } else {
- // _that.$refs.uToast.show({ message: res.msg, type: 'error' });
- }
- })
+ })
+ }
+
}
const click = () => {
@@ -167,9 +204,15 @@
state.currentIdex = e.index
}
const toDetail = (val) => {
- uni.navigateTo({
- url: `/pages/detail/detail?orderid=${val}`
- })
+ if (identity.value !== 'enterprise') {
+ uni.navigateTo({
+ url: `/pages/detail/detail?orderid=${val}`
+ })
+ } else {
+ uni.navigateTo({
+ url: `/pages/order/detail?orderid=${val}`
+ });
+ }
}
const deliver = (val) => {
uni.navigateTo({
--
Gitblit v1.9.1