Merge branch 'dev-new-campaign-0302' of...

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

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/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.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' 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 && !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> 
                         
                         <!-- <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>
@@ -208,7 +208,7 @@ export default {
     .task-activity {
         .task-con {
             position: relative;
-            padding-bottom: 5px;
+            padding-bottom: 10px;
             width: 335px;
             height: 70px;
             img {
@@ -221,7 +221,7 @@ export default {
                 top: 0;
                 width: 335px;
                 height: 70px;
-                padding: 0px 10px 0px 14px;
+                padding: 0px 10px 0px 20px;
                 box-sizing: border-box;
                 display: flex;
                 flex-direction: row;
@@ -232,7 +232,7 @@ export default {
                     height: 35px;
                 }
                 .task-l {
-                    width: 162px;
+                    width: 164px;
                     padding-left: 13px;
                     .task-t {
                         padding-bottom: 25px;

pages/index.vue

@@ -588,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,30 +8,33 @@
 		/>
         <!-- 我的排名 -->
         <div class="rank-info">
-            <div class="info-text">
-                <div class="info-detail">
-                    <img :src="avatarImage" />
-                    <div class="info-name">
-                        <span class="ft">{{name}}</span>
-                        <span><span class="cl">{{allScore}}</span>勤奋分</span>
+            <div class="rank-con">
+                <div class="info-text">
+                    <div class="info-detail">
+                        <img :src="avatarImage" />
+                        <div class="info-name">
+                            <span class="ft">{{name}}</span>
+                            <span><span class="cl">{{allScore}}</span>勤奋分</span>
+                        </div>
+                    </div>
+                    <div class="info-score">
+                        <p>{{rankNum}}<span v-if="rank > 100">+</span></p>
+                        <span class="text">我的排名</span>
                     </div>
                 </div>
-                <div class="info-score">
-                    <p>{{rankNum}}<span v-if="rank > 100">+</span></p>
-                    <span class="text">我的排名</span>
-                </div>
-            </div>
-            <div class="rank-detail">
-                <div class="rank-num" v-if="firstScore">
-                    <span class="dlot" v-if="firstScore && lastScore"></span>
-                    <span class="num">前一名：<span class="score">{{firstScore}}</span>勤奋分</span>
-                </div>
-                <div class="line" v-if="firstScore && lastScore"></div>
-                <div class="rank-num" v-if="lastScore">
-                    <span class="dlot" v-if="firstScore && lastScore"></span>
-                    <span class="num">后一名：<span class="score">{{lastScore}}</span>勤奋分</span>
+                <div class="rank-detail">
+                    <div class="rank-num" v-if="firstScore">
+                        <span class="dlot" v-if="firstScore && lastScore"></span>
+                        <span class="num">前一名：<span class="score">{{firstScore}}</span>勤奋分</span>
+                    </div>
+                    <div class="line" v-if="firstScore && lastScore"></div>
+                    <div class="rank-num" v-if="lastScore">
+                        <span class="dlot" v-if="firstScore && lastScore"></span>
+                        <span class="num">后一名：<span class="score">{{lastScore}}</span>勤奋分</span>
+                    </div>
                 </div>
             </div>
+            
         </div>
         <!-- 排行榜 -->
         <div class="main-content">
@@ -182,9 +185,11 @@ export default {
 .rank-container {
     .rank-info {
         padding-top: 70px;
-        height: 150px;
-        background-image:url('../../static/images/rank_head.png');
-        background-size: 100% 100%;
+        .rank-con {
+            height: 150px;
+            background-image:url('../../static/images/rank_head.png');
+            background-size: 100% 100%;
+        }
         .info-text {
             display: flex;
             flex-direction: row;