2

wl/www/css/style.css

@@ -68,8 +68,8 @@
 .app-link-item { text-align: center; }
 .app-link-item i { background: no-repeat center / auto 50px; width: 60px; height: 50px; display: inline-block; position: relative }
 .app-link-item i img { height: 24px; }
-.app-link-item span { display: block; font-size:20px; line-height:1.4;color:#fff;font-weight:bold }
-.app-link-item .gray { display: block; font-size:20px; line-height:1.4;color:#333;font-weight:bold }
+.app-link-item span { display: block; font-size:15px; line-height:1.4;color:#fff;font-weight:bold }
+.app-link-item .gray { display: block; font-size:15px; line-height:1.4;color:#333;font-weight:bold }
 .app-link-item p { text-align: center; display: block; line-height: 20px; font-size: 14px; font-weight: bold }
 .app-link-item i.i-applink-add { background-image: url(../img/icon/i_applink_add.png); }
 .app-link-item i.i-applink-addcar { background-image: url(../img/icon/addcar.png); }

wl/www/js/config/config.js

@@ -3,6 +3,7 @@
     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://wl.youawan.com/"
+        server: 'http://211.149.200.17/'
     });
 })(angular.module('app'));

wl/www/js/controllers/account.js

@@ -18,6 +18,7 @@
                     $state.go('wl.goods');
                 }
             }, function (erro) {
+                debugger;
                 msg.hide();
                 // msg.error(erro.data.message);
                 msg.error(erro.data.message);

wl/www/js/controllers/car.js

@@ -141,13 +141,16 @@
             });
         }
     }]);
-    app.controller('carSuccessCtrl', ['$scope', '$state', '$ionicHistory', '$stateParams', function ($scope, $state, $ionicHistory, $stateParams) {
+    app.controller('carSuccessCtrl', ['$scope', '$state', '$ionicHistory', '$stateParams', 'msg', function ($scope, $state, $ionicHistory, $stateParams, msg) {
         $scope.vm = $stateParams.item;
         //下单成功
         $scope.back = function () {
             $ionicHistory.clearHistory();
             $state.go('wl.car');
         }
+        $scope.pay = function () {
+            msg.text('支付尚未开通，敬请期待');
+        }
     }]);
 })(angular.module('app.controllers'));
 

wl/www/js/controllers/goods.js

@@ -16,7 +16,7 @@
                 $scope.filter.pageIndex = 1;
                 $scope.items = [];
                 if ($rootScope.location) {
-                    $scope.filter.begin_address = $rootScope.location.city;
+                   // $scope.filter.begin_address = $rootScope.location.city;
                 }
             }
           
@@ -132,12 +132,15 @@
             });
         }
     }]);
-    app.controller('goodsSuccessCtrl', ['$scope', '$state', '$ionicHistory', '$stateParams', function ($scope, $state, $ionicHistory, $stateParams) {
+    app.controller('goodsSuccessCtrl', ['$scope', '$state', '$ionicHistory', '$stateParams', 'msg', function ($scope, $state, $ionicHistory, $stateParams, msg) {
         $scope.vm = $stateParams.item;
         //下单成功
         $scope.back = function () {
             $ionicHistory.clearHistory();
             $state.go('wl.goods');
         }
+        $scope.pay = function () {
+            msg.text('支付尚未开通，敬请期待');
+        }
     }]);
 })(angular.module('app.controllers'));

wl/www/js/controllers/my.js

@@ -3,6 +3,7 @@
         $scope.user = {};
         userService.getUser().then(function (result) {
             $scope.user = result.data.data;
+             
         }, function (erro) {
             msg.error(erro.data.message);
         });
@@ -69,11 +70,7 @@
               { name: "男", value: 1 },
               { name: "女", value: 0 }
         ];
-        userService.getApplyProfile().then(function (result) {
-            $scope.vm = result;
-        }, function (erro) {
-            msg.error(erro);
-        });
+     
         $scope.setAvator = function () {
             var sheet = $ionicActionSheet.show({
                 buttons: [{ text: '<b>拍照</b> 上传' }, { text: '从 <b>相册</b> 中选' }],
@@ -155,6 +152,14 @@
         }
         $scope.save = function () {
             data.updateObject('user', $scope.user);
+            msg.loading('保存中...');
+            userService.update($scope.user).then(function () {
+                msg.hide();
+                msg.success('保存成功');
+            }, function (erro) {
+                msg.hide();
+                msg.error(erro.data.message);
+            });
         }
     }]);
     

