Merge branch 'master' of ssh://git.9026.com:2212/baimeng/wuliu into dev

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

@@ -19,6 +19,7 @@
 <script src="lib/ionic/js/ionic.bundle.js"></script>
 <script src="lib/ionic-citypicker/dist/ionic-citypicker.min.js"></script>
 <script type="text/javascript" src="http://webapi.amap.com/maps?v=1.3&key=0715086687d30a66050a5b7c5f1eed5d"></script> 
+
 <!--<script src="lib/ionic/js/ionic.bundle.min.js"></script>-->
 <script src="cordova.js"></script>
 <script src="js/app.js"></script>

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

@@ -86,5 +86,5 @@
  angular.module("app.controllers", []);
  angular.module("app.services", []);
  angular.module("app.filters", []);
- angular.module("app.directives", []);
+ angular.module('app.directives', []);
 })();

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

@@ -4,6 +4,7 @@
             mobile: '',
             password:''
         };
+      
         $scope.login = function () {
             msg.loading('登录中...');
             userService.login($scope.vm.mobile, $scope.vm.password).then(function (result) {

wl/platforms/android/assets/www/templates/account/login.html

@@ -5,6 +5,7 @@
             <img src="img/sublogo.png" style="width:100%;height:auto" />
         </div>
         <form>
+          
             <div class="list loginform">
                 <label class="item item-input" style="border-width:0">
                     <i class="icon ion-android-phone-portrait placeholder-icon"  ></i>

wl/www/index.html

@@ -19,6 +19,7 @@
 <script src="lib/ionic/js/ionic.bundle.js"></script>
 <script src="lib/ionic-citypicker/dist/ionic-citypicker.min.js"></script>
 <script type="text/javascript" src="http://webapi.amap.com/maps?v=1.3&key=0715086687d30a66050a5b7c5f1eed5d"></script> 
+
 <!--<script src="lib/ionic/js/ionic.bundle.min.js"></script>-->
 <script src="cordova.js"></script>
 <script src="js/app.js"></script>

wl/www/js/app.js

@@ -86,5 +86,5 @@
  angular.module("app.controllers", []);
  angular.module("app.services", []);
  angular.module("app.filters", []);
- angular.module("app.directives", []);
+ angular.module('app.directives', []);
 })();

wl/www/js/config/config.js

@@ -2,8 +2,8 @@
     //全局配置 
     app.constant("config", {
         //server: (!!window.cordova) ? "http://w2.9026.com/" : location.origin, //服务端,
-        // server: "http://120.25.204.211/"
-        server: "http://wl.youawan.com/"
+         server: "http://120.25.204.211/"
+      //  server: "http://wl.youawan.com/"
        // server: 'http://localhost:8094/'
        
     });

wl/www/js/controllers/account.js

@@ -4,6 +4,7 @@
             mobile: '',
             password:''
         };
+      
         $scope.login = function () {
             msg.loading('登录中...');
             userService.login($scope.vm.mobile, $scope.vm.password).then(function (result) {

wl/www/templates/account/login.html

@@ -5,6 +5,7 @@
             <img src="img/sublogo.png" style="width:100%;height:auto" />
         </div>
         <form>
+          
             <div class="list loginform">
                 <label class="item item-input" style="border-width:0">
                     <i class="icon ion-android-phone-portrait placeholder-icon"  ></i>