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/policyDetails/policyDetails.vue | 89 ++++++++++++++++++++++++++------------------
1 files changed, 53 insertions(+), 36 deletions(-)
diff --git a/wx/pages/policyDetails/policyDetails.vue b/wx/pages/policyDetails/policyDetails.vue
index 2990bb3..08c7e03 100644
--- a/wx/pages/policyDetails/policyDetails.vue
+++ b/wx/pages/policyDetails/policyDetails.vue
@@ -52,7 +52,7 @@
<view class="box_people_label">琚繚浜哄憳</view>
<view class="box_people_list">
<view class="box_people_list_item" v-for="(item, index) in list" :key="index">
- <template v-if="info.statusCollect !== 2">
+ <template v-if="info.statusCollect !== 2 && info.statusCollect !== 27">
<view class="item_status des">涓嶅湪淇�</view>
</template>
<template v-else>
@@ -66,6 +66,9 @@
</view>
<view class="item_head_bottom">
韬唤璇佸彿锛歿{item.idcardNo}}
+ </view>
+ <view class="item_head_bottom">
+ 澶囨敞锛歿{item.remark || ''}}
</view>
</view>
<view class="item_x"></view>
@@ -87,7 +90,7 @@
</view>
</view>
</view>
- <view style="width: 100%; height: calc(env(safe-area-inset-bottom) + 100rpx);" v-if="[2,0,7,1,4,22,25,26].includes(info.statusCollect)"></view>
+ <view style="width: 100%; height: calc(env(safe-area-inset-bottom) + 100rpx);" v-if="[2,0,7,1,4,22,25,26,27,28].includes(info.statusCollect)"></view>
<!-- 鐩翠繚 -->
<template v-if="info.solutionType === 0">
<!-- 淇濋殰涓� -->
@@ -106,7 +109,7 @@
<u-button type="primary" shape="circle" color="#437CB3" :plain="true" text="鐢宠閫�鍥�" @click="show = true"></u-button>
<view style="width: 44rpx; height: 50rpx;"></view>
<!-- @click="show1 = true" -->
- <u-button type="primary" shape="circle" color="#437CB3" text="绛剧讲鎶曚繚鍗�" @click="openmessage(4)"></u-button>
+ <u-button type="primary" shape="circle" color="#437CB3" :loading="loading" text="绛剧讲鎶曚繚鍗�" @click="openmessage(4)"></u-button>
</view>
<!-- 寰呭嚭璐� -->
<view class="details_footer" v-if="info.statusCollect === 1">
@@ -116,15 +119,15 @@
</view>
<!-- 宸查��鍥� -->
<view class="details_footer" v-if="info.statusCollect === 4">
- <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>
<!-- 濮旀墭鎶曚繚 -->
<template v-else>
<!-- 寰呯缃� -->
<view class="details_footer" v-if="info.statusCollect === 7 || info.statusCollect === 28">
- <u-button type="primary" shape="circle" color="#437CB3" text="绛剧讲纭涔�" @click="openmessage(2)" v-if="info.status !== 21"></u-button>
- <u-button type="primary" shape="circle" color="#437CB3" text="绛剧讲鐢宠鍗�" @click="openmessage(3)" v-if="info.status === 21"></u-button>
+ <u-button type="primary" shape="circle" color="#437CB3" text="绛剧讲纭涔�" :loading="loading" @click="openmessage(2)" v-if="info.status !== 21"></u-button>
+ <u-button type="primary" shape="circle" color="#437CB3" text="绛剧讲鐢宠鍗�" :loading="loading" @click="openmessage(3)" v-if="info.status === 21"></u-button>
</view>
<!-- 寰呭鏍�/寰呭嚭鍗� -->
<view class="details_footer" v-if="info.statusCollect === 22 || info.statusCollect === 0 || info.statusCollect === 1 || info.statusCollect === 23">
@@ -138,10 +141,12 @@
</view>
<!-- 鎶曚繚涓� -->
<view class="details_footer" v-if="info.statusCollect === 26 && info.unionApplyTbdStatus !== 0">
- <u-button type="primary" shape="circle" color="#437CB3" text="绛剧讲鎶曚繚鍗�" @click="openmessage(1)"></u-button>
+ <u-button type="primary" shape="circle" color="#437CB3" :loading="loading" text="绛剧讲鎶曚繚鍗�" @click="openmessage(1)"></u-button>
</view>
<!-- 淇濋殰涓� -->
<view class="details_footer" v-if="info.statusCollect === 27">
+ <u-button type="primary" shape="circle" color="#437CB3" text="鏌ョ湅鎶曚繚鍗�" @click="seePdf(info.toubaodanSignedFile ? info.toubaodanSignedFile.fileurlFull : info.toubaodanFile.fileurlFull)"></u-button>
+ <view style="width: 44rpx; height: 50rpx;"></view>
<u-button type="primary" shape="circle" color="#437CB3" text="鏌ョ湅淇濋櫓鍗�" @click="seePdf(info.baoxiandanFile.fileurlFull)"></u-button>
</view>
</template>
@@ -151,7 +156,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">
@@ -190,7 +195,9 @@
code: '',
num: 0,
error: false,
- timer: null
+ timer: null,
+
+ loading: false
};
},
computed: {
@@ -227,13 +234,14 @@
},
// 鎵撳紑鍙戦�侀獙璇佺爜寮圭獥
openmessage(type) {
- this.code = ''
- clearInterval(this.timer)
- this.error = ''
- this.timer = null
- this.num = 0
+ // this.code = ''
+ // clearInterval(this.timer)
+ // this.error = ''
+ // this.timer = null
+ // this.num = 0
this.type = type
- this.show1 = true
+ // this.show1 = true
+ this.confirm1()
},
signApplication() {
uni.navigateTo({
@@ -311,25 +319,28 @@
this.show = false
},
confirm1() {
- if (!this.code) {
- this.error = 1
- return
- }
+ // if (!this.code) {
+ // this.error = 1
+ // return
+ // }
// 绛剧讲鎶曚繚鍗�
+ this.loading = true
if (this.type === 1) {
this.$u.api.getSignWTBTBDLink({
code: this.code,
businessId: this.info.id
}).then(res => {
+ this.loading = false
if (res.code === 200) {
- this.error = ''
- this.show1 = false
+ // this.error = ''
+ // this.show1 = false
uni.navigateTo({
url: `/pages/webView/webView?url=${encodeURIComponent(res.data)}`
})
- } else {
- this.error = 2
}
+ // else {
+ // this.error = 2
+ // }
})
// 纭涔�
} else if (this.type === 2) {
@@ -338,14 +349,16 @@
code: this.code
}).then(res => {
if (res.code === 200) {
- this.error = ''
- this.show1 = false
+ this.loading = false
+ // this.error = ''
+ // this.show1 = false
uni.navigateTo({
url: `/pages/webView/webView?url=${encodeURIComponent(res.data)}`
})
- } else {
- this.error = 2
}
+ // else {
+ // this.error = 2
+ // }
})
// 绛剧讲鐢宠鍗� --- 濮旀墭
} else if (this.type === 3) {
@@ -354,14 +367,16 @@
code: this.code
}).then(res => {
if (res.code === 200) {
- this.error = ''
- this.show1 = false
+ this.loading = false
+ // this.error = ''
+ // this.show1 = false
uni.navigateTo({
url: `/pages/webView/webView?url=${encodeURIComponent(res.data)}`
})
- } else {
- this.error = 2
}
+ // else {
+ // this.error = 2
+ // }
})
// 绛剧讲鐢宠鍗� --- 鐩翠繚
} else if (this.type === 4) {
@@ -371,17 +386,19 @@
if (res.code === 200) {
this.$u.api.getSignLink(this.info.id)
.then(data => {
+ this.loading = false
if (data.code === 200) {
- this.error = ''
- this.show1 = false
+ // this.error = ''
+ // this.show1 = false
uni.navigateTo({
- url: `/pages/webView/webView?url=${encodeURIComponent(res.data)}`
+ url: `/pages/webView/webView?url=${encodeURIComponent(data.data)}`
})
}
})
- } else {
- this.error = 2
}
+ // else {
+ // this.error = 2
+ // }
})
}
},
--
Gitblit v1.9.3