Merge branch 'dev-new-campaign-0302' into 'release'

测试问题修复  code reviewer : 张平

测试问题修复  code reviewer : 张平

See merge request !3

components/header/index.vue

@@ -5,7 +5,7 @@
         <img :src="headerLeftIcon" />
       </div>
       <div :class="{ active: isScroll }" class="content title">
-        <span>{{shareTitle1}}</span>
+        <span>{{shareTitle}}</span>
       </div>
       <div 
       v-show="isShowRightIcon" 
@@ -40,6 +40,10 @@ export default {
       type: Boolean,
       default: false
     },
+    shareTitle: {
+      type: String,
+      default: ''
+    },
     shareTitle1: {
       type: String,
       default: ''

components/task-activity.vue

@@ -37,8 +37,8 @@
                         </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 == 8) && item.isFinish">已完成</span> 
-                        <span class='has-bg' v-if="item.resourceType == 4">去参加</span> 
+                        <span class='has-bg finish' v-if="(item.resourceType == 1 || item.resourceType == 4 || item.resourceType == 8) && 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> 
                         
@@ -82,6 +82,10 @@ export default {
         isWeb: {
             type: Boolean,
             default: false
+        },
+        taskRefreshFlag: {
+            type: Boolean,
+            default: false
         }
     },
     watch: {
@@ -94,7 +98,12 @@ export default {
             if(n != o) {
                 this.getNewActivityDesc();
             }
-        }
+        },
+        taskRefreshFlag(n,o) {
+            if (n !== o) {
+                this.getNewActivityDesc();
+            }
+        },
     },
 	data() {
 		return {
@@ -104,7 +113,8 @@ export default {
             statusText: '去完成',
             tokenFlag: false,
             textFlag: true,
-            clickFlag: true
+            clickFlag: true,
+            flag: false
 		}
     },
     created() {
@@ -122,10 +132,12 @@ export default {
                 // }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
+                        resourceType: item.resourceType,
+                        flag: this.flag
                     };
                     this.$emit('activityTaskJump', data);
                 // }

pages/index.vue

@@ -4,6 +4,7 @@
       :isWeb="isWeb"
 			:token="token"
 			:is-scroll="isScroll"
+      :share-title="shareTitle"
 			:share-title1="shareTitle1"
 			:share-title2="shareTitle2"
 			:share-icon-url="shareIconUrl"
@@ -55,6 +56,7 @@
         :acToken="token"
         :userMobile="userMobile"
         :acTempId="activityId"
+        :taskRefreshFlag="taskRefreshFlag"
         @activityTaskJump="activityTaskJump"
         @getTaskId="getTaskId" 
         @getNewTaskId="getNewTaskId"
@@ -146,6 +148,7 @@ export default {
       isWeb: false,
       activityId: 0,
       token: '',
+      shareTitle: '国际医生节特辑活动',
       shareTitle1: '',
       shareTitle2: '做任务瓜分500W云鹊豆，点一下你也能获得75分哦',
       shareTitle3: '',
@@ -181,7 +184,8 @@ export default {
       unableReason: 0, //3分数不够，4未参加
       isCarveTime: false, //是否是瓜分阶段
       isFirstRefresh: true, //是否没有掉refresh方法
-      showLoading: false //是否展示loading动画
+      showLoading: false, //是否展示loading动画
+      taskRefreshFlag: false
     }
   },
   async asyncData({ $axios }) {
@@ -409,6 +413,7 @@ export default {
     },
     // 活动任务
 		activityTaskJump(data) {
+      this.taskRefreshFlag = data.flag;
       let shareUrl = '';
       const { NUXT_ENV_APP } = process.env;
       if(data.resourceType == 11) {  // 邀请好友点赞

pages/perdetails/index.vue

@@ -2,7 +2,7 @@
   <section class="personal-detail">
     <Header
 			:is-scroll="isScroll"
-			:share-title1="shareTitle1"
+			:share-title="shareTitle1"
 			:share-title2="shareTitle2"
       :prePage="prePage"
 		/>

pages/ranks/index.vue

@@ -2,7 +2,7 @@
     <section class="rank-container">
         <Header
 			:is-scroll="isScroll"
-			:share-title1="shareTitle1"
+			:share-title="shareTitle1"
 			:share-title2="shareTitle2"
             :prePage="prePage"
 		/>