1

wl/www/js/controllers/car.js

@@ -56,13 +56,13 @@
     app.controller('carAddCtrl', ["$scope", "$state", "carService", "msg", function ($scope, $state, carService, msg) {
         $scope.vm = { type: 1 };
         $scope.vm.begin_addressPick = {
-          
+
         }
         $scope.vm.end_addressPick = {
-        
+
         }
         $scope.vm.midway_addressPick = {
-          
+
         }
         $scope.truckOpt = [];
         carService.listTrucks().then(function (result) {
@@ -95,6 +95,8 @@
                 msg.text('请输入详情');
                 return;
             }
+            msg.loading('提交中...');
+           
             if (!$scope.vm.contact_name) {
                 msg.text('请输入随车联系人');
                 return;
@@ -104,7 +106,6 @@
                 return;
             }
 
-            msg.loading('提交中...');
             $scope.vm.begin_address = getAdress($scope.vm.begin_addressPick);
             $scope.vm.end_address = getAdress($scope.vm.end_addressPick);
             $scope.vm.midway_address = getAdress($scope.vm.midway_addressPick);

wl/www/js/controllers/goods.js

@@ -58,13 +58,13 @@
 
         $scope.vm = { type: 1 };
         $scope.vm.begin_addressPick = {
-           
+
         }
         $scope.vm.end_addressPick = {
-           
+
         }
         $scope.vm.midway_addressPick = {
-            
+
         }
         $scope.save = function () {
             var price=new Number($scope.vm.price);
@@ -92,7 +92,6 @@
             $scope.vm.begin_address = getAdress($scope.vm.begin_addressPick);
             $scope.vm.end_address = getAdress($scope.vm.end_addressPick);
             $scope.vm.midway_address = getAdress($scope.vm.midway_addressPick);
-            
             goodsService.addGoods($scope.vm).then(function (result) {
                 $state.go('wl.goods');
                 msg.hide();

wl/www/js/filters/filter.js

@@ -49,7 +49,7 @@
     module.filter('fullAddress', function () {
         return function (input) {
             if (!input) return input;
-            return input.replace(',','--');
+            return input.replace(',','-');
         };
     });
 })(angular.module('app.filters'));

wl/www/templates/car/add.html

@@ -4,9 +4,6 @@
             <div class="item item-divider">
                 <span>请填写您要发布的车源信息</span>
             </div>
-            <label class="item item-input">
-                <input ng-model="vm.price"   type="number" placeholder="价格">
-            </label>
             <div class="item item-input item-myselect">
                 <span class="input-label" style="width:15%">
                     出发地址

wl/www/templates/car/index.html

@@ -39,7 +39,7 @@
                 <div class="list">
                     <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>
+                        <h2 style="white-space:normal">【{{item.begin_address | fullAddress }}】-【{{item.end_address | fullAddress }}】<span style="color:gray;"></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>

wl/www/templates/goods/add.html

@@ -4,14 +4,11 @@
             <div class="item item-divider">
                 <span>请填写您要发布的货源信息</span>
             </div>
-            <label class="item item-input">
-                <input ng-model="vm.price"   type="number" placeholder="价格">
-            </label>
             <div class="item item-input item-myselect">
                 <span class="input-label" style="width:15%">
                     出发地址
                 </span>
-                <china-area-selector  region="vm.begin_addressPick"></china-area-selector>
+                <china-area-selector region="vm.begin_addressPick"></china-area-selector>
             </div>
             <div class="item item-input item-myselect">
                 <span class="input-label" style="width:15%">
@@ -25,9 +22,27 @@
                 </span>
                 <china-area-selector region="vm.midway_addressPick"></china-area-selector>
             </div>
-          
             <label class="item item-input">
-                <textarea placeholder="详情" rows="8" ng-model="vm.detail"></textarea>
+                <input ng-model="vm.price" type="text" placeholder="价格">
+            </label>
+            <label class="item item-input">
+                <input ng-model="vm.contact_phone" type="text" placeholder="联系人">
+            </label>
+            <label class="item item-input">
+                <input ng-model="vm.contact_name" type="text" placeholder="联系电话">
+            </label>
+            <label class="item item-input">
+                <input ng-model="vm.expiry_date" type="text" placeholder="信息有效期">
+            </label>
+            <label class="item item-input">
+                <input ng-model="vm.title" type="text" placeholder="名称">
+            </label>
+            <label class="item item-input">
+                <textarea rows="8" ng-model="vm.detail" placeholder="重量：           20公斤
+货物类型：   货   
+体积：          1000
+注意事项：
+"></textarea>
             </label>
             <div class="padding">
                 <button type="button" ng-click="save()" class="button button-full button-positive">提交</button>

wl/www/templates/goods/index.html

@@ -36,10 +36,10 @@
                 </div>          
                 <div class="list">
                     <a class="item" ng-repeat="item in items" ng-click="detail(item)">
-                        <h2>【{{item.begin_address}}】-【{{item.end_address}}】</h2>
+                        <h2>【{{item.begin_address | fullAddress}}】-【{{item.end_address | fullAddress}}】</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>
+                            <span style="float:right">途经：{{item.midway_address | fullAddress}}</span>
                         </p>
                         <p><span style="float:left">联系人：{{item.contact_name}}</span> <span style="float:right">电话：{{item.contact_phone}}</span></p> 
                     </a>

wl/www/templates/home/index.html

@@ -54,16 +54,16 @@
         </div>
         <div class="list" ng-if="vm.showIndex==1">
             <a class="item" ng-repeat="item in goods" ng-click="detail(item)">
-                <h2>【{{item.begin_address | shortAddress}}】-【{{item.end_address | shortAddress}}】</h2>
+                <h2>【{{item.begin_address | fullAddress}}】-【{{item.end_address | fullAddress}}】</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>
+                 <span style="float:right">途经：{{item.midway_address | fullAddress}}</span></p>
                 <p><span style="float:left">联系人：{{item.contact_name}}</span> </p> 
             </a>
         </div>
         <div class="list" ng-if="vm.showIndex==2">
             <a class="item item-thumbnail-left" ng-repeat="item in cars" ng-click="detail(item)">
                 <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>
+                <h2 style="white-space:normal">【{{item.begin_address | fullAddress}}】-【{{item.end_address | fullAddress}}】<span style="color:gray;"></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>  </p>
             </a>

wl/www/templates/my/message.html

@@ -14,10 +14,10 @@
         <ion-list  show-delete="shouldShowDelete">
             <div   ng-repeat="item in items">
                 <ion-item class="item" ng-if="item.type==1" ng-click="detail(item)">
-                    <h2>【{{item.begin_address | shortAddress}}】-【{{item.end_address | shortAddress}}】</h2>
+                    <h2>【{{item.begin_address | fullAddress}}】-【{{item.end_address | fullAddress}}】</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>
+                        <span style="float:right">途经：{{item.midway_address | fullAddress}}</span>
                     </p>
                     <p><span style="float:left">联系人：{{item.contact_name}}</span> <span style="float:right">电话：{{item.contact_phone}}</span></p>
                     <ion-delete-button class="ion-minus-circled"
@@ -26,7 +26,7 @@
                 </ion-item>
                 <ion-item class="item item-thumbnail-left" ng-if="item.type==2" ng-click="detail(item)">
                     <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>
+                    <h2 style="white-space:normal">【{{item.begin_address | fullAddress}}】-【{{item.end_address | fullAddress}}】<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>
                     <ion-delete-button class="ion-minus-circled"