diff --git a/App.vue b/App.vue index 024e4d1..16e969c 100644 --- a/App.vue +++ b/App.vue @@ -4,6 +4,7 @@ // #endif import { loginShopAccount, + loginParseToken, userInfo } from "@/api/oaUser.js" export default { @@ -33,9 +34,13 @@ uni.setStorageSync('uniMP', info.referrerInfo?.extraData?.uniMP); uni.setStorageSync('APP_token', info.referrerInfo?.extraData?.token); try { - let res = await loginShopAccount({ - shop_token: info.referrerInfo?.extraData?.token - }); + let res = await loginParseToken({ + // token:"eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJjZXNoaS1taWRkbGUubGloYWluay5jbiIsImF1ZCI6ImNlc2hpLW1pZGRsZS5saWhhaW5rLmNuIiwiaWF0IjoxNzAwNzkzMjY2LCJuYmYiOjE3MDA3OTMyNjYsImV4cCI6MTcwMTM5ODA2NiwiZGF0YSI6eyJ1aWQiOjUsInBob25lIjoiMTc2ODUxNTE2NDMiLCJhdmF0YXIiOiIvcmVzb3VyY2UvaW1hZ2UvYWRtaW5hcGkvZGVmYXVsdC9kZWZhdWx0X2F2YXRhci5wbmciLCJuaWNrbmFtZSI6Ilx1NzUyOFx1NjIzNzE3Njg1MTUxNjQzIn19.ctEIiBUd6T6zpp9m3x5wdop5vnBcnpS6VOliy4uz9bc" + token: info.referrerInfo?.extraData?.token + }) + // let res = await loginShopAccount({ + // shop_token: info.referrerInfo?.extraData?.token + // }); this.$store.commit('SET_USERINFO', { user: {}, token: res.data.token diff --git a/api/oaUser.js b/api/oaUser.js index 5cf351c..b742186 100644 --- a/api/oaUser.js +++ b/api/oaUser.js @@ -69,3 +69,8 @@ export const destroyAccount = (data) => oahttp.post('/user/destroy_account', dat * 商城登录 */ export const loginShopAccount = (data) => oahttp.post('/login/shop_account', data, { noAuth: true }) + +/** + * 中台登录 + */ +export const loginParseToken = (data) => oahttp.post('/login/parseToken', data, { noAuth: true }) diff --git a/config/app.js b/config/app.js index ae60234..d42bfbc 100644 --- a/config/app.js +++ b/config/app.js @@ -2,7 +2,7 @@ let httpApiThree; let httpApi; // 总域名 let httpApiTwo; // 物流系统域名 -const env = 'local'; // 开发 +const env = 'dev'; // 开发 // const env = 'prod'; // 生产 // const env = 'prew'; // 预上线 // const env = 'local'; // 本地 @@ -19,7 +19,6 @@ switch (env) { httpApiTwo = 'https://preview-logistics.lihaink.cn' //预上线 break; case 'local': - httpApi = 'http://192.168.1.20:8000' //预上线 httpApiThree = 'http://192.168.1.20:8000' //预上线 httpApiTwo = 'http://192.168.1.20:8000' //预上线