fix: 修复iot账号无法登录可视化

config/config.ts

@@ -6,7 +6,7 @@ export default {
   title: 'Jetlinks', // 浏览器标签页title
   layout: {
     title: '物联网平台', // 平台title
-    logo: '/icons/icon-192x192.png', // 平台logo
+    logo: '/logo.png', // 平台logo
     siderWidth: 208, // 左侧菜单栏宽度
     headerHeight: 48, // 头部高度
     collapsedWidth: 48,

src/router/index.ts

@@ -20,7 +20,6 @@ const noTokenPath = [ AccountCenterBindPath, OauthPath ]
 router.beforeEach((to, from, next) => {
   // TODO 切换路由取消请求
   const token = getToken()
-  console.log(to.path, noTokenPath.includes(to.path))
   if (noTokenPath.includes(to.path)) {
     next()
   } else if (token) {

src/views/oauth/index.vue

@@ -14,9 +14,10 @@
                   <div class='oauth-content-header'>
                     <img :src='headerImg' />
                   </div>
+                  <h2>授权登录</h2>
                   <div class='oauth-content-content'>
                     <div class='oauth-content-content-text'>
-                      您正在授权登录,{{ appName }}将获得以下权限:
+                      您正在授权登录, {{ appName }} 将获得以下权限:
                     </div>
                     <ul>
                       <li>关联{{userName}}账号</li>
@@ -32,15 +33,16 @@
                   <div class='oauth-content-header'>
                     <img :src='headerImg' />
                   </div>
+                  <h2>授权登录</h2>
                   <div class='oauth-content-login'>
-                    <j-form layout='horizontal' size='large' :model='formModel' >
+                    <j-form layout='vertical' :model='formModel' ref='formRef' >
-                      <j-form-item name='username'>
+                      <j-form-item label='用户名' name='username' required :rules='[{ required: true, message: "请输入用户名"}]'>
                         <j-input placeholder='用户名' v-model:value='formModel.username' />
                       </j-form-item>
-                      <j-form-item name='password'>
+                      <j-form-item label='密码' name='password' required :rules='[{ required: true, message: "请输入密码"}]'>
                         <j-input-password placeholder='密码' v-model:value='formModel.password' />
                       </j-form-item>
-                      <j-form-item name='verifyCode' v-if='captcha.base64'>
+                      <j-form-item name='verifyCode' v-if='captcha.base64' required :rules='[{ required: true, message: "请输入验证码"}]'>
                         <j-input placeholder='请输入验证码' v-model:value='formModel.verifyCode' >
                           <template #addonAfter>
                             <img
@@ -72,9 +74,10 @@
 
 <script setup lang='ts' name='Oauth'>
 import { TOKEN_KEY } from '@/utils/variable'
-import { config, code, getOAuth2, initApplication, authLogin } from '@/api/login'
+import { config, code, getOAuth2, initApplication, authLogin, settingDetail } from '@/api/login'
 import { getMe_api } from '@/api/home'
 import { getImage, getToken } from '@/utils/comm'
+import Config from '../../../config/config'
 
 const spinning = ref(true)
 const isLogin = ref(false)
@@ -85,6 +88,9 @@ const userName = ref('-')
 const internal = ref('false')
 const params = ref()
 
+document.title = `OAuth授权-${Config.title}`;
+headerImg.value = getImage(Config.layout.logo)
+
 type LoginParam = {
   username: string;
   password: string;
@@ -104,6 +110,8 @@ const captcha = reactive<{base64?: string, key?: string }>({
   key: undefined
 })
 
+const formRef = ref()
+
 const getApplication = async (clientId: string) => {
   const res = await initApplication(clientId)
   if (res.success && res.result) {
@@ -141,7 +149,6 @@ const changeAccount = () => {
 }
 
 const getLoginUser = async (data?: any) => {
-  console.log(getToken())
   if (getToken()) { // 未登录
     const res = await getMe_api()
     if (res.success) {
@@ -182,19 +189,21 @@ const getQueryVariable = (variable: any) => {
   return '';
 }
 
-const doLogin = async () => {
+const doLogin = () => {
-  const res = await authLogin({
+  formRef.value.validate().then( async data => {
-    verifyKey: captcha.key,
+    const res = await authLogin({
-    ...formModel
+      verifyKey: captcha.key,
+      ...formModel
+    })
+    if (res.success) {
+      const token = res.result.token
+      localStorage.setItem(TOKEN_KEY, token)
+      getLoginUser()
+      // goOAuth2Fn()
+    } else {
+      getCode()
+    }
   })
-  if (res.success) {
-    const token = res.result.token
-    localStorage.setItem(TOKEN_KEY, token)
-    getLoginUser()
-    goOAuth2Fn()
-  } else {
-    getCode()
-  }
 }
 
 const initPage = async () => {
@@ -213,7 +222,6 @@ const initPage = async () => {
     const url = `${origin.join('/')}${items.redirect_uri?.split('redirect=')[1]}`
     // redirectUrl = `${items.redirect_uri?.split('redirect_uri=')[0]}?redirect=${url}`
     redirectUrl = items.redirect_uri
-    console.log(origin, items.redirect_uri)
   }
   // 获取用户信息
   getLoginUser({
@@ -229,9 +237,22 @@ const initPage = async () => {
   }
 }
 
-document.title = 'OAuth授权-jetlinks';
+const getSettingDetail = () => {
-headerImg.value = getImage('/logo.png')
+  settingDetail('front').then((res: any) => {
+    if (res.status === 200) {
+      const ico: any = document.querySelector('link[rel="icon"]');
+      ico.href = res.result.ico;
+      headerImg.value = res.result.logo
+      if (res.result.title) {
+        document.title = `OAuth授权-${res.result.title}`;
+      } else {
+        document.title = 'OAuth授权';
+      }
+    }
+  });
+}
 
+getSettingDetail()
 getCode()
 initPage()
 
@@ -320,7 +341,8 @@ initPage()
       gap: 24px;
     }
     .oauth-content-login {
-      max-width: 300px;
+      width: 100%;
+      padding: 0 24px;
     }
   }
 }