From e01af6d359c42b57550957d0108bb23d14088cd0 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期一, 08 四月 2024 15:19:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0.1' into 1.0.1
---
wx/pages/details_dispatch_unit/details_dispatch_unit.vue | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/wx/pages/details_dispatch_unit/details_dispatch_unit.vue b/wx/pages/details_dispatch_unit/details_dispatch_unit.vue
index 6ffcabf..8c9efc4 100644
--- a/wx/pages/details_dispatch_unit/details_dispatch_unit.vue
+++ b/wx/pages/details_dispatch_unit/details_dispatch_unit.vue
@@ -84,11 +84,17 @@
<view style="width: 44rpx; height: 50rpx;"></view>
<u-button type="primary" shape="circle" color="#437CB3" text="鏌ョ湅鎵瑰崟" @click="seePdf(info.pidanFile.fileurlFull)"></u-button>
</view>
- <!-- 寰呭鏍� | 寰呯缃� -->
- <view class="details_footer" v-if="info.status === 1 || info.status === 0">
+ <!-- 寰呭鏍� -->
+ <view class="details_footer" v-if="info.status === 1">
<u-button type="primary" shape="circle" color="#437CB3" @click="show = true" :plain="true" text="鐢宠閫�鍥�"></u-button>
<view style="width: 44rpx; height: 50rpx;"></view>
<u-button type="primary" shape="circle" color="#437CB3" text="鏌ョ湅鐢宠鍗�" @click="seePdf(info.applyFile.fileurlFull)"></u-button>
+ </view>
+ <!-- 寰呯缃� -->
+ <view class="details_footer" v-if="info.status === 0">
+ <u-button type="primary" shape="circle" color="#437CB3" @click="show = true" :plain="true" text="鐢宠閫�鍥�"></u-button>
+ <view style="width: 44rpx; height: 50rpx;"></view>
+ <u-button type="primary" shape="circle" color="#437CB3" text="绛剧讲鐢宠鍗�" @click="openmessage(2)"></u-button>
</view>
<!-- 宸查��鍥� -->
<view class="details_footer" v-if="info.status === 5 || info.status === 8">
@@ -188,7 +194,7 @@
.then(url => {
if (url.code === 200) {
uni.navigateTo({
- url: `/pages/webView/webView?url=${url.data}`
+ url: `/pages/webView/webView?url=${encodeURIComponent(url.data)}`
})
}
})
@@ -207,7 +213,7 @@
this.error = ''
this.show1 = false
uni.navigateTo({
- url: `/pages/webView/webView?url=${res.data}`
+ url: `/pages/webView/webView?url=${encodeURIComponent(res.data)}`
})
} else {
this.error = 2
@@ -281,9 +287,6 @@
},
cancel() {
this.show = false
- },
- confirm1() {
- this.show1 = false
},
cancel1() {
this.show1 = false
--
Gitblit v1.9.3