add:

1.注册
2.登录

@@ -164,10 +164,10 @@ onMounted(() => {
   if (useUserStore().user) {
   if (useUserStore().user) {
     isLogin.value = true
     isLogin.value = true
   }
   }
-  if (window.location.href.indexOf('en') > -1) {
-    cache.local.set('language', 1)
-    // location.reload()
-  }
+  // if (window.location.href.indexOf('en') > -1) {
+  //   cache.local.set('language', 1)
+  //   // location.reload()
+  // }
   if (route.fullPath.indexOf('news') > -1) {
   if (route.fullPath.indexOf('news') > -1) {
     activeIndex.value = '/news'
     activeIndex.value = '/news'
   } else if (route.fullPath.indexOf('notice') > -1) {
   } else if (route.fullPath.indexOf('notice') > -1) {

@@ -17,7 +17,7 @@ import 'virtual:svg-icons-register'
 import SvgIcon from '@/components/SvgIcon'
 import SvgIcon from '@/components/SvgIcon'
 import elementIcons from '@/components/SvgIcon/svgicon'
 import elementIcons from '@/components/SvgIcon/svgicon'
 
 
-import './permissionPc' // permission control
+// import './permissionPc' // permission control
 import * as socket from './utils/sockets'
 import * as socket from './utils/sockets'
 
 
 import { useDict } from '@/utils/dict'
 import { useDict } from '@/utils/dict'
@@ -95,7 +95,6 @@ app.component('Editor', Editor)
 app.component('Draggable', draggable)
 app.component('Draggable', draggable)
 app.component('WePay', wePay)
 app.component('WePay', wePay)
 
 
-
 if (language == 0) {
 if (language == 0) {
   app.use(routerCn)
   app.use(routerCn)
   app.use(ElementPlus, {
   app.use(ElementPlus, {

-import router from './routerPc/index'
+import router from './routerPc/cn'
 import { ElMessage } from 'element-plus'
 import { ElMessage } from 'element-plus'
 import NProgress from 'nprogress'
 import NProgress from 'nprogress'
 import 'nprogress/nprogress.css'
 import 'nprogress/nprogress.css'
@@ -10,7 +10,7 @@ NProgress.configure({ showSpinner: false })
 
 
 router.beforeEach((to, from, next) => {
 router.beforeEach((to, from, next) => {
   NProgress.start()
   NProgress.start()
-  // debugger
+  debugger
   if (getToken()) {
   if (getToken()) {
     // 判断当前用户是否已拉取完user_info信息
     // 判断当前用户是否已拉取完user_info信息
     if (!useUserStore().user) {
     if (!useUserStore().user) {

@@ -6,6 +6,11 @@ import {
 /* Layout */
 /* Layout */
 import Layout from '@/layoutPc'
 import Layout from '@/layoutPc'
 import Empty from '@/layoutPc/empty'
 import Empty from '@/layoutPc/empty'
+import NProgress from "nprogress";
+import {getToken} from "@/utils/auth";
+import useUserStore from "@/store/modules/user";
+import {isRelogin} from "@/utils/request";
+import {ElMessage} from "element-plus";
 // import useUserStore from '@/store/modules/user'
 // import useUserStore from '@/store/modules/user'
 
 
 /**
 /**
@@ -517,4 +522,34 @@ const router = createRouter({
   }
   }
 })
 })
 
 
+NProgress.configure({ showSpinner: false })
+
+router.beforeEach((to, from, next) => {
+  NProgress.start()
+  if (getToken()) {
+    // 判断当前用户是否已拉取完user_info信息
+    if (!useUserStore().user) {
+      isRelogin.show = true
+      useUserStore().getInfo().then(() => {
+        isRelogin.show = false
+        next() // hack方法 确保addRoutes已完成
+      }).catch(err => {
+        useUserStore().logOut().then(() => {
+          ElMessage.error(err)
+          next({ path: '/' })
+        })
+      })
+    } else {
+      next()
+    }
+  } else {
+    // 没有token
+    next()
+  }
+})
+
+router.afterEach((to) => {
+  NProgress.done()
+})
+
 export default router
 export default router

@@ -103,9 +103,14 @@
               @keyup.enter="handleLogin"
               @keyup.enter="handleLogin"
           >
           >
             <template #append>
             <template #append>
-              <span class="text-primary" @click="sendsmsMsg">
+              <el-button type="primary" plain style="width: 110px" @click="sendsmsMsg">
+                <count-down v-if="counting" v-slot="{ totalSeconds }" :time="60000" @end="counting=false">
+                  {{ totalSeconds }} 秒
+                </count-down>
+                <span v-else>
                   发送验证码
                   发送验证码
                 </span>
                 </span>
+              </el-button>
             </template>
             </template>
           </el-input>
           </el-input>
           <div class="vcodeBox" :style="isShow?'height:240px':'height:0'">
           <div class="vcodeBox" :style="isShow?'height:240px':'height:0'">
@@ -152,6 +157,8 @@
 </template>
 </template>
 
 
 <script setup>
 <script setup>
+import Vcode from "vue3-puzzle-vcode"
+import CountDown from '@chenfengyuan/vue-countdown'
 import { getCodeImg } from '@/api/login'
 import { getCodeImg } from '@/api/login'
 import * as match from '@/apiPc/match'
 import * as match from '@/apiPc/match'
 import Cookies from 'js-cookie'
 import Cookies from 'js-cookie'
@@ -411,4 +418,11 @@ function sendsmsMsg() {
   }
   }
   &:hover{color: #fff;}
   &:hover{color: #fff;}
 }
 }
+.el-input-group__append{ flex: 1 1 auto;}
+.el-input-group__append button.el-button, .el-input-group__append button.el-button:hover{
+  color: var(--el-color-primary);
+  background: #efefff;
+  border: var(--el-color-primary) solid 1px;
+  border-radius: 0;
+}
 </style>
 </style>

@@ -32,8 +32,7 @@
 </template>
 </template>
 
 
 <script setup>
 <script setup>
-import {reactive} from "@vue/runtime-core";
-import {toRefs} from "@vueuse/shared/index";
+import {reactive,toRefs} from 'vue'
 import Vcode from "vue3-puzzle-vcode"
 import Vcode from "vue3-puzzle-vcode"
 import { ElMessage } from 'element-plus'
 import { ElMessage } from 'element-plus'
 import CountDown from '@chenfengyuan/vue-countdown'
 import CountDown from '@chenfengyuan/vue-countdown'

@@ -2,7 +2,7 @@
   <el-card>
   <el-card>
       <div class="border-info text-center">
       <div class="border-info text-center">
 
 
-        <label>登录账号</label> 321
+        <label>登录账号</label> {{ accont }}
 
 
       </div>
       </div>
     <div class="leftboderTT">登录密码 <span>(登录时需要验证，保护账户信息)</span></div>
     <div class="leftboderTT">登录密码 <span>(登录时需要验证，保护账户信息)</span></div>
@@ -80,11 +80,13 @@ import {setToken} from "@/utils/auth";
 const { proxy } = getCurrentInstance()
 const { proxy } = getCurrentInstance()
 const emit = defineEmits(['submit','prev'])
 const emit = defineEmits(['submit','prev'])
 const props = defineProps({
 const props = defineProps({
-
+  accont:{
+    type:String,
+    required:true
+  }
 })
 })
 const data = reactive({
 const data = reactive({
   form: {
   form: {
-    username:'eryewawa@163.com'
   },
   },
   loading:false,
   loading:false,
   countryList: [],
   countryList: [],

@@ -10,14 +10,10 @@
         <el-step title="注册完成" />
         <el-step title="注册完成" />
       </el-steps>
       </el-steps>
     </el-card>
     </el-card>
-
   <div class="mt20"></div>
   <div class="mt20"></div>
     <Step1 v-if="activeStep==0" @submit="toStep2" @userName="getUserName" />
     <Step1 v-if="activeStep==0" @submit="toStep2" @userName="getUserName" />
-    <Step2 v-if="activeStep==1" @submit="toStep3" @prev="toStep1"/>
+    <Step2 v-if="activeStep==1" @submit="toStep3" @prev="toStep1" :accont="form.userName"/>
     <Step3 v-if="activeStep==2"/>
     <Step3 v-if="activeStep==2"/>
-
-
-
   </div>
   </div>
   </div>
   </div>
   </div>
   </div>
@@ -34,7 +30,9 @@ const data = reactive({
   isShow:false,
   isShow:false,
   isCodeTrue:false,
   isCodeTrue:false,
   counting:false,
   counting:false,
-  form:{},
+  form:{
+    userName:'1111'
+  },
   activeStep: 0
   activeStep: 0
 })
 })
 const {isShow,isCodeTrue,counting,form,activeStep} = toRefs(data)
 const {isShow,isCodeTrue,counting,form,activeStep} = toRefs(data)