diff --git a/src/utils/request.ts b/src/utils/request.ts index 1bb873bc..a74fb062 100644 --- a/src/utils/request.ts +++ b/src/utils/request.ts @@ -13,7 +13,7 @@ interface AxiosResponseRewrite extends AxiosResponse { export const SUCCESS_CODE = 200 // 成功代码 -const filterApiUrl = ['/system/version', '/system/config/front', '/authorize/captcha/config', '/application/sso/_all', '/authorize/captcha/image'] +const filterApiUrl = ['/system/version', '/system/config/front', '/authorize/captcha/config', '/application/sso/_all', '/authorize/captcha/image', '/application/sso/bind-code', '/authorize/login'] export const request = axios.create({ withCredentials: false, diff --git a/src/views/account/Center/bind/index.vue b/src/views/account/Center/bind/index.vue index c8737e8d..7ed4d059 100644 --- a/src/views/account/Center/bind/index.vue +++ b/src/views/account/Center/bind/index.vue @@ -1,378 +1,417 @@ - - + /> +

账号:{{ bindUser?.result?.userId || '-' }}

+

用户名:{{ bindUser?.result?.name || '-' }}

+ + +
+ 立即绑定 + +
+ + + + - - diff --git a/vite.config.ts b/vite.config.ts index 42794316..19fcc265 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -90,9 +90,9 @@ export default defineConfig(({ mode}) => { proxy: { [env.VITE_APP_BASE_API]: { - // target: 'http://192.168.32.226:8844', + target: 'http://192.168.32.226:8844', // target: 'http://192.168.32.244:8881', - target: 'http://120.77.179.54:8844', // 120测试 + // target: 'http://120.77.179.54:8844', // 120测试 // target: 'http://192.168.33.46:8844', // 本地开发环境 ws: 'ws://192.168.33.46:8844', changeOrigin: true, diff --git a/yarn.lock b/yarn.lock index f246aa3b..83423fab 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3700,8 +3700,8 @@ jetlinks-store@^0.0.3: jetlinks-ui-components@^1.0.5: version "1.0.5" - resolved "http://47.108.170.157:9013/jetlinks-ui-components/-/jetlinks-ui-components-1.0.5.tgz#da230869aacc49be00a03da55d6bf268570fee73" - integrity sha512-XOHa0sxhFlCrKBJ1tscCXdLlcr1ZZjDhHx1sE4wqurnSKKU6PsjHKsyOWzMC1+4XgRcCLomvo9OGIwHI0IyQrQ== + resolved "http://47.108.170.157:9013/jetlinks-ui-components/-/jetlinks-ui-components-1.0.5.tgz#bcf2ccab91dd64355bbe6528501d37f85f503161" + integrity sha512-yUN47hmOjDryn2CBrAL7IRMdyJsuKn7wG+OwLD9Jpii/8obUfIYT2nKoxihUzWjIrBmhP1WmD94C0AwaCN1hxw== dependencies: "@vueuse/core" "^9.12.0" ant-design-vue "^3.2.15"