wl/www/js/services/userservice.js

@@ -14,6 +14,13 @@
                    // reject('654878');
                  });
             },
+            update:function (model) {
+                return $http({
+                    url: config.server + 'api/user',
+                    method: "post",
+                    data: model
+                })
+            },
             register: function (model) {
                 return $http({
                     url: config.server + 'api/auth/register',

wl/www/templates/account/login.html

@@ -6,7 +6,7 @@
         </div>
         <form>
             <div class="list loginform">
-                <label class="item item-input">
+                <label class="item item-input" style="border-width:0">
                     <i class="icon ion-android-phone-portrait placeholder-icon"  ></i>
                     <input type="text" ng-model="vm.mobile" placeholder="手机号码">
                 </label>

wl/www/templates/car/detail.html

@@ -3,8 +3,8 @@
         <div class="list">
             <img ng-src="{{vm.picUrl}}" style="width:100%;" />
             <div class="list card">
-                <div class="item item-avatar">
-                    <img ng-src="{{user.data.avatar | avator}}"/>
+                <div class="item item-avatar" style="border-width:0">
+                    <img ng-src="{{user.data.avatar | avator}}" />
                     <h2 style="white-space:normal">【{{vm.begin_address | shortAddress}}】-【{{vm.end_address | shortAddress}}】的车源信息</h2>
                     <p>价格:<b style="color:red">￥{{vm.price}}</b></p>
                 </div>

wl/www/templates/car/index.html

@@ -35,7 +35,7 @@
                         </a>
                     </div>
                 </div>
-                <div class="app-link-bottom"></div>
+           
                 <div class="list">
                     <a class="item item-thumbnail-left"  ng-repeat="item in items" ng-click="detail(item)">
                         <img src="img/demo/defaultcar.png" />
@@ -50,7 +50,7 @@
 
             </ion-content>   
         </ion-side-menu-content>
-        <ion-side-menu side="right">
+        <ion-side-menu  width="220" side="right">
             <ion-content>
                 <div class="list">
                     <div class="padding">

wl/www/templates/car/success.html

@@ -8,8 +8,14 @@
                 <p>联系人：{{vm.contact_name}},联系电话：{{vm.contact_phone}}</p>
             </div>
         </div>
-        <div class="padding">
-            <button type="button" ng-click="back()" class="button button-full button-positive">返回</button>
+
+        <div class="row padding">
+            <div class="col-50">
+                <button type="button" ng-click="back()" class="button button-full button-positive">返回</button>
+            </div>
+            <div class="col-50">
+                <button ng-click="pay()" class="button button-full button-energized">立即支付</button>
+            </div>
         </div>
     </ion-content>
 </ion-view>

wl/www/templates/goods/detail.html

@@ -2,8 +2,8 @@
     <ion-content>
         <div class="list">
             <img  ng-src="{{vm.picUrl}}" style="width:100%;"/>
-            <div class="list card">
-                <div class="item item-avatar">
+            <div class="list" >
+                <div class="item item-avatar" style="border-width:0">
                     <img ng-src="{{user.data.avatar | avator}}" />
                     <h2 style="white-space:normal">【{{vm.begin_address | shortAddress}}】-【{{vm.end_address | shortAddress}}】的货源信息</h2>
                     <p>价格:<b style="color:red">￥{{vm.price}}</b></p>

wl/www/templates/goods/index.html

@@ -33,8 +33,7 @@
                             </div>
                         </a>
                     </div>
-                </div>
-                <div class="app-link-bottom"></div>
+                </div>          
                 <div class="list">
                     <a class="item" ng-repeat="item in items" ng-click="detail(item)">
                         <h2>【{{item.begin_address | shortAddress}}】-【{{item.end_address | shortAddress}}】</h2>
@@ -52,7 +51,7 @@
 
             </ion-content>   
         </ion-side-menu-content>
-        <ion-side-menu side="right">
+        <ion-side-menu width="220" side="right">
             <ion-content>
                 <div class="list">
                     <div class="padding">

wl/www/templates/goods/success.html

@@ -8,8 +8,14 @@
                 <p>联系人：{{vm.contact_name}},联系电话：{{vm.contact_phone}}</p>
             </div>
         </div>
-        <div class="padding">
-            <button type="button" ng-click="back()" class="button button-full button-positive">返回</button>
+      
+        <div class="row padding">
+            <div class="col-50">
+                <button type="button" ng-click="back()" class="button button-full button-positive">返回</button>
+            </div>
+            <div class="col-50">
+                <button ng-click="pay()"  class="button button-full button-energized">立即支付</button>
+            </div>
         </div>
     </ion-content>
 </ion-view>

wl/www/templates/home/index.html

@@ -57,7 +57,7 @@
                 <h2>【{{item.begin_address | shortAddress}}】-【{{item.end_address | shortAddress}}】</h2>
                 <p><span style="float:left"><b style="color:orangered">￥{{item.price}}</b><em style="padding-left:3px;font-size:0.75em">起</em></span>
                  <span style="float:right">途经：{{item.midway_address | shortAddress}}</span></p>
-                <p><span style="float:left">联系人：{{item.contact_name}}</span> <span style="float:right">电话：{{item.contact_phone}}</span></p> 
+                <p><span style="float:left">联系人：{{item.contact_name}}</span> </p> 
             </a>
         </div>
         <div class="list" ng-if="vm.showIndex==2">
@@ -65,7 +65,7 @@
                 <img ng-src="{{item.truck.data.photo | truckPhoto}}" />
                 <h2 style="white-space:normal">【{{item.begin_address | shortAddress}}】-【{{item.end_address | shortAddress}}】<span style="color:gray;">({{item.title}})</span></h2>
                 <p><span style="float:left"><b style="color:orangered">￥{{item.price}}</b><em style="padding-left:3px;font-size:0.75em">起</em></span></p>
-                <p><span style="float:left">联系人：{{item.contact_name}}</span> <span style="float:right">电话：{{item.contact_phone}}</span></p>
+                <p><span style="float:left">联系人：{{item.contact_name}}</span>  </p>
             </a>
          
         </div>

wl/www/templates/my/index.html

@@ -4,9 +4,8 @@
             <a  class="user-photo">
               <img ng-src="{{user.avatar | avator}}"  />
             </a>
-            
             <div class="user-info" ng-click="toProfile()">
-                <a >  <p><span>{{user.phone}}</span></p>  </a>
+                <a >  <p><span>{{user.nick_name}}</span></p>  </a>
             </div>
             <div class="msg-user">
                 <a class="msg-item"><b style="color:red">￥{{user.money_balance}}</b><span>我的余额</span></a>

wl/www/templates/my/order.html

@@ -16,7 +16,7 @@
                     <span >合计：<b style="color:orangered">￥{{item.message.data.price}}</b></span>
                     <div style="margin-top:10px">
                         <button class="button button-stable" style="color:orangered;margin-right:10px;font-weight:bold" ng-click="pay(item,$event)">
-                            去支付
+                            &nbsp;去支付&nbsp;
                         </button>
                         <button class="button button-stable" ng-click="delete(item,$event)">
                             删除订单

wl/www/templates/my/profile.html

@@ -6,13 +6,13 @@
             </div>
             <a class="item item-avatar-right item-arrow-no" ng-click="setAvator()">
                 <img ng-src="{{user.avatar | avator}}" />
-                <h2>上传照片</h2>
-                <p>头像</p>
+                <h2>头像</h2>
+                <p style="font-size:12px">点击上传</p>
             </a>
             <a class="item">
                 <em class="fl">手机号</em>
-                <span style="float:right;margin-right:85px">{{user.phone}}</span>
-                <span class="badge badge-assertive">已认证</span>
+                <span style="float:right;margin-right:60px">{{user.phone}}</span>
+                <span class="badge badge-assertive" style="right:10px">已认证</span>
             </a>
             <label class="item item-input ">
                 <span class="input-label">姓名<span class="mustfill">*</span></span>