Skip to content

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

活动首页任务调试

上级 0d939657
隐藏空白字符变更
内嵌 并排
正在显示 包含 298 行增加 和 124 行删除
components/bussiness/status-bar.vue
浏览文件 @ 38101a67
...@@ -33,17 +33,28 @@ export default { ...@@ -33,17 +33,28 @@ export default {
type: Number | String, type: Number | String,
default: 300 default: 300
}, },
isLogin: { // isLogin: {
type: Boolean | String, // type: Boolean | String,
default: true // default: true
}, // },
statusTextList: { statusTextList: {
type: Array, type: Array,
default: () => ['100勤奋分', '200勤奋分', '300勤奋分'] default: () => ['100勤奋分', '200勤奋分', '300勤奋分']
},
userMobile: {
type: String,
default: ''
}
},
watch: {
userMobile(n, o) {
this.isLogin = n ? true : false;
this.init();
} }
}, },
data() { data() {
return { return {
isLogin: false,
activeNum: 0, activeNum: 0,
activeWidth: '0%', activeWidth: '0%',
htmlText: '登录后完成任务，就能获得瓜分云鹊豆的资格啦！' htmlText: '登录后完成任务，就能获得瓜分云鹊豆的资格啦！'
......
components/task-activity.vue
浏览文件 @ 38101a67
...@@ -5,9 +5,12 @@ ...@@ -5,9 +5,12 @@
<div v-if="item.timeStatus == 1 || (item.timeStatus == 2 && item.hideEndFlag == 2)"> <div v-if="item.timeStatus == 1 || (item.timeStatus == 2 && item.hideEndFlag == 2)">
<img :src="item.defaultBackgroundImage"/> <img :src="item.defaultBackgroundImage"/>
<div class="task-item" @click="linkPage(item)"> <div class="task-item" @click="linkPage(item)">
<img v-if="item.resourceType == 7" src="../static/images/task-one.png" /> <!-- 1.课程 2.考试 3.调查问卷 4.患者招募 5.宣教漫画 6.打卡 7.邀请 8.任务排查 9.绑定居民到微信-->
<img v-if="item.resourceType == 1" src="../static/images/task-two.png" /> <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 == 3" src="../static/images/task-five.png" />
<img v-if="item.resourceType == 7" 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"> <div class="task-l">
<div class="task-t">{{item.ruleName}}</div> <div class="task-t">{{item.ruleName}}</div>
</div> </div>
...@@ -25,14 +28,17 @@ ...@@ -25,14 +28,17 @@
<div class="task-b" v-if="handleData(item.rewardJsonInfo)[0].rewardType == 4"> <div class="task-b" v-if="handleData(item.rewardJsonInfo)[0].rewardType == 4">
{{handleData(item.rewardJsonInfo)[0].rewardQuantity}}条短信额度/人 {{handleData(item.rewardJsonInfo)[0].rewardQuantity}}条短信额度/人
</div> </div>
<span class='has-bg' v-if="item.resourceType == 1">去学习</span>
<span class='has-bg' v-if="item.resourceType == 1 && (item.finishFrequency > item.doctorFinishFrequency)">去学习</span>
<span class='has-bg' v-if="item.resourceType == 1 && (item.finishFrequency == item.doctorFinishFrequency)">已完成</span>
<span class='has-bg' v-if="item.resourceType == 3">去参加</span> <span class='has-bg' v-if="item.resourceType == 3">去参加</span>
<span class='has-bg' v-if="item.resourceType == 7">去邀请</span> <span class='has-bg' v-if="item.resourceType == 7 || item.resourceType == 8">去邀请</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> <!-- <div class="task-b" v-if="item.taskFrequency == 2 && (item.cumulativeFrequency > item.nowCumulativeFrequency)">进度 {{item.nowCumulativeFrequency}}/{{item.cumulativeFrequency}}</div>
<span v-if="item.taskFrequency == 2 && item.timeStatus == 1 && (item.cumulativeFrequency == item.nowCumulativeFrequency)">已完成</span> <span v-if="item.taskFrequency == 2 && item.timeStatus == 1 && (item.cumulativeFrequency == item.nowCumulativeFrequency)">已完成</span>
<span class='has-bg' v-if="item.taskFrequency == 2 && item.timeStatus == 1 && (item.cumulativeFrequency > item.nowCumulativeFrequency) && item.nowCumulativeFrequency">继续完成</span> <span class='has-bg' v-if="item.taskFrequency == 2 && item.timeStatus == 1 && (item.cumulativeFrequency > item.nowCumulativeFrequency) && item.nowCumulativeFrequency">继续完成</span>
<span class='has-bg' v-if="item.taskFrequency == 2 && item.timeStatus == 1 && !item.nowCumulativeFrequency">去完成</span> <span class='has-bg' v-if="item.taskFrequency == 2 && item.timeStatus == 1 && !item.nowCumulativeFrequency">去完成</span> -->
</div> </div>
</div> </div>
...@@ -44,12 +50,12 @@ ...@@ -44,12 +50,12 @@
<script> <script>
// asyncData fetch 在组件中无效 // asyncData fetch 在组件中无效
import { getNewActivityDesc } from '@/service'; import { getNewActivityDesc } from '@/service';
import { setCookie, getCookie, delCookie } from '@/utils/index'; const cookies = require('cookie-universal')();
export default { export default {
name: 'TaskActivity', name: 'TaskActivity',
props: { props: {
acTempId: { acTempId: {
type: Number, type: Number | String,
default: 0 default: 0
}, },
acToken: { acToken: {
...@@ -59,12 +65,18 @@ export default { ...@@ -59,12 +65,18 @@ export default {
userMobile: { userMobile: {
type: String, type: String,
default: '' default: ''
}, }
},
watch: {
acTempId(n,o) {
if(n != o) {
this.getNewActivityDesc();
}
}
}, },
data() { data() {
return { return {
taskList: [], taskList: [],
taskListRefreshFlag: false,
status: true, status: true,
statusText: '去完成', statusText: '去完成',
tokenFlag: false, tokenFlag: false,
...@@ -72,53 +84,28 @@ export default { ...@@ -72,53 +84,28 @@ export default {
clickFlag: true clickFlag: true
} }
}, },
watch: {
userMobile(n, o) {
if (n !== o) {
this.getNewActivityDesc();
}
},
taskRefreshF(n,o) {
if (n !== o) {
this.getNewActivityDesc();
}
},
webTaskFresh(n,o) {
if (n !== o) {
this.getNewActivityDesc();
}
}
},
created() { created() {
this.getNewActivityDesc(); // this.getNewActivityDesc();
}, },
methods: { methods: {
login() {
this.$emit('taskRefresh',{taskRefreshFlag:true});
},
goRefresh() {
this.getNewActivityDesc();
},
linkPage(item) { linkPage(item) {
if((!this.isWeb && !this.userMobile) || (this.isWeb && !this.tokenFlag)) { if(!this.userMobile || !this.tokenFlag) {
this.login(); this.$rocNative.gotoLogin();
}else { }else {
let flag = item.timeStatus == 1 && ((item.finishFrequency == item.doctorFinishFrequency) && item.resourceType != 8); // let flag = item.timeStatus == 1 && ((item.finishFrequency == item.doctorFinishFrequency) && item.resourceType != 8);
let flag1 = item.timeStatus == 1 && ((item.finishFrequency == item.doctorFinishFrequency) && item.resourceType == 8 && item.resourceId == 1); // let flag1 = item.timeStatus == 1 && ((item.finishFrequency == item.doctorFinishFrequency) && item.resourceType == 8 && item.resourceId == 1);
if(item.timeStatus == 2 || flag || flag1) { // 已结束 、 已完成不可点击 // if(item.timeStatus == 2 || flag || flag1) { // 已结束 、 已完成不可点击
return; // return;
}else { // }else {
if(!this.clickFlag) return; if(!this.clickFlag) return;
if(!this.isWeb) { this.clickFlag = false; } if(!this.isWeb) { this.clickFlag = false; }
let data = { let data = {
id: item.id, id: item.id,
href: item.linkId href: item.linkId,
resourceType: item.resourceType
}; };
this.taskListRefreshFlag = !this.taskListRefreshFlag;
this.$emit('taskRef', { taskListRefreshFlag: this.taskListRefreshFlag });
this.$emit('activityTaskJump', data); this.$emit('activityTaskJump', data);
// }
}
} }
}, },
// 活动详情 // 活动详情
...@@ -140,14 +127,20 @@ export default { ...@@ -140,14 +127,20 @@ export default {
getNewActivityDesc({ id: req.id, token: req.token }).then(res => { getNewActivityDesc({ id: req.id, token: req.token }).then(res => {
if(res.code == '000000') { if(res.code == '000000') {
if(res.data.loginStatus == 2) { // 未登录 或者token失效 if(res.data.loginStatus == 2) { // 未登录 或者token失效
delCookie('token'); cookies.remove('token');
this.tokenFlag = false; this.tokenFlag = false;
}else { }else {
this.tokenFlag = true; this.tokenFlag = true;
} }
this.taskList = res.data.taskRuleData; 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);
}
}
} }
}) })
}, },
// 处理数据 // 处理数据
handleData(data) { handleData(data) {
......
package-lock.json
浏览文件 @ 38101a67
...@@ -6096,7 +6096,8 @@ ...@@ -6096,7 +6096,8 @@
"ansi-regex": { "ansi-regex": {
"version": "2.1.1", "version": "2.1.1",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"aproba": { "aproba": {
"version": "1.2.0", "version": "1.2.0",
...@@ -6117,12 +6118,14 @@ ...@@ -6117,12 +6118,14 @@
"balanced-match": { "balanced-match": {
"version": "1.0.0", "version": "1.0.0",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"brace-expansion": { "brace-expansion": {
"version": "1.1.11", "version": "1.1.11",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"balanced-match": "^1.0.0", "balanced-match": "^1.0.0",
"concat-map": "0.0.1" "concat-map": "0.0.1"
...@@ -6137,17 +6140,20 @@ ...@@ -6137,17 +6140,20 @@
"code-point-at": { "code-point-at": {
"version": "1.1.0", "version": "1.1.0",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"concat-map": { "concat-map": {
"version": "0.0.1", "version": "0.0.1",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"console-control-strings": { "console-control-strings": {
"version": "1.1.0", "version": "1.1.0",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"core-util-is": { "core-util-is": {
"version": "1.0.2", "version": "1.0.2",
...@@ -6264,7 +6270,8 @@ ...@@ -6264,7 +6270,8 @@
"inherits": { "inherits": {
"version": "2.0.3", "version": "2.0.3",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"ini": { "ini": {
"version": "1.3.5", "version": "1.3.5",
...@@ -6276,6 +6283,7 @@ ...@@ -6276,6 +6283,7 @@
"version": "1.0.0", "version": "1.0.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"number-is-nan": "^1.0.0" "number-is-nan": "^1.0.0"
} }
...@@ -6290,6 +6298,7 @@ ...@@ -6290,6 +6298,7 @@
"version": "3.0.4", "version": "3.0.4",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"brace-expansion": "^1.1.7" "brace-expansion": "^1.1.7"
} }
...@@ -6297,12 +6306,14 @@ ...@@ -6297,12 +6306,14 @@
"minimist": { "minimist": {
"version": "0.0.8", "version": "0.0.8",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"minipass": { "minipass": {
"version": "2.3.5", "version": "2.3.5",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"safe-buffer": "^5.1.2", "safe-buffer": "^5.1.2",
"yallist": "^3.0.0" "yallist": "^3.0.0"
...@@ -6321,6 +6332,7 @@ ...@@ -6321,6 +6332,7 @@
"version": "0.5.1", "version": "0.5.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"minimist": "0.0.8" "minimist": "0.0.8"
} }
...@@ -6401,7 +6413,8 @@ ...@@ -6401,7 +6413,8 @@
"number-is-nan": { "number-is-nan": {
"version": "1.0.1", "version": "1.0.1",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"object-assign": { "object-assign": {
"version": "4.1.1", "version": "4.1.1",
...@@ -6413,6 +6426,7 @@ ...@@ -6413,6 +6426,7 @@
"version": "1.4.0", "version": "1.4.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"wrappy": "1" "wrappy": "1"
} }
...@@ -6498,7 +6512,8 @@ ...@@ -6498,7 +6512,8 @@
"safe-buffer": { "safe-buffer": {
"version": "5.1.2", "version": "5.1.2",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"safer-buffer": { "safer-buffer": {
"version": "2.1.2", "version": "2.1.2",
...@@ -6534,6 +6549,7 @@ ...@@ -6534,6 +6549,7 @@
"version": "1.0.2", "version": "1.0.2",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"code-point-at": "^1.0.0", "code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0", "is-fullwidth-code-point": "^1.0.0",
...@@ -6553,6 +6569,7 @@ ...@@ -6553,6 +6569,7 @@
"version": "3.0.1", "version": "3.0.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"ansi-regex": "^2.0.0" "ansi-regex": "^2.0.0"
} }
...@@ -6596,12 +6613,14 @@ ...@@ -6596,12 +6613,14 @@
"wrappy": { "wrappy": {
"version": "1.0.2", "version": "1.0.2",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"yallist": { "yallist": {
"version": "3.0.3", "version": "3.0.3",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
} }
} }
}, },
...@@ -8070,7 +8089,8 @@ ...@@ -8070,7 +8089,8 @@
"ansi-regex": { "ansi-regex": {
"version": "2.1.1", "version": "2.1.1",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"aproba": { "aproba": {
"version": "1.2.0", "version": "1.2.0",
...@@ -8091,12 +8111,14 @@ ...@@ -8091,12 +8111,14 @@
"balanced-match": { "balanced-match": {
"version": "1.0.0", "version": "1.0.0",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"brace-expansion": { "brace-expansion": {
"version": "1.1.11", "version": "1.1.11",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"balanced-match": "^1.0.0", "balanced-match": "^1.0.0",
"concat-map": "0.0.1" "concat-map": "0.0.1"
...@@ -8111,17 +8133,20 @@ ...@@ -8111,17 +8133,20 @@
"code-point-at": { "code-point-at": {
"version": "1.1.0", "version": "1.1.0",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"concat-map": { "concat-map": {
"version": "0.0.1", "version": "0.0.1",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"console-control-strings": { "console-control-strings": {
"version": "1.1.0", "version": "1.1.0",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"core-util-is": { "core-util-is": {
"version": "1.0.2", "version": "1.0.2",
...@@ -8238,7 +8263,8 @@ ...@@ -8238,7 +8263,8 @@
"inherits": { "inherits": {
"version": "2.0.3", "version": "2.0.3",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"ini": { "ini": {
"version": "1.3.5", "version": "1.3.5",
...@@ -8250,6 +8276,7 @@ ...@@ -8250,6 +8276,7 @@
"version": "1.0.0", "version": "1.0.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"number-is-nan": "^1.0.0" "number-is-nan": "^1.0.0"
} }
...@@ -8264,6 +8291,7 @@ ...@@ -8264,6 +8291,7 @@
"version": "3.0.4", "version": "3.0.4",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"brace-expansion": "^1.1.7" "brace-expansion": "^1.1.7"
} }
...@@ -8271,12 +8299,14 @@ ...@@ -8271,12 +8299,14 @@
"minimist": { "minimist": {
"version": "0.0.8", "version": "0.0.8",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"minipass": { "minipass": {
"version": "2.3.5", "version": "2.3.5",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"safe-buffer": "^5.1.2", "safe-buffer": "^5.1.2",
"yallist": "^3.0.0" "yallist": "^3.0.0"
...@@ -8295,6 +8325,7 @@ ...@@ -8295,6 +8325,7 @@
"version": "0.5.1", "version": "0.5.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"minimist": "0.0.8" "minimist": "0.0.8"
} }
...@@ -8375,7 +8406,8 @@ ...@@ -8375,7 +8406,8 @@
"number-is-nan": { "number-is-nan": {
"version": "1.0.1", "version": "1.0.1",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"object-assign": { "object-assign": {
"version": "4.1.1", "version": "4.1.1",
...@@ -8387,6 +8419,7 @@ ...@@ -8387,6 +8419,7 @@
"version": "1.4.0", "version": "1.4.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"wrappy": "1" "wrappy": "1"
} }
...@@ -8472,7 +8505,8 @@ ...@@ -8472,7 +8505,8 @@
"safe-buffer": { "safe-buffer": {
"version": "5.1.2", "version": "5.1.2",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"safer-buffer": { "safer-buffer": {
"version": "2.1.2", "version": "2.1.2",
...@@ -8508,6 +8542,7 @@ ...@@ -8508,6 +8542,7 @@
"version": "1.0.2", "version": "1.0.2",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"code-point-at": "^1.0.0", "code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0", "is-fullwidth-code-point": "^1.0.0",
...@@ -8527,6 +8562,7 @@ ...@@ -8527,6 +8562,7 @@
"version": "3.0.1", "version": "3.0.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"ansi-regex": "^2.0.0" "ansi-regex": "^2.0.0"
} }
...@@ -8570,12 +8606,14 @@ ...@@ -8570,12 +8606,14 @@
"wrappy": { "wrappy": {
"version": "1.0.2", "version": "1.0.2",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"yallist": { "yallist": {
"version": "3.0.3", "version": "3.0.3",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
} }
} }
}, },
...@@ -12391,6 +12429,11 @@ ...@@ -12391,6 +12429,11 @@
"resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
"integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=" "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw="
}, },
"vconsole": {
"version": "3.3.4",
"resolved": "http://192.168.110.93:4873/vconsole/-/vconsole-3.3.4.tgz",
"integrity": "sha512-9yihsic96NPoMLQx/lCQwH9d89H0bbMW3LZPzo/t4yGQcS1X+vTCe9OHm1XSH7WNxzGDmcSwBiKLsFGwvJpQBg=="
},
"vendors": { "vendors": {
"version": "1.0.3", "version": "1.0.3",
"resolved": "https://registry.npmjs.org/vendors/-/vendors-1.0.3.tgz", "resolved": "https://registry.npmjs.org/vendors/-/vendors-1.0.3.tgz",
...@@ -12682,7 +12725,8 @@ ...@@ -12682,7 +12725,8 @@
}, },
"ansi-regex": { "ansi-regex": {
"version": "2.1.1", "version": "2.1.1",
"bundled": true "bundled": true,
"optional": true
}, },
"aproba": { "aproba": {
"version": "1.2.0", "version": "1.2.0",
...@@ -12700,11 +12744,13 @@ ...@@ -12700,11 +12744,13 @@
}, },
"balanced-match": { "balanced-match": {
"version": "1.0.0", "version": "1.0.0",
"bundled": true "bundled": true,
"optional": true
}, },
"brace-expansion": { "brace-expansion": {
"version": "1.1.11", "version": "1.1.11",
"bundled": true, "bundled": true,
"optional": true,
"requires": { "requires": {
"balanced-match": "^1.0.0", "balanced-match": "^1.0.0",
"concat-map": "0.0.1" "concat-map": "0.0.1"
...@@ -12717,15 +12763,18 @@ ...@@ -12717,15 +12763,18 @@
}, },
"code-point-at": { "code-point-at": {
"version": "1.1.0", "version": "1.1.0",
"bundled": true "bundled": true,
"optional": true
}, },
"concat-map": { "concat-map": {
"version": "0.0.1", "version": "0.0.1",
"bundled": true "bundled": true,
"optional": true
}, },
"console-control-strings": { "console-control-strings": {
"version": "1.1.0", "version": "1.1.0",
"bundled": true "bundled": true,
"optional": true
}, },
"core-util-is": { "core-util-is": {
"version": "1.0.2", "version": "1.0.2",
...@@ -12828,7 +12877,8 @@ ...@@ -12828,7 +12877,8 @@
}, },
"inherits": { "inherits": {
"version": "2.0.3", "version": "2.0.3",
"bundled": true "bundled": true,
"optional": true
}, },
"ini": { "ini": {
"version": "1.3.5", "version": "1.3.5",
...@@ -12838,6 +12888,7 @@ ...@@ -12838,6 +12888,7 @@
"is-fullwidth-code-point": { "is-fullwidth-code-point": {
"version": "1.0.0", "version": "1.0.0",
"bundled": true, "bundled": true,
"optional": true,
"requires": { "requires": {
"number-is-nan": "^1.0.0" "number-is-nan": "^1.0.0"
} }
...@@ -12850,17 +12901,20 @@ ...@@ -12850,17 +12901,20 @@
"minimatch": { "minimatch": {
"version": "3.0.4", "version": "3.0.4",
"bundled": true, "bundled": true,
"optional": true,
"requires": { "requires": {
"brace-expansion": "^1.1.7" "brace-expansion": "^1.1.7"
} }
}, },
"minimist": { "minimist": {
"version": "0.0.8", "version": "0.0.8",
"bundled": true "bundled": true,
"optional": true
}, },
"minipass": { "minipass": {
"version": "2.3.5", "version": "2.3.5",
"bundled": true, "bundled": true,
"optional": true,
"requires": { "requires": {
"safe-buffer": "^5.1.2", "safe-buffer": "^5.1.2",
"yallist": "^3.0.0" "yallist": "^3.0.0"
...@@ -12877,6 +12931,7 @@ ...@@ -12877,6 +12931,7 @@
"mkdirp": { "mkdirp": {
"version": "0.5.1", "version": "0.5.1",
"bundled": true, "bundled": true,
"optional": true,
"requires": { "requires": {
"minimist": "0.0.8" "minimist": "0.0.8"
} }
...@@ -12949,7 +13004,8 @@ ...@@ -12949,7 +13004,8 @@
}, },
"number-is-nan": { "number-is-nan": {
"version": "1.0.1", "version": "1.0.1",
"bundled": true "bundled": true,
"optional": true
}, },
"object-assign": { "object-assign": {
"version": "4.1.1", "version": "4.1.1",
...@@ -12959,6 +13015,7 @@ ...@@ -12959,6 +13015,7 @@
"once": { "once": {
"version": "1.4.0", "version": "1.4.0",
"bundled": true, "bundled": true,
"optional": true,
"requires": { "requires": {
"wrappy": "1" "wrappy": "1"
} }
...@@ -13034,7 +13091,8 @@ ...@@ -13034,7 +13091,8 @@
}, },
"safe-buffer": { "safe-buffer": {
"version": "5.1.2", "version": "5.1.2",
"bundled": true "bundled": true,
"optional": true
}, },
"safer-buffer": { "safer-buffer": {
"version": "2.1.2", "version": "2.1.2",
...@@ -13064,6 +13122,7 @@ ...@@ -13064,6 +13122,7 @@
"string-width": { "string-width": {
"version": "1.0.2", "version": "1.0.2",
"bundled": true, "bundled": true,
"optional": true,
"requires": { "requires": {
"code-point-at": "^1.0.0", "code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0", "is-fullwidth-code-point": "^1.0.0",
...@@ -13081,6 +13140,7 @@ ...@@ -13081,6 +13140,7 @@
"strip-ansi": { "strip-ansi": {
"version": "3.0.1", "version": "3.0.1",
"bundled": true, "bundled": true,
"optional": true,
"requires": { "requires": {
"ansi-regex": "^2.0.0" "ansi-regex": "^2.0.0"
} }
...@@ -13119,11 +13179,13 @@ ...@@ -13119,11 +13179,13 @@
}, },
"wrappy": { "wrappy": {
"version": "1.0.2", "version": "1.0.2",
"bundled": true "bundled": true,
"optional": true
}, },
"yallist": { "yallist": {
"version": "3.0.3", "version": "3.0.3",
"bundled": true "bundled": true,
"optional": true
} }
} }
}, },
......
package.json
浏览文件 @ 38101a67
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
"private": true, "private": true,
"scripts": { "scripts": {
"test": "jest", "test": "jest",
"dev": "cross-env NODE_ENV=development NUXT_ENV_APP=dev PORT=3000 nodemon server/index.js --watch server", "dev": "cross-env NODE_ENV=development NUXT_ENV_APP=dev HOST=0.0.0.0 PORT=3000 nodemon server/index.js --watch server",
"build": "NUXT_ENV_APP=${ENV} nuxt build", "build": "NUXT_ENV_APP=${ENV} nuxt build",
"start": "cross-env NUXT_ENV_APP=${ENV} HOST=0.0.0.0 PORT=3016 NODE_ENV=production node server/index.js", "start": "cross-env NUXT_ENV_APP=${ENV} HOST=0.0.0.0 PORT=3016 NODE_ENV=production node server/index.js",
"generate": "nuxt generate" "generate": "nuxt generate"
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
"koa": "^2.6.2", "koa": "^2.6.2",
"nuxt": "^2.0.0", "nuxt": "^2.0.0",
"vant": "^2.0.9", "vant": "^2.0.9",
"vconsole": "^3.3.4",
"web-buried-point": "^v2.1.0" "web-buried-point": "^v2.1.0"
}, },
"devDependencies": { "devDependencies": {
......
pages/index.vue
浏览文件 @ 38101a67
<template> <template>
<div class="container"> <div class="container">
<Header <Header
v-if="!userMobile"
:token="token" :token="token"
:is-scroll="isScroll" :is-scroll="isScroll"
:share-title1="shareTitle1" :share-title1="shareTitle1"
...@@ -16,19 +15,21 @@ ...@@ -16,19 +15,21 @@
<!-- 勤奋分进度 --> <!-- 勤奋分进度 -->
<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="../static/images/task-four.png" /> <img src="../static/images/task-four.png" />
<span class="tc">我的勤奋分<span>{{12345}}</span></span> <span class="tc">我的勤奋分<span>{{12345}}</span></span>
<span class="bt" @click="selfInfo">个人明细 ></span> <span class="bt" @click="selfInfo">个人明细 ></span>
</div> </div>
<div v-if="userMobile" class="text"> <div v-if="!userMobile" class="text">
<span class="tc">登录可参加活动</span> <span class="tc">登录可参加活动</span>
<span class="bt" @click="goToLogin">去登录 ></span> <span class="bt" @click="goToLogin">去登录 ></span>
</div> </div>
</div> </div>
<status-bar <status-bar
class="progress-bar" class="progress-bar"
:isLogin="isLogin"/> :userMobile="userMobile"
:minValue="minValue"
:maxValue="maxValue"/>
</div> </div>
</div> </div>
...@@ -72,7 +73,8 @@ import TaskActivity from '../components/task-activity'; ...@@ -72,7 +73,8 @@ import TaskActivity from '../components/task-activity';
import Header from '../components/header/index'; import Header from '../components/header/index';
import Step from '../components/step'; import Step from '../components/step';
import StatusBar from '../components/bussiness/status-bar'; import StatusBar from '../components/bussiness/status-bar';
import { getNcovRealReports } from "@/service"; import { checkToken, selectAppModuleParam } from "@/service";
const cookies = require('cookie-universal')();
export default { export default {
components: { components: {
...@@ -88,7 +90,7 @@ export default { ...@@ -88,7 +90,7 @@ export default {
userMobile: '', userMobile: '',
stepFlag: true, stepFlag: true,
isWeb: true, isWeb: true,
activityId: 9, activityId: 0,
token: '', token: '',
shareTitle1: '', shareTitle1: '',
shareTitle2: '', shareTitle2: '',
...@@ -105,24 +107,46 @@ export default { ...@@ -105,24 +107,46 @@ export default {
imgSrc3: require('@/static/images/get-award.png'), imgSrc3: require('@/static/images/get-award.png'),
numText3: 3, numText3: 3,
stepText3: '公布排名获奖名单', stepText3: '公布排名获奖名单',
stepTime3:'4月3日10:00-4月7日16:00' stepTime3:'4月3日10:00-4月7日16:00',
minValue: 50,
maxValue: 200
} }
}, },
async asyncData({ $axios }) { async asyncData({ $axios }) {
}, },
created() { created() {
},
mounted() {
let _this = this;
if (process.client) {
_this.activityId = _this.$route.query.id || 9;
window.__refresh = function() {
_this.getUserInfo();
}
}
}, },
mounted() {},
methods: { methods: {
async getNcovRealReports() { getUserInfo() {
await getNcovRealReports(100).then(res => { this.$rocNative
if (res.code === "000000") { .getUserInfo()
this.infoData = res.data || this.infoData; .then(params => {
} let _t = params.userToken;
}); let _this = this;
}, _this.token = params.userToken;
cookies.set('token', _this.token);
checkToken({ _t }).then(res => {
if(res.code == '200000' || res.code == '200006') {
_this.userMobile = '';
cookies.remove('token');
}else {
_this.userMobile = params.userMobile;
cookies.set('token', _this.token);
}
})
});
},
// 查看活动规则 // 查看活动规则
ruleDetail() { ruleDetail() {
this.$router.push({path: "/login-point/point-result",query: {}}); this.$router.push({path: "/login-point/point-result",query: {}});
...@@ -133,19 +157,82 @@ export default { ...@@ -133,19 +157,82 @@ export default {
}, },
// 去登录 // 去登录
goToLogin() { goToLogin() {
this.$rocNative.gotoLogin();
}, },
// 查看个人明细 // 查看个人明细
selfInfo() { selfInfo() {
// this.$router.push({path: "/perdetails",query: {}}); this.$router.push({path: "/perdetails",query: {}});
this.$router.push({path: "/login-point",query: {}});
}, },
// 活动任务 // 活动任务
activityTaskJump(data) { activityTaskJump(data) {
//this.jumpPage(data.href, data.id); if(data.resourceType == 7) { // 去邀请
},
}else if(data.resourceType == 8) { // 绑定居民微信
}else {
this.jumpPage(data.href, data.id);
}
},
async jumpPage(url, id) {
const _this = this;
if (!!url) { // 判断是否有跳转
const { token, isWeb } = _this;
const { data } = await selectAppModuleParam({
id: url,
token
});
const itemData = data.model;
// 增加点击图片时候，是否有loginFlag参数，有，则校验并登录。如未登录去登录，已登录，老逻辑。
const loginFlag = this.checkLoginFlag(itemData.paramList);
if(loginFlag){
_this.$rocNative.getToken().then(res => {
const { userToken } = res;
// alert('APP拿到的token=:'+userToken)
checkToken({ token: userToken }).then(res=>{
if(res.code == '200000' || res.code == '200006') {
_this.$rocNative.gotoLogin();
}else{
_this.oldJumpHandle(itemData, userToken);
}
})
});
}else{
_this.oldJumpHandle(itemData, _this.token);
}
}
},
// 原先的点击图片跳转逻辑
oldJumpHandle(itemData, token){
// 不改动原先逻辑
if (itemData.code == 'M301') {
itemData.code = 'M300';
//鉴权 自己调用token
this.$rocNative.getToken().then(res => {
const { userToken } = res;
setCookie('token', userToken);
});
} else {
const paramList = setEventByModuleCode(
itemData,
token
);
this.$rocNative.dispatchEventByModuleCode({
modeCode: itemData.code,
jsonString: paramList
});
}
},
// 增加一个点击图片请求selectAppModuleParam这个接口时候的 loginFlag 字段校验
checkLoginFlag(paramList){
let flag = false;
for(let i=0;i<paramList.length;i++){
if(paramList[i].key === 'loginFlag' && paramList[i].value === '1'){
flag = true;
break;
}
}
return flag;
}
} }
} }
</script> </script>
......
pages/login-point/point-result.vue
浏览文件 @ 38101a67
...@@ -28,7 +28,7 @@ export default { ...@@ -28,7 +28,7 @@ export default {
props: { props: {
status: { status: {
type: String | Number, type: String | Number,
default: 4 default: 1
} }
}, },
data() { data() {
......
plugins/vue-inject.js
浏览文件 @ 38101a67
...@@ -2,11 +2,17 @@ import Vue from 'vue'; ...@@ -2,11 +2,17 @@ import Vue from 'vue';
import { BASE_URL } from '@/utils/enumerate'; import { BASE_URL } from '@/utils/enumerate';
import rocNative from '@/utils/jsbridge'; import rocNative from '@/utils/jsbridge';
import WebBuriedPoint, { sendBuriedData } from 'web-buried-point'; import WebBuriedPoint, { sendBuriedData } from 'web-buried-point';
import VConsole from 'vconsole/dist/vconsole.min.js'
const { name } = require('../package.json'); const { name } = require('../package.json');
const cookies = require('cookie-universal')(); const cookies = require('cookie-universal')();
// const { NUXT_ENV_APP } = process.env; // const { NUXT_ENV_APP } = process.env;
if(!(process.env.NODE_ENV === 'uat' || process.env.NODE_ENV === 'pro')) {
// if(!(process.env.BUILD_ENV === 'pro')) {
let vConsole = new VConsole() // 初始化
}
Vue.prototype.$cookies = cookies; Vue.prototype.$cookies = cookies;
Vue.prototype.$rocNative = new rocNative(); Vue.prototype.$rocNative = new rocNative();
Vue.prototype.$sendBuriedData = sendBuriedData; Vue.prototype.$sendBuriedData = sendBuriedData;
......
service/index.js
浏览文件 @ 38101a67
...@@ -8,10 +8,6 @@ export const getHospital = async (params) => { ...@@ -8,10 +8,6 @@ export const getHospital = async (params) => {
return request({ url: `/api-ws/hospitals/?${str}` }); return request({ url: `/api-ws/hospitals/?${str}` });
}; };
export const getNcovRealReports = async (pageSize) => {
return request({ url: `ncov/ncovPage/realReports?pageSize=${pageSize}` });
};
// 新的任务列表查询 // 新的任务列表查询
export const getNewActivityDesc = async (data) => { export const getNewActivityDesc = async (data) => {
const { id, token } = data; const { id, token } = data;
...@@ -21,4 +17,22 @@ export const getNewActivityDesc = async (data) => { ...@@ -21,4 +17,22 @@ export const getNewActivityDesc = async (data) => {
token token
} }
}); });
} }
\ No newline at end of file
// token校验
export const checkToken = async({token}) => {
return request({
url: `campaign/admin/task/checkToken?token=${token}`,
withCredentials: true
})
}
// 获取跳转链接
export const selectAppModuleParam = async ({id, token }) => {
return request({
url: `/contents/contentAppModule/selectAppModuleParam?id=${id}&token=${token}&setEntry=true`,
withCredentials: true
});
}
utils/jsbridge.js
浏览文件 @ 38101a67
...@@ -18,16 +18,16 @@ export const JsBridgeOptions = { ...@@ -18,16 +18,16 @@ export const JsBridgeOptions = {
NATIVE_ANDROID_NAME: '__rocAndroid', NATIVE_ANDROID_NAME: '__rocAndroid',
initMethodsWithCallBack: ['getToken', 'getUserInfo', 'getLocalData'], // value is string initMethodsWithCallBack: ['getToken', 'getUserInfo', 'getLocalData'], // value is string
initMethodsWithoutCallBack: [ initMethodsWithoutCallBack: [
'gotoLogin', 'gotoLogin',
'appInit', 'appInit',
'goBack', 'goBack',
'shareWechat', 'shareWechat',
'showNativeToast', 'showNativeToast',
'dispatchEventByModuleCode', 'dispatchEventByModuleCode',
'appBuryingPointEntrust', 'appBuryingPointEntrust',
'webLoadSuccess', 'webLoadSuccess',
'sendBuriedPoint', 'sendBuriedPoint',
'openErrorDebug' 'openErrorDebug'
] // value is string ] // value is string
} }
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或