Skip to content

P
pica-insurance
提交 367aa548 编写于 作者: 张磊's avatar 张磊
浏览文件
操作

Merge branch 'release-zl' into 'release' 

for-all

See merge request !270
上级 d106524f a857c720
隐藏空白字符变更
内嵌 并排
正在显示 包含 116 行增加 和 64 行删除
src/views/entitlement/list.vue
浏览文件 @ 367aa548
......@@ -14,7 +14,11 @@
>
<div class="title-row">
<div class="title">
{{ item.title || '--' }}
<span> {{ item.title || '--' }}</span>
<span
v-if="item.detectionPayType == 1"
class="pay-icon"
>付费</span>
</div>
<div
class="status"
......@@ -72,7 +76,7 @@
{{ item.detectionTime ? "检测时间" : "预约时间" }} ：
</div>
<div class="value">
{{ item.detectionTime ? formatDate(item.detectionTime) : item.appointmentTimeStr || '--' }}
{{ item.detectionTime ? item.detectionTime : item.appointmentTimeStr || '--' }}
</div>
</div>
</div>
......@@ -115,7 +119,6 @@
</template>
<script>
import { formatDate } from '@/utils/common';
import { getEntitlementList, getBanner } from '@/api/entitlement';
export default {
......@@ -172,13 +175,6 @@ export default {
this.getEntitlementList(this.externalOrderNo, this.projectEquityNo);
},
formatDate(detectionTime) {
if (!detectionTime) {
return '--';
}
return formatDate(detectionTime);
},
getEntitlementList(externalOrderNo, projectEquityNo) {
const that = this;
// that.$loading.show();
......@@ -211,6 +207,10 @@ export default {
r.statusTxt = '待审核';
r.btnTxt = '检测详情';
break;
case '0105':
r.statusTxt = '待确认检测';
r.btnTxt = '去确认';
break;
case '0905':
r.statusTxt = '已完成';
r.btnTxt = '查看结果';
......@@ -266,7 +266,7 @@ export default {
return r;
});
arr.map((item, index) => {
if (item.statusCode == '0101') {
if (item.statusCode == '0101' || item.statusCode == '0105') {
arr[index]['yunOrderNoFirst_self'] = item.yunOrderNoFirst;
} else {
arr[index]['yunOrderNoFirst_self'] = item.yunOrderNo;
......@@ -320,7 +320,7 @@ export default {
padding-bottom: 10px;
.title {
display: inline-block;
display: flex;
width: 260px;
font-size: 18px;
font-weight: 900;
......@@ -328,6 +328,7 @@ export default {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
align-items: center;
}
.status {
......@@ -383,11 +384,6 @@ export default {
border: 1px solid #00bda5;
position: relative;
}
// .pbackground{
// color: #fff;
// background: #00BDA5;
// }
}
.empty-wrap {
......@@ -407,5 +403,15 @@ export default {
}
}
}
.pay-icon{
padding: 2px 3px;
background: #FF4B33;
border-radius: 6px;
color: #ffffff;
text-align: center;
font-size: 12px;
height: 18px;
font-weight: 100;
}
}
</style>
src/views/sz-public-new/index.vue
浏览文件 @ 367aa548
......@@ -132,22 +132,44 @@
领取权益
</van-button>
</div>
<!-- 选择证件类型弹框 -->
<van-popup
v-model="showProtocol"
:style="{ height: '230px', width: '300px' }"
:transition-appear="false"
:close-on-click-overlay="false"
v-model="showCardTypeVisible"
position="bottom"
:style="{ height: '280px' }"
>
<div
v-if="showProtocol"
class="protocol-content"
<van-cell
v-for="(item, index) in cardTypes"
:key="index"
:title="item.value"
style="display: flex; align-items: center"
@click="handleChooseCardType(item)"
>
<div class="block70 f20">
<template #right-icon>
<van-icon
v-if="dectionForm.idType == item.no"
name="success"
/>
</template>
</van-cell>
</van-popup>
<!-- 校验通过弹框 -->
<van-overlay
:show="showProtocol"
>
<div class="check-popup-wrapper">
<van-icon
name="close"
class="delete-icon"
size="25"
@click="showProtocol = false"
/>
<p class="title">
身份校验通过
</div>
<div class="block70">
请点击“领取权益”按钮填写预约领取信息
</div>
</p>
<span class="content">请点击“下一步”进入权益领取流程</span>
<div class="submit-button submit-button-empty">
<wx-open-launch-weapp
id="launchBtn"
......@@ -165,34 +187,12 @@
@launch="handleLaunchFn"
>
<script type="text/wxtag-template">
<style>.btn {position:absolute; top: -3px; color: #ffffff;text-align: center;line-height: 50px; font-size: 16px; font-weight: 500; left: 0; width:100%; height: 100%;}</style> <div class="btn">领取权益</div>
<style>.btn {position:absolute; top: -3px; color: #ffffff;text-align: center;line-height: 50px; font-size: 16px; font-weight: 500; left: 0; width:100%; height: 100%;}</style> <div class="btn">下一步</div>
</script>
</wx-open-launch-weapp>
</div>
</div>
</van-popup>
<!-- 选择证件类型弹框 -->
<van-popup
v-model="showCardTypeVisible"
position="bottom"
:style="{ height: '280px' }"
>
<van-cell
v-for="(item, index) in cardTypes"
:key="index"
:title="item.value"
style="display: flex; align-items: center"
@click="handleChooseCardType(item)"
>
<template #right-icon>
<van-icon
v-if="dectionForm.idType == item.no"
name="success"
/>
</template>
</van-cell>
</van-popup>
</van-overlay>
</div>
</template>
......@@ -281,7 +281,7 @@ export default {
this.uploadPointData(channelCode);
}
this.projectEquityNo = projectEquityNo;
this.externalOrderNo = externalOrderNo;
this.externalOrderNo = externalOrderNo || '';
// this.$loading.show();
this.getBanner(7, projectEquityNo);
this.loadCardTypes();
......@@ -335,8 +335,10 @@ export default {
yunOrderNo,
statusCode,
externalOrderNo,
lanZhouOldflag,
versionNumber,
projectEquityNo,
lanZhouOldflag,
} = res.data;
if (lanZhouOldflag) {
const url = '/home';
......@@ -345,14 +347,10 @@ export default {
l +
`/pica-insurance${url}?projectEquityNo=${projectEquityNo}&externalOrderNo=${externalOrderNo}`;
window.location.href = hr;
}
if (statusCode == '0103') {
}else if (statusCode == '0103' || versionNumber == 4) {
this.showProtocol = true;
this.openWebAppConfigPositive.path = `pagesInsurance/all-entrance/index?channelSource=insurance_channel&projectEquityNo=${projectEquityNo}&yunOrderNo=${yunOrderNo}&externalOrderNo=${externalOrderNo}`;
console.log(
'-openWebAppConfigPositive',
this.openWebAppConfigPositive
);
console.log('-this.openWebAppConfigPositive.path', versionNumber, this.openWebAppConfigPositive.path);
} else {
this.$router.replace({
path: '/entitlement',
......@@ -534,9 +532,9 @@ export default {
align-items: center;
background: #00bda5;
justify-content: center;
width: 130px;
margin: 0 auto;
margin-top: 30px;
width: 242px;
margin: 0px auto;
}
/deep/.van-popup--center {
border-radius: 20px;
......@@ -571,5 +569,53 @@ export default {
margin-top: 10px;
background-color: #bee2fd;
}
.check-popup-wrapper{
width: 295px;
height: 227px;
position: fixed;
background: url("https://files.yunqueyi.com/image/png/common/20230830115339979.png") no-repeat center;
background-size: 100% 100%;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
.delete-icon{
// width: 25px;
// height: 25px;
position: absolute;
color: #fff;
right: 0;
top: -36px;
}
.title{
font-size: 18px;
font-weight: 800;
color: #3C877D;
margin-top: 36px;
padding: 0 24px;
}
.content{
display: inline-block;
font-size: 16px;
color: #212121;
margin: 25px 0 48px 0;
padding: 0 24px;
}
.next-btn{
width: 247px;
height: 39px;
margin: 0 auto;
background: #00BDA5;
border-radius: 23px;
color: #fff;
font-size: 18px;
font-weight: 800;
line-height: 39px;
text-align: center;
}
}
}
</style>
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或