diff --git a/src/views/Selectmodel.vue b/src/views/Selectmodel.vue index 19fb170..9c361d1 100644 --- a/src/views/Selectmodel.vue +++ b/src/views/Selectmodel.vue @@ -38,6 +38,7 @@ import { useDataStore } from "@/store/dataList.js"; const { getQueryVariable, setActiveTabIndex, getUserInfo } = useDataStore(); import robot from "@/assets/img/Selectmodel/机器人 拷贝.png"; import BackToHomeButton from "@/views/components/BackToHomeButton.vue"; +import { useAppBridge } from "@/assets/js/useAppBridge.js"; const router = useRouter(); const pageRef = ref(null); @@ -47,13 +48,15 @@ onMounted(() => { /phone|pad|pod|iPhone|iPod|ios|iPad|Android|Mobile|BlackBerry|IEMobile|MQQBrowser|JUC|Fennec|wOSBrowser|BrowserNG|WebOS|Symbian|Windows Phone/i.test( navigator.userAgent ); - const token = getQueryVariable("token"); - !isPhone && - token && - localStorage.setItem( - "localToken", - decodeURIComponent(String(getQueryVariable("token"))) - ); + fnGetToken() + + // const token = getQueryVariable("token"); + // !isPhone && + // token && + // localStorage.setItem( + // "localToken", + // decodeURIComponent(String(getQueryVariable("token"))) + // ); // localStorage.setItem( // "localToken", @@ -63,6 +66,48 @@ onMounted(() => { getUserInfo(); }); +// 获取token的核心函数 +const fnGetToken = () => { + // console.log('进入fnGetToken') + window.JWready = (ress) => { + // console.log('进入JWready') + try { + ress = JSON.parse(ress); + // console.log(ress, 'ress') + } catch (error) { + console.log(error, "fnGetToken error"); + } //platform为5是app端 + // platform.value = ress.data.platform + // 处理平台判断 + console.log(ress.data.platform, "ress.data.platform"); + if (!ress.data.platform) { + // 非App环境通过URL参数获取 + localStorage.setItem( + "localToken", + decodeURIComponent(String(getQueryVariable("token"))) + ); + // localStorage.setItem('localToken', "+SsksARQgUHIbIG3rRnnbZi0+fEeMx8pywnIlrmTxo5EOPR/wjWDV7w7+ZUseiBtf9kFa/atmNx6QfSpv5w") + } else { + // App环境通过桥接获取 + useAppBridge().packageFun( + "JWgetStorage", + (response) => { + const res = JSON.parse(response); // 解析返回的结果 + localStorage.setItem("localToken", res.data); + // localStorage.setItem('localToken', "+SsksARQgUHIbIG3rRnnbZi0+fEeMx8pywnIlrmTxo5EOPR/wjWDV7w7+ZUseiBtf9kFa/atmNx6QfSpv5w") + }, + 5, + { + key: "token", + } + ); + } + }; + // console.log('出来了') + // 触发App桥接 + useAppBridge().packageFun("JWwebReady", () => {}, 5, {}); +}; + const goToDBQBmodel = () => { router.push("/DBQBmodel"); }; diff --git a/src/views/homePage.vue b/src/views/homePage.vue index 807da2e..b2cd895 100644 --- a/src/views/homePage.vue +++ b/src/views/homePage.vue @@ -664,51 +664,51 @@ watch( ); // 获取token的核心函数 -const fnGetToken = () => { - // console.log('进入fnGetToken') - window.JWready = (ress) => { - // console.log('进入JWready') - try { - ress = JSON.parse(ress); - // console.log(ress, 'ress') - } catch (error) { - console.log(error, "fnGetToken error"); - } //platform为5是app端 - // platform.value = ress.data.platform - // 处理平台判断 - console.log(ress.data.platform, "ress.data.platform"); - if (!ress.data.platform) { - // 非App环境通过URL参数获取 - localStorage.setItem( - "localToken", - decodeURIComponent(String(getQueryVariable("token"))) - ); - // localStorage.setItem('localToken', "+SsksARQgUHIbIG3rRnnbZi0+fEeMx8pywnIlrmTxo5EOPR/wjWDV7w7+ZUseiBtf9kFa/atmNx6QfSpv5w") - } else { - // App环境通过桥接获取 - useAppBridge().packageFun( - "JWgetStorage", - (response) => { - const res = JSON.parse(response); // 解析返回的结果 - localStorage.setItem("localToken", res.data); - // localStorage.setItem('localToken', "+SsksARQgUHIbIG3rRnnbZi0+fEeMx8pywnIlrmTxo5EOPR/wjWDV7w7+ZUseiBtf9kFa/atmNx6QfSpv5w") - }, - 5, - { - key: "token", - } - ); - } - }; - // console.log('出来了') - // 触发App桥接 - useAppBridge().packageFun("JWwebReady", () => {}, 5, {}); -}; +// const fnGetToken = () => { +// // console.log('进入fnGetToken') +// window.JWready = (ress) => { +// // console.log('进入JWready') +// try { +// ress = JSON.parse(ress); +// // console.log(ress, 'ress') +// } catch (error) { +// console.log(error, "fnGetToken error"); +// } //platform为5是app端 +// // platform.value = ress.data.platform +// // 处理平台判断 +// console.log(ress.data.platform, "ress.data.platform"); +// if (!ress.data.platform) { +// // 非App环境通过URL参数获取 +// localStorage.setItem( +// "localToken", +// decodeURIComponent(String(getQueryVariable("token"))) +// ); +// // localStorage.setItem('localToken', "+SsksARQgUHIbIG3rRnnbZi0+fEeMx8pywnIlrmTxo5EOPR/wjWDV7w7+ZUseiBtf9kFa/atmNx6QfSpv5w") +// } else { +// // App环境通过桥接获取 +// useAppBridge().packageFun( +// "JWgetStorage", +// (response) => { +// const res = JSON.parse(response); // 解析返回的结果 +// localStorage.setItem("localToken", res.data); +// // localStorage.setItem('localToken', "+SsksARQgUHIbIG3rRnnbZi0+fEeMx8pywnIlrmTxo5EOPR/wjWDV7w7+ZUseiBtf9kFa/atmNx6QfSpv5w") +// }, +// 5, +// { +// key: "token", +// } +// ); +// } +// }; +// // console.log('出来了') +// // 触发App桥接 +// useAppBridge().packageFun("JWwebReady", () => {}, 5, {}); +// }; // 在setTimeout中延迟执行 -setTimeout(() => { - fnGetToken(); -}, 800); +// setTimeout(() => { +// fnGetToken(); +// }, 800); const heightListener = () => { const tabContainer = getCurrentScrollContainer();