Skip to content

Y
year-end-activitiy
提交 110456c9 编写于 作者: chengxiang.li's avatar chengxiang.li
浏览文件
操作

更新活动主页个人信息下方再获得奖品提示文字及手机奖品名称更新

上级 da217ab6
隐藏空白字符变更
内嵌 并排
正在显示 包含 43 行增加 和 22 行删除
assets/style/in-activity.less
浏览文件 @ 110456c9
......@@ -303,7 +303,7 @@
.text{
position: absolute; left: 50%; top: 58px;
width: 60px; margin-left: -30px;
height: 12px; font-size: 12px; color: #676869; text-align: center; line-height: 12px;
height: 12px; font-size: 12px; color: #676869; text-align: center; line-height: 14px;
.ellipsis;
&.see-more{
color: #FD5D33;
......@@ -367,7 +367,7 @@
width: 60px; height: 30px; border-radius: 30px;
overflow: hidden; float: left;
font-weight: 700; color: #FFF;
font-size: 13px; line-height: 31px; text-align: center;
font-size: 13px; line-height: 34px; text-align: center;
background: linear-gradient(to right, #FEA356, #FF5824);
&.done{
color: #EE5C2E; background: #FFD9CD;
......
pages/activityPage.vue
浏览文件 @ 110456c9
......@@ -198,7 +198,7 @@
<div class="content-wrap">
<img class="back-image" src="../assets/img/stage-two/win-award-bg.png" alt="">
<p class="title" style="color: #EC592B;">昨日个人排名获奖啦！</p>
<p class="message">恭喜您获得了{{yestodayAwards}}1台</p>
<p class="message">恭喜您获得了{{yestodayAwards}}*1台</p>
<div @click="goQuest" class="bottom-btn">领奖</div>
<div class="close-btn" @click="awardModalShow=false"></div>
</div>
......@@ -255,7 +255,7 @@
{ 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: '糖尿病学习', award: '米家洗衣机' },
{ 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: '全科学习', award: '荣耀 Play3' },
{ date: '12月27至29日', beginDate: '2019/12/27 00:00:00', endDate: '2019/12/29 23:59:59', title: '全科学习', award: '荣耀Play3手机' },
],
awardList: {
No1: '',
......@@ -396,7 +396,7 @@
// alert('在活动期间内')
let userDayRank = vm.doctorInfo.userDayRank;
if( userDayRank == 1 ){
vm.scoreAwardTips = `今日保持第1名，可获得${vm.awardList.No1}`;
vm.scoreAwardTips = `今日保持第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名奖品
......@@ -404,7 +404,7 @@
}else{ // 10名以后 提示：再获得X勤奋分即可上升到前Y名获得 第10名奖品
award = vm.awardList.No10;
}
vm.scoreAwardTips = `再获得${vm.doctorInfo.targetRequiredScore}勤奋分即可上升到前${vm.doctorInfo.targetRank}名获得${award}`
vm.scoreAwardTips = `再获${vm.doctorInfo.targetRequiredScore}分即可上升到第${vm.doctorInfo.targetRank}名并可获得${award}`
}
}
vm.getServerTime(notInActivityTips)
......@@ -535,19 +535,36 @@
},
getUserActivityInfo() { // 获取用户及参加活动的具体信息
getUserScoreInfo().then(res => {
vm.doctorInfo = res.data;
vm.returnScoreAwardTips();
if(vm.doctorInfo.userYesterdayRank==1){
vm.awardModalShow = true;
vm.yestodayAwards = getFirstAwards(vm.doctorInfo.yesterdayDate);
}else if(vm.doctorInfo.userYesterdayRank>=2 && vm.doctorInfo.userYesterdayRank<=3){
vm.awardModalShow = true;
vm.yestodayAwards = vm.awardList.No3;
}else if(vm.doctorInfo.userYesterdayRank>=4 && vm.doctorInfo.userYesterdayRank<=10){
vm.awardModalShow = true;
vm.yestodayAwards = vm.awardList.No10;
if(res && res.code && res.code == '000000'){
vm.doctorInfo = res.data;
vm.returnScoreAwardTips();
// alert('getUserScoreInfo'); alert(JSON.stringify(res));
// 添加当天弹出一次后，就不再弹出 "昨日弹窗"
let isYesterdayRankShow = getCookie('isYesterdayRankShow');
// alert(isYesterdayRankShow); alert(res.data.nowToTodayEndMillis)
if( isYesterdayRankShow ){
return;
}else{
if(res.data && res.data.nowToTodayEndMillis){
setCookie('isYesterdayRankShow', 1, 7, '.yunqueyi.com', res.data.nowToTodayEndMillis);
}
}
if(vm.doctorInfo.userYesterdayRank==1){
vm.awardModalShow = true;
vm.yestodayAwards = getFirstAwards(vm.doctorInfo.yesterdayDate);
}else if(vm.doctorInfo.userYesterdayRank>=2 && vm.doctorInfo.userYesterdayRank<=3){
vm.awardModalShow = true;
vm.yestodayAwards = vm.awardList.No3;
}else if(vm.doctorInfo.userYesterdayRank>=4 && vm.doctorInfo.userYesterdayRank<=10){
vm.awardModalShow = true;
vm.yestodayAwards = vm.awardList.No10;
}else{
vm.awardModalShow = false;
}
}else{
vm.awardModalShow = false;
vm.$toast(res.message);
}
});
......@@ -807,7 +824,7 @@
taskId: vm.eachInviteAward.taskId,
activityId: vm.eachInviteAward.activityId
};
alert(JSON.stringify(obj))
// alert(JSON.stringify(obj))
const paramstr = Base64.encode(`id=${vm.encryptId}&taskId=${vm.eachInviteAward.taskId}&activityId=${vm.eachInviteAward.activityId}&`)
return `${getShareUrl()}year_end_ssr/shareActive?${paramstr}`
// return `${getShareUrl()}year_end_ssr/shareActive?id=${vm.encryptId}&taskId=${vm.eachInviteAward.taskId}&activityId=${vm.eachInviteAward.activityId}`
......
utils/cookieFun.js
浏览文件 @ 110456c9
const { NUXT_ENV_APP } = process.env;
export const setCookie = (cname,cvalue, exdays = 7, domain = '.yunqueyi.com') => { //yunqueyi.com
export const setCookie = (cname,cvalue, exdays = 7, domain = '.yunqueyi.com', validMsec) => { //yunqueyi.com
let d = new Date(), expires = '';
 
if (NUXT_ENV_APP === 'dev') {
domain = window.location.hostname;
}
d.setTime(d.getTime() + (exdays * 24 * 60 * 60 * 1000));
if(validMsec){
d.setTime(d.getTime() + validMsec);
}else{
d.setTime(d.getTime() + (exdays * 24 * 60 * 60 * 1000));
}
expires = `expires=${d.toUTCString()}`;
 
document.cookie = `${cname}=${cvalue};path=/;${expires};domain=${domain}`;
......
utils/index.js
浏览文件 @ 110456c9
......@@ -193,7 +193,7 @@ export const getFirstAwards = (awardsDate) => {
} else if (Date.parse(new Date(('2019-12-24 00:00:00').replace(/-/g, "/")))<=awardsTime&&Date.parse(new Date(('2019-12-26 23:59:59').replace(/-/g, "/")))>=awardsTime) {
return '米家两门冰箱';
} else if (Date.parse(new Date(('2019-12-27 00:00:00').replace(/-/g, "/")))<=awardsTime/*&&Date.parse(new Date('2019-12-29 23:59:59'))>=awardsTime*/) {
return '荣耀play3';
return '荣耀play3手机';
};
}
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或