j

wl/config.xml

@@ -13,6 +13,18 @@
     <icon density="mdpi" src="resources/android/icon/icon.png"/>
     <icon density="hdpi" src="resources/android/icon/icon.png"/>
     <icon density="xhdpi" src="resources/android/icon/icon.png"/>
+    <splash src="resources/android/splash/drawable-land-ldpi-screen.png" density="land-ldpi"/>
+    <splash src="resources/android/splash/drawable-land-mdpi-screen.png" density="land-mdpi"/>
+    <splash src="resources/android/splash/drawable-land-hdpi-screen.png" density="land-hdpi"/>
+    <splash src="resources/android/splash/drawable-land-xhdpi-screen.png" density="land-xhdpi"/>
+    <splash src="resources/android/splash/drawable-land-xxhdpi-screen.png" density="land-xxhdpi"/>
+    <splash src="resources/android/splash/drawable-land-xxxhdpi-screen.png" density="land-xxxhdpi"/>
+    <splash src="resources/android/splash/drawable-port-ldpi-screen.png" density="port-ldpi"/>
+    <splash src="resources/android/splash/drawable-port-mdpi-screen.png" density="port-mdpi"/>
+    <splash src="resources/android/splash/drawable-port-hdpi-screen.png" density="port-hdpi"/>
+    <splash src="resources/android/splash/drawable-port-xhdpi-screen.png" density="port-xhdpi"/>
+    <splash src="resources/android/splash/drawable-port-xxhdpi-screen.png" density="port-xxhdpi"/>
+    <splash src="resources/android/splash/drawable-port-xxxhdpi-screen.png" density="port-xxxhdpi"/>
   </platform>
   <platform name="ios">
     <icon height="180" src="resources/android/icon/icon.png" width="180"/>
@@ -30,6 +42,16 @@
     <icon height="58" src="resources/android/icon/icon.png" width="58"/>
     <icon height="50" src="resources/android/icon/icon.png" width="50"/>
     <icon height="100" src="resources/android/icon/icon.png" width="100"/>
+    <splash src="resources/ios/splash/Default-568h@2x~iphone.png" width="640" height="1136"/>
+    <splash src="resources/ios/splash/Default-667h.png" width="750" height="1334"/>
+    <splash src="resources/ios/splash/Default-736h.png" width="1242" height="2208"/>
+    <splash src="resources/ios/splash/Default-Landscape-736h.png" width="2208" height="1242"/>
+    <splash src="resources/ios/splash/Default-Landscape@2x~ipad.png" width="2048" height="1536"/>
+    <splash src="resources/ios/splash/Default-Landscape~ipad.png" width="1024" height="768"/>
+    <splash src="resources/ios/splash/Default-Portrait@2x~ipad.png" width="1536" height="2048"/>
+    <splash src="resources/ios/splash/Default-Portrait~ipad.png" width="768" height="1024"/>
+    <splash src="resources/ios/splash/Default@2x~iphone.png" width="640" height="960"/>
+    <splash src="resources/ios/splash/Default~iphone.png" width="320" height="480"/>
   </platform>
   <access origin="tel:*" launch-external="yes"/>
   <access origin="*"/>

