From 3a45da15c947c2d478a44a51bd0f926647b1b841 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期五, 11 四月 2025 16:33:17 +0800
Subject: [PATCH] 提交
---
wx/pages/addition_subtraction_details/addition_subtraction_details.vue | 87 ++++++++++++++++++++++++++++---------------
1 files changed, 56 insertions(+), 31 deletions(-)
diff --git a/wx/pages/addition_subtraction_details/addition_subtraction_details.vue b/wx/pages/addition_subtraction_details/addition_subtraction_details.vue
index 823c8d8..01e5a0a 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,15 +35,19 @@
</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>
<view class="box_info_list_item_val">{{info.startTime}}~{{info.endTime}}</view>
</view>
<view class="box_info_list_item">
- <view class="box_info_list_item_label">鎵瑰崟鐢熸晥鏈燂細</view>
+ <view class="box_info_list_item_label">鎵瑰鐢熸晥鏃ユ湡锛�</view>
<view class="box_info_list_item_val">{{info.applyStartTime}}</view>
+ </view>
+ <view class="box_info_list_item">
+ <view class="box_info_list_item_label">鎵瑰噺鐢熸晥鏃ユ湡锛�</view>
+ <view class="box_info_list_item_val">{{info.delValidTime}}</view>
</view>
</view>
</view>
@@ -73,6 +78,9 @@
<view class="item_head_bottom">
韬唤璇佸彿锛歿{item.memberIdcardNo}}
</view>
+ <view class="item_head_bottom">
+ 澶囨敞锛歿{item.remark || ''}}
+ </view>
</view>
<view class="item_x"></view>
<view class="item_list">
@@ -96,9 +104,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 +127,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 +174,7 @@
</template>
<script>
+ import { mapState } from 'vuex'
export default {
data() {
return {
@@ -184,13 +199,18 @@
code: '',
num: 0,
error: false,
- timer: null
+ timer: null,
+
+ loading: false
};
},
onLoad(options) {
this.id = options.id
this.getInfo()
this.getList()
+ },
+ computed: {
+ ...mapState(['userInfo'])
},
onReachBottom() {
this.getList()
@@ -232,13 +252,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.confirm1()
+ // this.show1 = true
},
IdCard(UUserCard) {
let idcard = UUserCard.toString();
@@ -305,10 +326,11 @@
},
// 绛剧讲
confirm1() {
- if (!this.code) {
- this.error = 1
- return
- }
+ // if (!this.code) {
+ // this.error = 1
+ // return
+ // }
+ this.loading = true
// 绛剧讲鎶曚繚鍗�
if (this.type === 1) {
console.log('绛剧讲鐢宠鍗�')
@@ -316,21 +338,23 @@
code: this.code
}).then(res => {
if (res.code === 200) {
- this.error = ''
- this.show1 = false
+ // this.error = ''
+ // this.show1 = false
this.$u.api.getJiajianBaoSignLink({ id: this.info.id })
.then(url => {
if (url.code === 200) {
+ this.loading = false
uni.navigateTo({
url: `/pages/webView/webView?url=${encodeURIComponent(url.data)}`
})
}
})
- } else {
- this.error = 2
}
+ // else {
+ // this.error = 2
+ // }
})
- this.show1 = false
+ // this.show1 = false
// 鐢宠鍗�
} else if (this.type === 2) {
this.$u.api.getChangeMemberListOnlineSignLink({
@@ -338,14 +362,16 @@
code: this.code
}).then(res => {
if (res.code === 200) {
- this.error = ''
- this.show1 = false
+ // this.error = ''
+ // this.show1 = false
+ this.loading = false
uni.navigateTo({
url: `/pages/webView/webView?url=${encodeURIComponent(res.data)}`
})
- } else {
- this.error = 2
}
+ // else {
+ // this.error = 2
+ // }
})
}
},
@@ -368,18 +394,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 +624,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