no message

2025-11-25 10:50:52 +08:00
parent e6e86f2ce0
commit 93ecebcb2e
5 changed files with 63 additions and 103 deletions
--- a/.env.dev
+++ b/.env.dev
@@ -4,7 +4,7 @@ VITE_NODE_ENV=development
 VITE_DEV=true

 # 请求路径 注：/api 正常不需要 当前是访问演示环境nginx转发用
-VITE_BASE_URL='https://demo.jeelowcode.com/api'
+VITE_BASE_URL='http://10.28.117.100'

 # 文件上传类型：server - 后端上传， client - 前端直连上传，仅支持S3服务
 VITE_UPLOAD_TYPE=server
--- a/src/components/Verifition/src/Verify/VerifyPoints.vue
+++ b/src/components/Verifition/src/Verify/VerifyPoints.vue
@@ -171,7 +171,7 @@ const canvasClick = (e) => {
        token: backToken.value
      }
      reqCheck(data).then((res) => {
-        if (res.repCode == '0000') {
+        if (res?.repCode == '0000') {
          barAreaColor.value = '#4cae4c'
          barAreaBorderColor.value = '#5cb85c'
          text.value = t('captcha.success')
@@ -228,14 +228,14 @@ const getPictrue = async () => {
    captchaType: captchaType.value
  }
  const res = await getCode(data)
-  if (res.repCode == '0000') {
-    pointBackImgBase.value = res.repData.originalImageBase64
-    backToken.value = res.repData.token
-    secretKey.value = res.repData.secretKey
-    poinTextList.value = res.repData.wordList
-    text.value = t('captcha.point') + '【' + poinTextList.value.join(',') + '】'
+  if (res?.repCode == '0000') {
+    pointBackImgBase.value = res?.repData?.originalImageBase64
+    backToken.value = res?.repData?.token
+    secretKey.value = res?.repData?.secretKey
+    poinTextList.value = res?.repData?.wordList || []
+    text.value = t('captcha.point') + '【' + poinTextList.value?.join(',') + '】'
  } else {
-    text.value = res.repMsg
+    text.value = res?.repMsg
  }
 }
 //坐标转换函数
--- a/src/components/Verifition/src/Verify/VerifySlide.vue
+++ b/src/components/Verifition/src/Verify/VerifySlide.vue
@@ -287,7 +287,7 @@ const end = () => {
      token: backToken.value
    }
    reqCheck(data).then((res) => {
-      if (res.repCode == '0000') {
+      if (res?.repCode == '0000') {
        moveBlockBackgroundColor.value = '#5cb85c'
        leftBarBorderColor.value = '#5cb85c'
        iconColor.value = '#fff'
@@ -364,13 +364,13 @@ const getPictrue = async () => {
    captchaType: captchaType.value
  }
  const res = await getCode(data)
-  if (res.repCode == '0000') {
-    backImgBase.value = res.repData.originalImageBase64
-    blockBackImgBase.value = res.repData.jigsawImageBase64
-    backToken.value = res.repData.token
-    secretKey.value = res.repData.secretKey
+  if (res?.repCode == '0000') {
+    backImgBase.value = res?.repData?.originalImageBase64
+    blockBackImgBase.value = res?.repData?.jigsawImageBase64
+    backToken.value = res?.repData?.token
+    secretKey.value = res?.repData?.secretKey
  } else {
-    tipWords.value = res.repMsg
+    tipWords.value = res?.repMsg
  }
 }
 </script>
--- a/src/views/Login/components/LoginForm.vue
+++ b/src/views/Login/components/LoginForm.vue
@@ -1,14 +1,6 @@
 <template>
-  <el-form
-    v-show="getShow"
-    ref="formLogin"
-    :model="loginData.loginForm"
-    :rules="LoginRules"
-    class="login-form login-form-default"
-    label-position="top"
-    label-width="120px"
-    size="large"
-  >
+  <el-form v-show="getShow" ref="formLogin" :model="loginData.loginForm" :rules="LoginRules"
+    class="login-form login-form-default" label-position="top" label-width="120px" size="large">
    <el-row style="margin-right: -10px; margin-left: -10px">
      <el-col :span="24" style="padding-right: 10px; padding-left: 10px">
        <el-form-item>
@@ -17,40 +9,23 @@
      </el-col>
      <el-col :span="24" style="padding-right: 10px; padding-left: 10px">
        <el-form-item v-if="loginData.tenantEnable === 'true'" prop="tenantName">
-          <el-input
-            v-model="loginData.loginForm.tenantName"
-            :placeholder="t('login.tenantNamePlaceholder')"
-            :prefix-icon="iconHouse"
-            link
-            type="primary"
-          />
+          <el-input v-model="loginData.loginForm.tenantName" :placeholder="t('login.tenantNamePlaceholder')"
+            :prefix-icon="iconHouse" link type="primary" />
        </el-form-item>
      </el-col>
      <el-col :span="24" style="padding-right: 10px; padding-left: 10px">
        <el-form-item prop="username">
-          <el-input
-            v-model="loginData.loginForm.username"
-            :placeholder="t('login.usernamePlaceholder')"
-            :prefix-icon="iconAvatar"
-          />
+          <el-input v-model="loginData.loginForm.username" :placeholder="t('login.usernamePlaceholder')"
+            :prefix-icon="iconAvatar" />
        </el-form-item>
      </el-col>
      <el-col :span="24" style="padding-right: 10px; padding-left: 10px">
        <el-form-item prop="password">
-          <el-input
-            v-model="loginData.loginForm.password"
-            :placeholder="t('login.passwordPlaceholder')"
-            :prefix-icon="iconLock"
-            show-password
-            type="password"
-            @keyup.enter="getCode()"
-          />
+          <el-input v-model="loginData.loginForm.password" :placeholder="t('login.passwordPlaceholder')"
+            :prefix-icon="iconLock" show-password type="password" @keyup.enter="getCode()" />
        </el-form-item>
      </el-col>
-      <el-col
-        :span="24"
-        style="padding-right: 10px; padding-left: 10px; margin-top: -20px; margin-bottom: -20px"
-      >
+      <el-col :span="24" style="padding-right: 10px; padding-left: 10px; margin-top: -20px; margin-bottom: -20px">
        <el-form-item>
          <el-row justify="space-between" style="width: 100%">
            <el-col :span="6">
@@ -66,13 +41,8 @@
      </el-col>
      <el-col :span="24" style="padding-right: 10px; padding-left: 10px" class="login-btn-col">
        <el-form-item>
-          <XButton
-            :loading="loginLoading"
-            :title="t('login.login')"
-            class="w-[100%]"
-            type="primary"
-            @click="getCode()"
-          />
+          <XButton :loading="loginLoading" :title="t('login.login')" class="w-[100%]" type="primary"
+            @click="getCode()" />
          <div v-if="loginType == 'easy'" class="w-100% mt-6px flex justify-end">
            <el-dropdown @command="easyCommand">
              <div class="mt--2px cursor-pointer">
@@ -95,13 +65,8 @@
          </div>
        </el-form-item>
      </el-col>
-      <Verify
-        ref="verify"
-        :captchaType="captchaType"
-        :imgSize="{ width: '400px', height: '200px' }"
-        mode="pop"
-        @success="handleLogin"
-      />
+      <Verify ref="verify" :captchaType="captchaType" :imgSize="{ width: '400px', height: '200px' }" mode="pop"
+        @success="handleLogin" />
      <template v-if="!loginType">
        <el-col :span="24" style="padding-right: 10px; padding-left: 10px">
          <!-- <el-form-item>
@@ -127,15 +92,8 @@
        <el-col :span="24" style="padding-right: 10px; padding-left: 10px">
          <el-form-item>
            <div class="w-[100%] flex justify-center">
-              <Icon
-                v-for="(item, key) in socialList"
-                :key="key"
-                :icon="item.icon"
-                :size="50"
-                class="anticon cursor-pointer"
-                color="#999"
-                @click="doSocialLogin(item.type)"
-              />
+              <Icon v-for="(item, key) in socialList" :key="key" :icon="item.icon" :size="50"
+                class="anticon cursor-pointer" color="#999" @click="doSocialLogin(item.type)" />
            </div>
          </el-form-item>
        </el-col>
@@ -269,11 +227,13 @@ const getCookie = () => {
 // 根据域名，获得租户信息
 const getTenantByWebsite = async () => {
  const website = location.host
+  try {
    const res = await LoginApi.getTenantByWebsite(website)
    if (res) {
      loginData.loginForm.tenantName = res.name
      authUtil.setTenantId(res.id)
    }
+  } catch (e) { }
 }
 const loading = ref() // ElLoading.service 返回的实例
 // 登录
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -32,7 +32,7 @@ export default ({ command, mode }: ConfigEnv): UserConfig => {
      // 本地跨域代理. 目前注释的原因：暂时没有用途，server 端已经支持跨域
      proxy: {
        ['/admin-api']: {
-          target: env.VITE_BASE_URL,
+          target: 'http://10.28.117.100:48080',
          ws: false,
          changeOrigin: true,
          rewrite: (path) => path.replace(new RegExp(`^/admin-api`), ''),