Skip to content

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

for-all2

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