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

ui优化  code reviewer : 张平

ui优化  code reviewer : 张平

See merge request !5

components/bussiness/status-bar.vue

@@ -72,11 +72,11 @@ export default {
       if(minValue < 100 ) {
         htmlText = `还差<span style="color">${100 - minValue}</span>分，就有资格瓜分<span style="color: #FFE8A5">100</span>万云鹊豆啦！`
       } else if(minValue < 200) {
-        htmlText = `已经有资格瓜分<span style="color: #FFE8A5">100</span>万云鹊豆啦，</br>继续努力还能瓜分<span style="color: #FFE8A5">200</span>万！`
+        htmlText = `已经有资格瓜分<span style="color: #FFE8A5">100万</span>云鹊豆啦，</br>继续努力还能瓜分<span style="color: #FFE8A5">200</span>万！`
       } else if(minValue < 300) {
-        htmlText = `已经有资格瓜分<span style="color: #FFE8A5">300</span>万云鹊豆啦，</br>继续努力还能瓜分<span style="color: #FFE8A5">200</span>万！`
+        htmlText = `已经有资格瓜分<span style="color: #FFE8A5">300万</span>云鹊豆啦，</br>继续努力还能瓜分<span style="color: #FFE8A5">200</span>万！`
       } else {
-        htmlText = `天啦撸，你有资格瓜分500万云鹊豆哦！`
+        htmlText = `天啦撸，你有资格瓜分<span style="color: #FFE8A5">500万</span>云鹊豆哦！`
       }
       activeNum = Math.floor(minValue / 100);
       if(activeNum <= 0) {
@@ -135,7 +135,6 @@ export default {
         position: relative;
         top: -10px;
         left: 0;
-        // margin-right: 80px;
         .circle {
           display: flex;
           flex-direction: row;

components/carve-up/index.vue

@@ -106,7 +106,7 @@
     },
     methods: {
       knowFn() {
-        window.location.replace('https://phome.yunqueyi.com/template_v2/?id=636')
+        window.location.replace('https://phome.yunqueyi.com/template_v2/?id=701')
       },
       goToBeanCenter() { //跳转至云鹊豆中心
         this.$rocNative.dispatchEventByModuleCode({

components/step.vue

@@ -60,9 +60,11 @@ export default {
             font-size: 18px;
             font-weight: 700;
             padding-bottom: 8px;
+            line-height: 18px;
         }
         .step-time {
             font-size: 13px;
+            line-height: 13px;
         }
     }
     img {

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,13 +125,6 @@ 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,
@@ -140,7 +133,6 @@ export default {
                     flag: this.flag
                 };
                 this.$emit('activityTaskJump', data);
-                // }
                 if(item.resourceType == 11) {
                     this.$sendBuriedData({ 
                         action: '分享任务',
@@ -216,7 +208,7 @@ export default {
     .task-activity {
         .task-con {
             position: relative;
-            padding-bottom: 5px;
+            padding-bottom: 10px;
             width: 335px;
             height: 70px;
             img {

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
       }
     }
     /*判断是否是瓜分阶段*/
@@ -263,7 +265,7 @@ export default {
           //   this.taskTimeFlag = false;
           // }
           //判断是否到瓜分云鹊豆的时间
-          let carveTime = (new Date("2020/04/17 17:00:00")).getTime();//"2020/04/07 17:00:00"
+          let carveTime = (new Date("2020/04/07 17:00:00")).getTime();//"2020/04/07 17:00:00"
           if (carveTime <= nowTime) {
             this.isCarveTime = true;
             this.showLoading = true;
@@ -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":"",
@@ -586,8 +588,9 @@ export default {
             font-size: 14px;
             font-weight: 700;
             color: #fff;
+            line-height: 35px;
             span {
-              padding-left: 8px;
+              padding-left: 6px;
               font-size: 18px;
               color: #FFE8A5;
             }

pages/ranks/index.vue

@@ -8,6 +8,7 @@
 		/>
         <!-- 我的排名 -->
         <div class="rank-info">
+            <div class="rank-con">
                 <div class="info-text">
                     <div class="info-detail">
                         <img :src="avatarImage" />
@@ -33,6 +34,8 @@
                     </div>
                 </div>
             </div>
+            
+        </div>
         <!-- 排行榜 -->
         <div class="main-content">
             <div class="description"><span>排行榜</span>排名每5分钟更新1次</div>
@@ -182,9 +185,11 @@ export default {
 .rank-container {
     .rank-info {
         padding-top: 70px;
+        .rank-con {
             height: 150px;
             background-image:url('../../static/images/rank_head.png');
             background-size: 100% 100%;
+        }
         .info-text {
             display: flex;
             flex-direction: row;