首页登录优化

dev/src/view/login/v_index.js

@@ -85,22 +85,6 @@ function initComponentsConfig() {
     }
 }
 
-//function resolve(self){
-//	if (plus.os.name == 'Android') {
-//      iot.permission.checkPermission(['READ_EXTERNAL_STORAGE'], function (res) {
-//          console.log('success', res);
-//			loginButtonTap(self);
-//      }, function (err) {
-//          console.log('error', err);
-//          //已禁用，跳到系统设置页面
-//          iot.native.toAppSetting();
-//      });
-//  }else{
-//  	loginButtonTap(self);
-//  }
-//}
-
-
 //sds登陆
 function loginButtonTap(self){
 	if (plus.os.name == 'Android') {
@@ -109,18 +93,6 @@ function loginButtonTap(self){
 			openSdsLogin(self);
         }, function (err) {
             console.log('error', err);
-            //已禁用，跳到系统设置页面
-//          plus.nativeUI.confirm('需要文件读取权限', (e)=>{
-//          	if(e.index == 1){
-//          		//确认
-//          		iot.native.toAppSetting();
-//          	}else if(e.index == 1){
-//          		//取消
-//          		uComponents.hideloading(self);
-//          	}
-//          },{ "title":"权限请求",
-//				"buttons":["取消","确定"],
-//				"verticalAlign":"center"});
         });
     }else{
     	openSdsLogin(self);
@@ -163,14 +135,11 @@ function openSdsLogin(self){
 		            }
 			    	uComponents.hideLoading(self);
 			    },
-			    complete: () => {
-//			    	uComponents.hideLoading(self);
-			    }
+			    complete: () => {}
 			});
 		},
 		error: (error) => {
 			//初始化失败,重新初始化
-			console.log('eroor');
 			console.log(error);
 			if(window.iotDebug){
                 iotDebug.push('end: 初始化失败'+JSON.stringify(error));
@@ -185,7 +154,10 @@ function openSdsLogin(self){
 		        }
 		    });
 		},
-		complete: () => {}
+		complete: () => {
+			console.log("complete");
+			uComponents.hideLoading(self);
+		}
 	});
 }
 
@@ -224,11 +196,13 @@ function cloudsLogin(self, id){
 							    	console.log(response);
 							    },
 							    error: (error) => {
-									uComponents.hideLoading(self);
 							    	console.log(error);
 									uPublic.openRequestErrorAlert(self);
+									uComponents.hideLoading(self);
 							    },
-							    complete: () => {}
+							    complete: () => {
+//									uComponents.hideLoading(self);
+							    }
 							});
 		    			}
 	    				iot.navigator.openWindow({