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

src/views/MainPage.vue

@@ -6,7 +6,7 @@
         <div :class="['text', currentPage()==='SignUp'?'active':'']">健步挑战赛</div>
       </div>
       <div class="bottom-tab" @click="selectTab('nowGame')">
-        <div :class="['text', (currentPage()==='MainPagePartakeChallenge'||currentPage()==='MainPageHaveJoinedGame')?'active':'']">当前比赛</div>
+        <div :class="['text', (currentPage()==='MainPagePartakeChallenge'||currentPage()==='MainPageHaveJoinedGame')?'active':'']">{{index1Name}}</div>
       </div>
       <div class="bottom-tab" @click="selectTab('UserCenter')">
         <div :class="['text', currentPage()==='UserCenter'?'active':'']">我的</div>
@@ -40,6 +40,16 @@
         return this.$router.history.current.name;
       }
     },
+    computed: {
+      index1Name() {
+        const userHaveJoinGame = sessionStorage.getItem('userHaveJoinGame');
+        if (userHaveJoinGame === 'true') {
+          return '我的比赛';
+        } else {
+          return '当前比赛';
+        }
+      }
+    }
   }
 </script>