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/factory_change_insurance/factory_change_insurance.vue | 78 +++++++++++++++++++++++++++++++++++++--
1 files changed, 74 insertions(+), 4 deletions(-)
diff --git a/wx/pages/factory_change_insurance/factory_change_insurance.vue b/wx/pages/factory_change_insurance/factory_change_insurance.vue
index 9d8d61f..2dfe7cd 100644
--- a/wx/pages/factory_change_insurance/factory_change_insurance.vue
+++ b/wx/pages/factory_change_insurance/factory_change_insurance.vue
@@ -64,7 +64,7 @@
<view style="width: 100%; height: calc(230rpx + env(safe-area-inset-bottom));"></view>
</view>
<view class="box_footer">
- <view class="box_footer_xy">
+ <view class="box_footer_xy" @click="show = true">
<image src="@/static/icon/ic_tips@2x.png" mode="widthFix"></image>
<text>璇烽槄璇汇�婃姇淇濋』鐭ャ��</text>
</view>
@@ -78,6 +78,15 @@
</view>
<view style="width: 100%; height: env(safe-area-inset-bottom); background-color: #ffffff;"></view>
</view>
+ <!-- 鎶曚繚椤荤煡 -->
+ <u-popup :show="show" round="20" :closeable="true" @close="show = false" mode="bottom">
+ <view class="info">
+ <view class="info_title">鎶曚繚椤荤煡</view>
+ <scroll-view scroll-y="true" class="info_nr">
+ <view>{{fangan.specialAgreement}}</view>
+ </scroll-view>
+ </view>
+ </u-popup>
</view>
</template>
@@ -91,7 +100,9 @@
startDate: null,
cyclePrice: null,
info: null,
- user: []
+ user: [],
+ show: false,
+ fangan: {}
};
},
onLoad(options) {
@@ -163,9 +174,14 @@
}
},
getDetails() {
- this.$u.api.insuranceApplyById(this.codeId)
+ var that = this
+ that.$u.api.insuranceApplyById(that.codeId)
.then(res => {
- this.info = res.data
+ that.info = res.data
+ that.$u.api.solutionsById(res.data.newVersionSolutionId)
+ .then(data => {
+ that.fangan = data.data
+ })
})
}
}
@@ -179,6 +195,60 @@
<style lang="scss" scoped>
.box {
width: 100%;
+ .info {
+ width: 100%;
+ padding: 32rpx 30rpx;
+ box-sizing: border-box;
+ .info_title {
+ width: 100%;
+ text-align: center;
+ font-weight: 500;
+ font-size: 30rpx;
+ color: #222222;
+ font-style: normal;
+ }
+ .info_nr {
+ width: 100%;
+ max-height: 70vh;
+ margin-top: 40rpx;
+ font-size: 30rpx;
+ color: black;
+ white-space: pre-wrap;
+ }
+ .info_data {
+ width: 100%;
+ margin-top: 40rpx;
+ .info_data_label {
+ font-weight: 500;
+ font-size: 32rpx;
+ color: #222222;
+ font-style: normal;
+ margin-bottom: 20rpx;
+ }
+ .info_data_item {
+ width: 100%;
+ display: flex;
+ align-items: center;
+ margin-bottom: 20rpx;
+ &:last-child {
+ margin-bottom: 0 !important;
+ }
+ .info_data_item_label {
+ flex-shrink: 0;
+ font-weight: 400;
+ font-size: 26rpx;
+ color: #777777;
+ font-style: normal;
+ }
+ .info_data_item_val {
+ font-weight: 400;
+ font-size: 26rpx;
+ color: #222222;
+ font-style: normal;
+ }
+ }
+ }
+ }
.box_footer {
width: 100%;
position: fixed;
--
Gitblit v1.9.3