f

wl/www/css/style.css

@@ -66,12 +66,15 @@
 
 .app-link { padding: 10px 5px 2px 5px; margin: 0 5 0 auto; background-color: #FFF; }
 .app-link-item { text-align: center; }
-.app-link-item i { background: no-repeat center / auto 40px; width: 40px; height: 40px; display: inline-block; position: relative }
+.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 }
+.app-link-item span { display: block; font-size:20px; line-height:1.4;color:white;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); }
+.app-link-item i.i-applink-findgoods { background-image: url(../img/icon/findgoods.png); }
+.app-link-item i.i-applink-search{ background-image: url(../img/icon/search.png); }
+
 .app-link a { color: #999; font-size: 14px; line-height: 22px; }
 .app-link-item em { width: 9px; height: 9px; border-radius: 10px; background-color: rgba(252,101,34,1.00); position: absolute; z-index: 2; right: 0px; top: 0; }
 
@@ -105,4 +108,5 @@ input.ion-amap-place[readonly] { background-color: transparent; cursor: text; }
 .bar-button-selftest .button.button-positive.button-outline { background-color: #ccc; color:#0c60ee;  }
 
 .loginform input {height:50px;width:auto   }
-.loginform i { color:orange}
+.loginform i { color:orange}
+.headbck { background-color:rgba(252,124,5,1.00);}

wl/www/js/controllers/car.js

@@ -16,7 +16,7 @@
                 $scope.items = [];
             }
             carService.listCars($scope.filter).then(function (result) {
-
+             
                 $scope.filter.pageIndex++;
                 var more = (result.data.data.length >= $scope.filter.pageSize);
                 $scope.filter.hasMore = more;
@@ -40,6 +40,9 @@
         $scope.add = function () {
             $state.go('wl.car_add');
         }
+        $scope.goGoods = function () {
+            $state.go('wl.goods');
+        }
         $scope.load(true);
     }]);
     app.controller('carAddCtrl', ["$scope", "$state", "carService", "msg", function ($scope, $state, carService, msg) {

wl/www/js/controllers/goods.js

@@ -40,6 +40,9 @@
         $scope.add = function () {
             $state.go('wl.goods_add');
         }
+        $scope.goCar = function () {
+            $state.go('wl.car');
+        }
         $scope.load(true);
     }]);
     app.controller('goodsAddCtrl', ["$scope", "$state", "goodsService", "msg", function ($scope, $state, goodsService, msg) {
@@ -78,6 +81,7 @@
     }]);
     app.controller('goodsDetailCtrl', ["$scope", '$stateParams', 'msg', 'orderService', '$state', function ($scope, $stateParams, msg, orderService, $state) {
         $scope.vm = $stateParams.item;
+        
         //下单
         $scope.bill = function () {
             msg.confirm('下单提示', '确定下单？').then(function (res) {

wl/www/js/controllers/home.js

@@ -5,13 +5,13 @@
             $scope.vm.showIndex = i;
         }
         $scope.goods = [];
-        goodsService.listGoods({page:1}).then(function (result) {
+        goodsService.listGoods({ type: 1, pageIndex: 1 }).then(function (result) {
             $scope.goods = result.data.data;
         }, function (erro) {
             msg.error(JSON.stringify(erro.data));
         });
         $scope.cars = [];
-        carService.listCars({ page: 1 }).then(function (result) {
+        carService.listCars({ type: 2, pageIndex: 1 }).then(function (result) {
             $scope.cars = result.data.data;
         }, function (erro) {
             msg.error(JSON.stringify(erro.data));

wl/www/js/services/carservice.js

@@ -11,8 +11,10 @@
             },
             //车源列表
             listCars: function (model) {
+                var condition = util.format("?type={0}&begin_address={1}&end_address={2}&midway_address={3}&page={4}"
+                  , model.type, model.begin_address ? model.begin_address : '', model.end_address ? model.end_address : '', model.midway_address ? model.midway_address : '', model.pageIndex);
                 return $http({
-                    url: config.server + 'api/messages/search',
+                    url: config.server + 'api/messages/search' + condition,
                     method: "get",
                     data: model
                 })

wl/www/js/services/goodsservice.js

@@ -11,8 +11,11 @@
             },
             //货源列表
             listGoods: function (model) {
+                var condition = util.format("?type={0}&begin_address={1}&end_address={2}&midway_address={3}&page={4}"
+                  , model.type, model.begin_address?model.begin_address:'', model.end_address?model.end_address:'', model.midway_address?model.midway_address:'', model.pageIndex);
+                
                 return $http({
-                    url: config.server + 'api/messages/search',
+                    url: config.server + 'api/messages/search' + condition,
                     method: "get",
                     data: model
                 })

wl/www/templates/car/index.html

@@ -8,28 +8,41 @@
                 <!--下拉刷新-->
                 <ion-refresher pulling-text="下拉刷新" on-refresh="load(true)">
                 </ion-refresher>
-                <div class="app-link-bottom"></div>
-                <div class="row app-link">
-                    <div class="col-25">
+                
+                <div class="row app-link headbck">
+                    <div class="col-33">
                         <a ng-click="add()">
                             <div class="app-link-item">
-                                <i class="i-applink-add"></i>
+                                <i class="i-applink-addcar"></i>
                                 <span>发布车源</span>
                             </div>
                         </a>
                     </div>
+                    <div class="col-33">
+                        <a ng-click="goGoods()">
+                            <div class="app-link-item">
+                                <i class="i-applink-findgoods"></i>
+                                <span>找货源</span>
+                            </div>
+                        </a>
+                    </div>
+                    <div class="col-34">
+                        <a ng-click="toggleRight()">
+                            <div class="app-link-item">
+                                <i class="i-applink-search"></i>
+                                <span>搜索</span>
+                            </div>
+                        </a>
+                    </div>
                 </div>
                 <div class="app-link-bottom"></div>
                 <div class="list">
-                    <a class="item" ng-repeat="item in items" ng-click="detail(item)">
-                        <h2>【{{item.begin_address}}】-【{{item.end_address}}】</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}}</span>
-                        </p>
+                    <a class="item item-thumbnail-left"  ng-repeat="item in items" ng-click="detail(item)">
+                        <img src="img/demo/defaultcar.png" />
+                        <h2 style="white-space:normal">【{{item.begin_address}}】-【{{item.end_address}}】<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> 
                     </a>
-
                 </div>
 
                 <!--上拉更多-->

wl/www/templates/goods/detail.html

@@ -4,25 +4,31 @@
             <div class="list card">
                 <div class="item item-avatar">
                     <img src="img/photo_default_turquoise.jpg" />
-                    <h2>{{vm.contact_name}}、{{vm.contact_phone}}</h2>
-                    <p>价格:<b style="color:red">￥{{vm.begin_address}}</b></p>
+                    <h2 style="white-space:normal">【{{vm.begin_address}}】-【{{vm.end_address}}】的货源信息</h2>
+                    <p>价格:<b style="color:red">￥{{vm.price}}</b></p>
                 </div>
-
                 <div class="item item-body">
-                    <p style="font-weight:bold">从{{vm.begin_address}}到{{vm.end_address}}</p>
-                    <p>途径{{vm.midway_address}}</p>
+                    <p>出发地：{{vm.begin_address}}</p>
+                    <p>途经：{{vm.midway_address}}</p>
+                    <p>目的地：{{vm.end_address}}</p>
+                    <p>货物名称：{{vm.title}}</p>
+                    <p>联系人：{{vm.contact_name}}</p>
+                    <p>联系电话：{{vm.contact_phone}}</p>
                     <p>
                         {{vm.detail}}
                     </p>
-                    <p> 
-                     {{vm.created_at}}
+                    <p style="color:red"> 
+                     有效期：{{vm.created_at}}
                     </p>
                 </div>
-
-            </div>
-            <div class="padding">
-                <button type="button" ng-click="bill()" class="button button-full button-positive">下单</button>
             </div>
+            <div class="row padding">
+                <div class="col-50">
+                <button type="button" ng-click="bill()" class="button button-full button-positive">立马拍单</button>
+                </div>
+                <div class="col-50">
+                    <input type="tel"  class="button button-full button-energized" value="立马拍单"/>
+                </div>
         </div>   
     </ion-content>
 </ion-view>

wl/www/templates/goods/index.html

@@ -8,16 +8,32 @@
                 <!--下拉刷新-->
                 <ion-refresher pulling-text="下拉刷新" on-refresh="load(true)">
                 </ion-refresher>
-                <div class="app-link-bottom"></div>
-                <div class="row app-link">
-                    <div class="col-25">
+              
+                <div class="row app-link headbck">
+                    <div class="col-33">
                         <a ng-click="add()">
                             <div class="app-link-item">
-                                <i class="i-applink-add"></i>
+                                <i class="i-applink-addcar"></i>
                                 <span>发布货源</span>
                             </div>
                         </a>
                     </div>
+                    <div class="col-33">
+                        <a ng-click="goCar()">
+                            <div class="app-link-item">
+                                <i class="i-applink-findgoods"></i>
+                                <span>找车源</span>
+                            </div>
+                        </a>
+                    </div>
+                    <div class="col-34">
+                        <a ng-click="toggleRight()">
+                            <div class="app-link-item">
+                                <i class="i-applink-search"></i>
+                                <span>搜索</span>
+                            </div>
+                        </a>
+                    </div>
                 </div>
                 <div class="app-link-bottom"></div>
                 <div class="list">

wl/www/templates/home/index.html

@@ -61,14 +61,13 @@
             </a>
         </div>
         <div class="list" ng-if="vm.showIndex==2">
-            <a class="item" ng-repeat="item in cars" ng-click="detail(item)">
-                <h2>【{{item.begin_address}}】-【{{item.end_address}}】</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}}</span>
-                </p>
-                <p><span style="float:left">联系人：{{item.contact_name}}</span> <span style="float:right">电话：{{item.contact_phone}}</span></p> 
+            <a class="item item-thumbnail-left" ng-repeat="item in cars" ng-click="detail(item)">
+                <img src="img/demo/defaultcar.png" />
+                <h2 style="white-space:normal">【{{item.begin_address}}】-【{{item.end_address}}】<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>
             </a>
+         
         </div>
     </ion-content>
 </ion-view>