panhui 3 年之前
父节点
当前提交
84a10b5c29
共有 3 个文件被更改,包括 15 次插入12 次删除
  1. 0 2
      src/components/room/joinGame.vue
  2. 5 1
      src/views/Room.vue
  3. 10 9
      src/views/account/Setting.vue

+ 0 - 2
src/components/room/joinGame.vue

@@ -2,9 +2,7 @@
     <van-dialog
         v-model:show="show"
         theme="round-button"
-        show-cancel-button
         confirm-button-text="直接进入"
-        cancel-button-text="分享进入"
         @confirm="confirm"
         @cancel="cancel"
     >

+ 5 - 1
src/views/Room.vue

@@ -112,7 +112,7 @@
         <div class="bottom" v-if="isJoin">
             <div class="join-btn" v-if="isFull && (info.status == 'WAITING' || info.status == 'GAMING')">
                 <van-button type="primary" v-if="info.status == 'WAITING'" block @click="start">开始比赛</van-button>
-                <van-button type="primary" v-else-if="info.status == 'GAMING'" block @click="$refs.joinGame.init()"
+                <van-button type="primary" v-else-if="info.status == 'GAMING'" block @click="goGame"
                     >进入比赛</van-button
                 >
             </div>
@@ -320,6 +320,10 @@ export default {
                         this.$toast(e.error);
                     }
                 });
+        },
+        goGame() {
+            window.location.href = this.info.url;
+            // this.$refs.joinGame.init()
         }
     },
     beforeRouteLeave(to, from, next) {

+ 10 - 9
src/views/account/Setting.vue

@@ -112,15 +112,16 @@ export default {
             window.location.href = 'https://test.raex.vip/9th/home';
         },
         goAuth() {
-            if (this.authStatus === '认证中' || this.authStatus === '认证失败') {
-                this.$router.push('/waiting');
-            } else if (this.authStatus === '未认证') {
-                if (this.faceAuth) {
-                    this.$router.push('/faceAuth');
-                } else {
-                    this.$router.push('/verified');
-                }
-            }
+            this.$router.push('/faceAuth');
+            // if (this.authStatus === '认证中' || this.authStatus === '认证失败') {
+            //     this.$router.push('/waiting');
+            // } else if (this.authStatus === '未认证') {
+            //     if (this.faceAuth) {
+            //         this.$router.push('/faceAuth');
+            //     } else {
+            //         this.$router.push('/verified');
+            //     }
+            // }
         }
     }
 };