Merge branch 'dev_1.2.7' of http://git.qmth.com.cn/union-question/union-question-web into dev_1.2.7

src/modules/portal/views/Login.vue

@@ -74,6 +74,7 @@ export default {
       loginInfo: {
         rootOrgId: "",
         domain: "",
+        code: "",
         accountType: "COMMON_LOGIN_NAME",
         accountValue: "",
         password: "",
@@ -136,6 +137,7 @@ export default {
   watch: {
     $route(to) {
       this.loginInfo.rootOrgId = to.query.orgId;
+      this.loginInfo.code = to.query.code;
     },
   },
   created() {
@@ -148,6 +150,7 @@ export default {
     var params = this.$route.query;
 
     this.loginInfo.rootOrgId = params.orgId;
+    this.loginInfo.code = params.code;
   },
   methods: {
     ...mapActions([USER_SIGNIN]),

src/modules/portal/views/home/Home.vue

@@ -322,12 +322,12 @@ export default {
       this.$refs.passForm.resetFields();
     },
     logout() {
-      const orgId = this.user.rootOrgId;
+      const rootOrgCode = this.user.rootOrgCode;
       const getRootOrgId = () => {
         if (location.hostname.includes("qmth.com.cn")) {
           return "";
         } else {
-          return "?orgId=" + orgId;
+          return "?code=" + rootOrgCode;
         }
       };