修复微信公众号BUG

src/pages/index.vue

@@ -89,7 +89,8 @@ import { scan_push, getHomePageData, getFunctionalModuleStatistics, getAppRouter
 import { useStores } from "@/store/modules/index";
 /*----------------------------------公共方法引入-----------------------------------*/
 import * as jwx from "@/utils/jssdk.js"; //引入js sdk的封装
-import { storageSystem } from "@/utils/storage"; // 公共方法引用
+import { getToken, setToken, removeToken } from "@/utils/auth";
+import { storage, storageSystem } from "@/utils/storage"; // 公共方法引用
 /*----------------------------------公共变量-----------------------------------*/
 const { proxy } = getCurrentInstance();
 const useStore = useStores();
@@ -111,9 +112,12 @@ const { dialogFlag } = toRefs(state);
 /**
  * @初始化
  */
-function init(options) {
+async function init(options) {
   //#ifdef H5
-  useStore.GetWxOpenId(2, options); //调用获取微信公众号openId
+  // alert("store" + storage.get("wxOpenId"));
+  // alert("store" + storageSystem.get("wxOpenId"));
+  // alert("token" + getToken());
+  await useStore.GetWxOpenId(2, options); //调用获取微信公众号openId
   //#endif
 
   setTimeout(() => {

src/store/modules/user.js

@@ -1,5 +1,5 @@
 import { defineStore } from "pinia";
-import { storage } from "@/utils/storage";
+import { storage, storageSystem } from "@/utils/storage";
 import { getToken, setToken, removeToken } from "@/utils/auth";
 // 接口引用
 import { login, logout, getInfo, getMobileTenantConfig, getCodeImg } from "@/api/login";
@@ -265,14 +265,6 @@ const useStores = defineStore("useStores", {
             this.SET_TOKEN("");//清空token
             this.SET_ROLES([]);
             this.SET_PERMISSIONS([]);
-            this.SET_STORAGE_OBJECT_KEYS({
-              loginTitle: "",
-              loginBottomTitle: "",
-              loginBg: "",
-              loginLogo: "",
-              tenantId: "",
-              wxOpenId: ""
-            });//清空登录页数据
             removeToken();
             storage.clean();
             resolve();
@@ -287,26 +279,27 @@ const useStores = defineStore("useStores", {
      * @获取微信OpenId
      * @param { 类型 } type 
      */
-    GetWxOpenId(type) {
+    GetWxOpenId(type, options) {
       if (type == 1 && common.isWechatMp()) {
         if (window.location.href.indexOf("openId=") == -1) {
           window.location.href = config.baseUrl + "/service-iot/weChat/getFirst1";
         } else {
-          this.SET_STORAGE_OBJECT_KEYS({
-            wxOpenId: common.getUrlList().openId
-          })
+          storage.set("wxOpenId", common.getUrlList().openId)
+          storageSystem.set("wxOpenId", common.getUrlList().openId)
         }
       } else if (type == 2 && common.isWechatMp()) {
-        if (window.location.href.indexOf("openId=") == -1) {
-          window.location.href = config.baseUrl + "/service-iot/weChat/getPageAuthorization?openId=" + this.wxOpenId;
-        } else {
-          this.SET_STORAGE_OBJECT_KEYS({
-            wxOpenId: common.getUrlList().openId
-          })
+        if (options?.flag === undefined || options?.flag == false) {
+          // alert("store" + storage.get("wxOpenId"))
+          // alert("store" + storageSystem.get("wxOpenId"))
+          // alert("token" + getToken())
+          if (storage.get("wxOpenId")) {
+            window.location.href = config.baseUrl + "/service-iot/weChat/getPageAuthorization?openId=" + storage.get("wxOpenId");
+          } else {
+            window.location.href = config.baseUrl + "/service-iot/weChat/getPageAuthorization";
+          }
         }
       }
     },
-
     SET_TOKEN(token) {
       this.token = token;
     },