提交 f394b3ac 编写于 作者: huangwensu's avatar huangwensu

样式和bug修改

上级 4476924c
...@@ -5,12 +5,12 @@ ...@@ -5,12 +5,12 @@
<div v-for="(item, index) in dataList" :key="index"> <div v-for="(item, index) in dataList" :key="index">
<li class="list" v-if="item.timsRewardResp[0].rewardType == 3"> <li class="list" v-if="item.timsRewardResp[0].rewardType == 3">
<!-- 1.课程 2.考试 3.调查问卷 4.患者招募 5.宣教漫画 6.打卡 7.邀请 8.任务排查 9.绑定居民到微信 10.首次进入 11.邀请点赞--> <!-- 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 == 1" src="../../static/images/task-two-new.png" />
<img v-if="item.resourceType == 4" src="../../static/images/task-five.png" /> <img v-if="item.resourceType == 4" src="../../static/images/task-five-new.png" />
<img v-if="item.resourceType == 11" src="../../static/images/task-one.png" /> <img v-if="item.resourceType == 11" src="../../static/images/task-one-new.png" />
<img v-if="item.resourceType == 8" src="../../static/images/task-three.png" /> <img v-if="item.resourceType == 8" src="../../static/images/task-three-new.png" />
<img v-if="item.resourceType == 9" src="../../static/images/task-four.png" /> <img v-if="item.resourceType == 9" src="../../static/images/task-four-new.png" />
<img v-if="item.resourceType == 10" src="../../static/images/task-six.png" /> <img v-if="item.resourceType == 10" src="../../static/images/task-six-new.png" />
<ul class="desc"> <ul class="desc">
<li class="text">{{item.taskName}}</li> <li class="text">{{item.taskName}}</li>
<li class="time">{{item.sortFinishTime}}</li> <li class="time">{{item.sortFinishTime}}</li>
......
...@@ -6,11 +6,11 @@ ...@@ -6,11 +6,11 @@
<img :src="item.defaultBackgroundImage"/> <img :src="item.defaultBackgroundImage"/>
<div class="task-item" @click="linkPage(item)"> <div class="task-item" @click="linkPage(item)">
<!-- 1.课程 2.考试 3.调查问卷 4.患者招募 5.宣教漫画 6.打卡 7.邀请 8.任务排查 9.绑定居民到微信 10.首次进入页面 11.点赞和邀请进入--> <!-- 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 == 1" src="../static/images/task-two-new.png" />
<img v-if="item.resourceType == 4" src="../static/images/task-five.png" /> <img v-if="item.resourceType == 4" src="../static/images/task-five-new.png" />
<img v-if="item.resourceType == 11" src="../static/images/task-one.png" /> <img v-if="item.resourceType == 11" src="../static/images/task-one-new.png" />
<img v-if="item.resourceType == 8" src="../static/images/task-three.png" /> <img v-if="item.resourceType == 8" src="../static/images/task-three-new.png" />
<img v-if="item.resourceType == 9" src="../static/images/task-four.png" /> <img v-if="item.resourceType == 9" src="../static/images/task-four-new.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>
......
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
import loading from '../../components/bussiness/common-loading'; import loading from '../../components/bussiness/common-loading';
import { getCaptchaGet, getAuthCode, pointResult, getPublicKey } from '@/service'; import { getCaptchaGet, getAuthCode, pointResult, getPublicKey } from '@/service';
import { CryptoJS } from '../../utils/aes'; import { CryptoJS } from '../../utils/aes';
import { ENV_CONFIG } from '@/utils/enumerate';
const TIMEALL = 60000; // 倒计时常量 60 秒 const TIMEALL = 60000; // 倒计时常量 60 秒
export default { export default {
components: { components: {
...@@ -180,15 +181,16 @@ export default { ...@@ -180,15 +181,16 @@ export default {
}; };
pointResult(param).then(res => { pointResult(param).then(res => {
this.loadingFlag = false; this.loadingFlag = false;
alert(JSON.stringify(res));
if(res.code == '000000') { if(res.code == '000000') {
if(res.data == '900001') { if(res.data == '900001') {
this.$toast('不能给自己点赞哦'); this.$toast('不能给自己点赞哦');
}else { }else {
const { NUXT_ENV_APP } = process.env;
//this.$router.push({path: "/point-result",query: {code: res.data}}); //this.$router.push({path: "/point-result",query: {code: res.data}});
let routeData = this.$router.resolve({path: "/point-result",query: {code: res.data}}); let routeData = this.$router.resolve({path: "/point-result",query: {code: res.data}});
window.open(routeData.href, '_blank'); let url = ENV_CONFIG[NUXT_ENV_APP]['shareUrl'] + routeData.href
alert(JSON.stringify(routeData)); window.open(url, '_blank');
//alert(JSON.stringify(routeData));
} }
}else if(res.code == '300000') { }else if(res.code == '300000') {
this.$toast(res.message); this.$toast(res.message);
......
...@@ -113,7 +113,7 @@ export default { ...@@ -113,7 +113,7 @@ export default {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
margin-left: 8px; margin-left: 8px;
text-align: center; text-align: left;
.score { .score {
height: 18px; height: 18px;
line-height: 18px; line-height: 18px;
...@@ -130,6 +130,7 @@ export default { ...@@ -130,6 +130,7 @@ export default {
color: #FFE8A5; color: #FFE8A5;
border: 1px solid rgba(255,232,165, 0.8); border: 1px solid rgba(255,232,165, 0.8);
border-radius: 9px; border-radius: 9px;
text-align: center;
} }
} }
} }
......
...@@ -198,7 +198,7 @@ export default { ...@@ -198,7 +198,7 @@ export default {
} }
.info-name { .info-name {
display: inline-block; display: inline-block;
padding: 9px; padding: 7px 9px;
font-size: 14px; font-size: 14px;
color: #fff; color: #fff;
span { span {
...@@ -206,7 +206,7 @@ export default { ...@@ -206,7 +206,7 @@ export default {
} }
span.ft { span.ft {
font-weight: 700; font-weight: 700;
padding-bottom: 3px; padding-bottom: 2px;
} }
span.cl { span.cl {
display: inline-block; display: inline-block;
...@@ -220,6 +220,7 @@ export default { ...@@ -220,6 +220,7 @@ export default {
position: relative; position: relative;
font-size: 26px; font-size: 26px;
text-align: center; text-align: center;
font-weight: 700;
span { span {
position: absolute; position: absolute;
right: 0; right: 0;
...@@ -293,6 +294,7 @@ export default { ...@@ -293,6 +294,7 @@ export default {
color: #373839; color: #373839;
padding-right: 6px; padding-right: 6px;
font-weight: 700; font-weight: 700;
font-family: Alibaba-PuHuiTi-H,Alibaba-PuHuiTi !important;
} }
} }
.ranking-title { .ranking-title {
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册