提交 1d822725 编写于 作者: Yuanzhao.dai's avatar Yuanzhao.dai

需求变更、增加,机构榜、个人榜底部banner不显示逻辑,首页个人参加机构未参加状态

上级 5716cc84
...@@ -32,12 +32,12 @@ ...@@ -32,12 +32,12 @@
<span class="line"></span> <span class="line"></span>
</div> </div>
</div> </div>
<div class="footer" v-if="!isWeb&&isLogin" :style="{height: `${50+homeIndicatorHeight}` + 'Px'}"> <div class="footer" v-if="!isWeb&&isLogin&&isShowBottomBar" :style="{height: `${50+homeIndicatorHeight}` + 'Px'}">
<div class="content"> <div class="content">
<div class="left"> <div class="left">
<p class="score">我的机构勤奋分<span>{{personalData.hospitalDiligence}}</span></p> <p class="score">我的机构勤奋分<span>{{personalData.hospitalDiligence}}</span></p>
<!--刘蓓测试需要改成8条,没那么多数据,测完需要改成100--> <!--刘蓓测试需要改成8条,没那么多数据,测完需要改成100-->
<p class="rank" v-if="personalData.hospitalRank<=8&&personalData.hospitalRank">恭喜您的机构上榜排名<span>{{personalData.hospitalRank}}</span></p> <p class="rank" v-if="personalData.hospitalRank<=8">恭喜您的机构上榜排名<span>{{personalData.hospitalRank}}</span></p>
<p class="rank" v-else>很遗憾,您的机构未上榜</p> <p class="rank" v-else>很遗憾,您的机构未上榜</p>
</div> </div>
<div class="right" @click="share">分享排名</div> <div class="right" @click="share">分享排名</div>
...@@ -99,7 +99,8 @@ ...@@ -99,7 +99,8 @@
2: require('../../assets/img/stage3/rank-icon3.png'), 2: require('../../assets/img/stage3/rank-icon3.png'),
}, },
appCallUrl: '', appCallUrl: '',
isLogin: true isLogin: true,
isShowBottomBar: true
} }
}, },
async asyncData( { query } ) { async asyncData( { query } ) {
...@@ -170,6 +171,15 @@ ...@@ -170,6 +171,15 @@
getPersonScore() { getPersonScore() {
getPersonScore().then(res => { getPersonScore().then(res => {
this.personalData = res.data this.personalData = res.data
if(res.data.hospitalType == this.hospitalType) {
if(res.data.hospitalDiligence) {
this.isShowBottomBar = true;
} else {
this.isShowBottomBar = false;
}
} else {
this.isShowBottomBar = false;
}
}) })
}, },
share() { share() {
......
...@@ -28,8 +28,9 @@ ...@@ -28,8 +28,9 @@
</div> </div>
<div class="right"> <div class="right">
<p class="title">机构{{rankName[mainInfo.hospitalType]}}</p> <p class="title">机构{{rankName[mainInfo.hospitalType]}}</p>
<p class="rank">{{mainInfo.hospitalRank}}</p> <p class="rank" v-if="mainInfo.hospitalDiligence">{{mainInfo.hospitalRank}}</p>
<p class="score">机构勤奋分 {{mainInfo.hospitalDiligence}}</p> <p class="rank" v-else >未参与活动</p>
<p class="score">机构勤奋分 {{mainInfo.hospitalDiligence?mainInfo.hospitalDiligence:'-'}}</p>
</div> </div>
</div> </div>
<div class="my-grade" v-if="mainInfo.diligence" @click="goMyGrade" v-bp="{ component_tag: '487#401004'}">我的成绩</div> <div class="my-grade" v-if="mainInfo.diligence" @click="goMyGrade" v-bp="{ component_tag: '487#401004'}">我的成绩</div>
...@@ -138,7 +139,7 @@ ...@@ -138,7 +139,7 @@
mainInfo: {},//顶部个人信息等相关数据 mainInfo: {},//顶部个人信息等相关数据
isWeb: false, isWeb: false,
shareObj: {}, shareObj: {},
mainInfoType: 1,//1,机构参加,2机构未参加 mainInfoType: 1,//1,机构个人都参加或者一个参加,2机构个人都未参加
rankName: { rankName: {
'0': '星火', '0': '星火',
'1': '萌芽', '1': '萌芽',
...@@ -285,7 +286,7 @@ ...@@ -285,7 +286,7 @@
getThirdMainInfo().then(res => { getThirdMainInfo().then(res => {
if(res.code == '000000') { if(res.code == '000000') {
this.mainInfo = res.data; this.mainInfo = res.data;
if(res.data.hospitalDiligence==0) { if(res.data.hospitalDiligence==0&&res.data.diligence==0) {
this.mainInfoType = 2; this.mainInfoType = 2;
} else { } else {
this.mainInfoType = 1; this.mainInfoType = 1;
......
...@@ -33,12 +33,12 @@ ...@@ -33,12 +33,12 @@
<span class="line"></span> <span class="line"></span>
</div> </div>
</div> </div>
<div class="footer" v-if="!isWeb&&isLogin" :style="{height: `${50+homeIndicatorHeight}` + 'Px'}"> <div class="footer" v-if="!isWeb&&isLogin&&personalData.diligence" :style="{height: `${50+homeIndicatorHeight}` + 'Px'}">
<div class="content"> <div class="content">
<div class="left"> <div class="left">
<p class="score">我的勤奋分<span>{{personalData.diligence}}</span></p> <p class="score">我的勤奋分<span>{{personalData.diligence}}</span></p>
<!--刘蓓测试需要改成8条,没那么多数据,测完需要改成100--> <!--刘蓓测试需要改成8条,没那么多数据,测完需要改成100-->
<p class="rank" v-if="personalData.personRank<=8&&personalData.personRank">恭喜您上榜排名<span>{{personalData.personRank}}</span> <p class="rank" v-if="personalData.personRank<=8">恭喜您上榜排名<span>{{personalData.personRank}}</span>
</p> </p>
<p class="rank" v-else>很遗憾,您未上榜</p> <p class="rank" v-else>很遗憾,您未上榜</p>
</div> </div>
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册