hbchen 1 rok pred
rodič
commit
7da5545de1

+ 11 - 0
src/App.vue

@@ -6,6 +6,7 @@
 
 <script>
 // import { loginconf } from "api/api.js";
+import { getRealPublicSettings } from '@/api/modules/oldApi';
 export default {
   name: "app",
   provide() {
@@ -27,6 +28,16 @@ export default {
       });
     },
   },
+  created(){
+    // 获取公共配置
+    getRealPublicSettings().then(res=>{
+      if(res.Ret == 200){
+        this.$store.commit('SET_PUBLIC_CONFIG',res.Data || [])
+      }else{
+        this.$store.commit('SET_PUBLIC_CONFIG',[])
+      }
+    })
+  }
 };
 </script>
 

+ 10 - 1
src/api/modules/oldApi.js

@@ -316,6 +316,14 @@ const getPublicSettingsApi = params => {
 	return http.get('/system/config')
 }
 
+/**
+ * 真·获取公共配置
+ * @param {*} params 
+ */
+const getRealPublicSettings = params => {
+	return http.get('/sysuser/public_config')
+}
+
 export {
 	userLogin,
 	modifyPwd,
@@ -390,5 +398,6 @@ export {
 	getUserUuid,
 	getBusinessCode,
 	getPublicSettingsApi,
-	recordActiveLogin
+	recordActiveLogin,
+	getRealPublicSettings
 }

+ 1 - 0
src/mixins/theme.js

@@ -31,5 +31,6 @@ export default {
   g_logo: require('@/assets/img/home/logo.png'),
   g_mini_logo: require('@/assets/img/home/eta_mini.png'),
   dynamicOutLinks:{},//动态的外部link链接
+  publicConfigs:{},//公共配置
   bus_code:'',
 }

+ 16 - 0
src/views/Login.vue

@@ -178,6 +178,22 @@ import OrdinaryModel from "./login_manage/OrdinaryModel.vue";
 
 export default {
     components: { OrdinaryModel, MobileModel, EmailModel, ForgetPassModel },
+    beforeRouteEnter(to, from, next){
+        // console.log(to, from);
+        if(to.query.HZ == 1){
+            next();
+        }else{
+            let publicConfigs = JSON.parse(localStorage.getItem('publicConfigs')) || {}
+            // 有的话需要跳转至客户的页面
+            let loginUrl=publicConfigs.LoginUrl
+            if(loginUrl){
+                window.location.replace(loginUrl)
+                // window.location.href = loginUrl
+            }else{
+                next();
+            }
+        }
+    },
     data() {
         return {
             b: new http.Base64(),

+ 13 - 10
src/views/transferPage.vue

@@ -16,18 +16,19 @@ export default {
     },
     methods:{
         async init(){
-            if(this.$route.query.code){
-                const res=await departInterence.useCodeLogin({AuthCode:this.$route.query.code})
+            if(Object.keys(this.$route.query).length > 0){
+                const res=await departInterence.useCodeLogin(this.$route.query)
+								// console.log(res);
+								// return 
                 if(res.Ret===200){
                     localStorage.setItem('auth', res.Data.Authorization)
-					localStorage.setItem('userName', res.Data.RealName)
-					localStorage.setItem('Role', res.Data.RoleTypeCode)
-					localStorage.setItem('RoleIdentity', res.Data.SysRoleTypeCode)
-					localStorage.setItem('RoleType', res.Data.ProductName)
-					localStorage.setItem('ManageType', res.Data.Authority)
-					localStorage.setItem('AdminId', res.Data.AdminId)
+										localStorage.setItem('userName', res.Data.RealName)
+										localStorage.setItem('Role', res.Data.RoleTypeCode)
+										localStorage.setItem('RoleIdentity', res.Data.SysRoleTypeCode)
+										localStorage.setItem('RoleType', res.Data.ProductName)
+										localStorage.setItem('ManageType', res.Data.Authority)
+										localStorage.setItem('AdminId', res.Data.AdminId)
                     localStorage.setItem('AdminName',res.Data.AdminName)
-
                     // 如果路由参数有redirect_uri则跳转到redirect_uri,redirect_uri通过encode
                     if(this.$route.query.redirect_uri){
                         const path=decodeURIComponent(this.$route.query.redirect_uri)
@@ -55,7 +56,9 @@ export default {
 					}
 					this.$router.push({ path });
                     return
-                }
+                }else{
+									this.$router.replace('/login')
+								}
             }
 
             this.$router.replace('/login')

+ 1 - 0
src/vuex/index.js

@@ -28,6 +28,7 @@ const state = {
   breadSelfName: '',//面包屑自定义当前页面name
 
   dynamicOutLinks:{},//外部动态链接配置 iframe链接 研报详情分享link
+  publicConfigs:{},// 公共配置
   // 是否执行过页面监听
   hasDoPageListening:false,
   // 是否有 试用用户行为权限

+ 13 - 1
src/vuex/mutations.js

@@ -60,7 +60,19 @@ const mutations = {
   //设置商家code
   SET_BUSINESS_CODE(state,code) {
     state.businessCode = code || ""
-  }
+  },
+  //设置公共配置
+  SET_PUBLIC_CONFIG(state,obj) {
+    let filterObj = {};
+    obj.forEach(item => {
+        if(!filterObj[item.ConfKey]) {
+          filterObj[item.ConfKey] = item.ConfVal;
+        }
+    });
+    localStorage.setItem('publicConfigs',JSON.stringify(filterObj))
+    state.publicConfigs = filterObj; 
+    setting.publicConfigs = state.publicConfigs;
+  },
 };
 
 export default mutations;