update

src/pages/index/Right.vue

@@ -440,6 +440,7 @@ export default {
     }
     // 活动开展
     .activ{
+        margin-top: 30px;
         width: 100%;
         height: 150px;
     }

src/pages/index/active.vue

@@ -3,11 +3,13 @@
          <div class="activity">
             <div class="activity-one">
                 <div class="act">活动开展</div>
-                <div class="mor"><span>查看更多</span><span></span></div>
+                <div class="mor" @click="getMore">查看更多</div>
             </div>
             <div class="activity-two">
                 <div class="left">
-                    <count-roll :count="4166" />
+                    <div class="act-left">
+                        <count-roll :count="4166" class="act-style"/> <span>次</span>
+                    </div>
                     <p class="act-num">活动开展次数</p>
                 </div>
                 <div class="line"></div>
@@ -32,9 +34,9 @@ export default {
             // 活动开展
             activeConfig: {},
             activeList: [
-                {name: '*****活动', value: 381},
+                {name: '*****活动', value: 192},
                 {name: '组织活动', value: 1103},
-                {name: '*****活动', value: 192}
+                {name: '*****活动', value: 381}
             ]
 
         }
@@ -48,7 +50,6 @@ export default {
             let y2Data = data.map(v => v.value).reverse()
             let max = 4166
             let maxData = new Array(data.length).fill(max)
-            console.log(maxData)
             let pointData = data.reverse().map((v, i) => {
                 return {
                     xAxis: v.value,
@@ -100,6 +101,10 @@ export default {
                     ]
                 }
             }
+        },
+        // 查看更多的点击事件
+        getMore () {
+            console.log(123)
         }
     }
 
@@ -112,11 +117,13 @@ export default {
             width: 100%;
             height: 140px;
             .activity-one{
+                height: 20px;
                 display: flex;
                 justify-content: space-between;
                 .act{
                     width: 72px;
-                    height: 19px;
+                    height: 20px;
+                    margin-top: -5px;
                     font-size: 18px;
                     font-family: Microsoft YaHei;
                     font-weight: 400;
@@ -124,34 +131,40 @@ export default {
                     line-height: 28px;
                 }
                 .mor{
-                    width: 100px;
-                    height: 17px;
-                    display: flex;
-                    span:nth-child(1){
-                        width: 65px;
-                        height: 17px;
-                        margin-top: 2px;
+                    width: 94px;
+                    height: 20px;
+                    cursor: pointer;
                     font-size: 16px;
                     font-family: Microsoft YaHei;
                     font-weight: 400;
-                        color: #18D1C6;
-                        line-height: 24px;
-                    }
-                    span:nth-child(2){
-                        display: inline-block;
-                        width: 28px;
-                        height: 24px;
-                        // margin-top: 5px!important;
-                     background:url('../../../static/images/index/查看更多.png') no-repeat;
-                    }
-                   
+                    color: #18d1c6;
+                    background:url('../../../static/images/index/more.png') no-repeat right;
                 }
             }
             .activity-two{
                 margin-top: 12px;
                 display: flex;
+                justify-content: space-between;
                 .left{
                     margin-top:10px;
+                    width: 150px;
+                    .act-left{
+                        display: flex;
+                        .act-style{
+                            width: 150px;
+                        }
+                        span{
+                            width: 16px;
+                            height: 17px;
+                            margin-top: 22px;
+                            margin-left: 12px;
+                            font-size: 16px;
+                            font-family: Microsoft YaHei;
+                            font-weight: 400;
+                            color: #FFFFFF;
+                            line-height: 35px;
+                        }
+                    }
                     .act-num{
                         width: 108px;
                         height: 18px;
@@ -166,11 +179,11 @@ export default {
                 .line{
                     width: 3px;
                     height: 76px;
-                    margin: 10px 10px 0 10px;
+                    margin: 10px 0 0 20px;
                     background:url('../../../static/images/index/3.png');
                 }
                 .right{
-                    width: 300px;
+                    width: 270px;
                     height: 100%;
                 }
             }