拆分

js/login.js

@@ -100,15 +100,17 @@ $(function () {
             data: JSON.stringify({ idx: 0, sum: 1, systemConfiguration: {keyconfig: 'ifRoom'} }),
           });
 
-          $.when($.all([promise1, promise2, promise3, promise4])).then(function(data1, data2, data3, data4){
+          promise1.all([promise1, promise2, promise3, promise4]).then(function([data1, data2, data3, data4]){
               console.log(data1, data2, data3, data4);
-              if(data1 && data2 && data3 && data4){
-                sessionStorage.setItem("repair_main", JSON.stringify(data1));
-                sessionStorage.setItem("wxIncidentWithCmdb",  data2.valueconfig);
-                sessionStorage.setItem("reqHasCategory", JSON.stringify(data3));
-                sessionStorage.setItem("ifRoom", data4.valueconfig);
+              if(Array.isArray(data1) && Array.isArray(data2) && Array.isArray(data3) && Array.isArray(data4) && data1.length && data2.length && data3.length && data4.length){
+                sessionStorage.setItem("repair_main", JSON.stringify(data1[0]));
+                sessionStorage.setItem("wxIncidentWithCmdb",  data2[0].valueconfig);
+                sessionStorage.setItem("reqHasCategory", JSON.stringify(data3[0]));
+                sessionStorage.setItem("ifRoom", data4[0].valueconfig);
                 hasClick = false;
                 window.location.href = "index.html";
+              }else{
+                hasClick = false;
               }
           }).catch(function(){
               hasClick = false;