Skip to content

Y
year-end-activitiy
提交 5baef239 编写于 作者: tao.wu's avatar tao.wu
浏览文件
操作

Merge remote-tracking branch 'origin/dev-stage2-20191125' into dev-stage2-20191125

上级 68601202 0c65831d
隐藏空白字符变更
内嵌 并排
正在显示 包含 400 行增加 和 214 行删除
assets/style/in-activity.less
浏览文件 @ 5baef239
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
} }
.big-bg-wrap{ .big-bg-wrap{
width: 100%; height: auto; overflow: hidden; width: 100%; height: auto; overflow: hidden;
background: url('../img/stageTwo/bg-01.png') no-repeat left top; background: url('../img/stage-two/bg-01.png') no-repeat left top;
background-size: 100% 100%; background-size: 100% 100%;
.award-wrap{ .award-wrap{
...@@ -73,7 +73,7 @@ ...@@ -73,7 +73,7 @@
position: relative; position: relative;
width: 355px; height: 480px; width: 355px; height: 480px;
margin: 2px auto 0; margin: 2px auto 0;
background: url('../img/stageTwo/user-info-bg.png') no-repeat left top; background: url('../img/stage-two/user-info-bg.png') no-repeat left top;
background-size: 100% 100%; background-size: 100% 100%;
.gold-coin{ .gold-coin{
position: absolute; right: -20px; top: -32px; position: absolute; right: -20px; top: -32px;
...@@ -84,9 +84,9 @@ ...@@ -84,9 +84,9 @@
padding: 16px 15px 0; box-sizing: border-box; padding: 16px 15px 0; box-sizing: border-box;
.head-icon{ .head-icon{
float: left; float: left;
width: 50px; height: 50px; overflow: hidden; width: 50px; height: 50px; overflow: hidden; border: 0; display: block;
border-radius: 50px; border-radius: 50px;
border: 1px solid red; // border: 1px solid red;
img{ img{
width: 50px; height: 50px; width: 50px; height: 50px;
} }
...@@ -227,7 +227,7 @@ ...@@ -227,7 +227,7 @@
} }
.head-icon{ .head-icon{
width: 50px; height: 50px; display: block; border: 0; width: 50px; height: 50px; display: block; border: 0;
float: left; float: left; border-radius: 50px;
} }
.content-info{ .content-info{
float: left; float: left;
...@@ -339,7 +339,7 @@ ...@@ -339,7 +339,7 @@
padding: 0 15px; padding: 0 15px;
.top-center-bar{ .top-center-bar{
width: 325px; height: 58px; overflow: hidden; width: 325px; height: 58px; overflow: hidden;
background: url('../img/stageTwo/daily-task-bar.png') no-repeat center center; background: url('../img/stage-two/daily-task-bar.png') no-repeat center center;
background-size: 128px 12px; background-size: 128px 12px;
font-size: 18px; color: #F05D30; font-weight: 700; text-align: center; line-height: 58px; font-size: 18px; color: #F05D30; font-weight: 700; text-align: center; line-height: 58px;
} }
...@@ -381,7 +381,7 @@ ...@@ -381,7 +381,7 @@
// 底部logo // 底部logo
.bottom-logo{ .bottom-logo{
width: 100%; height: 92px; width: 100%; height: 92px;
background: url('../img/stageTwo/bottom-logo.png') no-repeat center center; background: url('../img/stage-two/bottom-logo.png') no-repeat center center;
background-size: 36px 45px; background-size: 36px 45px;
} }
...@@ -444,7 +444,7 @@ ...@@ -444,7 +444,7 @@
.close-btn{ .close-btn{
position: absolute; left: 50%; bottom: -50px; margin-left: -15px; position: absolute; left: 50%; bottom: -50px; margin-left: -15px;
width: 30px; height: 30px; width: 30px; height: 30px;
background: url('../img/stageTwo/close-toast-icon.png') no-repeat center center; background: url('../img/stage-two/close-toast-icon.png') no-repeat center center;
background-size: 30px; height: 30px; background-size: 30px; height: 30px;
} }
} }
......
components/footer-button.vue 0 → 100644
浏览文件 @ 5baef239
<template>
<section class="footer-btn-wrap">
<div class="footer-btn">
<div class="btn" @click="handlerMethod">{{btnText}}</div>
</div>
</section>
</template>
<script>
export default {
name: "footer-button",
props: {
btnText: {
type: String,
default: () => {
return '确定'
}
},
btnType: {
type: Boolean,
default: () => {
return 1
}
}
},
methods: {
handlerMethod() {
if(this.btnType) {
this.$router.push('/in-activity')
} else {
this.$emit('sureBtn')
}
}
}
}
</script>
<style lang="less" scoped>
.footer-btn-wrap {
.footer-btn {
width: 100%;
height: 40px;
padding: 5px 0;
box-shadow:0px -1px 0px 0px rgba(237,237,237,1);
position: fixed;
bottom: 0;
background: #fff;
.btn {
width: 345px;
height: 40px;
margin: 0 auto;
line-height: 40px;
text-align: center;
background: linear-gradient(270deg,rgba(255,88,36,1) 0%,rgba(254,163,86,1) 100%);
border-radius: 20px;
color: #FFFFFF;
font-weight: 700;
font-size: 15px;
}
}
}
</style>
\ No newline at end of file
pages/hospital-ranking/index.less
浏览文件 @ 5baef239
...@@ -159,25 +159,5 @@ ...@@ -159,25 +159,5 @@
} }
} }
} }
.footer-btn {
width: 100%;
height: 40px;
padding: 5px 0;
box-shadow:0px -1px 0px 0px rgba(237,237,237,1);
position: fixed;
bottom: 0;
.btn {
width: 345px;
height: 40px;
margin: 0 auto;
line-height: 40px;
text-align: center;
background: linear-gradient(270deg,rgba(255,88,36,1) 0%,rgba(254,163,86,1) 100%);
border-radius: 20px;
color: #FFFFFF;
font-weight: 700;
font-size: 15px;
}
}
} }
} }
\ No newline at end of file
pages/hospital-ranking/index.vue
浏览文件 @ 5baef239
...@@ -74,19 +74,22 @@ ...@@ -74,19 +74,22 @@
<p class="num">{{itemD.score}}</p> <p class="num">{{itemD.score}}</p>
</div> </div>
</div> </div>
<div class="footer-btn"> <footer-button
<div class="btn">助力机构 创造佳绩</div> :btnText="btnText"
</div> :btnType="btnType">
</footer-button>
</div> </div>
</section> </section>
</template> </template>
<script> <script>
import RankingHeader from '@/components/ranking-header' import RankingHeader from '@/components/ranking-header';
import FooterButton from '@/components/footer-button';
export default { export default {
name: 'hospital-ranking', name: 'hospital-ranking',
components: { components: {
RankingHeader RankingHeader,
FooterButton
}, },
data() { data() {
return { return {
...@@ -100,7 +103,9 @@ ...@@ -100,7 +103,9 @@
}, },
activeBtnType: true, //true机构，false人员 activeBtnType: true, //true机构，false人员
hospitalRanking: {}, hospitalRanking: {},
contributionRanking: {} contributionRanking: {},
btnText: '助力机构 创造佳绩',
btnType: true
}; };
}, },
computed: { computed: {
......
pages/in-activity.vue
浏览文件 @ 5baef239
...@@ -29,72 +29,72 @@ ...@@ -29,72 +29,72 @@
<div class="award-wrap"> <div class="award-wrap">
<div class="stage-rule"> <div class="stage-rule">
<img class="stage-text" :src="returnStageText()" alt=""> <img class="stage-text" :src="returnStageText()" alt="">
<img class="rule-btn" src="../assets/img/stageTwo/rule-btn.png" alt="" @click="handleRuleBtnClick"> <img class="rule-btn" src="../assets/img/stage-two/rule-btn.png" alt="" @click="handleRuleBtnClick">
</div> </div>
<img class="reward-pic" :src="returnAwardPic()" alt=""> <img class="reward-pic" :src="returnAwardPic()" alt="">
</div> </div>
<!-- 未登录 --> <!-- 未登录 -->
<div v-if="!isLogin" class="not-login-wrap"> <div v-if="!isLogin" class="not-login-wrap">
<img class="gold-coin" src="../assets/img/stageTwo/gold-coin.png" alt=""> <img class="gold-coin" src="../assets/img/stage-two/gold-coin.png" alt="">
<img class="head-icon" src="../assets/img/stageTwo/default-login-icon.png" alt=""> <img class="head-icon" src="../assets/img/stage-two/default-login-icon.png" alt="">
<div class="content-info"> <div class="content-info">
<p class="not-login-text">您还未登录</p> <p class="not-login-text">您还未登录</p>
<p class="tips">登录并加入机构参加活动</p> <p class="tips">登录并加入机构参加活动</p>
</div> </div>
<div class="go-login login-but-no-join" @click="goToLogin">去登录<img src="../assets/img/stageTwo/right-icon-small.png" alt=""></div> <div class="go-login login-but-no-join" @click="goToLogin">去登录<img src="../assets/img/stage-two/right-icon-small.png" alt=""></div>
</div> </div>
<!-- 已登录，但没有加入机构 --> <!-- 已登录，但没有加入机构 -->
<div v-if="isLogin && !isJoin" class="not-login-wrap "> <div v-if="isLogin && !isJoin" class="not-login-wrap ">
<img class="gold-coin" src="../assets/img/stageTwo/gold-coin.png" alt=""> <img class="gold-coin" src="../assets/img/stage-two/gold-coin.png" alt="">
<img class="head-icon" v-if="doctorInfo.avatarImageUrl" :src="doctorInfo.avatarImageUrl" alt=""> <img class="head-icon" v-if="doctorInfo.avatarImageUrl" :src="doctorInfo.avatarImageUrl" alt="">
<img class="head-icon" v-else src="../assets/img/stageTwo/default-login-icon.png" alt=""> <img class="head-icon" v-else src="../assets/img/stage-two/default-login-icon.png" alt="">
<div class="content-info"> <div class="content-info">
<p class="not-login-text">{{ doctorInfo.name }}</p> <p class="not-login-text">{{ doctorInfo.name }}</p>
<p class="tips">尚未加入一个机构</p> <p class="tips">尚未加入一个机构</p>
</div> </div>
<div class="go-login login-but-nojoin" @click="goToJoin">加入机构<img src="../assets/img/stageTwo/right-icon-small.png" alt=""></div> <div class="go-login login-but-nojoin" @click="goToJoin">加入机构<img src="../assets/img/stage-two/right-icon-small.png" alt=""></div>
</div> </div>
<!-- 已登录 且 已加入机构 --> <!-- 已登录 且 已加入机构 -->
<div v-if="isLogin && isJoin" class="user-info-wrap"> <div v-if="isLogin && isJoin" class="user-info-wrap">
<img class="gold-coin" src="../assets/img/stageTwo/gold-coin.png" alt=""> <img class="gold-coin" src="../assets/img/stage-two/gold-coin.png" alt="">
<div class="basic-info"> <div class="basic-info">
<div class="head-icon"> <div class="head-icon">
<img v-if="doctorInfo.avatarImageUrl" :src="doctorInfo.avatarImageUrl" alt=""> <img v-if="doctorInfo.avatarImageUrl" :src="doctorInfo.avatarImageUrl" alt="">
<img v-else src="../assets/img/stageTwo/default-login-icon.png" alt=""> <img v-else src="../assets/img/stage-two/default-login-icon.png" alt="">
</div> </div>
<div class="name-info"> <div class="name-info">
<p class="name">{{ doctorInfo.name }}</p> <p class="name">{{ doctorInfo.name }}</p>
<p class="company">{{ doctorInfo.hospital }}</p> <p class="company">{{ doctorInfo.hospital }}</p>
</div> </div>
<div @click="goToUserDetail" class="detail">个人明细<img src="../assets/img/stageTwo/right-icon-small.png" alt=""></div> <div @click="goToUserDetail" class="detail">个人明细<img src="../assets/img/stage-two/right-icon-small.png" alt=""></div>
</div> </div>
<ul class="billboard-wrap"> <ul class="billboard-wrap">
<li> <li>
<p class="title">个人今日勤奋分</p> <p class="title">个人今日勤奋分</p>
<p class="score">{{doctorInfo.userDayScore}}</p> <p class="score">{{doctorInfo.userDayScore}}</p>
<p class="rank"><img src="../assets/img/stageTwo/billboard-flag.png" alt="">今日排名{{doctorInfo.userDayRank}}</p> <p class="rank"><img src="../assets/img/stage-two/billboard-flag.png" alt="">今日排名{{doctorInfo.userDayRank}}</p>
<div @click="goToUserBoard" class="billboard-btn">查看个人榜单<img src="../assets/img/stageTwo/right-icon-small.png" alt=""></div> <div @click="goToUserBoard" class="billboard-btn">查看个人榜单<img src="../assets/img/stage-two/right-icon-small.png" alt=""></div>
</li> </li>
<li class="organ"> <li class="organ">
<p class="title">机构累计勤奋分</p> <p class="title">机构累计勤奋分</p>
<p class="score">{{doctorInfo.hospitalScore}}</p> <p class="score">{{doctorInfo.hospitalScore}}</p>
<p class="rank"><img src="../assets/img/stageTwo/billboard-flag.png" alt="">累计排名{{doctorInfo.hospitalRank}}</p> <p class="rank"><img src="../assets/img/stage-two/billboard-flag.png" alt="">累计排名{{doctorInfo.hospitalRank}}</p>
<div @click="goToOrganBoard" class="billboard-btn">查看机构榜单<img src="../assets/img/stageTwo/right-icon-small.png" alt=""></div> <div @click="goToOrganBoard" class="billboard-btn">查看机构榜单<img src="../assets/img/stage-two/right-icon-small.png" alt=""></div>
</li> </li>
</ul> </ul>
<p class="score-tips">再获得{{doctorInfo.targetRequiredScore}}勤奋分即可上升到前{{doctorInfo.targetRank}}名获得?????????</p> <p class="score-tips">{{ returnScoreAwardTips }}</p>
<div class="bean-wrap"> <div class="bean-wrap">
<p class="personal-total-get">累计个人获得：<span>{{doctorInfo.userTotalBonus}}云鹊豆</span></p> <p class="personal-total-get">累计个人获得：<span>{{doctorInfo.userTotalBonus}}云鹊豆</span></p>
<div class="bean-center">云鹊豆中心<img src="../assets/img/stageTwo/right-icon-small.png" alt=""></div> <div @click="goToBeanCenter" class="bean-center">云鹊豆中心<img src="../assets/img/stage-two/right-icon-small.png" alt=""></div>
</div> </div>
<p class="bean-tips">机构勤奋分达成目标，全员可获云鹊豆</p> <p class="bean-tips">机构勤奋分达成目标，全员可获云鹊豆</p>
<div class="bean-stage"> <div class="bean-stage">
<img src="../assets/img/stageTwo/bean-stage01.png" alt=""> <img :src="returnBeanImg" alt="">
<ul class="score-list"> <ul class="score-list">
<li v-for="item in doctorInfo.hospitalLevelScore">达{{item}}分</li> <li v-for="item in doctorInfo.hospitalLevelScore">达{{item}}分</li>
<li>12月30日</li> <li>12月30日</li>
...@@ -110,29 +110,29 @@ ...@@ -110,29 +110,29 @@
<!-- 邀请医生好友学课程 --> <!-- 邀请医生好友学课程 -->
<div class="invite-doctor-wrap"> <div class="invite-doctor-wrap">
<img class="top-head-icon" src="../assets/img/stageTwo/invite-doctor-top.png" alt=""> <img class="top-head-icon" src="../assets/img/stage-two/invite-doctor-top.png" alt="">
<p class="invite-tips">每邀请1位医生好友领取课程，+20勤奋分 +20云鹊豆</p> <p class="invite-tips">每邀请1位医生好友领取课程，+20勤奋分 +20云鹊豆</p>
<div class="invite-list-wrap"> <div class="invite-list-wrap">
<ul class="invite-list"> <ul class="invite-list">
<template v-if="!isLogin || !isJoin"> <template v-if="!isLogin || !isJoin">
<li> <li>
<div class="add-btn" @click="eachDoctorClick"> <div class="add-btn" @click="eachDoctorClick">
<img src="../assets/img/stageTwo/add-pic-icon.png" alt=""> <img src="../assets/img/stage-two/add-pic-icon.png" alt="">
</div> </div>
</li> </li>
<li> <li>
<div class="add-btn" @click="eachDoctorClick"> <div class="add-btn" @click="eachDoctorClick">
<img src="../assets/img/stageTwo/add-pic-icon.png" alt=""> <img src="../assets/img/stage-two/add-pic-icon.png" alt="">
</div> </div>
</li> </li>
<li> <li>
<div class="add-btn" @click="eachDoctorClick"> <div class="add-btn" @click="eachDoctorClick">
<img src="../assets/img/stageTwo/add-pic-icon.png" alt=""> <img src="../assets/img/stage-two/add-pic-icon.png" alt="">
</div> </div>
</li> </li>
<li> <li>
<div class="add-btn" @click="eachDoctorClick"> <div class="add-btn" @click="eachDoctorClick">
<img src="../assets/img/stageTwo/add-pic-icon.png" alt=""> <img src="../assets/img/stage-two/add-pic-icon.png" alt="">
</div> </div>
</li> </li>
</template> </template>
...@@ -140,14 +140,14 @@ ...@@ -140,14 +140,14 @@
<!-- 已邀请的 --> <!-- 已邀请的 -->
<li v-for="item in inviteList"> <li v-for="item in inviteList">
<img @click="eachDoctorClick" v-if="item.avatarImageUrl" class="doctor-icon" :src="item.avatarImageUrl" alt=""> <img @click="eachDoctorClick" v-if="item.avatarImageUrl" class="doctor-icon" :src="item.avatarImageUrl" alt="">
<img @click="eachDoctorClick" v-else class="doctor-icon" src="../assets/img/stageTwo/default-doctor-icon.png" alt=""> <img @click="eachDoctorClick" v-else class="doctor-icon" src="../assets/img/stage-two/default-doctor-icon.png" alt="">
<p class="text">{{ item.doctorName ? item.doctorName : item.mobile }}</p> <p class="text">{{ item.doctorName ? item.doctorName : item.mobile }}</p>
</li> </li>
<!-- 未邀请的 --> <!-- 未邀请的 -->
<template v-if="inviteList && inviteList.length < 4"> <template v-if="inviteList && inviteList.length < 4">
<li v-for="item in notInviteShowList"> <li v-for="item in notInviteShowList">
<div class="add-btn" @click="eachDoctorClick"> <div class="add-btn" @click="eachDoctorClick">
<img src="../assets/img/stageTwo/add-pic-icon.png" alt=""> <img src="../assets/img/stage-two/add-pic-icon.png" alt="">
</div> </div>
</li> </li>
</template> </template>
...@@ -155,14 +155,14 @@ ...@@ -155,14 +155,14 @@
<!-- 查看更多 --> <!-- 查看更多 -->
<li> <li>
<div @click="seeMore" class="add-btn"> <div @click="seeMore" class="add-btn">
<img class="right-icon-big" src="../assets/img/stageTwo/right-icon-big.png" alt=""> <img class="right-icon-big" src="../assets/img/stage-two/right-icon-big.png" alt="">
</div> </div>
<p class="text see-more">查看更多</p> <p class="text see-more">查看更多</p>
</li> </li>
</ul> </ul>
</div> </div>
<div class="invite-btn"> <div class="invite-btn">
<img src="../assets/img/stageTwo/invite-btn.png" alt="" class="invite-btn"> <img src="../assets/img/stage-two/invite-btn.png" alt="" class="invite-btn">
<p @click="handleInviteClick" class="text">去邀请</p> <p @click="handleInviteClick" class="text">去邀请</p>
</div> </div>
<div class="login-tips">被邀请好友登录APP，收益X4倍</div> <div class="login-tips">被邀请好友登录APP，收益X4倍</div>
...@@ -173,7 +173,7 @@ ...@@ -173,7 +173,7 @@
<div class="top-center-bar">每日任务</div> <div class="top-center-bar">每日任务</div>
<ul class="task-list"> <ul class="task-list">
<li> <li>
<img class="left-icon" src="../assets/img/stageTwo/daily-clock-icon.png" alt=""> <img class="left-icon" src="../assets/img/task-icon/daily-clock-icon.png" alt="">
<div class="center-wrap"> <div class="center-wrap">
<p class="title">每日打卡</p> <p class="title">每日打卡</p>
<p class="detail-text">+5勤奋分 +5云鹊豆</p> <p class="detail-text">+5勤奋分 +5云鹊豆</p>
...@@ -181,7 +181,7 @@ ...@@ -181,7 +181,7 @@
<div @click="handleClock" class="right-btn done">已打卡</div> <div @click="handleClock" class="right-btn done">已打卡</div>
</li> </li>
<li> <li>
<img class="left-icon" src="../assets/img/stageTwo/hypertension-icon.png" alt=""> <img class="left-icon" src="../assets/img/task-icon/lesson-icon.png" alt="">
<div class="center-wrap"> <div class="center-wrap">
<p class="title">高血压课程学习</p> <p class="title">高血压课程学习</p>
<p class="detail-text">+5勤奋分 +5云鹊豆</p> <p class="detail-text">+5勤奋分 +5云鹊豆</p>
...@@ -189,7 +189,7 @@ ...@@ -189,7 +189,7 @@
<div @click="handleTaskClick" class="right-btn">去学习</div> <div @click="handleTaskClick" class="right-btn">去学习</div>
</li> </li>
<li> <li>
<img class="left-icon" src="../assets/img/stageTwo/smo-icon.png" alt=""> <img class="left-icon" src="../assets/img/task-icon/smo-icon.png" alt="">
<div class="center-wrap"> <div class="center-wrap">
<p class="title">高血压SMO项目任务</p> <p class="title">高血压SMO项目任务</p>
<p class="detail-text">奖励xxx勤奋分</p> <p class="detail-text">奖励xxx勤奋分</p>
...@@ -208,9 +208,9 @@ ...@@ -208,9 +208,9 @@
<div v-if="clockSuccessVisible" class="toast-wrap" @touchmove.prevent> <div v-if="clockSuccessVisible" class="toast-wrap" @touchmove.prevent>
<div class="full-screen-mask"></div> <div class="full-screen-mask"></div>
<div class="content-wrap"> <div class="content-wrap">
<img class="back-image" src="../assets/img/stageTwo/clock-success-bg.png" alt=""> <img class="back-image" src="../assets/img/stage-two/clock-success-bg.png" alt="">
<!-- <img class="back-image" src="../assets/img/stageTwo/win-award-bg.png" alt=""> --> <!-- <img class="back-image" src="../assets/img/stage-two/win-award-bg.png" alt=""> -->
<!-- <img class="back-image" src="../assets/img/stageTwo/award-cup-bg.png" alt=""> --> <!-- <img class="back-image" src="../assets/img/stage-two/award-cup-bg.png" alt=""> -->
<p class="title">打卡成功</p> <p class="title">打卡成功</p>
<p class="message">已获得: 5勤奋分, 5云鹊豆</p> <p class="message">已获得: 5勤奋分, 5云鹊豆</p>
<div class="bottom-btn">我知道了</div> <div class="bottom-btn">我知道了</div>
...@@ -236,6 +236,7 @@ ...@@ -236,6 +236,7 @@
<script> <script>
import { getInviteList } from '@/service/activityMainpage'; import { getInviteList } from '@/service/activityMainpage';
import { checkHospitalStatus } from '@/service'; import { checkHospitalStatus } from '@/service';
import { getShareUrl } from '@/utils/index';
import { Toast } from 'vant'; import { Toast } from 'vant';
const cookies = require('cookie-universal')(); const cookies = require('cookie-universal')();
...@@ -249,14 +250,18 @@ ...@@ -249,14 +250,18 @@
isLogin: false, // 是否 已登录 isLogin: false, // 是否 已登录
isJoin: false, // 是否 已加入机构 默认为false isJoin: false, // 是否 已加入机构 默认为false
joinStatus: 3, // 1-已加入机构 2-机构在审核中状态 3-未加入机构 joinStatus: 3, // 1-已加入机构 2-机构在审核中状态 3-未加入机构
currentStage: 0, // 当前处于第几阶段 0表示不在四个阶段里，1-4表示对应阶段 currentStage: 0, // 当前处于第几阶段 0表示不在四个阶段里，1-4表示对应阶段，取图片地址用
stageDateList: [ stageDateList: [
{ date: '12月16至19日', beginDate: '2019/12/16 00:00:00', endDate: '2019/12/19 23:59:59', title: '高血压学习' }, { date: '12月16至19日', beginDate: '2019/12/16 00:00:00', endDate: '2019/12/19 23:59:59', title: '高血压学习', award: '小米电视' },
{ date: '12月20至23日', beginDate: '2019/12/20 00:00:00', endDate: '2019/12/23 23:59:59', title: '糖尿病学习' }, { date: '12月20至23日', beginDate: '2019/12/20 00:00:00', endDate: '2019/12/23 23:59:59', title: '糖尿病学习', award: '米家洗衣机' },
{ date: '12月24至26日', beginDate: '2019/12/24 00:00:00', endDate: '2019/12/26 23:59:59', title: '中医学习' }, { date: '12月24至26日', beginDate: '2019/12/24 00:00:00', endDate: '2019/12/26 23:59:59', title: '中医学习', award: '米家两门冰箱' },
{ date: '12月27至29日', beginDate: '2019/12/27 00:00:00', endDate: '2019/12/29 23:59:59', title: '全科学习' }, { date: '12月27至29日', beginDate: '2019/12/27 00:00:00', endDate: '2019/12/29 23:59:59', title: '全科学习', award: '荣耀 Play3' },
], ],
awardList: {
No1: '',
No3: '欧姆龙血压计',
No10: '欧姆龙体温计',
},
appUserInfo: { appUserInfo: {
userName: '', userName: '',
userMobile: '', userMobile: '',
...@@ -265,13 +270,16 @@ ...@@ -265,13 +270,16 @@
// appVersion: '', // appVersion: '',
// systemType: '', // systemType: '',
}, },
eachInviteAward: { // 每邀请1位医生好友领取课程，+??勤奋分 +??云鹊豆
mark: 0, // 勤奋分
bean: 0, // 云鹊豆
},
doctorInfo: { doctorInfo: {
name: '', // 接口返回用户名字或者手机号带遮掩 name: '', // 接口返回用户名字或者手机号带遮掩
hospital: '', // 机构名称 hospital: '', // 机构名称
avatarImageUrl: '', // 头像URL avatarImageUrl: '', // 头像URL
userDayScore: '1000', // 用户当日勤奋分 userDayScore: '1000', // 用户当日勤奋分
userDayRank: '5', // 用户当日排名 userDayRank: '2', // 用户当日排名
hospitalScore: '6000', // 机构累计勤奋分 hospitalScore: '6000', // 机构累计勤奋分
hospitalRank: '8', // 机构累计排名 hospitalRank: '8', // 机构累计排名
userTotalBonus: '7777', // 个人累计获得云鹊豆 userTotalBonus: '7777', // 个人累计获得云鹊豆
...@@ -279,45 +287,55 @@ ...@@ -279,45 +287,55 @@
targetRequiredScore: '10', // 再获得多少分 // 再获得10勤奋分即可上升到前10名获得欧姆龙温度计 targetRequiredScore: '10', // 再获得多少分 // 再获得10勤奋分即可上升到前10名获得欧姆龙温度计
targetRank: '5', // 上升到多少名 targetRank: '5', // 上升到多少名
}, },
championAward: [ // 第一名的奖励名称会根据日期变化
'小米电视 4C 32英寸', // 12.16-12.19
'米家洗衣机', // 12.20-12.23
'米家两门冰箱', // 12.24-12.26
'荣耀 Play3', // 12.27-12.29
],
rankLittleTips: {
first: '今日保持第1名，可获得小米电视',
before3: '第1名可获得小米电视，今日再拿X分即有机会上升到第1名',
before10: '前3名可获得血压计，今日再拿X分即有机会上升到第3名',
after10: '前10名可获得体温计，今日再拿X分即有机会上升到第10名',
},
clockSuccessVisible: false, // 是否显示 打卡成功 弹窗 clockSuccessVisible: false, // 是否显示 打卡成功 弹窗
activityEndVisible: false, // 是否显示 活动结束 弹窗 activityEndVisible: false, // 是否显示 活动结束 弹窗
inviteList: [], // 已邀请的用户列表 inviteList: [], // 已邀请的用户列表
notInviteShowList: [], // 未邀请的默认显示 notInviteShowList: [], // 未邀请的默认显示
taskList: [], // 打卡、课程、SMO
} }
}, },
computed: { computed: {
// loginUserIcon() { returnBeanImg() {
// if(){ let hospitalScore = vm.doctorInfo.hospitalScore;
let arr = vm.doctorInfo.hospitalLevelScore;
// }else{ if( hospitalScore < arr[0]){
// return '../assets/img/stageTwo/default-login-icon.png'; return require(`../assets/img/stage-two/bean-stage-0.png`);
// } }else if( ((arr[0] == hospitalScore) || (arr[0] < hospitalScore)) && (hospitalScore < arr[1]) ){
// }, return require(`../assets/img/stage-two/bean-stage-1.png`);
}else if( ((arr[1] == hospitalScore) || (arr[1] < hospitalScore)) && (hospitalScore < arr[2]) ){
// 顶部类似tab的显示逻辑 return require(`../assets/img/stage-two/bean-stage-2.png`);
// topDateStatus(item) { }else if( ((arr[2] == hospitalScore) || (arr[2] < hospitalScore)) ){
return require(`../assets/img/stage-two/bean-stage-3.png`);
// }, }else{
return require(`../assets/img/stage-two/bean-stage-0.png`);
}
},
returnScoreAwardTips() {
let award = '';
if( vm.doctorInfo && vm.doctorInfo.userDayRank ) {
let userDayRank = vm.doctorInfo.userDayRank;
if( userDayRank == 1 ){
return `今日保持第1名，可获得${vm.awardList.No1}`;
}else if( userDayRank < 4 ){ // 2-3 提示 再获得X勤奋分即可上升到前Y名获得 第1名奖品
award = vm.awardList.No1;
}else if( userDayRank < 11 ){ // 4-10 提示 再获得X勤奋分即可上升到前Y名获得 第3名奖品
award = vm.awardList.No3;
}else{ // 10名以后 提示：再获得X勤奋分即可上升到前Y名获得 第10名奖品
award = vm.awardList.No10;
}
return `再获得${vm.doctorInfo.targetRequiredScore}勤奋分即可上升到前${vm.doctorInfo.targetRank}名获得${award}`
}
}
}, },
created() { created() {
vm = this; vm = this;
// 取服务器时间，切换不同时间段的显示 // 取服务器时间，切换不同时间段的显示
vm.getServerTime(); vm.getServerTime();
}, },
mounted() { mounted() {
vm.$rocNative.appInit(); vm.$rocNative.appInit();
...@@ -341,20 +359,22 @@ ...@@ -341,20 +359,22 @@
if(vm.currentStage == 0){ if(vm.currentStage == 0){
return ''; return '';
}else{ }else{
return require(`../assets/img/stageTwo/stage-0${vm.currentStage}-text.png`); return require(`../assets/img/stage-two/stage-0${vm.currentStage}-text.png`);
} }
}, },
returnAwardPic() { returnAwardPic() {
if(vm.currentStage == 0){ if(vm.currentStage == 0){
return ''; return '';
}else{ }else{
return require(`../assets/img/stageTwo/award-0${vm.currentStage}-pic.png`) return require(`../assets/img/stage-two/award-0${vm.currentStage}-pic.png`)
} }
}, },
returnStageClass(item, index){ // 返回顶部四个时间进度条状态 returnStageClass(item, index){ // 返回顶部四个时间进度条状态
// debugger; // debugger;
// 获取当前服务器时间 获取失败则用本地时间 // 获取当前服务器时间 获取失败则用本地时间 ***************************************************
let currentTime = 1577030400000; let currentTime = 1577376000000 || new Date().getTime();
let beginTime = new Date(item.beginDate).getTime(); let beginTime = new Date(item.beginDate).getTime();
let endTime = new Date(item.endDate).getTime(); let endTime = new Date(item.endDate).getTime();
let status = ''; let status = '';
...@@ -362,7 +382,8 @@ ...@@ -362,7 +382,8 @@
status = ''; status = '';
}else if( (currentTime == beginTime) || (beginTime < currentTime && currentTime < endTime) || (currentTime == endTime) ){ // 活动中 }else if( (currentTime == beginTime) || (beginTime < currentTime && currentTime < endTime) || (currentTime == endTime) ){ // 活动中
status = 'active'; status = 'active';
vm.currentStage = index + 1; vm.awardList.No1 = item.award; // 根据时间段来设置第1名奖品
vm.currentStage = index + 1; // 决定显示第几张图片
}else{ // 已结束 }else{ // 已结束
status = 'over'; status = 'over';
}; };
...@@ -382,7 +403,6 @@ ...@@ -382,7 +403,6 @@
if(params && params.userMobile){ // 已登录 （有手机号表示 已登录，无手机号表示 未登录） if(params && params.userMobile){ // 已登录 （有手机号表示 已登录，无手机号表示 未登录）
vm.isLogin = true; vm.isLogin = true;
vm.appUserInfo = params; vm.appUserInfo = params;
alert('已经获取了 登录token了')
vm.loginCallback(); vm.loginCallback();
...@@ -408,8 +428,8 @@ ...@@ -408,8 +428,8 @@
hospital: '上海协和医院', // 机构名称 hospital: '上海协和医院', // 机构名称
avatarImageUrl: 'https://ss0.bdstatic.com/94oJfD_bAAcT8t7mm9GUKT-xh_/timg?image&quality=100&size=b4000_4000&sec=1575272062&di=90feeb5bbc9d7f7122f74be154c6f69c&src=http://b-ssl.duitang.com/uploads/item/201709/06/20170906180625_YNysd.jpeg', // 头像URL avatarImageUrl: 'https://ss0.bdstatic.com/94oJfD_bAAcT8t7mm9GUKT-xh_/timg?image&quality=100&size=b4000_4000&sec=1575272062&di=90feeb5bbc9d7f7122f74be154c6f69c&src=http://b-ssl.duitang.com/uploads/item/201709/06/20170906180625_YNysd.jpeg', // 头像URL
userDayScore: '111', // 用户当日勤奋分 userDayScore: '111', // 用户当日勤奋分
userDayRank: '222', // 用户当日排名 userDayRank: '11', // 用户当日排名
hospitalScore: '333', // 机构累计勤奋分 hospitalScore: '600', // 机构累计勤奋分
hospitalRank: '444', // 机构累计排名 hospitalRank: '444', // 机构累计排名
userTotalBonus: '555', // 个人累计获得云鹊豆 userTotalBonus: '555', // 个人累计获得云鹊豆
hospitalLevelScore: [111, 222, 333], // 三阶段达标分值, 数组返回 hospitalLevelScore: [111, 222, 333], // 三阶段达标分值, 数组返回
...@@ -419,12 +439,11 @@ ...@@ -419,12 +439,11 @@
}, },
goToCheckJoin() { // 检查是否加入结构 goToCheckJoin() { // 检查是否加入结构
checkHospitalStatus(vm.appUserInfo.userToken).then(res => { checkHospitalStatus(vm.appUserInfo.userToken).then(res => {
alert('jiandddddd') alert('检查是否加入结构')
alert(JSON.stringify(res)) alert(JSON.stringify(res))
if(res && res.code == '000000' ){ if(res && res.code == '000000' ){
const status = res.data.status; const status = res.data.status;
// const status = 15; // test。。。。。。。。。。。。。。。。。 // const status = 15; // test。。。。。。。。。。。。。。。。。
alert('是否加入机构'); alert(status)
if (status && status == 1) { // 机构状态正常 if (status && status == 1) { // 机构状态正常
vm.isJoin = true; vm.isJoin = true;
vm.joinStatus = 1; vm.joinStatus = 1;
...@@ -442,9 +461,9 @@ ...@@ -442,9 +461,9 @@
}); });
}, },
handleGetInviteList() { handleGetInviteList() {
let token = '5463439BE4444FF8BC47CC4575E9D550'; // 开发时用这个调用数据 // let token = '5463439BE4444FF8BC47CC4575E9D550'; // 开发时用这个调用数据
// let token = vm.appUserInfo.userToken; // 正式上线 用这个！！！！ // let token = vm.appUserInfo.userToken; // 正式上线 用这个！！！！
getInviteList(token).then(res => { getInviteList().then(res => {
alert(JSON.stringify('获取邀请的列表 OK')); alert(JSON.stringify('获取邀请的列表 OK'));
alert(JSON.stringify(res)); alert(JSON.stringify(res));
...@@ -452,10 +471,10 @@ ...@@ -452,10 +471,10 @@
// alert // alert
if(res.data && res.data.list){ if(res.data && res.data.list){
vm.inviteList = res.data.list; vm.inviteList = res.data.list;
alert(vm.inviteList.length) // alert(vm.inviteList.length)
vm.notInviteShowList = [];
if( vm.inviteList.length > 4 || vm.inviteList.length == 4 ){ if( vm.inviteList.length > 4 || vm.inviteList.length == 4 ){
vm.inviteList.length = 4; vm.inviteList.length = 4;
vm.notInviteShowList = [];
}else{ }else{
let notInviteLength = 4 - vm.inviteList.length; let notInviteLength = 4 - vm.inviteList.length;
for(let i=0; i<notInviteLength; i++){ for(let i=0; i<notInviteLength; i++){
...@@ -540,31 +559,63 @@ ...@@ -540,31 +559,63 @@
// 跳转至 个人明细 // 跳转至 个人明细
goToUserDetail() { goToUserDetail() {
alert('跳转至 个人明细') alert('跳转至 个人明细')
this.$router.push({
name: 'person-detail',
});
}, },
// 查看个人榜单 // 查看个人榜单
goToUserBoard() { goToUserBoard() {
alert('跳转至 个人榜单') alert('跳转至 个人榜单')
this.$router.push({
name: 'person-ranking',
});
}, },
// 查看机构榜单 // 查看机构榜单
goToOrganBoard() { goToOrganBoard() {
alert('跳转至 机构榜单') alert('跳转至 机构榜单')
this.$router.push({
name: 'hospital-ranking',
});
}, },
// 云鹊豆中心 // 云鹊豆中心
goToBeanCenter() { goToBeanCenter() {
alert('云鹊豆中心') let url = getShareUrl() + 'integral/#/chirpCenter';
alert(url)
let paramList = [
{
"key":"pageUrl",
"value": url,
"type":4,
"seqNo":1
},{
"key":"showTitle",
"value": false,
"type":1,
"seqNo":2
},{
"key":"title",
"value": '',
"type":1,
"seqNo":3
}
]
vm.$rocNative.dispatchEventByModuleCode && vm.$rocNative.dispatchEventByModuleCode({
modeCode: 'M300',
jsonString: paramList
})
}, },
// “邀请医生好友学课程” 列表中的每一个医生点击事件 // “邀请医生好友学课程” 列表中的每一个医生点击事件 跳转至邀请详情页
eachDoctorClick() { eachDoctorClick() {
let cb = this.goToDoctorPage; let cb = this.goToDoctorPage;
this.handleLoginCheck(cb); this.handleLoginCheck(cb);
}, },
// 去每个li医生详情页 ?????? // 跳转至邀请详情页
goToDoctorPage() { goToDoctorPage() { //“被邀请的用户模块“点击逻辑，点击用户头像、“+“或者查看更多，都跳转至邀请详情页
//“被邀请的用户模块“点击逻辑，点击用户头像、“+“或者查看更多，都跳转至邀请详情页 this.$router.push({
alert('去邀请详情页....') name: 'invite-details',
});
}, },
//“邀请医生好友学课程” 查看更多 //“邀请医生好友学课程” 查看更多
...@@ -574,16 +625,30 @@ ...@@ -574,16 +625,30 @@
}, },
// 跳转至 “查看更多” 页面 // 跳转至 “查看更多” 页面
seeInviteMore() { seeInviteMore() {
alert('去查看更多页面...'); this.$router.push({
name: 'invite-details',
});
}, },
// 去邀请 按钮 // 去邀请 按钮
handleInviteClick() { handleInviteClick() {
let cb = this.goToInvite; let cb = this.goToShare;
this.handleLoginCheck(cb); this.handleLoginCheck(cb);
}, },
goToInvite() { goToShare() {
console.log('去邀请逻辑》》》') alert('调app分享');
// let id = vm.encryptDoctorId();
let params = {
id: '',
taskId: '',
activityId: '',
};
// 调用APP分享
},
encryptDoctorId() {
// 给id加密
// return 'dddddd'
}, },
// 去打卡 按钮 // 去打卡 按钮
...@@ -603,10 +668,122 @@ ...@@ -603,10 +668,122 @@
goToTask() { goToTask() {
console.log('do每个任务的跳转逻辑') console.log('do每个任务的跳转逻辑')
}, },
// 获取每日任务 及 邀请医生好友学课程里的 邀请1位医生的勤奋分及云鹊豆个数
getTasks() {
let res = {
"data": {
"loginStatus": 2,
"taskRuleData": [
{
"id": 14,
"activityId": 2,
"resourceType": 7,
"resourceId": "2",
"resourceChildId": null,
"defaultBackgroundImage": "https://test1-file.yunqueyi.com/image/png/common/2019112809513020.png",
"finishBackgroundImage": null,
"taskFrequency": 1,
"finishFrequency": 1,
"cumulativeFrequency": null,
"ruleName": "邀请好友测试",
"beginTime": "2019-11-26 00:00:00",
"endTime": "2019-11-27 23:59:59",
"linkId": 1703,
"rewardJsonInfo": "[{\"rewardType\":2,\"rewardQuantity\":\"100\"}]",
"pushType": 1,
"pushLinkUrl": "",
"hideEndFlag": 2,
"seqNo": 1,
"deleteFlag": 1,
"createdId": 161,
"createdTime": "2019-11-28 09:51:58",
"modifiedId": 161,
"modifiedTime": "2019-11-29 15:30:54",
"beginTimeStr": null,
"endTimeStr": null,
"nowCumulativeFrequency": 0,
"isFinish": 0,
"doctorFinishFrequency": null,
"timeStatus": 2
},
{
"id": 15,
"activityId": 2,
"resourceType": 7,
"resourceId": "2",
"resourceChildId": null,
"defaultBackgroundImage": "https://test1-file.yunqueyi.com/image/png/common/2019112809513020.png",
"finishBackgroundImage": null,
"taskFrequency": 1,
"finishFrequency": 1,
"cumulativeFrequency": null,
"ruleName": "邀请好友测试",
"beginTime": "2019-11-26 00:00:00",
"endTime": "2019-11-27 23:59:59",
"linkId": 1703,
"rewardJsonInfo": "[{\"rewardType\":3,\"rewardQuantity\":\"100\"},{\"rewardType\":4,\"rewardQuantity\":\"15\"}]",
"pushType": 1,
"pushLinkUrl": "",
"hideEndFlag": 2,
"seqNo": 2,
"deleteFlag": 1,
"createdId": 161,
"createdTime": "2019-11-28 09:51:58",
"modifiedId": 161,
"modifiedTime": "2019-11-29 15:30:54",
"beginTimeStr": null,
"endTimeStr": null,
"nowCumulativeFrequency": 0,
"isFinish": 0,
"doctorFinishFrequency": null,
"timeStatus": 2
}
],
"activityData": {
"id": 2,
"activityName": "hws-test",
"isDisabled": 1,
"unloginBackgroundImage": "https://test1-file.yunqueyi.com/image/png/common/20191129095943428.png",
"loginBackgroundImage": "https://test1-file.yunqueyi.com/image/png/common/20191129095948283.png",
"rewardType": "5",
"beginTime": "2019-11-25 00:00:00",
"endTime": "2019-11-30 23:59:59",
"beginTimeStr": null,
"endTimeStr": null,
"deleteFlag": 1,
"createdId": 161,
"createdTime": "2019-11-26 10:43:40",
"modifiedId": 161,
"modifiedTime": "2019-11-29 15:30:54",
"status": null
}
},
"code": "000000",
"message": "成功"
};
let data = res.data;
let taskRuleData = res.taskRuleData || [];
// 获取 邀请节点，此时获取邀请1个医生对应的 分数 和 豆子
for(let i=0; i<taskRuleData.length; i++){
let item = taskRuleData[i];
if( item.resourceType == 7 && resourceId == 1 ){
let rewardList = item.rewardJsonInfo || [];
for( let j=0; j<rewardList.length; j++ ){
if( rewardList[j].rewardType == 3 ){ // 勤奋分
vm.eachInviteAward.mark = rewardList[j].rewardQuantity;
}else if( rewardList[j].rewardType == 1 ){ // 云鹊豆
vm.eachInviteAward.bean = rewardList[j].rewardQuantity;
}
}
}
}
// 过滤出 活动主页需要的任务数据
// request
getDoctorInfo() {
}, },
......
pages/invite-details/index.less
浏览文件 @ 5baef239
...@@ -238,26 +238,5 @@ ...@@ -238,26 +238,5 @@
width: 300px; width: 300px;
} }
} }
.footer-btn {
width: 100%;
height: 40px;
padding: 5px 0;
box-shadow:0px -1px 0px 0px rgba(237,237,237,1);
position: fixed;
bottom: 0;
background: #fff;
.btn {
width: 345px;
height: 40px;
margin: 0 auto;
line-height: 40px;
text-align: center;
background: linear-gradient(270deg,rgba(255,88,36,1) 0%,rgba(254,163,86,1) 100%);
border-radius: 20px;
color: #FFFFFF;
font-weight: 700;
font-size: 15px;
}
}
} }
} }
\ No newline at end of file
pages/invite-details/index.vue
浏览文件 @ 5baef239
...@@ -50,8 +50,8 @@ ...@@ -50,8 +50,8 @@
<p class="active-line" v-if="recordType==2"></p> <p class="active-line" v-if="recordType==2"></p>
</div> </div>
</div> </div>
<div class="record-list"> <div class="record-list" v-if="inviteList.length">
<p class="sum" v-if="recordTotal">共{{recordTotal}}人</p> <p class="sum">共{{recordTotal}}人</p>
<div class="loadMore" v-infinite-scroll="loadMore" infinite-scroll-disabled="busy" <div class="loadMore" v-infinite-scroll="loadMore" infinite-scroll-disabled="busy"
infinite-scroll-distance="10"> infinite-scroll-distance="10">
<div class="record-item" v-if="inviteList.length" v-for="item in inviteList"> <div class="record-item" v-if="inviteList.length" v-for="item in inviteList">
...@@ -80,22 +80,24 @@ ...@@ -80,22 +80,24 @@
<p v-if="recordType==1">提醒您的医生好友领取课程您将获得奖励哦！</p> <p v-if="recordType==1">提醒您的医生好友领取课程您将获得奖励哦！</p>
<p v-if="recordType==2" class="text-get">提醒您的医生好友领取课程后登录云鹊医APP您将再获得奖励哦！</p> <p v-if="recordType==2" class="text-get">提醒您的医生好友领取课程后登录云鹊医APP您将再获得奖励哦！</p>
</div> </div>
<div class="footer-btn"> <footer-button
<div class="btn">去邀请</div> :btnText="btnText"
</div> :btnType="btnType">
</footer-button>
</div> </div>
</div> </div>
</section> </section>
</template> </template>
<script> <script>
import NormalHeader from '@/components/normal-header';
import NormalHeader from '@/components/normal-header' import FooterButton from '@/components/footer-button';
import { getOneInviteDetails,getTwoInviteDetails } from '@/service/detailsAndRanking' import { getOneInviteDetails,getTwoInviteDetails } from '@/service/detailsAndRanking';
export default { export default {
name: "index", name: "index",
components: { components: {
NormalHeader NormalHeader,
FooterButton,
}, },
data() { data() {
return { return {
...@@ -110,6 +112,8 @@ ...@@ -110,6 +112,8 @@
pageNo: 0, pageNo: 0,
pageSize: 10, pageSize: 10,
noMore: false,//分页参数--end noMore: false,//分页参数--end
btnText: '去邀请',
btnType: true
}; };
}, },
mounted() { mounted() {
......
pages/person-detail/index.vue
浏览文件 @ 5baef239
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
<div class="no-data" v-if="!personDetails.length"> <div class="no-data" v-if="!personDetails.length">
<img src="~/assets/img/icon-nodata.png" alt=""> <img src="~/assets/img/icon-nodata.png" alt="">
<p>暂无记录,您还没有参加活动</p> <p>暂无记录,您还没有参加活动</p>
<div class="button">立即参加</div> <div class="button" @click="goInActivity">立即参加</div>
</div> </div>
</div> </div>
</section> </section>
...@@ -92,6 +92,9 @@ ...@@ -92,6 +92,9 @@
this.getPersonDetails(); this.getPersonDetails();
}, },
methods: { methods: {
goInActivity() {
this.$router.push('/in-activity')
},
detailTaskIcon(taskName) { detailTaskIcon(taskName) {
if(taskName == '打卡') { if(taskName == '打卡') {
return require('../../assets/img/person-detail/icon-invite.png') return require('../../assets/img/person-detail/icon-invite.png')
......
pages/person-ranking/index.less
浏览文件 @ 5baef239
...@@ -130,25 +130,5 @@ ...@@ -130,25 +130,5 @@
} }
} }
} }
.footer-btn {
width: 100%;
height: 40px;
padding: 5px 0;
box-shadow:0px -1px 0px 0px rgba(237,237,237,1);
position: fixed;
bottom: 0;
.btn {
width: 345px;
height: 40px;
margin: 0 auto;
line-height: 40px;
text-align: center;
background: linear-gradient(270deg,rgba(255,88,36,1) 0%,rgba(254,163,86,1) 100%);
border-radius: 20px;
color: #FFFFFF;
font-weight: 700;
font-size: 15px;
}
}
} }
} }
\ No newline at end of file
pages/person-ranking/index.vue
浏览文件 @ 5baef239
...@@ -46,19 +46,22 @@ ...@@ -46,19 +46,22 @@
<p class="num">{{item.score}}</p> <p class="num">{{item.score}}</p>
</div> </div>
</div> </div>
<div class="footer-btn"> <footer-button
<div class="btn">获得更多勤奋分</div> :btnText="btnText"
</div> :btnType="btnType">
</footer-button>
</div> </div>
</section> </section>
</template> </template>
<script> <script>
import RankingHeader from '@/components/ranking-header' import RankingHeader from '@/components/ranking-header';
import FooterButton from '@/components/footer-button';
export default { export default {
name: 'person-ranking', name: 'person-ranking',
components: { components: {
RankingHeader RankingHeader,
FooterButton
}, },
data() { data() {
return { return {
...@@ -73,6 +76,8 @@ ...@@ -73,6 +76,8 @@
rightName: '累计排行榜' rightName: '累计排行榜'
}, },
activeBtnType: true, //true今日，false累计 activeBtnType: true, //true今日，false累计
btnText: '获得更多勤奋分',
btnType: true
}; };
}, },
computed: { computed: {
...@@ -135,6 +140,11 @@ ...@@ -135,6 +140,11 @@
} }
], ],
} }
if(this.rankData.score) {
this.btnText = '获得更多勤奋分'
} else {
this.btnText = '参与活动得勤奋分'
}
} }
}, },
}; };
......
pages/yesterday-prize/index.less
浏览文件 @ 5baef239
...@@ -80,24 +80,4 @@ ...@@ -80,24 +80,4 @@
} }
} }
.footer-btn {
width: 100%;
height: 40px;
padding: 5px 0;
box-shadow:0px -1px 0px 0px rgba(237,237,237,1);
position: fixed;
bottom: 0;
.btn {
width: 345px;
height: 40px;
margin: 0 auto;
line-height: 40px;
text-align: center;
background: linear-gradient(270deg,rgba(255,88,36,1) 0%,rgba(254,163,86,1) 100%);
border-radius: 20px;
color: #FFFFFF;
font-weight: 700;
font-size: 15px;
}
}
} }
\ No newline at end of file
pages/yesterday-prize/index.vue
浏览文件 @ 5baef239
...@@ -21,18 +21,21 @@ ...@@ -21,18 +21,21 @@
</div> </div>
</div> </div>
</div> </div>
<div class="footer-btn"> <footer-button
<div class="btn">今日我要拿奖</div> :btnText="btnText"
</div> :btnType="btnType">
</footer-button>
</section> </section>
</template> </template>
<script> <script>
import NormalHeader from '@/components/normal-header' import NormalHeader from '@/components/normal-header';
import FooterButton from '@/components/footer-button';
export default { export default {
name: "index", name: "index",
components: { components: {
NormalHeader NormalHeader,
FooterButton
}, },
data() { data() {
return { return {
...@@ -41,7 +44,9 @@ ...@@ -41,7 +44,9 @@
barHeight: 0, barHeight: 0,
barColor: '#fff', barColor: '#fff',
rightText: '如何领奖', rightText: '如何领奖',
rewardsList: [] rewardsList: [],
btnText: '今日我要拿奖',
btnType: true
}; };
}, },
mounted() { mounted() {
......
service/activityMainpage.js
浏览文件 @ 5baef239
...@@ -4,12 +4,13 @@ import request from './api'; ...@@ -4,12 +4,13 @@ import request from './api';
// 获取已邀请的医生列表 // 获取已邀请的医生列表
export const getInviteList = (token) => { export const getInviteList = () => {
return request({ return request({
url: `campaign/inviteDetail/oneList?pageNo=1&pageSize=10`, url: `campaign/inviteDetail/oneList?pageNo=1&pageSize=10`,
method: 'get', method: 'get',
headers: { withCredentials: true,
token: token // headers: {
} // token: token
// }
}) })
} }
\ No newline at end of file
service/api.js
浏览文件 @ 5baef239
...@@ -10,6 +10,7 @@ Axios.interceptors.request.use( ...@@ -10,6 +10,7 @@ Axios.interceptors.request.use(
// 0. Do something before request is sent // 0. Do something before request is sent
// 1. can be add loading // 1. can be add loading
// 2. make sure if need token // 2. make sure if need token
console.log('config>>>>>> ', config)
const method = config.method.toLocaleLowerCase(); const method = config.method.toLocaleLowerCase();
if (method === 'post' || method === 'put' || method === 'delete') {} if (method === 'post' || method === 'put' || method === 'delete') {}
if (config.withCredentials) { if (config.withCredentials) {
......
utils/jsbridge.js
浏览文件 @ 5baef239
...@@ -23,7 +23,6 @@ export const JsBridgeOptions = { ...@@ -23,7 +23,6 @@ export const JsBridgeOptions = {
'gotoLogin', 'gotoLogin',
'shareWechat', 'shareWechat',
'showNativeToast', 'showNativeToast',
'dispatchEventByModuleCode',
'appBuryingPointEntrust', 'appBuryingPointEntrust',
'webLoadSuccess', 'webLoadSuccess',
'WfileImageCallBack', 'WfileImageCallBack',
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或