From 93a986bc80abdef75923054b9df9adb6e1ccff52 Mon Sep 17 00:00:00 2001
From: zhangwei <1504152376@qq.com>
Date: 星期二, 08 十月 2024 16:44:08 +0800
Subject: [PATCH] -
---
src/pages/index/index.vue | 65 ++++++++++++++++++++++----------
1 files changed, 44 insertions(+), 21 deletions(-)
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index 647b188..f23dd5b 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -1,5 +1,5 @@
<template>
- <view class="full-page">
+ <view class="full-page" scroll-y using-sticky>
<up-sticky bgColor="#fff">
<view class="coreshop-ff c-p-10">
<!-- <up-search placeholder="璇风偣鍑婚�夋嫨鏃ユ湡" @clear='clear' @clickIcon='clickTime' @custom='search'
@@ -8,13 +8,13 @@
@search='search'></up-search>
</view>
</up-sticky>
- <scroll-view enable-flex="true" v-if="listO.orderList">
+ <view v-if="listO.orderList">
<view class="list chuany-flex chuany-flex-direction chuany-align-center c-p-b-30 "
v-if="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">
+ class="bgblue c-p-l-18 c-p-r-18 c-p-b-10 c-p-t-10 chuany-flex chuany-justify-between chuany-font30">
<view class="chuany-flex chuany-flex-direction">
<text class=''>
{{$util.formatDate(item.startTime)}}
@@ -24,40 +24,54 @@
鎷泏{item.worderCounted}}/{{item.worderCount}}浜�
</text>
</view>
- <view class="c-p-l-18 c-p-b-10 c-p-t-10 c-p-r-18 chuany-font34">
+ <view class="c-p-l-18 c-p-t-10 c-p-b-10 c-p-r-18 chuany-font32">
{{item.orderComName}}
</view>
- <view class="c-p-l-18 c-p-b-10 c-p-r-18 chuany-font34">
+ <view class="c-p-l-18 c-p-r-18 c-p-b-10 chuany-font32">
{{item.orderName}}
</view>
<!-- <view class="chuany-flex c-p-l-18">
<up-tag class='c-p-r-14' :text="item" plain v-for="(item,index) in item.tags" :key="index">
</up-tag>
</view> -->
- <view class="chuany-flex chuany-flex-direction">
- <text class='c-p-l-18 c-p-b-10 c-p-r-18 text-69'>
+ <view class="chuany-flex chuany-flex-direction chuany-font28">
+ <text class='c-p-l-18 c-p-r-18 text-69 c-p-b-10'>
鏃ユ湡锛歿{item.wordStartTimeName}} 鑷� {{item.wordEndTimeName}}
</text>
- <text class='c-p-l-18 c-p-b-10 c-p-r-18 text-69'>
+ <!-- <text class='c-p-l-18 c-p-r-18 text-69 c-p-b-10'>
鏃堕棿锛歿{item.startTimeName}} 鑷� {{item.endTimeName}}
- </text>
+ </text> -->
+ <view class="c-p-l-18 c-p-r-18 text-69 c-p-b-10" v-if="item.zixinganpai">
+ 鏃堕棿锛歿{item.zixinganpaiName}}
+ </view>
+ <view class="c-p-l-18 c-p-r-18 text-69 c-p-b-10" v-else>
+ 鏃堕棿锛歿{item.startTimeName}} 鑷� {{item.endTimeName}}
+ </view>
</view>
- <view class="chuany-flex chuany-flex-direction">
- <text class='c-p-l-18 c-p-b-10 c-p-r-18 text-69'>
+ <view class="chuany-flex chuany-flex-direction chuany-font28">
+ <text class='c-p-l-18 c-p-r-18 text-69 c-p-b-10'>
瑕佹眰锛歿{item.demand}}
</text>
- <text class='c-p-l-18 c-p-b-10 c-p-r-18 text-69'>
+ <text class='c-p-l-18 c-p-r-18 text-69 c-p-b-10'>
鍦板潃锛歿{item.worderAddress}}
</text>
</view>
<view class='chuany-flex chuany-justify-between c-p-l-18 c-p-r-18'>
<view class="redcla">
- <text class="chuany-font40">
+ <view class="">
+ <text class="chuany-font40">
+ {{item.workPrice}}<template v-if="item.workPriceMax">~{{item.workPriceMax}}</template>
+ </text>
+ <text class='chuany-font20'>
+ {{item.workerType==0?'鍏�/灏忔椂':'鍏�/浠�'}}
+ </text>
+ </view>
+ <!-- <text class="chuany-font40">
{{item.workPrice}}
</text>
<text class='chuany-font20'>
{{item.workerType==0?'鍏�/灏忔椂':'鍏�/浠�'}}
- </text>
+ </text> -->
</view>
<up-tag text="鍘绘姠娲�" v-if="identity !== 'enterprise'" type="warning" shape="circle"
@click.stop='deliver(item.id)'></up-tag>
@@ -66,8 +80,11 @@
</view>
<up-loadmore :status="loadStatus" />
</view>
-
- </scroll-view>
+ <view v-else>
+ <up-empty text='鏆傛棤' icon="/static/order.png">
+ </up-empty>
+ </view>
+ </view>
<view v-else>
<up-empty text='鏆傛棤' icon="/static/order.png">
</up-empty>
@@ -126,6 +143,7 @@
datePickerShow.value = !datePickerShow.value
}
let loadStatus = ref('loadmore')
+ let tokenVal = $db.get('userToken') || ''
onReachBottom(() => {
if (loadStatus.value != 'nomore') {
PostListPage();
@@ -141,6 +159,7 @@
})
onShow(() => {
identity.value = $db.get('identity')
+ tokenVal = $db.get('userToken')
console.log(identity.value);
PostListPage()
})
@@ -160,14 +179,14 @@
data.orderName = state.orderName
}
loadStatus.value = 'loading';
- if (identity.value == 'enterprise') {
+ if (identity.value == 'enterprise' && tokenVal) {
$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)
+ listO.orderList = listO.orderList.concat(...res.data.items)
}
console.log(listO.orderList, 'listO.orderList鈥�');
// totalPages.value = res.data.totalCount
@@ -190,7 +209,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
@@ -219,6 +238,9 @@
state.currentIdex = e.index
}
const toDetail = (val) => {
+ if(!tokenVal){
+ return false
+ }
if (identity.value !== 'enterprise') {
uni.navigateTo({
url: `/pages/detail/detail?orderid=${val}`
@@ -244,11 +266,12 @@
}
.content {
+ width: 93%;
min-height: 330rpx;
- width: 90%;
+ /* width: 90%; */
background-color: #fff;
border-radius: 20rpx;
- margin: 30rpx 30rpx 0 30rpx;
+ margin: 28rpx 28rpx 0 28rpx;
}
.bgblue {
--
Gitblit v1.9.1