wl/platforms/android/assets/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) {
@@ -73,6 +73,7 @@
             msg.error(erro.data.message);
         });
         $scope.save = function () {
+            $scope.vm.type = 2;
             var price = new Number($scope.vm.price);
             if (!price) {
                 msg.text('输入价格');
@@ -94,6 +95,8 @@
                 msg.text('请输入详情');
                 return;
             }
+            msg.loading('提交中...');
+           
             if (!$scope.vm.contact_name) {
                 msg.text('请输入随车联系人');
                 return;
@@ -103,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/platforms/android/assets/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/platforms/android/assets/www/js/controllers/my.js

@@ -184,26 +184,26 @@
             $scope.vm.expire_date = new Date($scope.vm.expire_date);
         }
         $scope.typeOpt = [
-            { name: '厢式货车', value: '1' },
-            { name: '面包车', value: '2' },
-            { name: '金杯车', value: '3' },
-        { name: '中巴货车', value: '4' },
-        { name: '高栏车', value: '5' },
-        { name: '低栏车', value: '6' },
-        { name: '平板车', value: '7' },
-        { name: '高低板车', value: '8' },
-        { name: '半挂车', value: '9' },
-        { name: '自卸车', value: '10' },
-        { name: '冷藏车', value: '11' },
-        { name: '保温车', value: '12' },
-        { name: '罐式车', value: '13' },
-        { name: '铁笼车', value: '14' },
-        { name: '集装箱运输车', value: '15' },
-        { name: '大件运输车', value: '16' },
-        { name: '危险品车', value: '17' },
-        { name: '全挂车', value: '18' },
-        { name: '加长挂车', value: '19' },
-        { name: '其他', value: '20' }];
+            { name: '厢式货车', value: 1 },
+            { name: '面包车', value: 2 },
+            { name: '金杯车', value: 3 },
+        { name: '中巴货车', value: 4 },
+        { name: '高栏车', value: 5 },
+        { name: '低栏车', value: 6 },
+        { name: '平板车', value: 7 },
+        { name: '高低板车', value: 8 },
+        { name: '半挂车', value: 9 },
+        { name: '自卸车', value: 10 },
+        { name: '冷藏车', value: 11 },
+        { name: '保温车', value: 12 },
+        { name: '罐式车', value: 13 },
+        { name: '铁笼车', value: 14 },
+        { name: '集装箱运输车', value: 15 },
+        { name: '大件运输车', value: 16 },
+        { name: '危险品车', value: 17 },
+        { name: '全挂车', value: 18 },
+        { name: '加长挂车', value: 19 },
+        { name: '其他', value: 20 }];
         $scope.save = function () {
             msg.loading('保存中...');
             console.log('id '+$scope.vm.id);

wl/platforms/android/assets/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/platforms/android/assets/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/platforms/android/assets/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/platforms/android/assets/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/platforms/android/assets/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/platforms/android/assets/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/platforms/android/res/xml/config.xml

@@ -40,6 +40,18 @@
     <icon density="mdpi" src="resources/android/icon/icon.png" />
     <icon density="hdpi" src="resources/android/icon/icon.png" />
     <icon density="xhdpi" src="resources/android/icon/icon.png" />
+    <splash density="land-ldpi" src="resources/android/splash/drawable-land-ldpi-screen.png" />
+    <splash density="land-mdpi" src="resources/android/splash/drawable-land-mdpi-screen.png" />
+    <splash density="land-hdpi" src="resources/android/splash/drawable-land-hdpi-screen.png" />
+    <splash density="land-xhdpi" src="resources/android/splash/drawable-land-xhdpi-screen.png" />
+    <splash density="land-xxhdpi" src="resources/android/splash/drawable-land-xxhdpi-screen.png" />
+    <splash density="land-xxxhdpi" src="resources/android/splash/drawable-land-xxxhdpi-screen.png" />
+    <splash density="port-ldpi" src="resources/android/splash/drawable-port-ldpi-screen.png" />
+    <splash density="port-mdpi" src="resources/android/splash/drawable-port-mdpi-screen.png" />
+    <splash density="port-hdpi" src="resources/android/splash/drawable-port-hdpi-screen.png" />
+    <splash density="port-xhdpi" src="resources/android/splash/drawable-port-xhdpi-screen.png" />
+    <splash density="port-xxhdpi" src="resources/android/splash/drawable-port-xxhdpi-screen.png" />
+    <splash density="port-xxxhdpi" src="resources/android/splash/drawable-port-xxxhdpi-screen.png" />
     <name>掌上物流网</name>
     <description>
         An Ionic Framework and Cordova project.

wl/www/js/controllers/my.js

@@ -184,26 +184,26 @@
             $scope.vm.expire_date = new Date($scope.vm.expire_date);
         }
         $scope.typeOpt = [
-            { name: '厢式货车', value: '1' },
-            { name: '面包车', value: '2' },
-            { name: '金杯车', value: '3' },
-        { name: '中巴货车', value: '4' },
-        { name: '高栏车', value: '5' },
-        { name: '低栏车', value: '6' },
-        { name: '平板车', value: '7' },
-        { name: '高低板车', value: '8' },
-        { name: '半挂车', value: '9' },
-        { name: '自卸车', value: '10' },
-        { name: '冷藏车', value: '11' },
-        { name: '保温车', value: '12' },
-        { name: '罐式车', value: '13' },
-        { name: '铁笼车', value: '14' },
-        { name: '集装箱运输车', value: '15' },
-        { name: '大件运输车', value: '16' },
-        { name: '危险品车', value: '17' },
-        { name: '全挂车', value: '18' },
-        { name: '加长挂车', value: '19' },
-        { name: '其他', value: '20' }];
+            { name: '厢式货车', value: 1 },
+            { name: '面包车', value: 2 },
+            { name: '金杯车', value: 3 },
+        { name: '中巴货车', value: 4 },
+        { name: '高栏车', value: 5 },
+        { name: '低栏车', value: 6 },
+        { name: '平板车', value: 7 },
+        { name: '高低板车', value: 8 },
+        { name: '半挂车', value: 9 },
+        { name: '自卸车', value: 10 },
+        { name: '冷藏车', value: 11 },
+        { name: '保温车', value: 12 },
+        { name: '罐式车', value: 13 },
+        { name: '铁笼车', value: 14 },
+        { name: '集装箱运输车', value: 15 },
+        { name: '大件运输车', value: 16 },
+        { name: '危险品车', value: 17 },
+        { name: '全挂车', value: 18 },
+        { name: '加长挂车', value: 19 },
+        { name: '其他', value: 20 }];
         $scope.save = function () {
             msg.loading('保存中...');
             console.log('id '+$scope.vm.id);

wl/www/templates/my/truck-add.html

@@ -17,7 +17,7 @@
                 <span class="input-label">
                     类型<span class="mustfill">*</span>
                 </span>
-                <select ng-model="vm.type+''" ng-options="x.value as x.name for x in typeOpt"></select>
+                <select ng-model="vm.type" ng-options="x.value as x.name for x in typeOpt"></select>
             </label>
             <label class="item item-input ">
                 <span class="input-label">车牌号<span class="mustfill">*</span></span>