From fa76e2c0727136a248383805f510ce4c8159cca8 Mon Sep 17 00:00:00 2001 From: dzc <2388224167@qq.com> Date: Tue, 26 Nov 2024 16:37:55 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E6=B5=8B=E8=AF=95=E7=99=BB=E9=99=86?= =?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 | 3 +- src/pages.json | 12 +++++ src/pages/tabbar/my.vue | 75 ++++++++++++++++---------------- src/pages/test/login.vue | 89 ++++++++++++++++++++++++++++++++++++++ src/sheep/api/user.ts | 29 ++++++++----- src/static/icon/login.png | Bin 0 -> 2530 bytes 6 files changed, 159 insertions(+), 49 deletions(-) create mode 100644 src/pages/test/login.vue create mode 100644 src/static/icon/login.png diff --git a/.env b/.env index 01cbb6c..5d59f08 100644 --- a/.env +++ b/.env @@ -1,7 +1,6 @@ # ******************** start 开发环境 start ******************** -#VITE_APP_DEV_SERVICE =http://localhost:48080/app-api -VITE_APP_DEV_SERVICE =https://stgl.pj.gov.cn/app-api +VITE_APP_DEV_SERVICE =http://localhost:48080/app-api # VITE_APP_DEV_SERVICE =http://123.156.228.134:48080/app-api # ******************** end 开发环境 end ******************** diff --git a/src/pages.json b/src/pages.json index 3ecde96..a4cd9b1 100644 --- a/src/pages.json +++ b/src/pages.json @@ -178,6 +178,18 @@ } ] }, + { + "root": "pages/test", + "pages": [ + { + "path": "login", + "style": { + "navigationBarTitleText": "", + "disableScroll": true + } + } + ] + }, { "root": "pages/wallet", "pages": [ diff --git a/src/pages/tabbar/my.vue b/src/pages/tabbar/my.vue index 74f845a..e9c5733 100644 --- a/src/pages/tabbar/my.vue +++ b/src/pages/tabbar/my.vue @@ -13,6 +13,7 @@ const data = { // { text: '车牌管理', icon: '/static/icon/service_2.png', router: '/pages/user/diff-price' }, { text: '外来人员就餐', icon: '/static/icon/service_1.png', router: '/pages/apply/foreign-list' }, { text: '跨单位就餐', icon: '/static/icon/service_1.png', router: '/pages/apply/stride-list' }, + { text: '测试登陆', icon: '/static/icon/login.png', router: '/pages/test/login' }, ] }; @@ -23,29 +24,29 @@ const state = reactive({ onLoad((options) => { - window.CP2.getAppInfo().then((res) => { - console.log(res); - if (res.code==1){ - //诗画 - console.log("诗画环境") - window.CP2.getUserInfo().then((res) => { - let accountId=res.data.accountId; - let sessionId=res.sessionId; - doLogin(1,null,accountId,sessionId) - }); - }else { - //浙政钉或者h5 - const url = window.location.href; - const params = new URL(url).searchParams; - const token = params.get('uabaseToken'); // 获取 uabaseToken 参数值 - console.log('Token:', token); - if (null!=token){ - //浙政钉 - doLogin(2,token,null,null) - } + (window as any).CP2.getAppInfo().then((res) => { + console.log(res); + if (res.code == 1) { + //诗画 + console.log("诗画环境"); + (window as any).CP2.getUserInfo().then((res) => { + let accountId = res.data.accountId; + let sessionId = res.sessionId; + doLogin(1, null, accountId, sessionId) + }); + } else { + //浙政钉或者h5 + const url = window.location.href; + const params = new URL(url).searchParams; + const token = params.get('uabaseToken'); // 获取 uabaseToken 参数值 + console.log('Token:', token); + if (null != token) { + //浙政钉 + doLogin(2, token, null, null) + } - } - }); + } + }); }); onShow(() => { getUserInfo() @@ -59,7 +60,7 @@ const getUserInfo = () => { } } -const doLogin = async (loginType,token, accountId, sessionId) => { +const doLogin = async (loginType, token, accountId, sessionId) => { const tokenKey = constant.storageConstant.TOKEN const userInfoKey = constant.storageConstant.USERINFO const tokenStorage = uni.getStorageSync(tokenKey) @@ -70,20 +71,20 @@ const doLogin = async (loginType,token, accountId, sessionId) => { mask: true }); let authData; - if (loginType==1){ - // 诗画 - const params = { - accountId:accountId, - sessionId:sessionId - } - const response = await userApi.authsh(params); - authData = response.data; - }else if (loginType==2){ - //浙政钉 - const response = await userApi.auth(token); - authData = response.data; - }else { - //后期手机号+验证码登录 + if (loginType == 1) { + // 诗画 + const params = { + accountId: accountId, + sessionId: sessionId + } + const response = await userApi.authsh(params); + authData = response.data; + } else if (loginType == 2) { + //浙政钉 + const response = await userApi.auth(token); + authData = response.data; + } else { + //后期手机号+验证码登录 } // const {data: authData} = await userApi.auth(token); uni.setStorageSync(tokenKey, authData) diff --git a/src/pages/test/login.vue b/src/pages/test/login.vue new file mode 100644 index 0000000..f692028 --- /dev/null +++ b/src/pages/test/login.vue @@ -0,0 +1,89 @@ + + + + + + \ No newline at end of file diff --git a/src/sheep/api/user.ts b/src/sheep/api/user.ts index ce770b1..5889116 100644 --- a/src/sheep/api/user.ts +++ b/src/sheep/api/user.ts @@ -20,16 +20,16 @@ export default { loadingMsg: "授权中", }, }), - authsh: (params: any) => - request({ - url: `/sys/auth/shjnsso`, - method: "POST", - custom: { - showLoading: false, - loadingMsg: "授权中", - }, - data:params, - }), + authsh: (params: any) => + request({ + url: `/sys/auth/shjnsso`, + method: "POST", + custom: { + showLoading: false, + loadingMsg: "授权中", + }, + data: params, + }), refreshToken: (params: any) => request({ url: `/sys/auth/refresh-token`, @@ -39,4 +39,13 @@ export default { showLoading: false, }, }), + testLogin: (data: any) => + request({ + url: `/sys/auth/test-login`, + method: "POST", + data, + custom: { + showLoading: false, + }, + }), }; diff --git a/src/static/icon/login.png b/src/static/icon/login.png new file mode 100644 index 0000000000000000000000000000000000000000..2265310a2853785867e8e3b66d94677bea7f4ca1 GIT binary patch literal 2530 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 I1<4Qo2N~yXeE