Skip to content

P
pica-new-compaign
提交 dc2ffcb3 编写于 作者: huangwensu's avatar huangwensu
浏览文件
操作

获取服务器当前时间

上级 e3921510
隐藏空白字符变更
内嵌 并排
正在显示 包含 46 行增加 和 32 行删除
components/task-activity.vue
浏览文件 @ dc2ffcb3
......@@ -2,13 +2,13 @@
<div class="task-activity">
<div class="task-content" v-for="(item,index) in taskList" :key="index">
<!-- timeStatus 1 进行中 2 结束 3未开始 hideEndFlag 1 结束后隐藏 2结束后不隐藏 -->
<div v-if="item.timeStatus == 1 || (item.timeStatus == 2 && item.hideEndFlag == 2)">
<div v-if="(item.timeStatus == 1 || (item.timeStatus == 2 && item.hideEndFlag == 2)) && item.resourceType != 10">
<img :src="item.defaultBackgroundImage"/>
<div class="task-item" @click="linkPage(item)">
<!-- 1.课程 2.考试 3.调查问卷 4.患者招募 5.宣教漫画 6.打卡 7.邀请 8.任务排查 9.绑定居民到微信-->
<!-- 1.课程 2.考试 3.调查问卷 4.患者招募 5.宣教漫画 6.打卡 7.邀请 8.任务排查 9.绑定居民到微信 10.首次进入页面 11.点赞和邀请进入-->
<img v-if="item.resourceType == 1" src="../static/images/task-two.png" />
<img v-if="item.resourceType == 3" src="../static/images/task-five.png" />
<img v-if="item.resourceType == 7" src="../static/images/task-one.png" />
<img v-if="item.resourceType == 11" src="../static/images/task-one.png" />
<img v-if="item.resourceType == 8" src="../static/images/task-three.png" />
<img v-if="item.resourceType == 9" src="../static/images/task-four.png" />
<div class="task-l">
......@@ -23,7 +23,7 @@
{{handleData(item.rewardJsonInfo)[0].rewardQuantity}}元现金红包/人
</div>
<div class="task-b" v-if="handleData(item.rewardJsonInfo)[0].rewardType == 3">
{{handleData(item.rewardJsonInfo)[0].rewardQuantity}}分勤奋分/人
<span class="score">+{{handleData(item.rewardJsonInfo)[0].rewardQuantity}}</span><span v-if="item.resourceType == 11 || item.resourceType == 8 || item.resourceType == 9">勤奋分/人</span><span v-if="item.resourceType == 1">勤奋分/门</span><span v-if="item.resourceType == 3">勤奋分/份</span>
</div>
<div class="task-b" v-if="handleData(item.rewardJsonInfo)[0].rewardType == 4">
{{handleData(item.rewardJsonInfo)[0].rewardQuantity}}条短信额度/人
......@@ -32,7 +32,7 @@
<span class='has-bg' v-if="item.resourceType == 1 && !item.isFinish">去学习</span>
<span class='has-bg' v-if="(item.resourceType == 1 || item.resourceType == 8) && item.isFinish">已完成</span>
<span class='has-bg' v-if="item.resourceType == 3">去参加</span>
<span class='has-bg' v-if="item.resourceType == 7 || (item.resourceType == 8 && !item.isFinish)">去邀请</span>
<span class='has-bg' v-if="item.resourceType == 11 || (item.resourceType == 8 && !item.isFinish)">去邀请</span>
<span class='has-bg' v-if="item.resourceType == 9">去绑定</span>
<!-- <div class="task-b" v-if="item.taskFrequency == 2 && (item.cumulativeFrequency > item.nowCumulativeFrequency)">进度 {{item.nowCumulativeFrequency}}/{{item.cumulativeFrequency}}</div>
......@@ -139,13 +139,13 @@ export default {
// }
this.taskList = res.data.taskRuleData;
for(let i = 0; i < this.taskList.length; i++) {
if(this.taskList[i].resourceType == 7 && this.taskList[i].resourceId == 2) {
this.taskList.splice(i,1);
}
if(this.taskList[i].resourceType == 7 && this.taskList[i].resourceId == 1) {
// if(this.taskList[i].resourceType == 7 && this.taskList[i].resourceId == 2) {
// this.taskList.splice(i,1);
// }
if(this.taskList[i].resourceType == 11 && this.taskList[i].resourceId == 1) {
this.$emit('getTaskId',{taskId: this.taskList[i].id});
}
if(this.taskList[i].resourceType == 10 && this.userMobile) {
if(this.taskList[i].resourceType == 10) {
this.$emit('firstEnterActivity',{taskId: this.taskList[i].id});
}
}
......@@ -244,18 +244,11 @@ export default {
color: #373839;
font-weight: 700;
}
.task-b {
font-size: 12px;
color: #979899;
span {
color: #979899;
}
}
}
.task-r {
text-align: right;
height: 39px;
span {
span.has-bg {
display: inline-block;
font-size: 11px;
color: #fff;
......@@ -267,9 +260,6 @@ export default {
border-radius: 25px;
text-align: center;
margin-top: 5px;
}
span.has-bg {
// background: #FB6D5E;
background:linear-gradient(270deg,rgba(255,88,36,1) 0%,rgba(254,163,86,1) 100%);
border-radius:35px;
}
......@@ -277,6 +267,10 @@ export default {
text-align: center;
font-size: 12px;
color: #979899;
span.score {
display: inline-block;
color: #CC2646;
}
// padding-top: 5px;
}
}
......
pages/index.vue
浏览文件 @ dc2ffcb3
......@@ -102,8 +102,8 @@ import {
checkToken,
selectAppModuleParam,
getSelfAllScore,
getEncryptId,
checkFirstEnter } from "@/service";
checkFirstEnter,
getActivityTime } from "@/service";
import { setEventByModuleCode } from "@/utils"
import { ENV_CONFIG } from '@/utils/enumerate';
import { Base64 } from 'js-base64';
......@@ -137,15 +137,15 @@ export default {
imgSrc1: require('@/static/images/score.png'),
numText1: 1,
stepText1: '做任务拿勤奋分',
stepTime1:'3月24日10:00-4月2日16:00',
stepTime1:'3月25日10:00-4月6日24:00',
imgSrc2: require('@/static/images/beans.png'),
numText2: 2,
stepText2: '瓜分云鹊豆',
stepTime2:'4月3日10:00-4月7日16:00',
stepTime2:'4月7日17:00-4月11日24:00',
imgSrc3: require('@/static/images/get-award.png'),
numText3: 3,
stepText3: '公布排名获奖名单',
stepTime3:'4月3日10:00-4月7日16:00',
stepTime3:'4月7日17:00-4月11日24:00',
maxValue: 200,
myAvatarl: '',
myScore: 0,
......@@ -162,11 +162,7 @@ export default {
},
created() {
let nowTime = new Date().getTime();
let lastTime = (new Date(" 2020/04/02 10:00:00")).getTime();
if(lastTime < nowTime) {
this.taskTimeFlag = false;
}
},
mounted() {
let _this = this;
......@@ -179,9 +175,22 @@ export default {
}
if(!_this.isWeb && _this.$rocNative.appInit()){
_this.getUserInfo();
};
};
_this.getActivityTime();
},
methods: {
// 获取时间
getActivityTime() {
getActivityTime().then(res => {
if(res.code == '000000') {
let nowTime = res.data;
let lastTime = (new Date("2020/04/06 24:00:00")).getTime();
if(lastTime < nowTime) {
this.taskTimeFlag = false;
}
}
});
},
// 首次进入活动页面
firstEnterActivity() {
checkFirstEnter({
......@@ -200,6 +209,7 @@ export default {
let _t = params.userToken;
let _this = this;
_this.token = params.userToken;
delCookie('token');
setCookie('token', _this.token);
checkToken({ _t }).then(res => {
if(res.code == '200000' || res.code == '200006') {
......@@ -207,6 +217,7 @@ export default {
delCookie('token');
}else {
_this.userMobile = params.userMobile;
delCookie('token');
setCookie('token', _this.token);
_this.getSelfAllScore();
_this.getEncryptId();
......
service/index.js
浏览文件 @ dc2ffcb3
......@@ -93,6 +93,15 @@ export const getEncryptId = () => {
withCredentials: true,
})
}
// 获取时间
export const getActivityTime = () => {
return request({
url: `campaign/tims/getTodayDate`,
method: 'get'
})
}
// 第一次进入活动接口需要调的接口
export const checkFirstEnter = ( data ) => {
return request({
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或