From b79a39d92db3baae7c3c8587e2858561bec0d6ca Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期三, 17 四月 2024 14:37:34 +0800
Subject: [PATCH] mrshi

---
 wx/pages/addition_subtraction_details/addition_subtraction_details.vue |   34 ++++++++++++++++++++++------------
 1 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/wx/pages/addition_subtraction_details/addition_subtraction_details.vue b/wx/pages/addition_subtraction_details/addition_subtraction_details.vue
index 2185e8d..9e55257 100644
--- a/wx/pages/addition_subtraction_details/addition_subtraction_details.vue
+++ b/wx/pages/addition_subtraction_details/addition_subtraction_details.vue
@@ -12,7 +12,8 @@
 							<text>鍏宠仈淇濆崟鍙凤細{{info.applyCode}}</text>
 						</view>
 						<image v-if="info.status === 2" src="@/static/icon/progress_yishengxiao@2x.png" mode="widthFix"></image>
-						<image v-if="info.status === 1 || info.status === 9" src="@/static/icon/progress_daishenhe@2x.png" mode="widthFix"></image>
+						<image v-if="info.status === 9" src="@/static/icon/ic_toubaozhong.png" mode="widthFix"></image>
+						<image v-if="info.status === 1" src="@/static/icon/progress_daishenhe@2x.png" mode="widthFix"></image>
 						<image v-if="info.status === 0" src="@/static/icon/progress_daiqianshu@2x.png" mode="widthFix"></image>
 						<image v-if="info.status === 3" src="@/static/icon/progress_shenqingtuihui@2x.png" mode="widthFix"></image>
 						<image v-if="info.status === 5" src="@/static/icon/progress_yituihui@2x.png" mode="widthFix"></image>
@@ -34,7 +35,7 @@
 					</view>
 					<view class="box_info_list_item">
 						<view class="box_info_list_item_label">璐圭敤鍙樻洿锛�</view>
-						<view class="box_info_list_item_val">-{{info.fee}}鍏�</view>
+						<view class="box_info_list_item_val">{{info.fee}}鍏�</view>
 					</view>
 					<view class="box_info_list_item">
 						<view class="box_info_list_item_label">淇濆崟鐢熸晥鏈燂細</view>
@@ -96,9 +97,9 @@
 		<template v-if="info && info.solutionType === 0">
 			<!-- 宸茬敓鏁� -->
 			<view class="details_footer" v-if="info.status === 2">
-				<u-button type="primary" shape="circle" color="#437CB3" :plain="true" text="鏌ョ湅鐢宠鍗�" @click="seePdf(info.applyFile.fileurlFull)"></u-button>
+				<u-button type="primary" shape="circle" color="#437CB3" text="鏌ョ湅鐢宠鍗�" @click="seePdf(info.applyFile.fileurlFull)"></u-button>
 				<view style="width: 44rpx; height: 50rpx;"></view>
-				<u-button type="primary" shape="circle" color="#437CB3" :plain="true" text="鏌ョ湅鎵瑰崟" @click="seePdf(info.pidanFile.fileurlFull)"></u-button>
+				<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">
@@ -119,6 +120,12 @@
 		</template>
 		<!-- 濮旀墭淇� -->
 		<template v-if="info && info.solutionType === 1">
+			<!-- 宸茬敓鏁� -->
+			<view class="details_footer" v-if="info.status === 2">
+				<u-button type="primary" shape="circle" color="#437CB3" text="鏌ョ湅鐢宠鍗�" @click="seePdf(info.applyFile.fileurlFull)"></u-button>
+				<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 === 9 || info.status === 7">
 				<u-button type="primary" shape="circle" color="#437CB3" text="鏌ョ湅鐢宠鍗�" @click="seePdf(info.applyFile.fileurlFull)"></u-button>
@@ -160,6 +167,7 @@
 </template>
 
 <script>
+	import { mapState } from 'vuex'
 	export default {
 		data() {
 			return {
@@ -191,6 +199,9 @@
 			this.id = options.id
 			this.getInfo()
 			this.getList()
+		},
+		computed: {
+			...mapState(['userInfo'])
 		},
 		onReachBottom() {
 			this.getList()
@@ -322,7 +333,7 @@
 								.then(url => {
 									if (url.code === 200) {
 										uni.navigateTo({
-											url: `/pages/webView/webView?url=${url.data}`
+											url: `/pages/webView/webView?url=${encodeURIComponent(url.data)}`
 										})
 									}
 								})
@@ -341,7 +352,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
@@ -368,18 +379,18 @@
 				this.show2 = false
 			},
 			returnStyle(type) {
-				if ([2].includes(type)) {
+				if ([2,9].includes(type)) {
 					return 'linear-gradient(#97DDC5 0%, #F7F7F7 100%);'
-				} else if ([0,1,9,7].includes(type)) {
+				} else if ([0,1,7].includes(type)) {
 					return 'linear-gradient( 180deg, #FBC88C 0%, #F7F7F7 100%);'
 				} else if ([3,5,6].includes(type)) {
 					return ''
 				}
 			},
 			returnStyle1(type) {
-				if ([2].includes(type)) {
+				if ([2,9].includes(type)) {
 					return 'linear-gradient( 180deg, #E5F7F1 0%, rgba(255,255,255,0) 100%)'
-				} else if ([0,1,9,7].includes(type)) {
+				} else if ([0,1,7].includes(type)) {
 					return 'linear-gradient( 180deg, #FFF2E3 0%, rgba(255,255,255,0) 100%);'
 				} else if ([3,5,6].includes(type)) {
 					return '#ffffff'
@@ -598,12 +609,11 @@
 			position: fixed;
 			bottom: 0;
 			left: 0;
-			padding: 10rpx 30rpx;
+			padding: 10rpx 30rpx calc(env(safe-area-inset-bottom) + 10rpx) 30rpx;
 			box-sizing: border-box;
 			background-color: #ffffff;
 			display: flex;
 			align-items: center;
-			padding-bottom: env(safe-area-inset-bottom);
 		}
 		.code {
 			width: 100%;

--
Gitblit v1.9.3