提交 63aff1f5 编写于 作者: 史文彬's avatar 史文彬

Merge branch 'release' into feature/insurance-h5-0718

...@@ -18,7 +18,13 @@ ...@@ -18,7 +18,13 @@
</div> </div>
<div <div
class="status" class="status"
:class="{particlar : (item.statusCode == '0204' || item.statusCode == '0905' || item.statusCode == '0904'), 'red-particlar':item.statusCode == '0305'}" :class="{
particlar:
item.statusCode == '0204' ||
item.statusCode == '0905' ||
item.statusCode == '0904',
'red-particlar': item.statusCode == '0305',
}"
> >
{{ item.statusTxt || '--' }} {{ item.statusTxt || '--' }}
</div> </div>
...@@ -32,29 +38,55 @@ ...@@ -32,29 +38,55 @@
{{ item.detectionName || '--' }} {{ item.detectionName || '--' }}
</div> </div>
</div> </div>
<div class="item">
<div class="label"> <div v-if="item.expressContent">
领取机构: <div class="item">
<div class="label">
运单号:
</div>
<div class="value">
{{ item.expressNo || '--' }}
</div>
</div> </div>
<div class="value"> <div class="item">
{{ item.hospitalName || '--' }} <div class="label">
物流进度:
</div>
<div class="value">
{{ item.expressContent || '--' }}
</div>
</div> </div>
</div> </div>
<div class="item">
<div class="label"> <div v-else>
检测时间: <div class="item">
<div class="label">
领取机构:
</div>
<div class="value">
{{ item.hospitalName || '--' }}
</div>
</div> </div>
<div class="value"> <div class="item">
{{ formatDate(item.detectionTime) || "--" }} <div class="label">
检测时间:
</div>
<div class="value">
{{ formatDate(item.detectionTime) || '--' }}
</div>
</div> </div>
</div> </div>
</div> </div>
<div <div class="btn">
class="btn"
>
<wx-open-launch-weapp <wx-open-launch-weapp
:id="`launch-btn${index}`" :id="`launch-btn${index}`"
style="position: absolute; top: 0; left: 0; width: 100%; height: 100%" style="
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
"
:username="openWebAppConfig.username" :username="openWebAppConfig.username"
:path="`pagesInsurance/all-entrance/index?channelSource=insurance_channel&projectEquityNo=${item.projectEquityNo}&yunOrderNo=${item.yunOrderNoFirst_self}&detectionKind=${item.detectionKind}&tradeDetectionServiceRecordId=${item.tradeDetectionServiceRecordId}`" :path="`pagesInsurance/all-entrance/index?channelSource=insurance_channel&projectEquityNo=${item.projectEquityNo}&yunOrderNo=${item.yunOrderNoFirst_self}&detectionKind=${item.detectionKind}&tradeDetectionServiceRecordId=${item.tradeDetectionServiceRecordId}`"
:env-version="envVersion" :env-version="envVersion"
...@@ -65,23 +97,6 @@ ...@@ -65,23 +97,6 @@
</script> </script>
</wx-open-launch-weapp> </wx-open-launch-weapp>
</div> </div>
<!-- <div
v-else
class="btn pbackground"
>
<wx-open-launch-weapp
id="launch-btn"
style="position: absolute; top: 0; left: 0; width: 100%; height: 100%"
:username="openWebAppConfig.username"
:path="`pagesInsurance/all-entrance/index?channelSource=insurance_channel&projectEquityNo=${item.projectEquityNo}&yunOrderNo=${item.yunOrderNoFirst_self}&detectionKind=${item.detectionKind}&tradeDetectionServiceRecordId=${item.tradeDetectionServiceRecordId}`"
:env-version="envVersion"
:extra-data="openWebAppConfig.extraData"
>
<script type="text/wxtag-template">
<style>.btn {position:absolute; top: -3px; color: #ffffff;text-align: center;line-height: 40px; left: 0; width:100%; height: 100%;}</style> <div class="btn">{{ item.btnTxt }}</div>
</script>
</wx-open-launch-weapp>
</div> -->
</div> </div>
<div <div
v-if="entitlementList.length == 0" v-if="entitlementList.length == 0"
...@@ -99,84 +114,80 @@ ...@@ -99,84 +114,80 @@
</div> </div>
</template> </template>
<script> <script>
import { formatDate } from '@/utils/common'; import { formatDate } from '@/utils/common';
const { VUE_APP_ENV } = process.env; const { VUE_APP_ENV } = process.env;
import {getEntitlementList, getBanner} from '@/api/entitlement'; import { getEntitlementList, getBanner } from '@/api/entitlement';
export default { export default {
data() { data() {
return { return {
bgPath: '', bgPath: '',
entitlementList: [], entitlementList: [],
emptyIconPath: 'https://files.yunqueyi.com/image/png/common/20230602155400880.png', emptyIconPath:
envVersion: VUE_APP_ENV == 'production' ? 'release' : 'trial', 'https://files.yunqueyi.com/image/png/common/20230602155400880.png',
// envVersion: 'trial', envVersion: VUE_APP_ENV == 'production' ? 'release' : 'trial',
openWebAppConfig:{ // envVersion: 'trial',
username:'gh_e92f58174364', // 小程序唯一username 1.gh_80d54796f2d5 云鹊助手 2. gh_e92f58174364 云鹊健康 openWebAppConfig: {
path:'pagesInsurance/all-entrance/index', // 打开页面 username: 'gh_e92f58174364', // 小程序唯一username 1.gh_80d54796f2d5 云鹊助手 2. gh_e92f58174364 云鹊健康
extraData: JSON.stringify({}) path: 'pagesInsurance/all-entrance/index', // 打开页面
}, extraData: JSON.stringify({}),
externalOrderNo:'', },
projectEquityNo:'', externalOrderNo: '',
showDialog: false, projectEquityNo: '',
}; showDialog: false,
}, };
computed() { },
computed() {},
mounted() {
const { externalOrderNo, projectEquityNo } = this.$route.query;
this.externalOrderNo = externalOrderNo;
this.projectEquityNo = projectEquityNo;
this.getBanner(6, projectEquityNo);
this.getEntitlementList(externalOrderNo, projectEquityNo);
this.monitorMiniProgram();
},
methods: {
getBanner(pageType, yunOrderNo) {
const self = this;
self.$loading.show();
getBanner(pageType, yunOrderNo).then((res) => {
if (res.code === '000000') {
self.bgPath = res.data.logoUrl;
self.$loading.hide();
}
});
}, },
mounted() { monitorMiniProgram() {
const {externalOrderNo, projectEquityNo} = this.$route.query; const self = this;
this.externalOrderNo = externalOrderNo; document.addEventListener('visibilitychange', () => {
this.projectEquityNo = projectEquityNo; self.entitlementList = [];
this.getBanner(6, projectEquityNo); if (document.visibilityState == 'visible') {
this.getEntitlementList(externalOrderNo, projectEquityNo); self.refreshList();
this.monitorMiniProgram(); }
});
}, },
methods:{
getBanner(pageType, yunOrderNo) { refreshList() {
const self = this; this.getEntitlementList(this.externalOrderNo, this.projectEquityNo);
self.$loading.show(); },
getBanner(pageType, yunOrderNo).then(res => {
if(res.code === '000000') {
self.bgPath = res.data.logoUrl;
self.$loading.hide();
}
});
},
monitorMiniProgram() {
const self = this;
document.addEventListener('visibilitychange', e => {
self.entitlementList = [];
console.log('monitor', e);
console.log('visibilityState', document.visibilityState);
if(document.visibilityState == 'visible') {
self.refreshList();
}
});
},
refreshList() {
this.getEntitlementList(this.externalOrderNo, this.projectEquityNo);
},
formatDate(detectionTime) { formatDate(detectionTime) {
if (!detectionTime) { if (!detectionTime) {
return '--'; return '--';
} }
return formatDate(detectionTime); return formatDate(detectionTime);
}, },
getEntitlementList(externalOrderNo, projectEquityNo) { getEntitlementList(externalOrderNo, projectEquityNo) {
const that = this; const that = this;
// that.$loading.show(); // that.$loading.show();
getEntitlementList(externalOrderNo, projectEquityNo).then(res => { getEntitlementList(externalOrderNo, projectEquityNo).then((res) => {
if (res.code === '000000') { if (res.code === '000000') {
if(res?.data.length > 0) { if (res?.data.length > 0) {
let arr = []; let arr = [];
arr = res.data.map( r => { arr = res.data.map((r) => {
// 0905已完成 0101未填写问卷 0102已填写问卷 0202已预约 0902已结束 0104待支付 0201待预约 0302已采样 0901 已出报告 // 0905已完成 0101未填写问卷 0102已填写问卷 0202已预约 0902已结束 0104待支付 0201待预约 0302已采样 0901 已出报告
// 0903 待报销 0904 已报销 // 0903 待报销 0904 已报销
switch (r.statusCode) { switch (r.statusCode) {
...@@ -230,24 +241,35 @@ ...@@ -230,24 +241,35 @@
r.statusTxt = '审核驳回'; r.statusTxt = '审核驳回';
r.btnTxt = '查看详情'; r.btnTxt = '查看详情';
break; break;
case '0205':
r.statusTxt = '未发货';
r.btnTxt = '查看物流';
break;
case '0206':
r.statusTxt = '已发货';
r.btnTxt = '上传结果';
break;
} }
// 已采样 单独处理 // 已采样 单独处理
if(r.statusCode == '0302') { if (r.statusCode == '0302') {
if(r.detectionKind == 1) { if (r.detectionKind == 1) {
r.btnTxt = '上传结果'; r.btnTxt = '上传结果';
}else{ } else {
r.btnTxt = '检测详情'; r.btnTxt = '检测详情';
} }
} }
r.title = r.detectionKind == 1 ? '癌症早早检权益领取' : '癌症早检权益领取'; r.title =
r.detectionKind == 1
? '癌症早早检权益领取'
: '癌症早检权益领取';
return r; return r;
}); });
arr.map((item, index) => { arr.map((item, index) => {
if(item.statusCode == '0101') { if (item.statusCode == '0101') {
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;
} }
}); });
...@@ -255,137 +277,136 @@ ...@@ -255,137 +277,136 @@
that.entitlementList = arr; that.entitlementList = arr;
} else { } else {
that.entitlementList = []; that.entitlementList = [];
// const l = window.location.origin;
// const hr = l + `/pica-insurance/sz-public?projectEquityNo=${projectEquityNo}&externalOrderNo=${externalOrderNo}`;
// window.location.href = hr;
this.$router.push({ this.$router.push({
path: '/sz-public-new', path: '/sz-public-new',
query: { query: {
externalOrderNo: externalOrderNo, externalOrderNo: externalOrderNo,
projectEquityNo:projectEquityNo, projectEquityNo: projectEquityNo,
reload: 'reload', reload: 'reload',
} },
}); });
} }
// that.$loading.hide(); // that.$loading.hide();
} }
}); });
}, },
} },
}; };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.page-entitlement { .page-entitlement {
width: 100%; width: 100%;
height: 100vh; height: 100vh;
background: #f5f6f8; background: #f5f6f8;
overflow-y: auto; overflow-y: auto;
.banner{ .banner {
width: 375px; width: 375px;
height: 287px; height: 287px;
} }
.ul { .ul {
position: relative; position: relative;
padding: 0 12px; padding: 0 12px;
top: -186px; top: -186px;
.li { .li {
border-radius: 10px; border-radius: 10px;
background: #ffffff; background: #ffffff;
padding: 14px 15px 20px 15px; padding: 14px 15px 20px 15px;
margin-bottom: 10px; margin-bottom: 10px;
.title-row { .title-row {
border-bottom: 1px solid #e9e9e9; border-bottom: 1px solid #e9e9e9;
display: flex; display: flex;
align-items: center; align-items: center;
padding-bottom: 10px; padding-bottom: 10px;
.title { .title {
display: inline-block; display: inline-block;
width: 260px; width: 260px;
font-size: 18px; font-size: 18px;
font-weight: 900; font-weight: 900;
color: #212121; color: #212121;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
} }
.status { .status {
width: 75px; width: 75px;
text-align: right; text-align: right;
font-size: 12px; font-size: 12px;
font-weight: 400; font-weight: 400;
color: #00BDA5; color: #00bda5;
} }
.particlar{ .particlar {
color: #999999; color: #999999;
} }
.red-particlar{ .red-particlar {
color: #FF4B33; color: #ff4b33;
}
} }
}
.content { .content {
margin-top: 10px; margin-top: 10px;
.item { .item {
font-size: 14px; font-size: 14px;
display: flex; display: flex;
align-items: top; align-items: top;
margin-bottom: 5px; margin-bottom: 5px;
.label { .label {
display: inline-block; display: inline-block;
width: 90px; width: 90px;
color: #999999; color: #999999;
} }
.value { .value {
display: inline-block; display: inline-block;
width: 258px; width: 258px;
color: #212121; color: #212121;
font-weight: 700; font-weight: 700;
word-break: break-all; word-break: break-all;
} overflow: hidden;
text-overflow: ellipsis;
} }
} }
.btn { }
margin-left: auto; .btn {
width: 82px; margin-left: auto;
height: 33px; width: 82px;
text-align: center; height: 33px;
line-height: 33px; text-align: center;
font-size: 13px; line-height: 33px;
color: #00bda5; font-size: 13px;
font-weight: 400; color: #00bda5;
border-radius: 25px; font-weight: 400;
border: 1px solid #00bda5; border-radius: 25px;
position: relative; border: 1px solid #00bda5;
} position: relative;
// .pbackground{
// color: #fff;
// background: #00BDA5;
// }
} }
.empty-wrap{ // .pbackground{
padding: 154px 54px 250px 54px; // color: #fff;
background: #fff; // background: #00BDA5;
border-radius: 10px; // }
.empty-icon{ }
width: 243px;
height: 127px;
}
.empty-text{ .empty-wrap {
font-size: 18px; padding: 154px 54px 250px 54px;
font-weight: 500; background: #fff;
color: #02120F; border-radius: 10px;
text-align: center; .empty-icon {
} width: 243px;
height: 127px;
}
.empty-text {
font-size: 18px;
font-weight: 500;
color: #02120f;
text-align: center;
} }
} }
} }
</style> }
</style>
...@@ -111,16 +111,18 @@ ...@@ -111,16 +111,18 @@
</van-field> </van-field>
</van-form> </van-form>
</div> </div>
<div class="bg-img mt20"> <div
<img v-for="(i, ind) in staticINFO.logoUrlList"
src="https://files.yunqueyi.com/image/png/common/20230628141616682.png" :key="ind"
> class="bg-img mt20"
</div> >
<div class="bg-img mt20"> <img :src="i">
<img
src="https://files.yunqueyi.com/image/png/common/20230628141650960.png"
>
</div> </div>
<!-- <div class="bg-img mt20">-->
<!-- <img-->
<!-- src="https://files.yunqueyi.com/image/png/common/20230628141650960.png"-->
<!-- >-->
<!-- </div>-->
</div> </div>
</div> </div>
<div class="bottom-btn"> <div class="bottom-btn">
...@@ -227,6 +229,9 @@ export default { ...@@ -227,6 +229,9 @@ export default {
extraData: JSON.stringify({}), extraData: JSON.stringify({}),
}, },
bgPath: '', bgPath: '',
staticINFO: {
logoUrlList: [],
},
}; };
}, },
computed: { computed: {
...@@ -285,6 +290,7 @@ export default { ...@@ -285,6 +290,7 @@ export default {
getBanner(pageType, yunOrderNo).then((res) => { getBanner(pageType, yunOrderNo).then((res) => {
if (res.code === '000000') { if (res.code === '000000') {
self.bgPath = res.data.logoUrl; self.bgPath = res.data.logoUrl;
self.staticINFO = res.data;
self.$loading.hide(); self.$loading.hide();
} }
}); });
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册