获取code方式调整

src/constants/app.js

@@ -3,30 +3,31 @@ import { parseHrefParam } from "../plugins/utils";
 const MD5 = require("js-md5");
 
 // domain
-let domain;
-if (process.env.VUE_APP_SELF_DEFINE_DOMAIN === "true") {
-  domain = window.localStorage.getItem("domain_in_url");
-}
-if (!domain) {
-  const ipFormat = new RegExp(/\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/);
-  const hostname = window.location.hostname;
-  const paramCode = parseHrefParam(window.location.href, "code");
+export function getOrgCode() {
+  let domain;
+  if (process.env.VUE_APP_SELF_DEFINE_DOMAIN === "true") {
+    domain = window.localStorage.getItem("domain_in_url");
+  }
+  if (!domain) {
+    const ipFormat = new RegExp(/\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/);
+    const hostname = window.location.hostname;
+    const paramCode = parseHrefParam(window.location.href, "code");
 
-  if (ipFormat.test(hostname) || paramCode) {
-    domain = paramCode || window.sessionStorage.getItem("ipDomainCode");
-    if (domain) {
-      window.sessionStorage.setItem("ipDomainCode", domain);
+    if (ipFormat.test(hostname) || paramCode) {
+      domain = paramCode || window.sessionStorage.getItem("ipDomainCode");
+      if (domain) {
+        window.sessionStorage.setItem("ipDomainCode", domain);
+      }
+    } else {
+      domain = hostname.split(".")[0];
     }
-  } else {
-    domain = hostname.split(".")[0];
   }
+  console.log(domain);
+  return domain;
 }
-console.log(domain);
-export const ORG_CODE = domain;
 
 const ADMIN_CODE = "admin";
-
-export const IS_ADMIN_SYSTEM = ADMIN_CODE === ORG_CODE;
+export const IS_ADMIN_SYSTEM = ADMIN_CODE === getOrgCode();
 
 export const PLATFORM = "WEB";
 

src/modules/base/components/ModifyOrganization.vue

@@ -105,7 +105,8 @@ export default {
           {
             required: true,
             pattern: /^[0-9a-zA-Z\u4E00-\u9FA5()（）]{1,100}$/,
-            message: "机构名称只能输入汉字、数字、字母和括号，长度不能超过100",
+            message:
+              "机构名称只能输入汉字、数字、字母和圆括号，长度不能超过100",
             trigger: "change"
           }
         ]

src/modules/login/views/Login.vue

@@ -141,7 +141,7 @@ import { password, phone, smscode } from "@/plugins/formRules";
 import { login, getSmsCode, getSchoolInfo, getAccountSmsCode } from "../api";
 import { Base64 } from "@/plugins/crypto";
 import ResetPwd from "@/modules/base/components/ResetPwd";
-import { ORG_CODE } from "@/constants/app";
+import { getOrgCode } from "@/constants/app";
 import fetchSmsMixins from "../fetchSmsMixins";
 
 export default {
@@ -153,7 +153,7 @@ export default {
       nameWaitTime: "login",
       smsCodeRequired: false,
       loginModel: {
-        schoolCode: ORG_CODE,
+        schoolCode: "",
         loginName: "",
         password: "",
         code: "",
@@ -201,7 +201,8 @@ export default {
   },
   methods: {
     async getSchool() {
-      const data = await getSchoolInfo(ORG_CODE);
+      this.loginModel.schoolCode = getOrgCode();
+      const data = await getSchoolInfo(this.loginModel.schoolCode);
       this.$ls.set("schoolLogo", data.logo);
       this.$ls.set("schoolName", data.name);
       this.schoolLogo = data.logo;

src/modules/login/views/Login2.vue

@@ -81,7 +81,7 @@ import { password, smscode } from "@/plugins/formRules";
 import { login, getSmsCode, getSchoolInfo, getSysConfig } from "../api";
 import { Base64 } from "@/plugins/crypto";
 import ResetPwd from "@/modules/base/components/ResetPwd";
-import { ORG_CODE } from "@/constants/app";
+import { getOrgCode } from "@/constants/app";
 import fetchSmsMixins from "../fetchSmsMixins";
 
 export default {
@@ -93,7 +93,7 @@ export default {
       nameWaitTime: "login",
       smsCodeRequired: false,
       loginModel: {
-        schoolCode: ORG_CODE,
+        schoolCode: "",
         loginName: "",
         code: "",
         password: ""
@@ -134,7 +134,8 @@ export default {
       this.smsCodeRequired = data && data.configValue === "true";
     },
     async getSchool() {
-      const data = await getSchoolInfo(ORG_CODE);
+      this.loginModel.schoolCode = getOrgCode();
+      const data = await getSchoolInfo(this.loginModel.schoolCode);
       this.$ls.set("schoolLogo", data.logo);
       this.$ls.set("schoolName", data.name);
       this.schoolLogo = data.logo;