Merge remote-tracking branch 'origin/dev' into dev

src/api/login.ts

@@ -106,7 +106,7 @@ export function getTenantList(): AxiosPromise<TenantInfo> {
   });
 }
 
-
+// 粤政易登录
 export function yzyLogin(code) {
   return request({
     url: '/api/auth/yzylogin',

src/permission.ts

@@ -10,7 +10,7 @@ import useSettingsStore from '@/store/modules/settings';
 import usePermissionStore from '@/store/modules/permission';
 
 NProgress.configure({ showSpinner: false });
-const whiteList = ['/login', '/yzylogin', '/register', '/social-callback'];
+const whiteList = ['/login', '/yzylogin', '/register', '/social-callback', '/noyzyuser'];
 
 router.beforeEach(async (to, from, next) => {
   NProgress.start();

src/views/login.vue

@@ -209,7 +209,7 @@ const handleTab = (tab) => {
   if(tab == 1) {
     // const redirect_uri = encodeURIComponent(import.meta.env.YZY_REDIRECT_URI);
     // const tyrz_url = import.meta.env.YZY_TYRZ_URL + redirect_uri;
-    const redirect_uri = encodeURIComponent("http://19.155.220.206:8086/tyrz/login?redirect="+redirect.value);
+    const redirect_uri = encodeURIComponent("http://19.155.220.206:8086/tyrz/login?src=yjzp&redirect="+redirect.value);
     const tyrz_url = "https://xtbg.digitalgd.com.cn/zwrz/rz/sso/oauth/authorize?response_type=code&scope=all&client_id=zwrz_mmzhyj&redirect_uri="+redirect_uri;
     window.location.href = tyrz_url;
   }