添加提示

@@ -69,25 +69,23 @@ angular.module('myApp')
 						localStorage.removeItem('ls.user')
 						localStorage.removeItem('ls.user')
 						return
 						return
 					}
 					}
-					if(date.meta.code === 200) {
-                        if(data.data.unfinishedOrder.status == 200) {
-                            if(data.data.unfinishedOrder.id) {
-                                $rootScope.isRendBike = true;
-                                $scope.unfinishOrder = data.data.unfinishedOrder;
-                            }
-                            layer.open({
-                                content: '您有未支付的订单，是否前往支付？',
-                                btn: ['确认', '取消'],
-                                shadeClose: false,
-                                yes: function(index){
-                                    layer.close(index);
-                                    $state.go('tripDetail' , { orderId : $scope.unfinishOrder.id});
-                                    return;
-                                },no: function(index){
-                                    layer.close(index);
-                                }
-                            });
-                        }
+					if(data.meta.code === 200) {
+						if(data.data.unfinishedOrder.id) {
+							$rootScope.isRendBike = true;
+							$scope.unfinishOrder = data.data.unfinishedOrder;
+						}
+						layer.open({
+							content: '您有未支付的订单，是否前往支付？',
+							btn: ['确认', '取消'],
+							shadeClose: false,
+							yes: function(index){
+								layer.close(index);
+								$state.go('tripDetail' , { orderId : $scope.unfinishOrder.id});
+								return;
+							},no: function(index){
+								layer.close(index);
+							}
+						});
 					}
 					}
 
 
 				}).error(function(data , status) {
 				}).error(function(data , status) {

@@ -306,9 +306,6 @@ angular.module('myApp')
 				} else {
 				} else {
 
 
                     appClient.getGPS('', function (latitude, longitude, cb) {
                     appClient.getGPS('', function (latitude, longitude, cb) {
-                        layer.open({
-                            content: latitude + "_" + longitude
-                        })
                         onSuccess({
                         onSuccess({
                             latitude: latitude,
                             latitude: latitude,
                             longitude: longitude
                             longitude: longitude
@@ -384,12 +381,20 @@ angular.module('myApp')
 ////							navigator.geolocation.getCurrentPosition(onSuccess,onError,options);
 ////							navigator.geolocation.getCurrentPosition(onSuccess,onError,options);
 //						} , 1000 * 60 * 60);
 //						} , 1000 * 60 * 60);
 					} else {
 					} else {
-						myMarker.position = point;
-						if(isForce) {
-							var map = myMarker.getMap();
-							map.panTo(point);
-						}
-						refreshNewPoints(point);
+						try {
+                            myMarker.position = point;
+                            if(isForce) {
+                                // var map = myMarker.getMap();
+                                map.panTo(point);
+                                map.setZoom(15)
+                            }
+                            refreshNewPoints(point);
+                        } catch (e) {
+							layer.open({
+								content: e
+							})
+                        }
+
 					}
 					}
 				})
 				})
 			}
 			}