From a1c569d40b5d1d6571a197467a41fd3421c393ce Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 15 九月 2025 09:10:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
small-program/pages/demand-hall/demand-hall.vue | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/small-program/pages/demand-hall/demand-hall.vue b/small-program/pages/demand-hall/demand-hall.vue
index d9722bb..c7a2ce6 100644
--- a/small-program/pages/demand-hall/demand-hall.vue
+++ b/small-program/pages/demand-hall/demand-hall.vue
@@ -63,13 +63,13 @@
{{item.categoryName}}锝渰{item.priceNum2}}浜�
</view>
<view class="index-list-item-info" v-if="item.type === 0 && item.workType === 2&& item.carType === 0">
- {{item.categoryName}}锝渰{item.priceNum1}}澶� 锝渰{item.priceNum2}}浜�
+ {{item.categoryName}}锝渰{item.priceNum1}}澶� | {{item.priceNum2}}浜�
</view>
<view class="index-list-item-info" v-if="item.type === 0 && item.workType === 2&& item.carType === 1">
- {{item.categoryName}}锝渰{item.priceNum1}}灏忔椂 锝渰{item.priceNum2}}浜�
+ {{item.categoryName}}锝渰{item.priceNum1}}灏忔椂 | {{item.priceNum2}}浜�
</view>
<view class="index-list-item-info" v-if="item.type === 0 && item.workType === 2&& item.carType === 2">
- {{item.categoryName}}锝渰{item.priceNum1}}鏂�
+ {{item.categoryName}}锝渰{item.priceNum1}}鏂� | {{item.priceNum2}}浜�
</view>
<view class="index-list-item-info" v-if="item.type === 1">
{{item.carUnit}} | {{item.transportTypeName}} | {{item.transportNum}}{{item.transportUnit}}锝滅敤杞{item.priceNum1}}{{item.carType === 0?"澶�":"娆�"}}
@@ -233,8 +233,8 @@
async onShow(options) {
var flag = getApp().globalData.orderStatus
console.log(getApp().globalData,"=====================================")
- this.status = ''
- this.commentStatus=''
+ // this.status = ''
+ // this.commentStatus=''
// status: this.status === 5 ? 4 : this.status,
// commentStatus: this.status === 5 ? 0 : '',
if(flag =='1'){//鍙戝崟鏂瑰緟鎺ュ崟
--
Gitblit v1.9.3