From 02cb47bef10bafc3a591f160f0b286df529c704a Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 12 四月 2024 15:10:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0.1' into 1.0.1
---
wx/pages/details_dispatch_unit/details_dispatch_unit.vue | 20 +++++++++++++-------
1 files changed, 13 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 8c9efc4..70091b0 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">
@@ -80,7 +81,7 @@
<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>
@@ -88,7 +89,7 @@
<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">
@@ -103,9 +104,15 @@
</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">
@@ -308,7 +315,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 ''
@@ -317,7 +324,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'
@@ -541,12 +548,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