diff --git a/src/pages/index/index.jsx b/src/pages/index/index.jsx index db76ee6..21b8b9b 100644 --- a/src/pages/index/index.jsx +++ b/src/pages/index/index.jsx @@ -61,28 +61,19 @@ const Index = () => { let localwxid = window.localStorage.getItem("wxid"); let localh5openid = window.localStorage.getItem("h5openid"); - if ( - (params?.wxid || localwxid) && - !localh5openid && - localh5openid == "undefined" && - localh5openid == "null" - ) { + if (params?.wxid || localwxid) { // 本地存储 window.localStorage.setItem("wxid", params?.wxid ?? ""); alert(params?.wxid); setwxid(params?.wxid); - getopenId(); - } else { - try { - let getuserInfo = Taro.getStorageSync("userInfo"); - if (getuserInfo) { - setuserInfo(getuserInfo); - console.log("本地用户信息存在"); - } else { - console.log("本地用户信息,不存在"); - } - } catch (e) { - console.log("error", e); + if ( + !localh5openid || + localh5openid == "undefined" || + localh5openid == "null" + ) { + getopenId(); + } else { + h5openidUser(); } } }, []); @@ -91,6 +82,31 @@ const Index = () => { WeixinJSBridge.call("hideOptionMenu"); }; + const h5openidUser = () => { + try { + const params = Taro.getCurrentInstance().router.params; + let hashopenid = window.localStorage.getItem("h5openid"); + let localwxid = window.localStorage.getItem("wxid"); + //发起网络请求 + Taro.request({ + url: "/api/addH5openid", + // url: "https://kunpeng.hackrobot.cn/addH5openid", + data: { + h5openid: hashopenid ?? null, + wxid: localwxid ?? null, //debug eric 的wxid + }, + success: function (resUser) { + console.log(resUser); + console.log(resUser.data); + setuserInfo({ ...resUser.data }); + }, + }); + } catch (e) { + alert(e); + } finally { + } + }; + useEffect(() => { let $instance = Taro.getCurrentInstance(); console.log($instance.router.params); @@ -114,33 +130,9 @@ const Index = () => { // alert(hashopenid); let localwxid = window.localStorage.getItem("wxid"); // alert(localwxid); - seth5openid(hashopenid); - try { - const params = Taro.getCurrentInstance().router.params; - - //发起网络请求 - Taro.request({ - url: "/api/addH5openid", - // url: "https://kunpeng.hackrobot.cn/addH5openid", - data: { - h5openid: h5openid ?? null, - wxid: params?.wxid ?? null, //debug eric 的wxid - }, - success: function (resUser) { - console.log(resUser); - console.log(resUser.data); - setuserInfo({ ...resUser.data }); - // 本地存储 - Taro.setStorage({ - key: "userInfo", - data: resUser.data, - }); - }, - }); - } catch (e) { - } finally { - } + // 查询用户信息 + h5openidUser(); } else { let nowUrl = window.location.href; // alert(nowUrl); @@ -217,7 +209,7 @@ const Index = () => { }, success: function (resUser) { console.log("resUser--", resUser); - alert(resUser?.data?.success); + // alert(resUser?.data?.success); console.log("加入微信群成功"); if (resUser?.data?.success == "fail") { //已经在群聊中