gst

@@ -4,6 +4,44 @@ angular.module('myApp')
 		$rootScope.isRendBike = false;
 		$rootScope.isLoadFinish = false;
 		$scope.unfinishOrder = {};
+		var code = getUrl('code')
+		var loginCode = function (code) {
+			if(code){
+				dingdaService.verifyThirdCode(code).success(function (res) {
+					globalService.saveData('loginCode', code)
+					if(res.meta.code == 200) {
+													dingdaService.verifyPhoneCode(res.data.mobile, res.data.code).success(function (data) {
+															if (data.meta.code == 200) {
+																	data.data.userName = res.data.mobile;
+																	globalService.saveData('user',data.data);
+																	layer.open({
+																			content: '登录成功',
+																			time:1
+																	});
+																	setTimeout(function() {
+									window.location.href = window.location.origin + window.location.pathname
+																			// location.reload();
+																	} , 300);
+															} else if (data.meta.code == 401) {
+																	layer.open({
+																			content: data.meta.message,
+																			time:1
+																	});
+//					alert(data.meta.message);
+//					layer.msg(data.data.error);
+																	return;
+															}
+													})
+					}
+					if(res.meta.code == 500){
+													$state.go('login', {}, {reload: true});
+					}
+				})} else {
+					$scope.userinfo = {};
+					$scope.userinfo.userName = "未登录";
+					$scope.userinfo.loginState = false;
+				}
+		}
 		var init = function() {
 //			globalService.init();
             function getUrl(name){
@@ -12,48 +50,13 @@ angular.module('myApp')
                 if(r!=null)return  unescape(r[2]); return null;
             }
 			$scope.userinfo = globalService.getData("user");
-			var loginCode = globalService.getData("loginCode");
-			var code = getUrl('code')
-			if(!$scope.userinfo || (code && (loginCode !== code))) {
-				if(code){
-					dingdaService.verifyThirdCode(code).success(function (res) {
-						globalService.saveData('loginCode', code)
-						if(res.meta.code == 200) {
-                            dingdaService.verifyPhoneCode(res.data.mobile, res.data.code).success(function (data) {
-                                if (data.meta.code == 200) {
-                                    data.data.userName = res.data.mobile;
-                                    globalService.saveData('user',data.data);
-                                    layer.open({
-                                        content: '登录成功',
-                                        time:1
-                                    });
-                                    setTimeout(function() {
-										window.location.href = window.location.origin + window.location.pathname
-                                        // location.reload();
-                                    } , 300);
-                                } else if (data.meta.code == 401) {
-                                    layer.open({
-                                        content: data.meta.message,
-                                        time:1
-                                    });
-//					alert(data.meta.message);
-//					layer.msg(data.data.error);
-                                    return;
-                                }
-                            })
-						}
-						if(res.meta.code == 500){
-                            $state.go('login', {}, {reload: true});
-						}
-                    })
-				} else {
-                    $scope.userinfo = {};
-                    $scope.userinfo.userName = "未登录";
-                    $scope.userinfo.loginState = false;
-				}
-
+			if(!$scope.userinfo ) {
+				loginCode()
 			} else {
-				$scope.userinfo.loginState = true;
+				var loginCode = globalService.getData("loginCode");
+				if(code && (loginCode !== code)){
+					loginCode()
+				}
 //				alert("getUnfinishedOrder")
 				dingdaService.getUnfinishedOrder().success(function(data , status){
 //					alert(JSON.stringify(data))