From 16e8c7adbee6c9ee9bac09a80d44d3bfd3fe2f0c Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 19 五月 2025 09:45:38 +0800
Subject: [PATCH] Merge branch '2.0.2' into 2.0.1
---
wx/pages/details_dispatch_unit/details_dispatch_unit.vue | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/wx/pages/details_dispatch_unit/details_dispatch_unit.vue b/wx/pages/details_dispatch_unit/details_dispatch_unit.vue
index 2a6e20c..fd3d267 100644
--- a/wx/pages/details_dispatch_unit/details_dispatch_unit.vue
+++ b/wx/pages/details_dispatch_unit/details_dispatch_unit.vue
@@ -51,7 +51,7 @@
韬唤璇佸彿锛歿{item.memberIdcardNo}}
</view>
<view class="item_head_bottom">
- 澶囨敞锛歿{item.remark}}
+ 澶囨敞锛歿{item.remark||''}}
</view>
</view>
<view class="item_x"></view>
@@ -102,7 +102,7 @@
</view>
<!-- 宸查��鍥� -->
<view class="details_footer" v-if="info.status === 5 || info.status === 8">
- <u-button type="primary" shape="circle" color="#437CB3" @click="show2 = true" :plain="true" text="鍏抽棴璁㈠崟"></u-button>
+ <u-button type="primary" shape="circle" color="#437CB3" @click="show2 = true" :plain="true" text="鍏抽棴鐢宠"></u-button>
</view>
</template>
<!-- 濮旀墭 -->
@@ -119,7 +119,7 @@
</view>
<!-- 宸查��鍥� -->
<view class="details_footer" v-if="info.status === 5">
- <u-button type="primary" shape="circle" color="#437CB3" @click="show2 = true" :plain="true" text="鍏抽棴璁㈠崟"></u-button>
+ <u-button type="primary" shape="circle" color="#437CB3" @click="show2 = true" :plain="true" text="鍏抽棴鐢宠"></u-button>
</view>
<!-- 寰呯缃� -->
<view class="details_footer" v-if="info.status === 0">
@@ -132,7 +132,7 @@
</u-modal>
<!-- 鍏抽棴纭寮圭獥 -->
<u-modal :show="show2" title="娓╅Θ鎻愮ず" :showCancelButton="true" cancelText="鎴戝啀鎯虫兂" confirmColor="#437CB3" @cancel="cancel2" @confirm="confirm2">
- 纭鍏抽棴璁㈠崟锛�
+ 纭鍏抽棴鐢宠锛�
</u-modal>
<!-- 绛剧讲鎶曚繚鍗曢獙璇佺爜寮圭獥 -->
<u-modal :show="show1" title="鑾峰彇楠岃瘉鐮�" :showCancelButton="true" confirmColor="#437CB3" @cancel="cancel1" @confirm="confirm1">
--
Gitblit v1.9.3