Przeglądaj źródła

集团邀请分支,没有企业注册与登录切换

lifanagju_citu 11 miesięcy temu
rodzic
commit
070e8dc0b1

+ 1 - 1
src/layout/personal/navBar.vue

@@ -28,7 +28,7 @@
         
         <div class="d-flex user-nav">
           <div class="btns d-flex align-center" v-if="!getToken()">
-            <v-btn class="half-button" border color="primary" size="small" @click="handleLogin">{{ $t('login.register') }}</v-btn>
+            <v-btn class="half-button" border color="primary" size="small" @click="handleLogin">{{ $t('login.loginOrRegister') }}</v-btn>
           </div>
           
           <!-- 头像用户名 -->

+ 2 - 1
src/locales/en.js

@@ -87,7 +87,8 @@ export default {
     password: 'Password',
     login: 'Sign in',
     reLogin: 'Sign in again',
-    register: 'Sign in or Register',
+    loginOrRegister: 'Sign in or Register',
+    register: 'Register',
     checkPassword: 'Confirm password',
     mobileNumber: 'Mobile Number',
     mobileNumberPlaceholder: 'Please Enter Mobile Number',

+ 2 - 1
src/locales/zh-CN.js

@@ -87,7 +87,8 @@ export default {
     password: '密码',
     login: '登录',
     reLogin: '重新登录',
-    register: '登录/注册',
+    loginOrRegister: '登录/注册',
+    register: '注册',
     checkPassword: '确认密码',
     mobileNumber: '手机号码',
     mobileNumberPlaceholder: '请输入手机号码',

+ 1 - 1
src/views/login/index.vue

@@ -61,7 +61,7 @@
           <qr-code></qr-code>
         </div>
         <v-btn v-if="!isPhone" :loading="loginLoading" color="primary" class="white--text mt-5" min-width="350" @click="handleLogin">
-          {{ tab === 1 ? $t('login.register') : $t('login.login') }}
+          {{ tab === 1 ? $t('login.loginOrRegister') : $t('login.login') }}
         </v-btn>
         <div class="login-tips mt-3">
           {{ $t('login.agreeLogin') }}

+ 23 - 8
src/views/recruit/enterprise/systemManagement/groupAccount/inviteConfirmEnt.vue

@@ -25,16 +25,24 @@
           <div v-show="!showCompanySelect">
             <phoneFrom ref="phoneRef" @handleEnter="handleClick()" :style="{'width': isMobile ? '100%' : '350px' }"></phoneFrom>
             <v-btn :loading="loginLoading" color="warning" class="white--text mt-3" min-width="350" @click="handleConfirmJoin" :style="{'width': isMobile ? '100%' : '350px' }">
-              {{ $t('common.confirmJoin') }}
+              {{ quickRegister ? $t('login.register') : $t('common.confirmJoin') }}
             </v-btn>
             <div class="mt-3" style="font-size: 13px;text-align: center;">
               <div>注:请使用已经申请好的企业账户加入集团</div>
-              <!-- <div
-                style="color: red; cursor: pointer;"
-                @click="handleRegister"
-              >
-                没有企业账号?去注册
-              </div> -->
+              <div style="color: red; cursor: pointer;">
+                <span
+                  v-if="quickRegister"
+                  @click="quickRegister = false"
+                >
+                  已有企业账号,去登录
+                </span>
+                <span
+                  v-else
+                  @click="handleRegister"
+                >
+                  没有企业账号?去注册
+                </span>
+              </div>
             </div>
           </div>
         </template>
@@ -82,7 +90,9 @@ const handleConfirmJoin = async () => {
     setToken(res.accessToken)
     setRefreshToken(res.refreshToken)
     localStorage.setItem('loginType', 'personal') // 不存在时刷新会出现重定向
-    getEnterpriseList()
+    quickRegister.value ? getApplyInfo() : getEnterpriseList()
+    // if (quickRegister.value) getApplyInfo()
+    // else getEnterpriseList()
   } catch (error) {
     Snackbar.error('查询用户数据失败')
   } finally {
@@ -146,6 +156,11 @@ const join = async (enterpriseId) => {
   }
 }
 
+const quickRegister = ref(false)
+const handleRegister = () => {
+  quickRegister.value = true
+}
+
 const logoutFun = async () => {
   if (!getToken()) {
     localStorage.clear()

+ 1 - 1
src/views/recruit/personal/shareJob/components/login.vue

@@ -11,7 +11,7 @@
     <div class="my-5">
       <phoneFrom ref="phoneRef" @handleEnter="handleLogin"></phoneFrom>
       <v-btn :loading="loginLoading" color="primary" class="white--text mt-5" min-width="350" @click="handleLogin">
-        {{ $t('login.register') }}
+        {{ $t('login.loginOrRegister') }}
       </v-btn>
     </div>
   </CtDialog>