Merge remote-tracking branch 'origin/master'

src/views/integralpage/guessranking.vue

@@ -188,12 +188,13 @@
             }
         }
         .l_n3 {
-            margin-bottom: 30px;
+            margin: 0 0 30px 80px;
             text-align: center;
             li {
                 display: inline-block;
-                margin: 0 47px;
+                /*margin: 0 47px;*/
                 text-align: center;
+                width: 33%;
                 .p_img {
                     height: 200px;
                     margin-bottom: 20px;

src/views/integralpage/integralguesslist.vue

@@ -10,7 +10,7 @@
                         <el-tabs class="content_tab" v-model="activeName" @tab-click="handleClick">
                             <el-tab-pane v-for="(item,index) in groupalllist" :key="index"  :label="item.typeName" :name="item.id+''"></el-tab-pane>
                         </el-tabs>
-                        <p @click="$router.push({path:'/guessranking'})" style="position: absolute;right: 10px;top: 10px;color: #69697A;font-size: 16px;cursor: pointer;">
+                        <p @click="$router.push({path:'/guessRank'})" style="position: absolute;right: 10px;top: 10px;color: #69697A;font-size: 16px;cursor: pointer;">
                             <i style="color: #69697A;font-size: 16px;" class="iconfont icon-paihangbang"></i>
                             竞猜排行
                         </p>