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 | 94 ++++++++++++++++++++++++++++++++++-------------
1 files changed, 68 insertions(+), 26 deletions(-)
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index 7f7bbd0..67bfd8c 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -48,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>
@@ -69,7 +70,8 @@
onLoad,
onShow,
onReachBottom,
- onPullDownRefresh
+ onPullDownRefresh,
+ onHide
} from "@dcloudio/uni-app";
import {
reactive,
@@ -82,7 +84,8 @@
$util,
$db
} = getCurrentInstance().appContext.config.globalProperties
-
+ const userToken = $db.get("userToken");
+ let identity = ref('')
let workTime = ref('')
let datePickerShow = ref(false)
const state = reactive({
@@ -122,11 +125,18 @@
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,
@@ -134,32 +144,58 @@
if (orderStatus) {
data.orderStatus = orderStatus
}
- if(state.orderName){
+ 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 = () => {
@@ -168,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