Skip to content

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

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

上级 33a94b25 3a391f4c
隐藏空白字符变更
内嵌 并排
正在显示 包含 71 行增加 和 29 行删除
pages/in-activity.vue
浏览文件 @ c181b718
......@@ -182,8 +182,6 @@
<div class="full-screen-mask"></div>
<div class="content-wrap">
<img class="back-image" src="../assets/img/stage-two/clock-success-bg.png" alt="">
<!-- <img class="back-image" src="../assets/img/stage-two/win-award-bg.png" alt=""> -->
<!-- <img class="back-image" src="../assets/img/stage-two/award-cup-bg.png" alt=""> -->
<p class="title">打卡成功</p>
<p class="message">已获得: {{clockAward.mark}}勤奋分, {{clockAward.bean}}云鹊豆</p>
<div @click="hideClockModal" class="bottom-btn">我知道了</div>
......@@ -195,12 +193,10 @@
<div v-if="awardModalShow" class="toast-wrap" @touchmove.prevent>
<div class="full-screen-mask"></div>
<div class="content-wrap">
<img class="back-image" src="../assets/img/stage-two/clock-success-bg.png" alt="">
<!-- <img class="back-image" src="../assets/img/stage-two/win-award-bg.png" alt=""> -->
<!-- <img class="back-image" src="../assets/img/stage-two/award-cup-bg.png" alt=""> -->
<img class="back-image" src="../assets/img/stage-two/win-award-bg.png" alt="">
<p class="title">昨日个人排名获奖啦</p>
<p class="message">恭喜您获得了{{yestodayAwards}}1台</p>
<div @click="hideClockModal" class="bottom-btn">我知道了</div>
<div @click="goQuest" class="bottom-btn">领奖</div>
<div class="close-btn" @click="awardModalShow=false"></div>
</div>
</div>
......@@ -211,7 +207,7 @@
<div class="content-wrap activity-end">
<p class="content-text">本次活动已结束，感谢您的参与，最终获奖排名将于12月30日10点公布，届时查看</p>
<ul class="btn-list">
<li @click="goBack">领奖</li>
<li @click="goBack">我知道了</li>
<li @click="goToYesterdayPrize" class="high-light">查看昨日获奖</li>
</ul>
</div>
......@@ -221,7 +217,7 @@
</template>
<script>
import { getActivityId, getUserScoreInfo, getInviteList, getClockStatus, goToUpdateClock, getTimsActivityInfo, selectAppModuleParam, checkToken, getRole, sayHello } from '@/service/activityMainpage';
import { getActivityId, getUserScoreInfo, getInviteList, getClockStatus, goToUpdateClock, getTimsActivityInfo, selectAppModuleParam, checkToken, getRole, sayHello, getEncryptId } from '@/service/activityMainpage';
import { checkHospitalStatus } from '@/service';
import h5header from '@/components/h5header';
import { getShareUrl } from '@/utils/index';
......@@ -237,7 +233,6 @@
return {
awardModalShow: false, // 根据排名是否显示中奖弹窗
showAwadModal: true, // 根据活动时间是否展示中奖弹层以及查看昨日榜单逻辑
todayAwards: '', // 今日可获得
yestodayAwards: '', // 昨日可获得
token: '',
activityId: 2, // 上线前等产品通知修改默认值
......@@ -287,6 +282,7 @@
clockSuccessVisible: false, // 是否显示 打卡成功 弹窗
activityEndVisible: false, // 是否显示 活动结束 弹窗
yesterdayWinVisible: false,
inviteList: [], // 已邀请的用户列表
notInviteShowList: [], // 未邀请的默认显示
......@@ -321,6 +317,9 @@
returnBeanImg() {
let hospitalScore = vm.doctorInfo.hospitalScore;
let arr = vm.doctorInfo.hospitalLevelScore;
if(arr && arr.length < 1){
return;
}
if( hospitalScore < arr[0]){
return require(`../assets/img/stage-two/bean-stage-0.png`);
}else if( ((arr[0] == hospitalScore) || (arr[0] < hospitalScore)) && (hospitalScore < arr[1]) ){
......@@ -346,7 +345,7 @@
}else{ // 10名以后 提示：再获得X勤奋分即可上升到前Y名获得 第10名奖品
award = vm.awardList.No10;
}
return `再获得${vm.doctorInfo.targetRequiredScore}勤奋分即可上升到前${vm.doctorInfo.targetRank}名获得${vm.todayAwards}`
return `再获得${vm.doctorInfo.targetRequiredScore}勤奋分即可上升到前${vm.doctorInfo.targetRank}名获得${award}`
}
}
},
......@@ -355,7 +354,14 @@
},
mounted() {
// 取服务器时间，切换不同时间段的显示
// 这里需要删掉！！！
// vm.getTasks();
vm.getUserActivityInfo();
// 这里需要删掉！！！
vm.isWeb = vm.$rocNative.isWeb;
// 取服务器时间，切换不同时间段的显示
vm.getServerTime();
// 请求接口获取activityId (经与后端产品确认，默认没传id的话，就取接口；默认有的话就不取接口)
if( !vm.activityId ){
......@@ -373,14 +379,6 @@
})
}
},
mounted() {
// 这里需要删掉！！！
vm.getUserActivityInfo();
// 这里需要删掉！！！
vm.isWeb = vm.$rocNative.isWeb;
vm.$rocNative.appInit();
vm.getUserInfo(); // 判断是否登录
......@@ -402,6 +400,32 @@
hideClockModal() {
vm.clockSuccessVisible = false;
},
goQuest(){
// window.location.href = 'https://wj.qq.com/s2/5112128/18be/';
let url = 'https://wj.qq.com/s2/5112128/18be/';
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
})
},
returnStageText() {
if(vm.currentStage == 0){
return '';
......@@ -467,19 +491,29 @@
loginCallback() {
vm.getUserActivityInfo();
vm.goToCheckJoin();
getEncryptId().then(res => {
alert('获取加密过后的id');
alert(JSON.stringify(res))
})
},
getUserActivityInfo() { // 获取用户及参加活动的具体信息
getUserScoreInfo().then(res => {
// alert('获取用户及分数信息。。。');
// alert(JSON.stringify(res));
vm.doctorInfo = res.data;
if(vm.doctorInfo.userYesterdayRank>0 && vm.doctorInfo.userYesterdayRank<=10){
if(vm.doctorInfo.userYesterdayRank==1){
vm.awardModalShow = true;
vm.todayAwards = getFirstAwards(vm.doctorInfo.todayDate);
vm.yestodayAwards = getFirstAwards(vm.doctorInfo.yesterdayDate);
console.log(vm.todayAwards)
console.log(vm.yestodayAwards)
}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;
}
});
},
goToCheckJoin() { // 检查是否加入结构
......@@ -898,7 +932,6 @@
}
return text;
},
async jumpPage(url, id) {
const _this = this;
if (!!url) {
......
service/activityMainpage.js
浏览文件 @ c181b718
......@@ -9,10 +9,10 @@ export const getUserScoreInfo = () => {
return request({
url: `campaign/ranking/user_info`,
method: 'post',
withCredentials: true,
// headers: {
// token: '8F685DEFFEAC45C393AA55A4DD9E9048'
// }
// withCredentials: true,
headers: {
token: 'D3FFA515261C48478773C0BA17C11F52'
}
})
}
......@@ -52,7 +52,7 @@ export const getActivityId = () => {
return request({
url: `contents/commonComstant/selectByTypeCode?code=C015`,
method: 'get',
withCredentials: true,
// withCredentials: true,
})
}
......@@ -100,3 +100,12 @@ export const sayHello = async ({ token }) => {
url: `/diplomat/oauth/sayhello?app_id=pica-crrs`
});
}
// 获取加密过后的id
export const getEncryptId = () => {
return request({
url: `campaign/inviteDetail/vinci`,
method: 'get',
withCredentials: true,
})
}
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或