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

src/views/Login.vue

@@ -211,20 +211,10 @@ 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.u, t: false }
+        ? { type: 'pc' }
         : { username: this.zhanghao, password: this.mima };
-      this.$http.post("service/auth/loginEncrypt", postData).then(res => {
+      this.$http.post("service/auth/sslLogin", postData).then(res => {
         that.loading = false;
         if (res.data && res.data.state == 200) {
           localStorage.setItem("loginUser", JSON.stringify(res.data.data.user));
@@ -234,6 +224,10 @@ export default {
             JSON.stringify(res.data.data.requester)
           );
           this.getConfig(res.data.data.user,res.data.data.requester);
+        }else if (res.data && res.data.state == 501) {
+          var user = JSON.parse(localStorage.getItem('loginUser'));
+          var requester = JSON.parse(localStorage.getItem('login_requester'));
+          user && requester && this.getConfig(user,requester);
         } else {
           that
             .$createDialog({
@@ -258,11 +252,7 @@ export default {
     }
   },
   created() {
-    if (location.search.length > 0) {
-      this.isSSo = Boolean(this.getQueryString("t"));
-    } else {
-      this.isSSo = false;
-    }
+    this.isSSo = true;
     if (this.isSSo) {
       this.zlogin();
     }