From 391c0cfc4ba595ef26c7a2315c555d8c75afec7d Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 22 八月 2025 11:13:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
small-program/pages/demand-hall/demand-hall.vue | 53 ++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 36 insertions(+), 17 deletions(-)
diff --git a/small-program/pages/demand-hall/demand-hall.vue b/small-program/pages/demand-hall/demand-hall.vue
index 52e4b0d..0a4e6e9 100644
--- a/small-program/pages/demand-hall/demand-hall.vue
+++ b/small-program/pages/demand-hall/demand-hall.vue
@@ -11,7 +11,7 @@
<view class="index-wu" v-if="!isLogin">
<image src="/static/icon/default_login@2x.png" mode="widthFix"></image>
<text>鎮ㄨ繕娌℃湁鐧诲綍锛岃鐧诲綍鍚庢煡鐪嬭鍗�</text>
- <button>鐧诲綍</button>
+ <button @click="toLogin">鐧诲綍</button>
</view>
<!-- 宸茬櫥闄� -->
@@ -36,7 +36,10 @@
</view>
<!-- 鍙戝崟鏂� -->
<view class="index-list" v-if="typeViewId === 0">
- <view class="index-list-item" v-for="(item, index) in orderList" :key="index" @click="jumpDesc(item)">
+ <view class="index-list-wu" v-if="orderList.length === 0">
+ <text>宸插姞杞藉叏閮ㄦ暟鎹�</text>
+ </view>
+ <view class="index-list-item" v-for="(item, index) in orderList" :key="index" @click="jumpDesc(item)" v-else>
<view class="index-list-item-head">
<view class="index-list-item-head-l">
<view class="xoam"></view>
@@ -50,7 +53,7 @@
<view class="index-list-item-head-r" v-if="item.status === 2">宸叉帴鍗�</view>
<view class="index-list-item-head-r" v-if="item.status === 3">杩涜涓�</view>
<view class="index-list-item-head-r" v-if="item.status === 2 && item.isUpdate === 1">宸蹭慨鏀癸紝寰呮帴鍗曟柟纭</view>
- <view class="index-list-item-head-r hui" v-if="item.status === 4">宸插畬鎴�</view>
+ <view class="index-list-item-head-r hui" v-if="item.status === 4 && item.commentStatus !== 0">宸插畬鎴�</view>
<view class="index-list-item-head-r hui" v-if="item.status === 99">宸插彇娑�</view>
<view class="index-list-item-head-r" v-if="item.status === 4 && item.commentStatus === 0">寰呰瘎浠�</view>
</view>
@@ -75,7 +78,7 @@
<image src="/static/icon/ic_qidian@2x.png" mode="widthFix" v-if="i === 0"></image>
<image src="/static/icon/ic_jingguo@2x.png" mode="widthFix" v-else-if="i !== 0 && i !== item.wayInfo.length - 1"></image>
<image src="/static/icon/ic_zhongdian@2x.png" mode="widthFix" v-else-if="i === item.wayInfo.length - 1"></image>
- <text>{{item.location}}</text>
+ <text>{{address.location}}</text>
</view>
</view>
<template v-if="[0, 2].includes(item.type)">
@@ -98,9 +101,9 @@
<view class="eidt-close" v-if="[0,1,2].includes(item.status)" @click.stop="orderId = item.id, show = true">鍙栨秷璁㈠崟</view>
<view class="eidt-phone" v-if="[2].includes(item.status)">鑱旂郴甯堝倕</view>
<view class="eidt-phone" v-if="item.status === 4 && item.commentStatus === 0">璇勪环璁㈠崟</view>
- <view class="eidt-btn" v-if="[0,1,2].includes(item.status)" @click.stop="jumpEdit(item)">淇敼璁㈠崟</view>
+ <view class="eidt-btn" v-if="[0,1,2].includes(item.status) && item.type !== 2" @click.stop="jumpEdit(item)">淇敼璁㈠崟</view>
<view class="eidt-btn" v-if="(item.type === 2 && item.status === 0) || (item.type === 2 && item.status === 3)" @click.stop="jumpEdit(item)">缁х画鏀粯</view>
- <view class="eidt-btn" v-if="item.status === 2" @click.stop="startJobs(item.id)">寮�濮嬩綔涓�</view>
+ <!-- <view class="eidt-btn" v-if="item.status === 2" @click.stop="startJobs(item.id)">寮�濮嬩綔涓�</view> -->
<view class="eidt-btn" v-if="item.status === 3" @click.stop="jumpDesc(item)">瀹屾垚骞舵敮浠�</view>
</view>
</view>
@@ -118,7 +121,7 @@
<text v-else-if="item.type === 1">杩愯揣鍗�-{{item.categoryName}}-{{item.carUnit}}</text>
<text v-else-if="item.type === 2">璁㈤鍗�</text>
<view class="tips" v-if="item.acceptType === 1">绯荤粺娲惧崟</view>
- <view class="tips1" v-if="item.acceptType === 0">鎵嬪姩鎺ュ崟</view>
+ <view class="tips1" v-if="item.acceptType === 0">鑷富鎶㈠崟</view>
</view>
<view class="index-list-item-head-r" v-if="item.status === 2">宸叉帴鍗�</view>
<view class="index-list-item-head-r" v-if="item.status === 3">杩涜涓�</view>
@@ -146,7 +149,7 @@
<image src="/static/icon/ic_qidian@2x.png" mode="widthFix" v-if="i === 0"></image>
<image src="/static/icon/ic_jingguo@2x.png" mode="widthFix" v-else-if="i !== 0 && i !== item.wayInfo.length - 1"></image>
<image src="/static/icon/ic_zhongdian@2x.png" mode="widthFix" v-else-if="i === item.wayInfo.length - 1"></image>
- <text>{{item.location}}</text>
+ <text>{{address.location}}</text>
</view>
</view>
<template v-if="[0, 2].includes(item.type)">
@@ -206,19 +209,21 @@
onShow(options) {
this.typeViewId = 0
if(this.token && this.token != '' && this.userInfo && JSON.stringify(this.userInfo) != '{}'){
+ console.log('宸茬櫥闄�')
this.isLogin = true
+ if (!this.isOnce) {
+ this.commentStatus = ''
+ this.orderList = []
+ this.next = true
+ this.page = 1
+ this.getOrderList()
+ }
+ } else {
+ this.isLogin = false
+ console.log('鏈櫥闄�')
}
if (this.userInfo && this.userInfo.useIdentity == 1) {
this.typeViewId = 1
- } else {
- this.typeViewId = 0
- }
- if (!this.isOnce) {
- this.commentStatus = ''
- this.orderList = []
- this.next = true
- this.page = 1
- this.getOrderList()
}
},
data() {
@@ -270,6 +275,11 @@
this.getOrderList()
},
methods: {
+ toLogin() {
+ uni.navigateTo({
+ url: '/pages/login/login'
+ })
+ },
startJobs(orderId) {
this.$u.api.begin({ orderId })
.then(res => {
@@ -443,6 +453,15 @@
width: 100%;
padding: 20rpx 30rpx;
box-sizing: border-box;
+ .index-list-wu {
+ width: 100%;
+ margin-top: 40rpx;
+ text-align: center;
+ text {
+ font-size: 30rpx;
+ color: #666666;
+ }
+ }
.index-list-item {
width: 100%;
padding: 30rpx;
--
Gitblit v1.9.3