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/addition_subtraction/addition_subtraction.vue | 95 ++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 85 insertions(+), 10 deletions(-)
diff --git a/wx/pages/addition_subtraction/addition_subtraction.vue b/wx/pages/addition_subtraction/addition_subtraction.vue
index 82e2aa8..34dd380 100644
--- a/wx/pages/addition_subtraction/addition_subtraction.vue
+++ b/wx/pages/addition_subtraction/addition_subtraction.vue
@@ -73,7 +73,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>
@@ -99,7 +99,17 @@
</view>
</view>
<view style="width: 100%; height: env(safe-area-inset-bottom); background-color: #ffffff;"></view>
+ <u-toast ref="uToast"></u-toast>
</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>
@@ -108,7 +118,9 @@
data() {
return {
id: null,
+ show: false,
codeId: null,
+ fangan: {},
code: null,
startDate: null,
cyclePrice: null,
@@ -127,6 +139,13 @@
this.cyclePrice = options.cyclePrice
this.getDetails()
uni.$on('add', (res) => {
+ if (JSON.stringify(this.add).indexOf(res.model.idCard) !== -1) {
+ this.$refs.uToast.show({
+ type: 'default',
+ message: `[${res.model.name}]浜哄憳韬唤璇侀噸澶峘
+ })
+ return
+ }
this.add.unshift(res.model)
})
uni.$on('del', (res) => {
@@ -166,6 +185,7 @@
})
let delDetailList = this.del.map(item => {
return {
+ memberId: item.id,
duId: item.pqId,
duName: item.pqName,
idcardNo: item.idCard,
@@ -183,14 +203,9 @@
type: 0
}).then(res => {
if (res.code === 200) {
- uni.showToast({
- title: '鎻愪氦鎴愬姛',
- icon: 'success'
- })
+ uni.showToast({ title: '鎻愪氦鎴愬姛', icon: 'success' })
setTimeout(() => {
- uni.navigateBack({
- delta: 2
- })
+ uni.navigateBack({ delta: 2 })
}, 1500)
}
})
@@ -225,9 +240,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
+ })
})
},
jump() {
@@ -255,6 +275,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;
@@ -450,6 +524,7 @@
color: #FF971D;
font-style: normal;
margin-left: 8rpx;
+ box-sizing: border-box;
}
.top_a_tips {
width: 64rpx;
--
Gitblit v1.9.3