提交 bf493b2f 编写于 作者: 张磊's avatar 张磊

Merge branch 'develop2' into 'release'

auto commit

See merge request !134
...@@ -7,7 +7,7 @@ if [ ! $hasGit ];then ...@@ -7,7 +7,7 @@ if [ ! $hasGit ];then
else else
git fetch --all git fetch --all
result=`git symbolic-ref --short -q HEAD` # 获取分支名 result=`git symbolic-ref --short -q HEAD` # 获取分支名
current_id=`git log -n 1 origin/develop --pretty=format:"%H"` current_id=`git log -n 1 origin/release --pretty=format:"%H"`
git reset --soft $current_id git reset --soft $current_id
git add . git add .
git commit -m "$msg" git commit -m "$msg"
......
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
:key="item" :key="item"
class="text" class="text"
:class="selectTimes === item.appointmentDate ?'selected':''" :class="selectTimes === item.appointmentDate ?'selected':''"
:style="item.amAppointmentFlag && item.pmAppointmentFlag?'color:#999999':''"
@click="selectTime(item.appointmentDate,item)" @click="selectTime(item.appointmentDate,item)"
> >
{{ item.appointmentDate }} {{ item.appointmentDate }}
...@@ -29,6 +30,7 @@ ...@@ -29,6 +30,7 @@
v-show="currentItem.amTimeBegin !='' && currentItem.amTimeEnd !=''" v-show="currentItem.amTimeBegin !='' && currentItem.amTimeEnd !=''"
class="text" class="text"
:class="selectTimeBucket === currentItem.amTimeBegin ?'selected':''" :class="selectTimeBucket === currentItem.amTimeBegin ?'selected':''"
:style="currentItem.amAppointmentFlag?'':'color:#212121'"
@click="selectTimeB('am')" @click="selectTimeB('am')"
> >
{{ currentItem.amTimeContent }} {{ currentItem.amTimeContent }}
...@@ -37,6 +39,7 @@ ...@@ -37,6 +39,7 @@
v-if="currentItem.pmTimeBegin !='' && currentItem.pmTimeEnd!=''" v-if="currentItem.pmTimeBegin !='' && currentItem.pmTimeEnd!=''"
class="text" class="text"
:class="selectTimeBucket === currentItem.pmTimeBegin ?'selected':''" :class="selectTimeBucket === currentItem.pmTimeBegin ?'selected':''"
:style="currentItem.pmAppointmentFlag?'':'color:#212121'"
@click="selectTimeB('pm')" @click="selectTimeB('pm')"
> >
{{ currentItem.pmTimeContent }} {{ currentItem.pmTimeContent }}
...@@ -117,6 +120,7 @@ export default { ...@@ -117,6 +120,7 @@ export default {
}); });
}, },
selectItem() { selectItem() {
if (this.selectTimes === '') { if (this.selectTimes === '') {
// this.$toast('请选择日期'); // this.$toast('请选择日期');
return; return;
...@@ -155,6 +159,9 @@ export default { ...@@ -155,6 +159,9 @@ export default {
return num > 9 ? num + '' : '0' + num; return num > 9 ? num + '' : '0' + num;
}, },
selectTime(selectTimes, item) { selectTime(selectTimes, item) {
if (item.amAppointmentFlag && item.pmAppointmentFlag) {
return;
}
console.log(item); console.log(item);
this.selectTimes = selectTimes; this.selectTimes = selectTimes;
this.currentItem = item; this.currentItem = item;
...@@ -228,11 +235,15 @@ export default { ...@@ -228,11 +235,15 @@ export default {
font-size: 16px; font-size: 16px;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: #666666; color: #999999;
line-height: 41px; line-height: 41px;
} }
} }
} }
.canselect{
color: #02120F;
}
.selected{ .selected{
color: #00BDA5 !important; color: #00BDA5 !important;
background: #FFFFFF background: #FFFFFF
......
...@@ -6,12 +6,12 @@ ...@@ -6,12 +6,12 @@
:header-info="headerInfo" :header-info="headerInfo"
/> />
<div class="wrap"> <div class="wrap">
<div class="title-1"> <!-- <div class="title-1">
检测预约 检测预约
</div> </div>
<div class="title-2"> <div class="title-2">
及时接受检测结果检测报告 及时接受检测结果检测报告
</div> </div> -->
<div class="choose-section"> <div class="choose-section">
<van-form <van-form
ref="dectionForm" ref="dectionForm"
...@@ -173,6 +173,12 @@ ...@@ -173,6 +173,12 @@
> >
提交 提交
</van-button> </van-button>
<div class="appoint-tel">
客服电话:<a
style="font-weight:550"
href="tel:400-006-5252"
>400-006-5252</a>
</div>
</div> </div>
<SelectHospital <SelectHospital
:external-data="externalData" :external-data="externalData"
...@@ -561,6 +567,7 @@ export default { ...@@ -561,6 +567,7 @@ export default {
overflow: auto; overflow: auto;
box-sizing: border-box; box-sizing: border-box;
color: #ffffff; color: #ffffff;
background: #F3FCFF;
.bg-img { .bg-img {
width: 100%; width: 100%;
...@@ -572,9 +579,6 @@ export default { ...@@ -572,9 +579,6 @@ export default {
.wrap { .wrap {
padding: 0 12px; padding: 0 12px;
overflow: auto; overflow: auto;
background: url('https://files.yunqueyi.com/image/png/common/20221213160647748.png')
no-repeat top left;
background-size: 100% 281px;
} }
.title-1 { .title-1 {
font-size: 20px; font-size: 20px;
...@@ -648,11 +652,25 @@ export default { ...@@ -648,11 +652,25 @@ export default {
} }
} }
.appoint-form-items{ .appoint-form-items{
font-weight: 550px;
/deep/ .van-field__label{ /deep/ .van-field__label{
color: #999999; color: #999999;
} }
/deep/ .van-field__control{
font-weight: 550;
}
/deep/ .van-field__control::placeholder{
font-weight: 450;
}
.appoint-form-placeholder{
font-weight: 450;
}
} }
.appoint-form-value{
font-weight: 550;
}
.appoint-form-placeholder{ .appoint-form-placeholder{
color: #999999; color: #999999;
} }
...@@ -793,6 +811,7 @@ export default { ...@@ -793,6 +811,7 @@ export default {
.appoint-form-submit{ .appoint-form-submit{
margin-top: 30px; margin-top: 30px;
height: 40px; height: 40px;
font-weight: 550;
background: #D9D9D9; background: #D9D9D9;
border-radius: 20px; border-radius: 20px;
border: 1px solid #D9D9D9; border: 1px solid #D9D9D9;
...@@ -800,6 +819,16 @@ export default { ...@@ -800,6 +819,16 @@ export default {
.appoint-form-submit-active{ .appoint-form-submit-active{
background: #00BDA5; background: #00BDA5;
} }
.appoint-tel{
margin-top: 25px;
height: 22px;
font-size: 14px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #666666;
line-height: 22px;
text-align: center;
}
} }
::v-deep { ::v-deep {
.address-wrap { .address-wrap {
......
...@@ -6,26 +6,28 @@ ...@@ -6,26 +6,28 @@
:header-info="headerInfo" :header-info="headerInfo"
/> />
<div class="insurance-reseach-detail"> <div class="insurance-reseach-detail">
<div class="detail-top"> <div class="detail-status">
<div <img
class="detail-top-info" v-if="expireFlag"
:class="detailInfo.status == 5 ? 'grey' : ''" src="https://files.yunqueyi.com/image/png/common/20230301105920798.png"
alt=""
> >
<img <img
class="detail-top-img" v-else
:src=" src="https://files.yunqueyi.com/image/png/common/20230228133738711.png"
detailInfo.status == 5 alt=""
? 'https://files.yunqueyi.com/image/png/common/20221229163136934.png'
: 'https://files.yunqueyi.com/image/png/common/20220816120131913.png'
"
> >
<div class="detail-top-time">
{{ detailInfo.appointmentTimeStr || "--" }} {{ !expireFlag ? statusMap[detailInfo.status]:'已过期' }}
</div> </div>
<div class="detail-top-status"> <div class="detail-top insurance-detection">
{{ statusMap[detailInfo.status] || "--" }} <div class="detection-title">
您的{{ isUnderLine ? '领取' : '检测' }}时间
</div> </div>
<div class="detection-time">
{{ detailInfo.appointmentTimeStr }}
</div> </div>
<div class="detail-top-info">
<div class="detail-top-address"> <div class="detail-top-address">
<div class="detail-top-address-name"> <div class="detail-top-address-name">
{{ detailInfo.hospitalName || "--" }} {{ detailInfo.hospitalName || "--" }}
...@@ -33,21 +35,78 @@ ...@@ -33,21 +35,78 @@
<div class="detail-top-address-info"> <div class="detail-top-address-info">
{{ detailInfo.hospitalAddress || "--" }} {{ detailInfo.hospitalAddress || "--" }}
</div> </div>
<div <div
class="detail-top-address-navigation" class="detail-top-address-navigation"
@click="navigation" @click="navigation"
> >
<img <img
class="navigation-img" class="navigation-img"
src="https://files.yunqueyi.com/image/png/common/20221220105602921.png" src="https://files.yunqueyi.com/image/png/common/20230301160437750.png"
> >
<div class="navigation-text"> <div class="navigation-text">
导航 导航
</div> </div>
</div> </div>
</div> </div>
<img
class="detail-top-img"
src="https://files.yunqueyi.com/image/png/common/20230228180052259.png"
alt=""
>
<div
v-if="detailInfo.hospitalRemarks && detailInfo.hospitalRemarks !== ''"
class="detail-top-hospitalInfo"
>
<img
src="https://files.yunqueyi.com/image/png/common/20230228181040335.png"
alt=""
>
{{ detailInfo.hospitalRemarks }}
</div>
</div>
</div>
<div
v-if="!expireFlag"
class="detail-bottom"
>
<div
class="tips"
>
<div class="tip-org">
<div class="tip-org-left" />
云鹊医温馨提示
<div class="tip-org-right" />
</div>
<div
v-if="isUnderLine"
class="tip-grey"
>
<div class="tip-grey-dot" />
请在预约日前往现场领取产品;
</div>
<div
v-else
class="tip-grey"
>
<div class="tip-grey-dot" />
请在预约日期前往预约医院完成采样。无需空腹,采样前三天可适当清淡饮食;
</div>
<div class="tip-grey">
<div class="tip-grey-dot" />
注意携带好您投保时注册的手机前往,凭手机号扫码确认采样;
</div>
<div class="tip-grey">
<div class="tip-grey-dot" />
预计7-10个工作日电子报告将返回至您的手机,届时将提供进一步的报告解读服务,请注意查收。
</div>
</div>
</div> </div>
<div class="detail-bottom"> <div class="detail-bottom">
<div class="detail-bottom-title">
订单信息
</div>
<div class="detail-bottom-item"> <div class="detail-bottom-item">
<div class="title"> <div class="title">
受检人: 受检人:
...@@ -80,6 +139,12 @@ ...@@ -80,6 +139,12 @@
class="value" class="value"
> >
{{ detailInfo.recordNo || "--" }} {{ detailInfo.recordNo || "--" }}
<img
class="value-copy"
src="https://files.yunqueyi.com/image/png/common/20230301110919111.png"
alt=""
@click="copyNum()"
>
<!-- <text <!-- <text
class="value-copy" class="value-copy"
@click="copyNum()" @click="copyNum()"
...@@ -88,45 +153,55 @@ ...@@ -88,45 +153,55 @@
</text> --> </text> -->
</div> </div>
</div> </div>
<div
v-if="detailInfo.status != 5"
class="tips"
>
<div class="tip-org">
<van-icon
name="warning-o"
size="16px"
/> 温馨提示
</div>
<div class="tip-grey">
(1)请在预约日期前往预约医院完成采样。无需空腹,采样前三天可适当清淡饮食;
</div>
<div class="tip-grey">
(2)注意携带好您投保时注册的手机前往,凭手机号扫码确认采样;
</div> </div>
<div class="tip-grey"> <div class="appoint-detail-tel">
(3)预计7-10个工作日电子报告将返回至您的手机,届时将提供进一步的报告解读服务,请注意查收。 客服电话:<a
style="font-weight:550"
href="tel:400-006-5252"
>400-006-5252</a>
</div> </div>
<!-- <div
class="detail-btn"
@click="checkDetail"
>
查看详情
</div> -->
<div
v-if="!expireFlag"
class="detail-btn-bottom"
>
<div
class="detail-btn-bottom-tips"
>
<van-icon name="warning-o" />
请在预约日前往预约地{{ isUnderLine ? '领取产品' : '完成采样' }},并点击按钮绑定采样码
</div> </div>
<div
class="detail-btn btn-empty reAppoint"
@click="reAppoint"
>
重新预约
</div> </div>
<div <div
class="detail-btn" class="detail-btn"
@click="bindingCode" @click="bindingCode"
> >
绑定采样条形 绑定采样
</div> </div>
<!-- <div </div>
class="detail-btn" <div
@click="checkDetail" v-else
class="detail-btn-bottom"
> >
查看详情
</div> -->
<div <div
class="detail-btn btn-empty" class="detail-btn"
@click="reAppoint" @click="reAppoint"
> >
重新预约 重新预约
</div> </div>
</div>
<van-action-sheet <van-action-sheet
v-model="showSsheet" v-model="showSsheet"
:actions="actions" :actions="actions"
...@@ -159,8 +234,10 @@ export default { ...@@ -159,8 +234,10 @@ export default {
detailInfo: {}, detailInfo: {},
showSsheet:false, showSsheet:false,
yunOrderNo: '', yunOrderNo: '',
projectEquityNo:'', projectEquityNo: '',
query:{}, expireFlag:false,
query: {},
isUnderLine:false,
// 状态 代码 说明 // 状态 代码 说明
// 0101 未填写问卷 // 0101 未填写问卷
// 0102 已填写问卷 // 0102 已填写问卷
...@@ -176,7 +253,7 @@ export default { ...@@ -176,7 +253,7 @@ export default {
'0101': '未填写问卷', '0101': '未填写问卷',
'0102': '已填写问卷', '0102': '已填写问卷',
'0201': '待预约', '0201': '待预约',
'0202': '已预约', '0202': '预约成功',
'0203': '已取消待重新预约', '0203': '已取消待重新预约',
'0301': '待采样', '0301': '待采样',
'0302': '已采样', '0302': '已采样',
...@@ -193,6 +270,7 @@ export default { ...@@ -193,6 +270,7 @@ export default {
this.projectEquityNo = projectEquityNo; this.projectEquityNo = projectEquityNo;
console.log('yunOrderNo', yunOrderNo); console.log('yunOrderNo', yunOrderNo);
this.getDetailByYunOrderNo(yunOrderNo); this.getDetailByYunOrderNo(yunOrderNo);
this.$loading.hide();
}, },
methods: { methods: {
formatDate(orderTime) { formatDate(orderTime) {
...@@ -206,6 +284,8 @@ export default { ...@@ -206,6 +284,8 @@ export default {
getDetailByYunOrderNo(yunOrderNo).then(res => { getDetailByYunOrderNo(yunOrderNo).then(res => {
console.log(res); console.log(res);
this.detailInfo = res.data; this.detailInfo = res.data;
this.expireFlag = res.data.expireFlag;
this.isUnderLine = res.data.detectionCategory == 2;
this.$loading.hide(); this.$loading.hide();
}); });
}, },
...@@ -344,7 +424,16 @@ export default { ...@@ -344,7 +424,16 @@ export default {
// 复制快递单号 // 复制快递单号
copyNum() { copyNum() {
console.log(this.detailInfo.recordNo); console.log(this.detailInfo.recordNo);
const copyText = this.detailInfo.recordNo;
const input = document.createElement('input');
input.value = copyText;
document.body.appendChild(input);
input.select();
input.setSelectionRange(0, input.value.length);
document.execCommand('Copy');
document.body.removeChild(input);
this.$toast('已复制');
console.log('已复制的内容:', copyText);
}, },
validateShow() { validateShow() {
}, },
...@@ -357,9 +446,35 @@ export default { ...@@ -357,9 +446,35 @@ export default {
position: relative; position: relative;
width: 100%; width: 100%;
box-sizing: border-box; box-sizing: border-box;
padding: 10px 12px;
background: #f5f6f8; background: #f5f6f8;
padding-bottom: 120px; background: linear-gradient(180deg, #00BDA5 0%, #20C5B0 125px, #F5F6F8 257px);
padding: 20px 12px 160px;
overflow: auto;
// .top-bg{
// position: absolute;
// width: 100%;
// height: 257px;
// top: 0;
// background: linear-gradient(180deg, #00BDA5 0%, #20C5B0 52%, #F5F6F8 100%);
// }
.detail-status{
display: flex;
justify-content: center;
align-items: center;
font-size: 20px;
font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500;
color: #FFFFFF;
line-height: 28px;
img{
width: 24px;
height: 24px;
margin-right: 6px;
}
}
.detail-top { .detail-top {
padding: 15px; padding: 15px;
background: #ffffff; background: #ffffff;
...@@ -367,17 +482,32 @@ export default { ...@@ -367,17 +482,32 @@ export default {
margin-bottom: 10px; margin-bottom: 10px;
} }
.detail-top-info { .detail-top-info {
background: #F9FAFB;
border-radius: 11px;
padding-bottom: 10px;
.detail-top-img {
position: relative; position: relative;
left: 50%;
transform: translateX(-50%);
width: 307px;
height: 6px;
margin-bottom: 10px;
}
.detail-top-hospitalInfo{
display: flex; display: flex;
justify-content: space-between; padding-left: 15px;
padding-left: 26px; font-size: 13px;
margin-bottom: 13px; font-family: PingFangSC-Regular, PingFang SC;
.detail-top-img { font-weight: 400;
position: absolute; color: #212121;
width: 21px; line-height: 19px;
height: 21px; align-items: center;
left: 0;
top: 2px; img{
width: 12px;
height: 14px;
margin-right: 5px;
}
} }
.detail-top-time { .detail-top-time {
height: 25px; height: 25px;
...@@ -406,9 +536,7 @@ export default { ...@@ -406,9 +536,7 @@ export default {
} }
.detail-top-address { .detail-top-address {
position: relative; position: relative;
background: linear-gradient(117deg, #f6fffc 0%, #effefb 100%); padding: 15px 52px 6px 12px;
border-radius: 11px;
padding: 15px 52px 18px 12px;
.detail-top-address-name { .detail-top-address-name {
height:21px; height:21px;
width: 257px; width: 257px;
...@@ -450,10 +578,18 @@ export default { ...@@ -450,10 +578,18 @@ export default {
} }
.detail-bottom { .detail-bottom {
background: #ffffff; background: #ffffff;
width: calc(100% - 30px);
border-radius: 15px; border-radius: 15px;
padding: 15px 15px 1px 15px; padding: 15px 15px 1px 15px;
margin-bottom: 67px; margin-bottom: 10px;
.detail-bottom-title{
height: 25px;
font-size: 18px;
font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500;
color: #212121;
line-height: 25px;
margin-bottom: 12px;
}
.detail-bottom-item { .detail-bottom-item {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
...@@ -468,13 +604,17 @@ export default { ...@@ -468,13 +604,17 @@ export default {
line-height: 20px; line-height: 20px;
} }
.value { .value {
display: flex;
height: 20px; height: 20px;
font-size: 14px; font-size: 14px;
font-family: PingFangSC-Medium, PingFang SC; font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500; font-weight: 500;
color: #212121; color: #212121;
line-height: 20px; line-height: 20px;
align-items: center;
.value-copy { .value-copy {
width: 14px;
height: 14px;
margin-left: 4px; margin-left: 4px;
color: #1677fe; color: #1677fe;
} }
...@@ -482,19 +622,60 @@ export default { ...@@ -482,19 +622,60 @@ export default {
} }
.tips { .tips {
font-size: 14px; font-size: 14px;
background: #f9fafb;
border-radius: 11px; border-radius: 11px;
padding: 12px 15px; padding: 5px 0 10px 0;
margin-bottom: 14px;
.tip-org { .tip-org {
color: #ff720c; text-align: center;
} height: 21px;
font-size: 15px;
font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500;
color: #212121;
line-height: 21px;
margin-bottom: 18px;
background: url('https://files.yunqueyi.com/image/png/common/20230301094652399.png') no-repeat center center;
background-size: 213px 4px;
}
// .tip-org-left{
// width: 62px;
// height: 1px;
// opacity: 0.31;
// border: 7px solid;
// border-image: linear-gradient(270deg, rgba(255, 255, 255, 1), rgba(6, 191, 167, 1)) 7 7;
// }
// .tip-org-right{
// width: 62px;
// height: 1px;
// opacity: 0.31;
// border: 7px solid;
// border-image: linear-gradient(270deg, rgba(255, 255, 255, 1), rgba(6, 191, 167, 1)) 7 7;
// }
.tip-grey { .tip-grey {
position: relative;
color: #999999; color: #999999;
font-weight: 200; font-weight: 200;
padding-left: 12px;
font-size: 13px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #666666;
line-height: 18px;
margin-bottom: 10px;
}
.tip-grey-dot{
position: absolute;
width: 4px;
height: 4px;
background: #FF720C;
opacity: 0.5;
border-radius: 50%;
left: 0;
top: 7px;
} }
} }
} }
.detail-btn { .detail-btn {
width: 345px; width: 345px;
height: 40px; height: 40px;
...@@ -506,7 +687,6 @@ export default { ...@@ -506,7 +687,6 @@ export default {
color: #ffffff; color: #ffffff;
text-align: center; text-align: center;
line-height: 40px; line-height: 40px;
margin-top: 10px;
} }
.btn-empty { .btn-empty {
color: #00bda5; color: #00bda5;
...@@ -521,4 +701,92 @@ export default { ...@@ -521,4 +701,92 @@ export default {
right: 16px; right: 16px;
} }
} }
.insurance-detection{
background: #FFFFFF;
border-radius: 11px;
padding: 20px 15px;
margin-top: 22px;
// .detection-item{
// margin-bottom: 9px;
// display: flex;
// .label{
// width: 60px;
// height: 20px;
// font-size: 14px;
// font-family: PingFangSC-Regular, PingFang SC;
// font-weight: 400;
// color: #666666;
// line-height: 20px;
// margin-right: 4px;
// }
// .value{
// height: 20px;
// font-size: 14px;
// font-family: PingFangSC-Medium, PingFang SC;
// font-weight: 500;
// color: #212121;
// line-height: 20px
// }
// }
.detection-title{
height: 18px;
font-size: 13px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #666666;
line-height: 18px;
text-align: center;
margin-bottom: 1px;
}
.detection-time{
height: 30px;
font-size: 21px;
font-family: PingFangSC-Semibold, PingFang SC;
font-weight: 600;
color: #212121;
line-height: 30px;
text-align: center;
margin-bottom: 15px ;
}
}
.appoint-detail-tel{
margin-top: 25px;
height: 22px;
font-size: 14px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #666666;
line-height: 22px;
text-align: center;
}
.detail-btn-bottom{
position: fixed;
background: #fff;
left: 0;
width: calc(100vw - 24px);
bottom: 0;
padding:5px 12px 5px 12px ;
display: flex;
.detail-btn-bottom-tips{
position: absolute;
padding: 6px 0;
left: 0;
top: -30px;
width: 100vw;
height: 18px;
font-size: 13px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #FF720C;
line-height: 18px;
background: #FFFBE7;
text-align: center;
}
.reAppoint{
width: 155px;
margin-right:11px ;
border: 1px solid #C0C0C0;
color: #212121;
}
}
</style> </style>
<template> <template>
<div> <van-uploader
<div v-model="fileList"
id="navigation" capture="user"
@click="openGeoApp" accept="image/*"
/> />
<van-button
type="primary"
block
class="navigation-button"
@click="openGeoApp"
>
块级元素
</van-button>
</div>
</template> </template>
<script> <script>
import AMapLoader from '@amap/amap-jsapi-loader';
export default { export default {
mounted() {
this.initMap();
window.location.href = 'amapuri://route';
},
methods: {
data() { data() {
return { return {
geoNavigation:null fileList:[]
}; };
},
initMap() {
var that = this;
AMapLoader.load({
key:'d22c1f112c97cb93b8d343b18420b98d', // 申请好的Web端开发者Key,首次调用 load 时必填
version:'2.0', // 指定要加载的 JSAPI 的版本,缺省时默认为 1.4.15
plugins:[''], // 需要使用的的插件列表,如比例尺'AMap.Scale'等
}).then((AMap) => {
var map = new AMap.Map('navigation', {
resizeEnable: true
});
AMap.plugin('AMap.Driving', function() {
that.geoNavigation = new AMap.Driving({
// 驾车路线规划策略,AMap.DrivingPolicy.LEAST_TIME是最快捷模式
policy: AMap.DrivingPolicy.LEAST_TIME,
map:map
});
var startLngLat = [116.379028, 39.865042];
var endLngLat = [116.427281, 39.903719];
that.geoNavigation.search(startLngLat, endLngLat, function (status, result) {
// 未出错时,result即是对应的路线规划方案
console.log(status, result);
});
});
// geolocation.getCurrentPosition((status, result) => {
// console.log('geolocation,', status, result);
// });
});
},
openGeoApp() {
var target = document.querySelector('#navigation').parentElement.previousElementSibling.previousElementSibling.innerHTML;
console.log(target);
window.location.href = `iosamap://plan${target}`;
}
} }
}; };
</script> </script>
<style> <style>
#navigation{
width: 100vw;
height: 100vh;
}
.navigation-button{
position: fixed;
bottom: 0;
z-index: 99;
}
</style> </style>
<template> <template>
<div class="insurance-binding-code-container" :class="picaWechat == 'wechat' && 'mt20'"> <div
class="insurance-binding-code-container"
:class="picaWechat == 'wechat' && 'mt20'"
>
<page-model <page-model
v-if="picaWechat != 'wechat'" v-if="picaWechat != 'wechat'"
ref="PageModel" ref="PageModel"
...@@ -106,6 +109,20 @@ ...@@ -106,6 +109,20 @@
提交 提交
</div> </div>
</div> </div>
<div class="tel-wrap">
<div class="l-left">
客服电话: &nbsp;
</div>
<div
class="l-right"
>
<!-- <img-->
<!-- class="l-right-img"-->
<!-- src="https://files.yunqueyi.com/image/png/common/20230207134347503.png"-->
<!-- />-->
<a href="tel:400-006-5252">400-006-5252</a>
</div>
</div>
<van-popup <van-popup
v-model="showProtocol" v-model="showProtocol"
position="bottom" position="bottom"
...@@ -398,6 +415,7 @@ export default { ...@@ -398,6 +415,7 @@ export default {
} }
}); });
}, },
callPhone() {}
} }
}; };
...@@ -608,7 +626,8 @@ export default { ...@@ -608,7 +626,8 @@ export default {
line-height: 30px; line-height: 30px;
text-align: center; text-align: center;
font-size: 18px; font-size: 18px;
font-weight: bold; color: #212121;
font-weight: 600;
} }
.protocol-text{ .protocol-text{
height: 400PX; height: 400PX;
...@@ -629,10 +648,11 @@ export default { ...@@ -629,10 +648,11 @@ export default {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
font-weight: 500; font-weight: 600;
margin: 0 auto; margin: 0 auto;
position: absolute; position: absolute;
bottom: 10px; bottom: 10px;
font-size: 16px;
left: calc(50% - 150px); left: calc(50% - 150px);
} }
} }
...@@ -672,7 +692,7 @@ export default { ...@@ -672,7 +692,7 @@ export default {
flex: 1; flex: 1;
height: 50px; height: 50px;
font-size: 18px; font-size: 18px;
font-weight: 500; font-weight: 600;
line-height: 50px; line-height: 50px;
letter-spacing: 3px; letter-spacing: 3px;
color: #00BDA5; color: #00BDA5;
...@@ -723,6 +743,28 @@ export default { ...@@ -723,6 +743,28 @@ export default {
white-space: nowrap; white-space: nowrap;
} }
} }
.tel-wrap{
font-size: 14px;
font-weight: 400;
color: #666666;
width: 100%;
text-align: center;
margin-top: 200px;
display: flex;
align-items: center;
justify-content: center;
.l-right{
color:#00BDA5;
display: flex;
align-items: center;
}
.l-right-img{
width: 12px;
height: 12px;
position: relative;
//top: 1px;
}
}
} }
.mt20{padding-top: 20px} .mt20{padding-top: 20px}
</style> </style>
......
...@@ -13,13 +13,14 @@ ...@@ -13,13 +13,14 @@
z-index: 1; z-index: 1;
.status { .status {
padding: 16px 0; padding: 16px 0;
display: flex;
align-items: center;
img { img {
width: 27px; width: 57px;
height: 66px;
margin: 0 auto;
} }
div { .text {
padding-left: 9px; text-align: center;
margin: 0 auto;
width: 120px; width: 120px;
height: 20px; height: 20px;
font-size: 20px; font-size: 20px;
...@@ -30,14 +31,16 @@ ...@@ -30,14 +31,16 @@
} }
.content { .content {
height: auto; height: auto;
position: relative;
top: 20px;
box-shadow: 0px 15px 10px 0px rgba(229,248,245,0.4);
border-radius: 20px;
.info { .info {
width: 100%; width: 100%;
height: auto; height: auto;
background: #ffffff; background: #ffffff;
border-radius: 10px; border-radius: 10px;
margin-bottom: 10px; padding-bottom: 20px;
padding-top: 20px;
padding-bottom: 40px;
.success-title{ .success-title{
font-size: 16px; font-size: 16px;
font-weight: 700; font-weight: 700;
...@@ -70,7 +73,7 @@ ...@@ -70,7 +73,7 @@
width: auto; width: auto;
height: auto; height: auto;
font-size: 14px; font-size: 14px;
font-weight: 500; font-weight: 600;
color: #212121; color: #212121;
flex: 1; flex: 1;
line-height: 20px; line-height: 20px;
...@@ -151,6 +154,18 @@ ...@@ -151,6 +154,18 @@
justify-content: center; justify-content: center;
} }
} }
.wechat-wrap{
position: absolute;
bottom: 50px;
left: calc(50% - 175px);
margin: 0 auto;
width: 350px;
height: 80px;
img{
width: 100%;
height: 100%;
}
}
} }
...@@ -8,17 +8,28 @@ ...@@ -8,17 +8,28 @@
<div class="detail-box"> <div class="detail-box">
<div class="status"> <div class="status">
<img <img
src="https://files.yunqueyi.com/image/png/common/20220816135250298.png" src="https://files.yunqueyi.com/image/png/common/20230301101427839.png"
alt="success" alt="success"
> >
<div>提交成功</div> <div class="text">提交成功</div>
</div> </div>
<div class="content"> <div class="content">
<div class="info"> <div class="info">
<!-- <div class="success-title">-->
<!-- 请将以下信息展示给采样医生-->
<!-- </div>-->
<div class="blue-wrap"> <div class="blue-wrap">
<div class="list">
<div class="l-left">
条形码:
</div>
<div class="l-right">
{{ dataDetail.sampleCode || '--' }}
<div
class="l-copy"
@click="copyText(dataDetail.sampleCode)"
>
复制
</div>
</div>
</div>
<div class="list"> <div class="list">
<p class="l-left"> <p class="l-left">
受检人: 受检人:
...@@ -39,28 +50,15 @@ ...@@ -39,28 +50,15 @@
{{ dataDetail.checkName || '--' }} {{ dataDetail.checkName || '--' }}
</p> </p>
</div> </div>
<div class="list"> <!-- <div class="list">-->
<p class="l-left"> <!-- <p class="l-left">-->
检测编号: <!-- 检测编号:-->
</p> <!-- </p>-->
<p class="l-right"> <!-- <p class="l-right">-->
{{ dataDetail.recordNo || '--' }} <!-- {{ dataDetail.recordNo || '&#45;&#45;' }}-->
</p> <!-- </p>-->
</div> <!-- </div>-->
<div class="list">
<div class="l-left">
条形码:
</div>
<div class="l-right">
{{ dataDetail.sampleCode || '--' }}
<div
class="l-copy"
@click="copyText(dataDetail.sampleCode)"
>
复制
</div>
</div>
</div>
</div> </div>
</div> </div>
</div> </div>
...@@ -76,6 +74,9 @@ ...@@ -76,6 +74,9 @@
查看我的检测 查看我的检测
</div> </div>
</div> </div>
<div class="wechat-wrap" @click="towechat">
<img src="https://files.yunqueyi.com/image/gif/common/20230301171528895.gif" alt="">
</div>
</div> </div>
</template> </template>
<script> <script>
...@@ -141,6 +142,9 @@ export default { ...@@ -141,6 +142,9 @@ export default {
document.body.removeChild(input); document.body.removeChild(input);
this.$toast('已复制'); this.$toast('已复制');
}, },
towechat() {
window.location.href = 'https://mp.weixin.qq.com/mp/profile_ext?action=home&__biz=MzIyOTY2MTI0MQ==#wechat_redirect';
}
}, },
}; };
</script> </script>
......
...@@ -6,56 +6,76 @@ ...@@ -6,56 +6,76 @@
:header-info="headerInfo" :header-info="headerInfo"
/> />
<div class="insuranceQuestionResult"> <div class="insuranceQuestionResult">
<div class="icon-item"> <div class="insuranceQuestionResult-info">
<img <template v-if="!needDetect">
:src=" <div class="info-top">
!needDetect <div class="info-top-title">
? 'https://files.yunqueyi.com/image/png/common/20221213144514273.png' 防癌专家提醒您尽快进行
: 'https://files.yunqueyi.com/image/png/common/20221213144810625.png'
"
>
</div> </div>
<div <div class="info-top-name">
class="font-big" {{ detectionName }}
:class="needDetect && 'green'"
>
{{ !needDetect ? '建议领用' : '暂无需领用' }}
</div> </div>
<div class="font-normal"> <div class="info-top-tips">
{{ <div class="tips-item">
!needDetect <div class="tips-item-dot" />
? '参照本次评估结果,建议您接受防癌早筛检测。坚持良好生活方式,定期接受体检,关注个人健康' DNA甲基化检测技术,对比传统肿瘤标志物检查,早期癌变检出率高5-10倍
: '参照本次评估结果,建议您可暂不进行防癌早筛检测。坚持良好生活方式,定期接受体检,关注个人健康。'
}}
</div> </div>
<div <div class="tips-item">
v-if="!needDetect" <div class="tips-item-dot" />
class="advise" 早期检出、早期干预、实现可逆
> </div>
<div class="fs"> <div class="tips-item">
建议您进行以下防癌筛查: <div class="tips-item-dot" />
检测报告阳性,最高可报销300元复查费用
</div> </div>
<div class="ad-fs">
{{ detectionName || '' }}
</div> </div>
</div> </div>
<div
v-if="!needDetect"
class="progress"
>
<img <img
src="https://files.yunqueyi.com/image/png/common/20221226103307358.png" src="https://files.yunqueyi.com/image/gif/common/20230228173135233.gif"
class="info-btn"
@click="toAppoint"
> >
<div class="info-tips">
点击上方按钮预约,并前往预约的医疗机构采样
</div> </div>
<div </template>
<template v-else>
<div class="info-noNeed">
<div class="info-noNeed-title">
<div class="text-left" />
参照本次评估结果
<div class="text-right" />
</div>
<div class="info-noNeed-result">
您可暂不进行防癌早筛检测
</div>
<div class="info-noNeed-tips">
<div class="tips-item">
<div class="tips-item-dot" />
坚持良好生活方式;
</div>
<div class="tips-item">
<div class="tips-item-dot" />
定期接受体检,关注个人健康
</div>
</div>
</div>
</template>
</div>
<!-- <div
v-if="!needDetect" v-if="!needDetect"
class="custom-style" class="custom-style"
@click="toAppoint" @click="toAppoint"
> >
{{ buttonText || '免费预约检测' }} {{ buttonText || '免费预约检测' }}
</div> </div> -->
<div class="tips">
<div
class="tips-fixed"
>
注:该问卷评估结果仅供填写人自行参考。 注:该问卷评估结果仅供填写人自行参考。
</div> </div>
</div> </div>
...@@ -113,7 +133,7 @@ export default { ...@@ -113,7 +133,7 @@ export default {
}; };
return m[status]; return m[status];
}, },
// 目前是配置一个检测信息,可能会拓展,所以返回的是一个list // 目前是配置一个检测信息,可能会拓展,所以返回的是一个list ces
getDetectionName(yunOrderNo) { getDetectionName(yunOrderNo) {
getDetectionName(yunOrderNo).then(res => { getDetectionName(yunOrderNo).then(res => {
if (res.code === '000000' && res.data) { if (res.code === '000000' && res.data) {
...@@ -151,105 +171,191 @@ export default { ...@@ -151,105 +171,191 @@ export default {
<style lang="scss" scoped> <style lang="scss" scoped>
.insuranceQuestionResult-box{ .insuranceQuestionResult-box{
background: #fff; height: 100vh;
background: #F3FCFF;
} }
.insuranceQuestionResult { .insuranceQuestionResult {
width: 100%; width: 100%;
box-sizing: border-box; box-sizing: border-box;
padding: 0 16px;
color: #676869; color: #676869;
overflow: auto; overflow: auto;
text-align: center; text-align: center;
.icon-item { background: url('https://files.yunqueyi.com/image/png/common/20230228101352132.png') no-repeat left top;
width: 50px; background-size: 100% 209px ;
height: 60px;
margin: 0 auto; }
margin-top: 30px; .insuranceQuestionResult-info{
img { width: 348px;
width: 100%; background: linear-gradient(180deg, #FFFFFF 0%, #FFFFFF 100%);
height: 100%; box-shadow: 0px 9px 6px 0px #EBF9F8;
} border-radius: 20px;
border: 1px solid rgba(0,189,165,0.33);
margin: 168px auto 54px;
.info-top{
width: 308px;
height: 200px;
background: #FFFBF9;
border-radius: 11px;
margin: 10px auto 20px;
overflow: hidden;
.info-top-title{
margin-top: 25px;
height: 21px;
font-size: 15px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #EF8337;
line-height: 21px;
} }
.font-big { .info-top-name{
margin-top: 8px; margin-top: 8px;
font-size: 25px; height: 22px;
font-weight: 500; font-size: 20px;
color: #ef8337; font-family: PingFangSC-Semibold, PingFang SC;
} font-weight: 600;
.green { color: #EF8337;
color: #179082; line-height: 22px;
} }
.font-normal { .info-top-tips{
margin-top: 15px; margin-top: 25px;
font-size: 15px; .tips-item{
position: relative;
padding-left: 25px;
padding-right: 14px;
font-size: 14px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: #666666; color: #212121;
line-height: 20px;
text-align: left;
} }
.advise {
height: 48px; .tips-item-dot{
background: #fffbf9; position: absolute;
border-radius: 11px; width: 3px;
border: 1px solid #fbe0ce; height: 3px;
padding: 15px; background: #EF8337;
opacity: 0.8;
left: 15px;
top: 9px;
border-radius: 50%;
}
}
}
.info-btn{
position: relative;
width: 375px;
height: 105px;
margin: 0 auto;
font-size: 21px;
font-family: PingFangSC-Semibold, PingFang SC;
font-weight: 600;
color: #FFFFFF;
left: 50%;
transform: translateX(-50%);
line-height: 64px;
text-align: center; text-align: center;
margin: 16px auto; margin-bottom: 20px;
} }
.fs { .info-tips{
font-size: 12px; height: 18px;
font-size: 13px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: #666666;
line-height: 18px;
margin-bottom: 38px;
}
}
.tips{
height: 21px;
font-size: 13px;
font-family: PingFangSC-Light, PingFang SC;
font-weight: 300;
color: #999999; color: #999999;
margin-bottom:6px ; line-height: 21px;
}
.info-noNeed{
width: 307px;
height: 154px;
background: #F9FAFB;
border-radius: 11px;
margin: 22px auto;
overflow: hidden;
.info-noNeed-title{
height: 21px;
font-size: 15px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #00BDA5;
line-height: 21px;
margin-top: 20px;
display: flex;
justify-content: center;
align-items: center;
position: relative;
.text-left{
width: 20px;
height: 1px;
background: linear-gradient(270deg, #EEEEEE 0%, #D8D8D8 100%);
border-radius: 1px;
margin-right: 6px;
}
.text-right{
width: 20px;
height: 1px;
background: linear-gradient(270deg, #EEEEEE 0%, #D8D8D8 100%);
border-radius: 1px;
margin-left: 6px;
}
} }
.ad-fs { .info-noNeed-result{
margin-top: 4px;
height: 20px;
font-size: 18px; font-size: 18px;
font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500; font-weight: 500;
color: #ef8337; color: #00BDA5;
line-height: 20px;
margin-bottom: 25px;
} }
.custom-style { .info-noNeed-tips{
background: #00bda5;
font-size: 16px; margin-bottom: 25px;
color: #ffffff; .tips-item{
font-weight: 600; position: relative;
width: 90%; font-size: 14px;
height: 40px; font-family: PingFangSC-Regular, PingFang SC;
line-height: 40px; font-weight: 400;
border-radius: 40px; color: #666666;
//position: absolute; line-height: 20px;
//bottom: 120px; text-align: left;
margin: 0 auto; padding-left:38px ;
margin-top: 70px; .tips-item-dot{
position: absolute;
width: 3px;
height: 3px;
background: #179082;
opacity: 0.8;
left: 27px;
top: 9px;
border-radius: 50%;
} }
.tips {
font-size: 13px;
font-weight: 300;
color: #212121;
//bottom: 60px;
//position: absolute;
margin: 0 auto;
text-align: center;
width: 100%;
margin-top: 38px;
} }
.progress {
margin-top: 24px;
height: 168px;
width: 100%;
image {
width: 100%;
height: 100%;
}
} }
} }
.loadingShow { .tips-fixed{
display: flex; margin-top: 53px;
justify-content: center; width: 100%;
align-items: center; bottom: 70px;
height: 100vh; height: 21px;
width: 100vw; font-size: 13px;
position: absolute; font-family: PingFangSC-Light, PingFang SC;
top: 0; font-weight: 300;
left: 0; color: #999999;
background: rgba($color: #000000, $alpha: 0.3); line-height: 21px;
} }
</style> </style>
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册