From 3f12b301476eb31687ad6671d649da0e3b4cee86 Mon Sep 17 00:00:00 2001 From: sjeam <359824901@qq.com> Date: Sun, 31 Aug 2025 18:05:14 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- env/.env | 26 +++++++---- src/api/login.typings.ts | 4 +- src/components/fly-login/fly-login.vue | 40 ++++++++++++---- src/interceptors/request.ts | 64 ++++++++++++++++++-------- src/pages/about/index.vue | 6 +-- src/pages/index/index.vue | 44 ++++++++++++++---- src/pages/my/components/wx-login.vue | 11 +++-- src/pages/my/index.vue | 36 +++++++-------- src/pages/service/index.vue | 4 +- src/pages/web_view/h5.vue | 4 +- src/pages/web_view/index.vue | 8 ++-- src/service/crmeb/product.ts | 4 +- src/store/user.ts | 21 ++++++--- src/utils/index.ts | 12 +++++ vite.config.ts | 7 +++ 15 files changed, 198 insertions(+), 93 deletions(-) diff --git a/env/.env b/env/.env index f266882..ff4ad1b 100644 --- a/env/.env +++ b/env/.env @@ -10,22 +10,30 @@ VITE_APP_PUBLIC_BASE=/ # 登录页面 VITE_LOGIN_URL = '/pages/login/index' -VITE_SERVER_BASEURL = 'https://test.shop.lihaink.cn/' -VITE_UPLOAD_BASEURL = 'https://test.shop.lihaink.cn//upload' +# 数字乡村 +VITE_SERVER_BASEURL = 'http://127.0.0.1:8787' +VITE_UPLOAD_BASEURL = 'http://127.0.0.1:8787/upload' -VITE_CRMEB_SERVER_BASEURL = 'https://test.shop.lihaink.cn/pages/user/login' +# 村集体 +VITE_CRMEB_SERVER_BASEURL = 'https://test.shop.lihaink.cn' + +# 村集体登录 +VITE_CRMEB_SERVER_BASEURL_LOGIN = 'https://test.shop.lihaink.cn/pages/user/login' # 有些同学可能需要在微信小程序里面根据 develop、trial、release 分别设置上传地址,参考代码如下。 # 下面的变量如果没有设置,会默认使用 VITE_SERVER_BASEURL or VITE_UPLOAD_BASEURL -VITE_SERVER_BASEURL__WEIXIN_DEVELOP = 'https://test.shop.lihaink.cn/' -VITE_SERVER_BASEURL__WEIXIN_TRIAL = 'https://test.shop.lihaink.cn/' -VITE_SERVER_BASEURL__WEIXIN_RELEASE = 'https://test.shop.lihaink.cn/' +VITE_SERVER_BASEURL__WEIXIN_DEVELOP = 'http://127.0.0.1:8787' +VITE_SERVER_BASEURL__WEIXIN_TRIAL = 'http://127.0.0.1:8787' +VITE_SERVER_BASEURL__WEIXIN_RELEASE = 'http://127.0.0.1:8787' -VITE_UPLOAD_BASEURL__WEIXIN_DEVELOP = 'https://test.shop.lihaink.cn//upload' -VITE_UPLOAD_BASEURL__WEIXIN_TRIAL = 'https://test.shop.lihaink.cn//upload' -VITE_UPLOAD_BASEURL__WEIXIN_RELEASE = 'https://test.shop.lihaink.cn//upload' +VITE_UPLOAD_BASEURL__WEIXIN_DEVELOP = 'http://127.0.0.1:8787/upload' +VITE_UPLOAD_BASEURL__WEIXIN_TRIAL = 'http://127.0.0.1:8787/upload' +VITE_UPLOAD_BASEURL__WEIXIN_RELEASE = 'http://127.0.0.1:8787/upload' # h5是否需要配置代理 VITE_APP_PROXY=true +# 数字乡村代理 VITE_APP_PROXY_PREFIX = '/api' +# 村集体代理 +VITE_APP_PROXY_PREFIX_CRMEB = '/crmeb' diff --git a/src/api/login.typings.ts b/src/api/login.typings.ts index d0638cf..99f2eea 100644 --- a/src/api/login.typings.ts +++ b/src/api/login.typings.ts @@ -3,7 +3,7 @@ */ export interface IUserInfoVo { id: number - username: string + nickname: string avatar: string token: string } @@ -13,7 +13,7 @@ export interface IUserInfoVo { */ export interface IUserLogin { id: string - username: string + nickname: string token: string } diff --git a/src/components/fly-login/fly-login.vue b/src/components/fly-login/fly-login.vue index 7017f24..a6b369b 100644 --- a/src/components/fly-login/fly-login.vue +++ b/src/components/fly-login/fly-login.vue @@ -1,16 +1,16 @@ @@ -105,6 +118,12 @@ const onSubmit = () => {