Skip to content

P
pica-new-compaign
提交 5fa22dc5 编写于 作者: Yuanzhao.dai's avatar Yuanzhao.dai
浏览文件
操作

Merge branch 'dev-new-campaign-0302' of... 

Merge branch 'dev-new-campaign-0302' of 192.168.110.53:com.pica.cloud.education.frontend/pica-new-compaign into dev-new-campaign-0302

# Conflicts:
#	pages/index.vue
#	service/index.js
上级 6886d85e ffa90354
隐藏空白字符变更
内嵌 并排
正在显示 包含 129 行增加 和 33 行删除
components/bussiness/detail-list.vue
浏览文件 @ 5fa22dc5
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
:isFixed="!isFixed" :isFixed="!isFixed"
:needBT="needBT" :needBT="needBT"
btnWidth="100%" btnWidth="100%"
v-bp="{ component_tag: '364#360018' }"
@btnClick="btnClick"/> @btnClick="btnClick"/>
</div> </div>
<div v-if="!dataList.length" class="no-content"> <div v-if="!dataList.length" class="no-content">
......
components/header/index.vue
浏览文件 @ 5fa22dc5
...@@ -7,7 +7,11 @@ ...@@ -7,7 +7,11 @@
<div :class="{ active: isScroll }" class="content title"> <div :class="{ active: isScroll }" class="content title">
<span>{{ shareTitle1 }}</span> <span>{{ shareTitle1 }}</span>
</div> </div>
<div v-show="isShowRightIcon" class="content right-icon" @click="share"> <div
v-show="isShowRightIcon"
class="content right-icon"
@click="share"
v-bp="{ component_tag: '360#360001'}">
<img :src="headerRightIcon" /> <img :src="headerRightIcon" />
</div> </div>
</div> </div>
......
components/task-activity.vue
浏览文件 @ 5fa22dc5
...@@ -111,6 +111,32 @@ export default { ...@@ -111,6 +111,32 @@ export default {
}; };
this.$emit('activityTaskJump', data); this.$emit('activityTaskJump', data);
// } // }
if(item.resourceType == 11) {
this.$sendBuriedData({
action: '分享任务',
component_tag: '360#360004'
});
}else if(item.resourceType == 1) {
this.$sendBuriedData({
action: '课程学习任务',
component_tag: '360#360005'
});
}else if(item.resourceType == 8) {
this.$sendBuriedData({
action: '排查任务',
component_tag: '360#360006'
});
}else if(item.resourceType == 9) {
this.$sendBuriedData({
action: '居民绑定任务',
component_tag: '360#360007'
});
}else if(item.resourceType == 3) {
this.$sendBuriedData({
action: 'SMO任务',
component_tag: '360#360008'
});
}
} }
}, },
// 活动详情 // 活动详情
......
pages/index.vue
浏览文件 @ 5fa22dc5
...@@ -17,14 +17,14 @@ ...@@ -17,14 +17,14 @@
<!-- 顶部 --> <!-- 顶部 -->
<div class="top-container"> <div class="top-container">
<img class="rule" @click="ruleDetail" src="../static/images/rule.png" /> <img class="rule" @click="ruleDetail" src="../static/images/rule.png" />
<img class="rank" @click="gotoRank" src="../static/images/rank.png" /> <img class="rank" @click="gotoRank" v-bp="{ component_tag: '360#360003'}" src="../static/images/rank.png" />
<!-- 勤奋分进度 --> <!-- 勤奋分进度 -->
<div class="progress-container"> <div class="progress-container">
<div class="score-info"> <div class="score-info">
<div v-if="userMobile" class="text"> <div v-if="userMobile" class="text">
<img :src="myAvatarl" /> <img :src="myAvatarl" />
<span class="tc">我的勤奋分<span>{{myScore}}</span></span> <span class="tc">我的勤奋分<span>{{myScore}}</span></span>
<span class="bt" @click="selfInfo">个人明细 ></span> <span class="bt" @click="selfInfo" v-bp="{ component_tag: '360#360002'}">个人明细 ></span>
</div> </div>
<div v-if="!userMobile" class="text"> <div v-if="!userMobile" class="text">
<span class="tc">登录可参加活动</span> <span class="tc">登录可参加活动</span>
...@@ -109,6 +109,7 @@ import { ...@@ -109,6 +109,7 @@ import {
getSelfAllScore, getSelfAllScore,
checkFirstEnter, checkFirstEnter,
getActivityTime, getActivityTime,
inviteFirstEnter,
getCarveStatus, getCarveStatus,
getRedPacketsLog } from "@/service"; getRedPacketsLog } from "@/service";
import { setEventByModuleCode } from "@/utils" import { setEventByModuleCode } from "@/utils"
...@@ -189,8 +190,19 @@ export default { ...@@ -189,8 +190,19 @@ export default {
_this.getUserInfo(); _this.getUserInfo();
}; };
_this.getActivityTime(); _this.getActivityTime();
_this.inviteFirstEnter();
_this.$sendBuriedData({
action: '查看量',
component_tag: '360#360000'
});
}, },
methods: { methods: {
// 点赞后进入活动主页
inviteFirstEnter() {
inviteFirstEnter({taskId: this.taskId,activityId: this.activityId}).then(res => {
})
},
// 获取服务器当前时间 // 获取服务器当前时间
getActivityTime() { getActivityTime() {
getActivityTime().then(res => { getActivityTime().then(res => {
......
pages/login-point/index.vue
浏览文件 @ 5fa22dc5
...@@ -21,12 +21,12 @@ ...@@ -21,12 +21,12 @@
<button v-if="notSend" @click="sendSms">{{btnMsg}}</button> <button v-if="notSend" @click="sendSms">{{btnMsg}}</button>
<van-count-down v-if="!notSend" :time="time" @finish="finishCount" :format="'ss' + 's'" /> <van-count-down v-if="!notSend" :time="time" @finish="finishCount" :format="'ss' + 's'" />
</div> </div>
<button class="btn-post" @click="gotoPoint">登录点赞 助力好友</button> <button class="btn-post" @click="gotoPoint" v-bp="{ component_tag: '361#360009'}">登录点赞 助力好友</button>
</div> </div>
</div> </div>
</template> </template>
<script> <script>
import { getCaptchaGet, getAuthCode } from '@/service'; import { getCaptchaGet, getAuthCode, pointResult } from '@/service';
const TIMEALL = 60000; // 倒计时常量 60 秒 const TIMEALL = 60000; // 倒计时常量 60 秒
export default { export default {
data() { data() {
...@@ -111,8 +111,24 @@ export default { ...@@ -111,8 +111,24 @@ export default {
this.notSend = true; this.notSend = true;
this.btnMsg = '重新获取'; this.btnMsg = '重新获取';
}, },
// 点赞登录
gotoPoint() { gotoPoint() {
this.$router.push({path: "/login-point/point-result",query: {}}); let param = {
mobile: this.mobilePhone,
authCode: this.authCode,
id: this.userId,
taskId: this.taskId,
activityId: this.activityId
}
pointResult(param).then(res => {
if(res.code == '000000') {
if(res.data.code == '900001') {
this.$toast('不能给自己点赞哦');
}else {
this.$router.push({path: "/login-point/point-result",query: {code: res.data.code}});
}
}
})
} }
} }
} }
......
pages/login-point/point-result.vue
浏览文件 @ 5fa22dc5
<template> <template>
<section class="point-container"> <section class="point-container">
<div :class="{'point-bg': (status != 3)}"> <div class="point-bg">
<div class="point-status"> <div class="point-status">
<img v-if="status == 1 || status == 2" src="../../static/images/point-success-nobg.png" /> <img v-if="status == 1 || status == 3" src="../../static/images/point-success.png" />
<img v-if="status == 3" src="../../static/images/point-success.png" /> <img v-if="status == 2" src="../../static/images/point-fail.png" />
<img v-if="status == 4" src="../../static/images/point-fail.png" />
</div> </div>
<div class="status-text"> <div class="status-text">
<p :class="{'fw': status != 3}">{{pointText1}}</p> <p class="fw">{{pointText1}}</p>
<p :class="{'fw': status != 3}">{{pointText2}}</p> <p class="fw">{{pointText2}}</p>
</div> </div>
<div class="point-award"> <div class="point-award">
<div v-if="status != 3" class="award-con"> <div v-if="status != 3" class="award-con">
<!-- <div>达到100勤奋分，即有资格瓜分100W云鹊豆</div> -->
<img src="../../static/images/point-award-new.png" /> <img src="../../static/images/point-award-new.png" />
</div> </div>
</div> </div>
<div class="btn"> <div class="btn">
<button @click="openApp">{{btnText}}</button> <button @click="openApp" v-bp="{ component_tag: '361#3600010'}">{{btnText}}</button>
<button @click="downloadApp">下载APP</button> <button @click="downloadApp">下载APP</button>
</div> </div>
</div> </div>
...@@ -25,45 +23,49 @@ ...@@ -25,45 +23,49 @@
</template> </template>
<script> <script>
export default { export default {
props: {
status: {
type: String | Number,
default: 1
}
},
data() { data() {
return { return {
pointText1: "", pointText1: "",
pointText2: "", pointText2: "",
btnText: "" btnText: "",
code: '',
status: 1
} }
}, },
created() { created() {
if(this.status == 1) { this.code = this.$route.query.code;
this.pointText1 = "点赞成功，感谢您为TA拿下5勤奋分"; if(this.code == '900002'){
this.status = 1;
this.pointText1 = "点赞成功";
this.pointText2 = "登陆云鹊医APP，您也可获得75勤奋分"; this.pointText2 = "登陆云鹊医APP，您也可获得75勤奋分";
this.btnText = "打开APP参与瓜分云鹊豆"; this.btnText = "打开APP参与瓜分云鹊豆";
}else if(this.status == 2) { }else if(this.code == '900003') {
this.status = 1;
this.pointText1 = "点赞成功"; this.pointText1 = "点赞成功";
this.pointText2 = "登陆云鹊医APP，参加活动瓜分云鹊豆"; this.pointText2 = "登陆云鹊医APP，参加活动瓜分云鹊豆";
this.btnText = "打开APP参与瓜分云鹊豆"; this.btnText = "打开APP参与瓜分云鹊豆";
}else if(this.status == 3) { }else if(this.code == '900004') {
this.pointText1 = "该活动已结束"; this.status = 1;
this.pointText2 = "登陆云鹊医APP，查看更多精彩内容"; this.pointText1 = "点赞成功，感谢您为TA拿下5勤奋分";
this.btnText = "打开APP";
}else if(this.status = 4) {
this.pointText1 = "抱歉！您的点赞次数已达3次上限！";
this.pointText2 = "登陆云鹊医APP，您也可获得75勤奋分"; this.pointText2 = "登陆云鹊医APP，您也可获得75勤奋分";
this.btnText = "打开APP参与瓜分云鹊豆"; this.btnText = "打开APP参与瓜分云鹊豆";
}else if(this.status == 5){ }else if(this.code = '900005') {
this.pointText1 = "点赞成功"; this.status = 2;
this.pointText1 = "抱歉！您的点赞次数已达3次上限！";
this.pointText2 = "登陆云鹊医APP，您也可获得75勤奋分"; this.pointText2 = "登陆云鹊医APP，您也可获得75勤奋分";
this.btnText = "打开APP参与瓜分云鹊豆"; this.btnText = "打开APP参与瓜分云鹊豆";
}else if(this.status == 6) { }else if(this.code == '900006') {
this.status = 3;
this.pointText1 = "该活动已结束";
this.pointText2 = "登陆云鹊医APP，查看更多精彩内容";
this.btnText = "打开APP";
}else if(this.code == '900007') {
this.status = 2;
this.pointText1 = "抱歉！您的点赞次数已达3次上限！"; this.pointText1 = "抱歉！您的点赞次数已达3次上限！";
this.pointText2 = "登陆云鹊医APP，参加活动瓜分云鹊豆"; this.pointText2 = "登陆云鹊医APP，参加活动瓜分云鹊豆";
this.btnText = "打开APP参与瓜分云鹊豆"; this.btnText = "打开APP参与瓜分云鹊豆";
}else { }else {
this.status = 1;
this.pointText1 = "点赞成功"; this.pointText1 = "点赞成功";
this.pointText2 = "登陆云鹊医APP，参加活动瓜分云鹊豆"; this.pointText2 = "登陆云鹊医APP，参加活动瓜分云鹊豆";
this.btnText = "打开APP参与瓜分云鹊豆"; this.btnText = "打开APP参与瓜分云鹊豆";
......
pages/perdetails/index.vue
浏览文件 @ 5fa22dc5
...@@ -55,6 +55,12 @@ export default { ...@@ -55,6 +55,12 @@ export default {
this.token = this.$route.query.token; this.token = this.$route.query.token;
this.getSelfActivity(); this.getSelfActivity();
}, },
mounted() {
this.$sendBuriedData({
action: '查看量 ',
component_tag: '364#360017'
});
},
methods: { methods: {
goBack() { goBack() {
if(this.$rocNative.isWeb) { if(this.$rocNative.isWeb) {
......
pages/ranks/index.vue
浏览文件 @ 5fa22dc5
...@@ -97,6 +97,12 @@ export default { ...@@ -97,6 +97,12 @@ export default {
this.getRankData(); this.getRankData();
this.getSelfAllScore(); this.getSelfAllScore();
}, },
mounted() {
this.$sendBuriedData({
action: '查看量',
component_tag: '362#360011'
});
},
methods: { methods: {
// 获取个人信息 // 获取个人信息
getSelfAllScore() { getSelfAllScore() {
...@@ -132,6 +138,10 @@ export default { ...@@ -132,6 +138,10 @@ export default {
}, },
goBack() { goBack() {
this.$sendBuriedData({
action: '更多勤奋分按钮',
component_tag: '362#360012'
});
this.$router.go(-1); this.$router.go(-1);
// if(this.$rocNative.isWeb) { // if(this.$rocNative.isWeb) {
// this.$router.go(-1); // this.$router.go(-1);
......
service/index.js
浏览文件 @ 5fa22dc5
...@@ -125,6 +125,25 @@ export const getRedPacketsLog = ( params ) => { ...@@ -125,6 +125,25 @@ export const getRedPacketsLog = ( params ) => {
return request({ return request({
url: `/campaign/redPackets/getRedPacketsLog`, url: `/campaign/redPackets/getRedPacketsLog`,
params: params, params: params,
})
}
// 登录点赞
export const pointResult = ( data ) => {
return request({
url: `/campaign/like/like`,
method: 'post',
data: data,
withCredentials: true
})
}
// 点赞后进入活动主页
export const inviteFirstEnter = ( data ) => {
return request({
url: `/campaign/like/activePage `,
method: 'post',
data: data,
withCredentials: true withCredentials: true
}) })
} }
\ No newline at end of file
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或