1201

dev/src/view/addDevice/v_scanCodeAdd.js

@@ -27,6 +27,8 @@ function init() {
                 }, function (err) {
                     console.log('error', err);
                 });
+            }else{
+            	openScanCode(self);
             }
         },
         methods:{

dev/src/view/device/v_index.js

@@ -419,6 +419,7 @@ function getDevices(self){
 	iot.business.sds.getDevicesByUser({
 	    success: (response) => {
 	    	console.log(response);
+//	    	alert(JSON.stringify(response));
 	    	let data = uPublic.checkResponseData(response.data);
 			if(response.data == 'success'){
 				setValueOfSwitch(self, true);

dev/src/view/login/v_index.js

@@ -47,6 +47,7 @@ function init() {
         		this.showLoginButtonFlag = flag;
         	},
         	onLoginButtonTap(){
+				uComponents.showLoading(this);
         		loginButtonTap(this);
         	},
         	getClientId(){
@@ -83,7 +84,7 @@ function initComponentsConfig() {
 }
 
 function loginButtonTap(self){
-	uComponents.showLoading(self);
+
 //	if(window.iotDebug){
 //      iotDebug.push('start: initSDSLogin');
 //  }

web/view/addDevice/scanCodeAdd.js

@@ -34,6 +34,8 @@ function init() {
 																}, function (err) {
 																				console.log('error', err);
 																});
+												} else {
+																openScanCode(self);
 												}
 								},
 

web/view/device/index.js

@@ -24271,6 +24271,7 @@ function getDevices(self) {
   _public.iot.business.sds.getDevicesByUser({
     success: function success(response) {
       console.log(response);
+      //	    	alert(JSON.stringify(response));
       var data = _public.uPublic.checkResponseData(response.data);
       if (response.data == 'success') {
         setValueOfSwitch(self, true);

web/view/login/index.js

@@ -55,6 +55,7 @@ function init() {
                 this.showLoginButtonFlag = flag;
             },
             onLoginButtonTap: function onLoginButtonTap() {
+                _public.uComponents.showLoading(this);
                 loginButtonTap(this);
             },
             getClientId: function getClientId() {
@@ -91,7 +92,7 @@ function initComponentsConfig() {
 }
 
 function loginButtonTap(self) {
-    _public.uComponents.showLoading(self);
+
     //	if(window.iotDebug){
     //      iotDebug.push('start: initSDSLogin');
     //  }