Merge branches 'dev-new-campaign-0302' and 'dev-new-campaign-0302' of...

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

components/task-activity.vue

@@ -37,10 +37,10 @@
                         </div>
 
                         <span class='has-bg' v-if="item.resourceType == 1 && !item.isFinish">去学习</span> 
-                        <span class='has-bg finish' v-if="(item.resourceType == 1 || item.resourceType == 4 || item.resourceType == 8) && item.isFinish">已完成</span> 
+                        <span class='has-bg finish' v-if="item.isFinish">已完成</span> 
                         <span class='has-bg' v-if="item.resourceType == 4 && !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> 
+                        <span class='has-bg' v-if="(item.resourceType == 11 || item.resourceType == 8) && !item.isFinish">去邀请</span>
+                        <span class='has-bg' v-if="item.resourceType == 9 && !item.isFinish">去绑定</span> 
                         
                         <!-- <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>
@@ -83,7 +83,7 @@ export default {
             type: Boolean,
             default: false
         },
-        taskRefreshFlag: {
+        taskRefresh: {
             type: Boolean,
             default: false
         }
@@ -99,7 +99,7 @@ export default {
                 this.getNewActivityDesc();
             }
         },
-        taskRefreshFlag(n,o) {
+        taskRefresh(n,o) {
             if (n !== o) {
                 this.getNewActivityDesc();
             }
@@ -125,22 +125,14 @@ export default {
             if(!this.userMobile) {
                 this.$rocNative.gotoLogin();
             }else {
-                // 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);
-                // if(item.timeStatus == 2 || flag || flag1) { // 已结束 、 已完成不可点击
-                //     return;
-                // }else {
-                    // if(!this.clickFlag) return;
-                    // if(!this.isWeb) { this.clickFlag = false; }
-                    this.flag = !this.flag;
-                    let data = {
-                        id: item.id,
-                        href: item.linkId,
-                        resourceType: item.resourceType,
-                        flag: this.flag
-                    };
-                    this.$emit('activityTaskJump', data);
-                // }
+                this.flag = !this.flag;
+                let data = {
+                    id: item.id,
+                    href: item.linkId,
+                    resourceType: item.resourceType,
+                    flag: this.flag
+                };
+                this.$emit('activityTaskJump', data);
                 if(item.resourceType == 11) {
                     this.$sendBuriedData({ 
                         action: '分享任务',

pages/index.vue

@@ -56,7 +56,7 @@
         :acToken="token"
         :userMobile="userMobile"
         :acTempId="activityId"
-        :taskRefreshFlag="taskRefreshFlag"
+        :taskRefresh="taskRefresh"
         @activityTaskJump="activityTaskJump"
         @getTaskId="getTaskId" 
         @getNewTaskId="getNewTaskId"
@@ -185,7 +185,8 @@ export default {
       isCarveTime: false, //是否是瓜分阶段
       isFirstRefresh: true, //是否没有掉refresh方法
       showLoading: false, //是否展示loading动画
-      taskRefreshFlag: false
+      taskRefreshFlag: false,
+      taskRefresh: false
     }
   },
   async asyncData({ $axios }) {
@@ -202,6 +203,7 @@ export default {
       window.__refresh = function() {
         _this.isFirstRefresh = false;
         _this.getUserInfo();
+        _this.taskRefresh = _this.taskRefreshFlag
       }
     }
     /*判断是否是瓜分阶段*/
@@ -345,7 +347,7 @@ export default {
     // 查看活动规则
     ruleDetail() {
       const { NUXT_ENV_APP } = process.env;
-      let url = ENV_CONFIG[NUXT_ENV_APP]['shareUrl'] + '/template_v2/?id=701';
+      let url = ENV_CONFIG[NUXT_ENV_APP]['shareUrl'] + '/template_v2/?id=703';
       let itemData={
           "title":"",
           "imageUrl":"",