Merge branch 'wx-repair' of http://git.dashitech.com/seimin/zuel-itsm-3.0.2 into wx-repair

src/views/Login.vue

@@ -185,22 +185,13 @@ export default {
     zlogin() {
       console.log(this);
       var that = this;
-      var ssoStr = "";
-      var ssoJson;
-      if (this.isSSo) {
-        ssoStr = location.search
-          .replace("?", "")
-          .split("&")[0]
-          .split("=")[1];
-        ssoStr = decode(decodeURIComponent(ssoStr));
-        ssoJson = JSON.parse(ssoStr);
-      }
       var postData = this.isSSo
-        ? { username: ssoJson.a, password: ssoJson.r, t: false }
+        ? { type: 'req' }
         : { username: this.zhanghao, password: this.mima };
-      this.$http.post("service/auth/reqlogin", postData).then(res => {
+      this.$http.post("service/auth/sslLogin", postData).then(res => {
         that.loading = false;
         if (res.data && res.data.state == 200) {
+          localStorage.clear();
           localStorage.setItem(
             "loginUser",
             JSON.stringify(res.data.data.requester)
@@ -216,7 +207,16 @@ export default {
           } else {
             this.loginNext(res.data.data.requester);
           }
+        }else if (res.data && res.data.state == 501) {
+          // 判断是否有区域地点或联系电话或校区，没有则需要补充
+          var requester = JSON.parse(localStorage.getItem('loginUser')) || {};
+          if (!requester.place || !requester.mphone || !requester.branch) {
+            this.$router.push({ path: "/supplementary" });
+          } else {
+            this.loginNext(requester);
+          }
         } else {
+          localStorage.clear();
           that
             .$createDialog({
               type: "alert",
@@ -240,12 +240,7 @@ export default {
     }
   },
   created() {
-    localStorage.clear();
-    if (location.search.length > 0) {
-      this.isSSo = Boolean(this.getQueryString("t"));
-    } else {
-      this.isSSo = false;
-    }
+    this.isSSo = true;
     if (this.isSSo) {
       this.zlogin();
     }