From 37b1176f4b37260bd455891898ed1258c6421607 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期四, 21 八月 2025 15:28:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
small-program/pages/demand-hall/demand-hall.vue | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/small-program/pages/demand-hall/demand-hall.vue b/small-program/pages/demand-hall/demand-hall.vue
index 793717b..635bcbd 100644
--- a/small-program/pages/demand-hall/demand-hall.vue
+++ b/small-program/pages/demand-hall/demand-hall.vue
@@ -75,7 +75,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)">
@@ -100,7 +100,7 @@
<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) && 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 +118,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 +146,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)">
--
Gitblit v1.9.3