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 | 120 +++++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 82 insertions(+), 38 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..fd3d267 100644
--- a/wx/pages/details_dispatch_unit/details_dispatch_unit.vue
+++ b/wx/pages/details_dispatch_unit/details_dispatch_unit.vue
@@ -17,6 +17,7 @@
<image v-if="info.status === 3 || info.status === 4" src="@/static/icon/progress_shenqingtuihui@2x.png" mode="widthFix"></image>
<image v-if="info.status === 5 || info.status === 8" src="@/static/icon/progress_yituihui@2x.png" mode="widthFix"></image>
<image v-if="info.status === 6" src="@/static/icon/progress_yiguanbi@2x.png" mode="widthFix"></image>
+ <image v-if="info.status === 7" src="@/static/icon/progress_daichudan@2x.png" mode="widthFix"></image>
</view>
</template>
<view class="box_info_center">
@@ -49,6 +50,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">
@@ -80,34 +84,46 @@
<template v-if="info && info.solutionType === 0">
<!-- 宸茬敓鏁� -->
<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>
+ <u-button type="primary" shape="circle" color="#437CB3" text="鏌ョ湅鐢宠鍗�" @click="seePdf(info.applyUnitFile.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 === 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>
+ <u-button type="primary" shape="circle" color="#437CB3" text="鏌ョ湅鐢宠鍗�" @click="seePdf(info.applyUnitFile.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" :loading="loading" text="绛剧讲鐢宠鍗�" @click="openmessage(2)"></u-button>
</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>
<!-- 濮旀墭 -->
<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.applyUnitFile.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>
+ <u-button type="primary" shape="circle" color="#437CB3" text="鏌ョ湅鐢宠鍗�" @click="seePdf(info.applyUnitFile.fileurlFull)"></u-button>
</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">
- <u-button type="primary" shape="circle" color="#437CB3" text="绛剧讲鐢宠鍗�" @click="openmessage(2)"></u-button>
+ <u-button type="primary" shape="circle" color="#437CB3" :loading="loading" text="绛剧讲鐢宠鍗�" @click="openmessage(2)"></u-button>
</view>
</template>
<!-- 鐢宠閫�鍥炵‘璁ゅ脊绐� -->
@@ -116,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">
@@ -138,6 +154,7 @@
</template>
<script>
+ import { mapState } from 'vuex'
export default {
data() {
return {
@@ -159,7 +176,9 @@
code: '',
num: 0,
error: false,
- timer: null
+ timer: null,
+
+ loading: false
};
},
onLoad(option) {
@@ -169,61 +188,90 @@
onReachBottom() {
this.getList()
},
+ computed: {
+ ...mapState(['userInfo'])
+ },
methods: {
+ send () {
+ this.$u.api.sendSms({
+ phone: this.userInfo.mobile
+ }).then(res => {
+ if (res.code === 200) {
+ this.num = 60
+ this.setTime()
+ }
+ })
+ },
+ setTime () {
+ this.timer = setInterval(() => {
+ if (this.num === 0) {
+ clearInterval(this.timer)
+ this.timer = null
+ return
+ }
+ this.num = this.num - 1
+ }, 1000)
+ },
// 绛剧讲
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.validateCode({
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 => {
+ this.loading = false
if (url.code === 200) {
uni.navigateTo({
- url: `/pages/webView/webView?url=${url.data}`
+ 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({
businessId: this.info.id,
code: this.code
}).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=${res.data}`
+ url: `/pages/webView/webView?url=${encodeURIComponent(res.data)}`
})
- } else {
- this.error = 2
}
+ // else {
+ // this.error = 2
+ // }
})
}
},
// 鎵撳紑鍙戦�侀獙璇佺爜寮圭獥
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
},
// 鏌ョ湅pdf
seePdf(url) {
@@ -282,9 +330,6 @@
cancel() {
this.show = false
},
- confirm1() {
- this.show1 = false
- },
cancel1() {
this.show1 = false
},
@@ -305,7 +350,7 @@
returnStyle(type) {
if ([2].includes(type)) {
return 'linear-gradient(#97DDC5 0%, #F7F7F7 100%);'
- } else if ([1,0].includes(type)) {
+ } else if ([1,0,7].includes(type)) {
return 'linear-gradient( 180deg, #FBC88C 0%, #F7F7F7 100%);'
} else if ([3,4,5,8,6].includes(type)) {
return ''
@@ -314,7 +359,7 @@
returnStyle1(type) {
if ([2].includes(type)) {
return 'linear-gradient( 180deg, #E5F7F1 0%, rgba(255,255,255,0) 100%)'
- } else if ([1,0].includes(type)) {
+ } else if ([1,0,7].includes(type)) {
return 'linear-gradient( 180deg, #FFF2E3 0%, rgba(255,255,255,0) 100%);'
} else if ([3,4,5,8,6].includes(type)) {
return '#ffffff'
@@ -538,12 +583,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