任务显示修改

components/task-activity.vue

@@ -23,14 +23,21 @@
                             {{handleData(item.rewardJsonInfo)[0].rewardQuantity}}元现金红包/人
                         </div>
                         <div class="task-b" v-if="handleData(item.rewardJsonInfo)[0].rewardType == 3">
-                            <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 == 4">勤奋分/份</span>
+                            <span class="score">+{{handleData(item.rewardJsonInfo)[0].rewardQuantity}}</span>
+                            <span v-if="item.resourceType == 11 || item.resourceType == 9">勤奋分/人</span>
+                            <span v-if="item.resourceType == 8 && item.taskFrequency == 1">勤奋分 {{item.doctorFinishFrequency}}/{{item.finishFrequency}}</span>
+                            <span v-if="item.resourceType == 8 && item.taskFrequency == 2">勤奋分 {{item.nowCumulativeFrequency}}/{{item.cumulativeFrequency}}</span>
+                            <span v-if="item.resourceType == 1 && item.taskFrequency == 1">勤奋分 {{item.doctorFinishFrequency}}/{{item.finishFrequency}}</span>
+                            <span v-if="item.resourceType == 1 && item.taskFrequency == 2">勤奋分 {{item.nowCumulativeFrequency}}/{{item.cumulativeFrequency}}</span>
+                            <span v-if="item.resourceType == 4 && item.taskFrequency == 1">勤奋分 {{item.doctorFinishFrequency}}/{{item.finishFrequency}}</span>
+                            <span v-if="item.resourceType == 4 && item.taskFrequency == 2">勤奋分 {{item.nowCumulativeFrequency}}/{{item.cumulativeFrequency}}</span>
                         </div>
                         <div class="task-b" v-if="handleData(item.rewardJsonInfo)[0].rewardType == 4">
                             {{handleData(item.rewardJsonInfo)[0].rewardQuantity}}条短信额度/人
                         </div>
 
                         <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 finish' v-if="(item.resourceType == 1 || item.resourceType == 8) && item.isFinish">已完成</span> 
                         <span class='has-bg' v-if="item.resourceType == 4">去参加</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> 
@@ -243,6 +250,10 @@ export default {
                         background:linear-gradient(270deg,rgba(255,88,36,1) 0%,rgba(254,163,86,1) 100%);
                         border-radius:35px;
                     }
+                    span.finish {
+                        color: #F68367;
+                        background: rgba(253,234,228,1);
+                    }
                     .task-b {
                         text-align: center;
                         font-size: 12px;

pages/login-point/index.vue

@@ -166,6 +166,10 @@ export default {
         },
         // 点赞登录
         gotoPoint() {
+            if(!this.mobilePhone) {
+                this.$toast('请填写手机号码');
+                return;
+            }
             this.loadingFlag = true;
             let param = {
                 mobile: this.mobilePhone,
@@ -180,7 +184,7 @@ export default {
                     if(res.data == '900001') {
                         this.$toast('不能给自己点赞哦');
                     }else {
-                        this.$router.push({path: "/login-point/point-result",query: {code: res.data}});
+                        this.$router.push({path: "/point-result",query: {code: res.data}});
                     }
                 }else if(res.code == '300000') {
                     this.$toast(res.message);

pages/login-point/point-result.vue → pages/point-result.vue

@@ -2,8 +2,8 @@
     <section class="point-container">
         <div class="point-bg">
             <div class="point-status">
-                <img v-if="status == 1 || status == 3" src="../../static/images/point-success-nobg.png" />
-                <img v-if="status == 2" src="../../static/images/point-fail.png" />
+                <img v-if="status == 1 || status == 3" src="../static/images/point-success-nobg.png" />
+                <img v-if="status == 2" src="../static/images/point-fail.png" />
             </div>
             <div class="status-text">
                 <p class="fw">{{pointText1}}</p>
@@ -11,11 +11,11 @@
             </div>
             <div class="point-award">
                 <div v-if="status != 3" class="award-con">
-                    <img src="../../static/images/point-award-new.png" />
+                    <img src="../static/images/point-award-new.png" />
                 </div>
             </div>
             <div class="btn">
-                <button @click="openApp" v-bp="{ component_tag: '361#3600010'}">{{btnText}}</button>
+                <button @click="openApp" v-bp="{ component_tag: '361#360010'}">{{btnText}}</button>
                 <button @click="downloadApp">下载APP</button>
             </div>
         </div>
@@ -100,7 +100,7 @@ export default {
     .point-bg {
         width: 100%;
         height: 100vh;
-        background-image:url('../../static/images/result-bg.png');
+        background-image:url('../static/images/result-bg.png');
         background-size: 100% 100%;
     }
     .point-status {