1

wl/platforms/android/assets/www/index.html

@@ -40,6 +40,6 @@
 <script src="js/services/goodsservice.js"></script>
 <script src="js/services/orderservice.js"></script>
 <script src="js/services/myservice.js"></script>
-<script src="js/services/nativeservices.js"></script>
+<script src="js/services/mapservice.js"></script>
 <!--filters-->
 <script src="js/filters/filter.js"></script>

wl/platforms/android/assets/www/js/app.js

@@ -42,8 +42,8 @@
      $httpProvider.interceptors.push('myHttpInterceptor');
      
  }])
-.run(["$ionicPlatform", "$location", "msg", "$rootScope", "$timeout", "$ionicHistory", "userService", "$state", "$http",
-    function ($ionicPlatform, $location, msg, $rootScope, $timeout, $ionicHistory, userService, $state, $http) {
+.run(["$ionicPlatform", "$location", "msg", "$rootScope", "$timeout", "$ionicHistory", "userService", "$state", "$http", "map",
+    function ($ionicPlatform, $location, msg, $rootScope, $timeout, $ionicHistory, userService, $state, $http, map) {
     $ionicPlatform.registerBackButtonAction(function (e) {
         if ($location.path().indexOf("wl/") != -1) {
             if ($rootScope.backButtonPressedOnceToExit) {
@@ -71,9 +71,15 @@
         if (window.StatusBar) {
             StatusBar.styleDefault();
         }
+   
+        if (!$rootScope.location) {
+            map.getLocation().then(function (result) {
+                $rootScope.location = result;
+            });
+        }
         if (!userService.isLogin()) {
             $state.go('login');
-        } 
+        }
     });
 }]);
  angular.module("app.controllers", []);

wl/platforms/android/assets/www/js/controllers/car.js

@@ -1,5 +1,5 @@
 (function (app) {
-    app.controller('carCtrl', ["$scope", "$ionicSideMenuDelegate", "$state", 'carService', 'msg', function ($scope, $ionicSideMenuDelegate, $state, carService, msg) {
+    app.controller('carCtrl', ["$scope", "$ionicSideMenuDelegate", "$state", 'carService', 'msg', '$rootScope', function ($scope, $ionicSideMenuDelegate, $state, carService, msg, $rootScope) {
         $scope.filter = {
             hasMore: false,
             pageIndex: 0,
@@ -12,11 +12,14 @@
         $scope.items = [];
         $scope.load = function (init) {
             if (init) {
+             
                 $scope.filter.pageIndex = 1;
                 $scope.items = [];
+                if ($rootScope.location) {
+                    $scope.filter.begin_address = $rootScope.location.city;
+                }
             }
             carService.listCars($scope.filter).then(function (result) {
-             
                 $scope.filter.pageIndex++;
                 var more = (result.data.data.length >= $scope.filter.pageSize);
                 $scope.filter.hasMore = more;
@@ -114,10 +117,10 @@
             });
         }
     }]);
-    app.controller('carDetailCtrl', ["$scope", '$stateParams', 'msg', 'orderService', '$state', 'userService',
-        function ($scope, $stateParams, msg, orderService, $state, userService) {
+    app.controller('carDetailCtrl', ["$scope", '$stateParams', 'msg', 'orderService', '$state', 'map',
+        function ($scope, $stateParams, msg, orderService, $state, map) {
         $scope.vm = $stateParams.item;
-        userService.getMapPic($scope.vm.begin_address).then(function (result) {
+        map.getMapPic($scope.vm.begin_address).then(function (result) {
             $scope.vm.picUrl = result;
         });
         //下单

wl/platforms/android/assets/www/js/controllers/goods.js

@@ -1,6 +1,6 @@
 (function (app) {
-    app.controller('goodsCtrl', ["$scope", "$state", 'goodsService', '$ionicSideMenuDelegate', 'msg', function ($scope, $state, goodsService, $ionicSideMenuDelegate, msg) {
-
+    app.controller('goodsCtrl', ["$scope", "$state", 'goodsService', '$ionicSideMenuDelegate', 'msg', '$rootScope'
+        , function ($scope, $state, goodsService, $ionicSideMenuDelegate, msg, $rootScope) {
         $scope.filter = {
             hasMore: false,
             pageIndex: 0,
@@ -15,7 +15,11 @@
             if (init) {
                 $scope.filter.pageIndex = 1;
                 $scope.items = [];
+                if ($rootScope.location) {
+                    $scope.filter.begin_address = $rootScope.location.city;
+                }
             }
+          
             goodsService.listGoods($scope.filter).then(function (result) {
                  
                 $scope.filter.pageIndex++;
@@ -46,32 +50,10 @@
         }
         $scope.load(true); 
         $scope.getLocation = function () {
-            //http://lbs.amap.com/api/javascript-api/reference/plugin/#m_AMap.Geolocation
-           var mapObj = new AMap.Map('iCenter');
-            mapObj.plugin('AMap.Geolocation', function () {
-                geolocation = new AMap.Geolocation({
-                    enableHighAccuracy: true,//是否使用高精度定位，默认:true
-                    timeout: 10000,          //超过10秒后停止定位，默认：无穷大
-                    maximumAge: 0,           //定位结果缓存0毫秒，默认：0
-                    convert: true,           //自动偏移坐标，偏移后的坐标为高德坐标，默认：true
-                    showButton: true,        //显示定位按钮，默认：true
-                    buttonPosition: 'LB',    //定位按钮停靠位置，默认：'LB'，左下角
-                    buttonOffset: new AMap.Pixel(10, 20),//定位按钮与设置的停靠位置的偏移量，默认：Pixel(10, 20)
-                    showMarker: true,        //定位成功后在定位到的位置显示点标记，默认：true
-                    showCircle: true,        //定位成功后用圆圈表示定位精度范围，默认：true
-                    panToLocation: true,     //定位成功后将定位到的位置作为地图中心点，默认：true
-                    zoomToAccuracy: true      //定位成功后调整地图视野范围使定位位置及精度范围视野内可见，默认：false
-                });
-                mapObj.addControl(geolocation);
-                AMap.event.addListener(geolocation, 'complete', function (result) {
-                    alert('sucess:' + JSON.stringify(result));
-                });//返回定位信息
-                AMap.event.addListener(geolocation, 'error', function (error) {
-                    alert('error:' + JSON.stringify(error));
-                });      //返回定位出错信息
-            });
+          
         }
-      //  $scope.getLocation();
+    
+       
     }]);
     app.controller('goodsAddCtrl', ["$scope", "$state", "goodsService", "msg", function ($scope, $state, goodsService, msg) {
 
@@ -126,10 +108,10 @@
             });
         }
     }]);
-    app.controller('goodsDetailCtrl', ["$scope", '$stateParams', 'msg', 'orderService', '$state', 'userService'
-        , function ($scope, $stateParams, msg, orderService, $state, userService) {
+    app.controller('goodsDetailCtrl', ["$scope", '$stateParams', 'msg', 'orderService', '$state', 'map'
+        , function ($scope, $stateParams, msg, orderService, $state, map) {
         $scope.vm = $stateParams.item;
-        userService.getMapPic($scope.vm.begin_address).then(function (result) {
+        map.getMapPic($scope.vm.begin_address).then(function (result) {
             $scope.vm.picUrl = result;
         });
         //下单

wl/platforms/android/assets/www/js/controllers/my.js

@@ -320,6 +320,15 @@
         }
         $scope.pay = function (item,$event) {
             $event.stopPropagation();
+            msg.text('支付尚未开通，敬请期待');
+            //var price = item.message.data.price;
+            //window.alipay.pay({
+            //    tradeNo: new Date().getTime(),
+            //    subject: "测试标题",
+            //    body: "我是测试内容",
+            //    price: price,
+            //    notifyUrl: "http://your.server.notify.url"
+            //}, function (successResults) { alert(successResults) }, function (errorResults) { alert(errorResults) });
             //to do 
         }
         $scope.delete = function (item,$event) {

wl/platforms/android/assets/www/templates/goods/index.html

@@ -8,7 +8,6 @@
                 <!--下拉刷新-->
                 <ion-refresher pulling-text="下拉刷新" on-refresh="load(true)">
                 </ion-refresher>
-              <div id="iCenter"></div>
                 <div class="row app-link headbck">
                     <div class="col-33">
                         <a ng-click="add()">

wl/www/js/controllers/goods.js

@@ -1,6 +1,6 @@
 (function (app) {
-    app.controller('goodsCtrl', ["$scope", "$state", 'goodsService', '$ionicSideMenuDelegate', 'msg'
-        ,function ($scope, $state, goodsService, $ionicSideMenuDelegate, msg) {
+    app.controller('goodsCtrl', ["$scope", "$state", 'goodsService', '$ionicSideMenuDelegate', 'msg', '$rootScope'
+        , function ($scope, $state, goodsService, $ionicSideMenuDelegate, msg, $rootScope) {
         $scope.filter = {
             hasMore: false,
             pageIndex: 0,