去小程序页面取消改为弹框

src/components/FollowDialog.vue

@@ -3,9 +3,12 @@
     <div class="follow_img" v-if="isKefu==1">
       <img src="https://cos-minigame.wxatech.com/common/study_contact_kefu.jpg" alt="">
     </div>
-    <div class="follow_img" v-else>
+    <div class="follow_img" v-else-if="isKefu==2">
       <img src="https://cos-minigame.wxatech.com/common/walk_daka_account_1.jpg" alt="">
     </div>
+    <div class="follow_img" v-else-if="isKefu==3">
+      <img src="../images/common/go_xcx.jpg">
+    </div>
     <div class="close_btn" @click="closeDialog">
       <img src="../assets/ic_close3.png" alt="">
     </div>

src/router.js

@@ -99,11 +99,11 @@ export default new Router({
       name: 'HaveJoinedGame',
       component: HaveJoinedGame
     },
-    {
-      path: '/GoXCX',
-      name: 'GoXCX',
-      component: GoXCX
-    },
+    // {
+    //   path: '/GoXCX',
+    //   name: 'GoXCX',
+    //   component: GoXCX
+    // },
     {
       path: '/MainPage',
       name: 'MainPage',

src/views/HaveJoinedGame.vue

@@ -58,7 +58,7 @@
       <div class="swiper-pagination" slot="pagination" style="opacity: 0"></div>
     </swiper>
     <div class="func-btn green-btn" @click="inviteFriend" v-if="record_list.length&&record_list[0].status === 0">邀请好友来参赛</div>
-    <div class="func-btn" @click="goOtherPage('GoXCX')" v-else>提交今日步数</div>
+    <div class="func-btn" @click="changeXcxPopup()" v-else>提交今日步数</div>
     <div class="next-func-btn" :style="next_period?'background: #5f95e7;':''" v-if="next_signup" @click="joinNextGame()">{{next_period?`已报名${String(next_period).slice(4,8)}期`:'报名下一期'}}</div>
     <!-- 报名成功弹框 -->
     <div class="game-status-popup" v-if="userHavePaidGame">
@@ -111,6 +111,13 @@
         <img class="close-btn" src="../images/common/pop_ic_close.png" @click="closePopup()">
       </div>
     </div>
+    <!-- 提交步数去小程序弹框 -->
+    <div class="go-xcx-popup" v-if="showXcxPopup">
+      <div class="go-xcx-container">
+        <img class="main-img" src="../images/common/go_xcx.jpg">
+        <img class="close-btn" src="../images/common/pop_ic_close.png" @click="changeXcxPopup()">
+      </div>
+    </div>
     <ShareModal v-on:close="closeShareModal" v-if="showShareModal"></ShareModal>
   </div>
 </template>
@@ -162,7 +169,8 @@ export default {
       current_day: 0,
       userHavePaidGame: false,
       showShareModal: false,
-      userData: null
+      userData: null,
+      showXcxPopup: false
     };
   },
   created() {
@@ -196,6 +204,9 @@ export default {
     }
   },
   methods: {
+    changeXcxPopup() {
+      this.showXcxPopup = !this.showXcxPopup;
+    },
     joinNextGame() {
       if (this.next_period) {
         this.$router.push({
@@ -802,4 +813,32 @@ export default {
     }
   }
 }
+
+.go-xcx-popup {
+  position: fixed;
+  left: 0;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  z-index: 998;
+  background: rgba(0, 0, 0, 0.5);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  .go-xcx-container {
+    position: relative;
+    .main-img {
+      width: 6.4rem;
+      height: 8rem;
+      display: block;
+    }
+    .close-btn {
+      width: 0.58rem;
+      height: 0.58rem;
+      position: absolute;
+      top: -0.88rem;
+      right: 0;
+    }
+  }
+}
 </style>

src/views/SignUp.vue

@@ -12,7 +12,7 @@
       <div class="card-title">{{item.action}}期耐力赛</div>
       <div class="card-time">{{item.already_join===1?'已参赛':'未参赛'}} {{item.period_start}} - {{item.period_end}}</div>
       <div class="card-info">
-        <div class="info-item" v-if="item.status===0||item.status===2">
+        <div class="info-item" v-if="(item.status===0||item.status===2)&&item.people_cnt">
           <div class="item-title">达标人数</div>
           <div class="item-content">{{item.people_cnt || 0}}</div>
         </div>

src/views/UserCenter.vue

@@ -107,7 +107,7 @@
           {
             icon: require("../images/UserCenter/ic_my_daka.png"),
             text: "提交今日步数",
-            router: "GoXCX"
+            isKefu: 3
           },
         ]
       }