feat: 联调

src/App.vue

@@ -5,17 +5,17 @@
       <cr-loading class="loading" size="24px">加载中...</cr-loading>
     </div>
     <login-modal />
-    <auth-from-xyqb />
+    <!-- <auth-from-xyqb /> -->
   </div>
 </template>
 <script>
 import { mapState, mapActions } from "vuex";
 import LoginModal from "@/components/LoginModal";
-import AuthFromXyqb from "@/components/AuthFromXyqb";
+// import AuthFromXyqb from "@/components/AuthFromXyqb";
 export default {
   components: {
-    LoginModal,
-    AuthFromXyqb
+    LoginModal
+    // AuthFromXyqb
   },
   computed: {
     ...mapState(["isLoading"])

src/components/AuthFromXyqb.vue

@@ -13,8 +13,6 @@
 
 <script>
 import { mapState, mapActions } from "vuex";
-import localStorage from "@/service/localStorage";
-import { authByxyqb } from "@/api/user";
 export default {
   name: "AuthFromXyqb",
   data() {
@@ -24,14 +22,7 @@ export default {
     ...mapState(["showAuthXyqb"])
   },
   methods: {
-    ...mapActions(["setShowAuthXyqb"]),
-    async getAuthInfo() {
-      const res = await authByxyqb();
-      if (res) {
-        localStorage.set("mongoToken", res.token);
-        localStorage.set("xyqbUserInfo", res);
-      }
-    }
+    ...mapActions(["setShowAuthXyqb"])
   }
 };
 </script>

src/router/index.js

@@ -3,6 +3,7 @@ import VueRouter from "vue-router";
 import routes from "./routes";
 import { parseSearch } from "@/service/utils";
 import { isXyqb } from "@/service/validation";
+// import cfg from "@/config";
 import { authByxyqb } from "@/api/user";
 import localStorage from "@/service/localStorage";
 Vue.use(VueRouter);
@@ -23,11 +24,13 @@ const router = new VueRouter({
 
 router.beforeEach((to, from, next) => {
   const urlParams = parseSearch(window.location.href);
-  if (isXyqb()) getAuthInfo(urlParams.token);
+  if (isXyqb) getAuthInfo(urlParams.token);
+  // if (isWeixinBrower) getWxOpenId(urlParams.code);
   next();
 });
 
 async function getAuthInfo(xyqbToken) {
+  if (localStorage.get("xyqbToken")) return;
   const res = await authByxyqb({ xyqbToken });
   if (res) {
     localStorage.set("mongoToken", res.token);
@@ -35,6 +38,13 @@ async function getAuthInfo(xyqbToken) {
     localStorage.set("xyqbToken", xyqbToken);
   }
 }
+
+// async function getWxOpenId(code) {
+//   if (localStorage.get("openId")) return;
+//   const res = await getwxOpenId({ code, appId: cfg.wxAppId });
+//   this.openId = res.openId;
+//   localStorage.set("openId", res.openId);
+// }
 // router.afterEach(() => {});
 
 export default router;

src/service/validation.js

@@ -250,12 +250,6 @@ export function isBankNumber(str) {
 }
 
 // 判断微信环境
-export function isWeixinBrower() {
-  const ua = window.navigator.userAgent.toLowerCase();
-  return ua.match(/MicroMessenger/i) === "micromessenger";
-}
+export const isWeixinBrower = window.navigator.userAgent.toLowerCase().match(/MicroMessenger/i) == "micromessenger";
 // 判断信用钱包环境
-export function isXyqb() {
-  const ua = window.navigator.userAgent.toLowerCase();
-  return ua.match(/xyqb/i) === "xyqb";
-}
+export const isXyqb = window.navigator.userAgent.toLowerCase().match(/xyqb/i) == "xyqb";

src/store/index.js

@@ -9,7 +9,7 @@ export default new Vuex.Store({
     activeIdx: 0,
     isLoading: false,
     isShowLogin: false,
-    showAuthXyqb: true
+    showAuthXyqb: "init" // init 已获取信息未授权，pending 授权弹框
   },
   mutations: {
     setActiveIdx(state, value) {
@@ -21,7 +21,7 @@ export default new Vuex.Store({
     setIsShowLogin(state, value) {
       state.isShowLogin = value;
     },
-    setShowAuthXyqb(state, value) {
+    authXyqb(state, value) {
       state.showAuthXyqb = value;
     }
   },
@@ -35,7 +35,7 @@ export default new Vuex.Store({
     setIsShowLogin({ commit }, args) {
       commit("setIsShowLogin", args);
     },
-    setShowAuthXyqb({ commit }, args) {
+    setsuthXyqb({ commit }, args) {
       commit("setShowAuthXyqb", args);
     }
   },