Merge remote-tracking branch 'remotes/origin/mutou' into dev_yijun

src/views/MainPage.vue

 <template>
   <div class="main-page">
-    <router-view class="main-page-child"/>
+    <router-view/>
     <div class="bottom-bar">
       <div class="bottom-tab" @click="selectTab('SignUp')">
         <div :class="['text', currentPage()==='SignUp'?'active':'']">7天健步挑战赛</div>
@@ -48,9 +48,6 @@
     height: 100vh;
     padding-bottom: .9rem;
     box-sizing: border-box;
-    .main-page-child {
-      height: 100%;
-    }
     .bottom-bar {
       width: 100%;
       height: .9rem;

src/views/PartakeChallenge.vue

@@ -138,6 +138,7 @@
         line-height: 1;
         color: #333;
         margin-bottom: .24rem;
+        flex-shrink: 0;
         img {
           width: .26rem;
           height: .35rem;
@@ -149,6 +150,7 @@
         margin-top: .34rem;
         display: flex;
         align-items: flex-start;
+        flex-shrink: 0;
         &:last-of-type .section-content {
           border-bottom: none;
         }
@@ -175,6 +177,7 @@
         }
       }
       .game-introduce-join-container {
+        flex-shrink: 0;
         .auth-container {
           background: transparent;
           margin-top: .26rem;