10122023

dev/src/view/login/v_index.js

@@ -74,8 +74,9 @@ function loginButtonTap(self){
 			    	console.log(response);
 			    	let data = uPublic.checkResponseData(response.data);
 			    	if(data){
-			    		console.log("云端登陆");
+			    		if(data.hasOwnProperty('UserID')){
 			    			cloudsLogin(self, data.UserID);
+			    		}
 //			    		iot.navigator.openWindow({
 //					        url: '../device/index.html',
 //					        id: 'device'
@@ -87,9 +88,11 @@ function loginButtonTap(self){
 			    error: (error) => {
 			    	console.log(error);
 			    	//请求失败
-					uPublic.openRequestErrorAlert(self);
+//					uPublic.openRequestErrorAlert(self);
 			    },
-			    complete: () => {}
+			    complete: () => {
+			    	uComponents.hideLoading(self);
+			    }
 			});
 	    },
 	    error: (error) => {

dev/src/view/login/v_login.js

@@ -45,7 +45,7 @@ function init() {
 								    	let data = uPublic.checkResponseData(response.data);
 					    				if(data){
 					    					iot.navigator.openWindow({
-										        url: '../device/',
+										        url: '../device/index.html',
 										        id: 'device'
 										    });
 					    				}else{
@@ -148,7 +148,7 @@ function passwordChange(self,text){
 //tap 登录
 function loginButtonTap(){
     iot.navigator.openWindow({
-        url: '../device/',
+        url: '../device/index.html',
         id: 'device'
     });
 }

dev/src/view/myInfo/v_index.js

@@ -124,7 +124,7 @@ function logoutButtonTap(self){
 		                console.log(error);
 		            });
 			    	iot.navigator.openWindow({
-				        url: '../login/',
+				        url: '../login/index.html',
 				        id: 'login'
 				    });
 				    let wvs = plus.webview.all();

web/view/login/index.js

@@ -82,8 +82,9 @@ function loginButtonTap(self) {
 																				console.log(response);
 																				var data = _public.uPublic.checkResponseData(response.data);
 																				if (data) {
-																								console.log("云端登陆");
+																								if (data.hasOwnProperty('UserID')) {
 																												cloudsLogin(self, data.UserID);
+																								}
 																								//			    		iot.navigator.openWindow({
 																								//					        url: '../device/index.html',
 																								//					        id: 'device'
@@ -93,9 +94,11 @@ function loginButtonTap(self) {
 																error: function error(_error) {
 																				console.log(_error);
 																				//请求失败
-																				_public.uPublic.openRequestErrorAlert(self);
+																				//					uPublic.openRequestErrorAlert(self);
 																},
-																complete: function complete() {}
+																complete: function complete() {
+																				_public.uComponents.hideLoading(self);
+																}
 												});
 								},
 								error: function error(_error2) {

web/view/login/login.js

@@ -52,7 +52,7 @@ function init() {
                                         var data = _public.uPublic.checkResponseData(response.data);
                                         if (data) {
                                             _public.iot.navigator.openWindow({
-                                                url: '../device/',
+                                                url: '../device/index.html',
                                                 id: 'device'
                                             });
                                         } else {}
@@ -153,7 +153,7 @@ function passwordChange(self, text) {
 //tap 登录
 function loginButtonTap() {
     _public.iot.navigator.openWindow({
-        url: '../device/',
+        url: '../device/index.html',
         id: 'device'
     });
 }

web/view/myInfo/index.js

@@ -130,7 +130,7 @@ function logoutButtonTap(self) {
                         console.log(error);
                     });
                     _public.iot.navigator.openWindow({
-                        url: '../login/',
+                        url: '../login/index.html',
                         id: 'login'
                     });
                     var wvs = plus.webview.all();