Merge branch 'iteration-h5-share' into jenkins-test

src/state.ts

@@ -55,6 +55,17 @@ export const openDefaultWebView = (url?: string, callBack?: any) => {
   }
 };
 
+
+/**
+ * @description 微信授权-会根据环境去判断
+ * @param wxAppId
+ * @param urlString 回调链接【默认当前页面地址】
+ * @returns void
+ */
+export const goWechatAuthTemp = (wxAppId: string, urlString?: string) => {
+  goAuth(wxAppId, urlString);
+};
+
 /**
  * @description 微信授权-会根据环境去判断
  * @param wxAppId

src/views/intention-questionnaire/index.tsx

@@ -24,7 +24,7 @@ import OWxTip from '@/components/m-wx-tip';
 import { browser, getHttpOrigin, getUrlCode } from '@/helpers/utils';
 import qs from 'query-string';
 import request from '@/helpers/request';
-import { goWechatAuth } from '@/state';
+import { goWechatAuth, goWechatAuthTemp } from '@/state';
 import { useInterval, useIntervalFn } from '@vueuse/core';
 import MMessageTip from '@/components/m-message-tip';
 import TCPlayer from 'tcplayer.js';
@@ -144,7 +144,8 @@ export default defineComponent({
         if (data) {
           sessionStorage.setItem('isWxcode', '1');
           closeToast();
-          goWechatAuth(data, url);
+          // goWechatAuth(data, url);
+          goWechatAuthTemp(data, url);
         }
       } catch (e) {
         //

src/views/student-register/index-apply.tsx

@@ -27,6 +27,7 @@ import qs from 'query-string';
 import {
   state as baseState,
   goWechatAuth,
+  goWechatAuthTemp,
   setLogin,
   setLoginInit
 } from '@/state';
@@ -1304,7 +1305,7 @@ export default defineComponent({
         // 判断是否有微信appId
         if (data) {
           closeToast();
-          goWechatAuth(data, url);
+          goWechatAuthTemp(data, url);
         }
       } catch {
         //