Mike 9 лет назад
Родитель
Сommit
b92eda045a

+ 22 - 0
wl/config.xml

xqd xqd
@@ -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="*"/>

BIN
wl/platforms/android/.gradle/2.2.1/taskArtifacts/cache.properties.lock


BIN
wl/platforms/android/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin


BIN
wl/platforms/android/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin


+ 4 - 1
wl/platforms/android/assets/www/css/style.css

xqd
@@ -110,4 +110,7 @@ input.ion-amap-place[readonly] { background-color: transparent; cursor: text; }
 .home a{font-size: 18px}
 .loginform input {height:50px;width:auto   }
 .loginform i { color:orange;width: 30px;font-size: 25px;}
-.headbck { background-color:rgba(252,124,5,1.00);}
+.headbck { background-color:rgba(252,124,5,1.00);}
+.item-myselect select {
+    border:none
+}

+ 4 - 1
wl/platforms/android/assets/www/index.html

xqd
@@ -43,4 +43,7 @@
 <script src="js/services/mapservice.js"></script>
 <script src="js/services/nativeservices.js"></script>
 <!--filters-->
-<script src="js/filters/filter.js"></script>
+<script src="js/filters/filter.js"></script>
+<!--directives-->
+<script src="js/directives/areaselector/area-selector.js"></script>
+<script src="js/directives/areaselector/areaData.js"></script>

+ 15 - 16
wl/platforms/android/assets/www/js/controllers/car.js

xqd xqd xqd xqd xqd
@@ -56,19 +56,13 @@
     app.controller('carAddCtrl', ["$scope", "$state", "carService", "msg", function ($scope, $state, carService, msg) {
         $scope.vm = { type: 1 };
         $scope.vm.begin_addressPick = {
-            areaData: ['请选择城市'],
-            title: '出发地址',
-            hardwareBackButtonClose: false
+
         }
         $scope.vm.end_addressPick = {
-            areaData: ['请选择城市'],
-            title: '到达地址',
-            hardwareBackButtonClose: false
+
         }
         $scope.vm.midway_addressPick = {
-            areaData: ['请选择城市'],
-            title: '途经地址',
-            hardwareBackButtonClose: false
+
         }
         $scope.truckOpt = [];
         carService.listTrucks().then(function (result) {
@@ -79,20 +73,21 @@
             msg.error(erro.data.message);
         });
         $scope.save = function () {
+            $scope.vm.type = 2;
             var price = new Number($scope.vm.price);
             if (!price) {
                 msg.text('输入价格');
                 return;
             }
-            if ($scope.vm.begin_addressPick.areaData.length == 1) {
+            if (!$scope.vm.begin_addressPick.area) {
                 msg.text('请输入出发地址');
                 return;
             }
-            if ($scope.vm.end_addressPick.areaData.length == 1) {
+            if (!$scope.vm.end_addressPick.area) {
                 msg.text('请输入到达地址');
                 return;
             }
-            if ($scope.vm.midway_addressPick.areaData.length == 1) {
+            if (!$scope.vm.midway_addressPick.area) {
                 msg.text('请输入途经地址');
                 return;
             }
@@ -100,6 +95,8 @@
                 msg.text('请输入详情');
                 return;
             }
+            msg.loading('提交中...');
+           
             if (!$scope.vm.contact_name) {
                 msg.text('请输入随车联系人');
                 return;
@@ -109,10 +106,9 @@
                 return;
             }
 
-            msg.loading('提交中...');
-            $scope.vm.begin_address = $scope.vm.begin_addressPick.areaData.join(',');
-            $scope.vm.end_address = $scope.vm.end_addressPick.areaData.join(',');
-            $scope.vm.midway_address = $scope.vm.midway_addressPick.areaData.join(',');
+            $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);
             carService.addCar($scope.vm).then(function (result) {
                 $state.go('wl.car');
                 msg.hide();
@@ -121,6 +117,9 @@
                 msg.error(erro.data.message);
             });
         }
+        function getAdress(address) {
+            return address.province + ',' + address.city + ',' + address.area;
+        }
     }]);
     app.controller('carDetailCtrl', ["$scope", '$stateParams', 'msg', 'orderService', '$state', 'map',
         function ($scope, $stateParams, msg, orderService, $state, map) {

+ 13 - 15
wl/platforms/android/assets/www/js/controllers/goods.js

xqd xqd xqd xqd xqd
@@ -27,6 +27,7 @@
                 var more = (result.data.data.length >= $scope.filter.pageSize);
                 $scope.filter.hasMore = more;
                 $scope.items = $scope.items.concat(result.data.data);
+              
                 if (init) {
                     $scope.$broadcast('scroll.refreshComplete');
                 } else {
@@ -57,19 +58,13 @@
 
         $scope.vm = { type: 1 };
         $scope.vm.begin_addressPick = {
-            areaData: ['请选择城市'],
-            title: '出发地址',
-            hardwareBackButtonClose: false
+
         }
         $scope.vm.end_addressPick = {
-            areaData: ['请选择城市'],
-            title: '到达地址',
-            hardwareBackButtonClose: false
+
         }
         $scope.vm.midway_addressPick = {
-            areaData: ['请选择城市'],
-            title: '途经地址',
-            hardwareBackButtonClose: false
+
         }
         $scope.save = function () {
             var price=new Number($scope.vm.price);
@@ -77,15 +72,15 @@
                 msg.text('输入价格');
                 return;
             }
-            if ($scope.vm.begin_addressPick.areaData.length == 1) {
+            if (!$scope.vm.begin_addressPick.area) {
                 msg.text('请输入出发地址');
                 return;
             }
-            if ($scope.vm.end_addressPick.areaData.length == 1) {
+            if (!$scope.vm.end_addressPick.area) {
                 msg.text('请输入到达地址');
                 return;
             }
-            if ($scope.vm.midway_addressPick.areaData.length == 1) {
+            if (!$scope.vm.midway_addressPick.area) {
                 msg.text('请输入途经地址');
                 return;
             }
@@ -94,9 +89,9 @@
                 return;
             }
             msg.loading('提交中...');
-            $scope.vm.begin_address = $scope.vm.begin_addressPick.areaData.join(',');
-            $scope.vm.end_address = $scope.vm.end_addressPick.areaData.join(',');
-            $scope.vm.midway_address = $scope.vm.midway_addressPick.areaData.join(',');
+            $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();
@@ -105,6 +100,9 @@
                 msg.error(erro.data.message);
             });
         }
+        function getAdress(address) {
+            return address.province + ',' + address.city + ',' + address.area;
+        }
     }]);
     app.controller('goodsDetailCtrl', ["$scope", '$stateParams', 'msg', 'orderService', '$state', 'map'
         , function ($scope, $stateParams, msg, orderService, $state, map) {

+ 20 - 20
wl/platforms/android/assets/www/js/controllers/my.js

xqd
@@ -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);

+ 1 - 1
wl/platforms/android/assets/www/js/filters/filter.js

xqd
@@ -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'));

+ 25 - 7
wl/platforms/android/assets/www/templates/car/add.html

xqd xqd
@@ -4,18 +4,33 @@
             <div class="item item-divider">
                 <span>请填写您要发布的车源信息</span>
             </div>
-            <label class="item item-input">
-                <input ng-model="vm.price"   type="number" placeholder="价格">
-            </label>
-            <ionic-city-picker options='vm.begin_addressPick'></ionic-city-picker>
-            <ionic-city-picker options='vm.end_addressPick'></ionic-city-picker>
-            <ionic-city-picker options='vm.midway_addressPick'></ionic-city-picker>
+            <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>
+            </div>
+            <div class="item item-input item-myselect">
+                <span class="input-label" style="width:15%">
+                    到达地址
+                </span>
+                <china-area-selector region="vm.end_addressPick"></china-area-selector>
+            </div>
+            <div class="item item-input item-myselect">
+                <span class="input-label" style="width:15%">
+                    途经地址
+                </span>
+                <china-area-selector region="vm.midway_addressPick"></china-area-selector>
+            </div>
             <label class="item item-input item-select item-select-width">
                 <span class="input-label">
                     车辆
                 </span>
                 <select ng-model="vm.truck_id" ng-options="x.id as x.name for x in truckOpt" placeholder="车辆"></select>
             </label>
+            <label class="item item-input">
+                <input ng-model="vm.price" type="text" placeholder="价格">
+            </label>
             <label class="item item-input ">
                 <input ng-model="vm.contact_name" type="text" placeholder="随车联系人">
             </label>
@@ -23,7 +38,10 @@
                 <input  ng-model="vm.contact_phone" type="text" placeholder="联系电话">
             </label>
             <label class="item item-input">
-                <textarea placeholder="详情" rows="8" ng-model="vm.detail"></textarea>
+                <input ng-model="vm.expiry_date" type="text" placeholder="信息有效期">
+            </label>
+            <label class="item item-input">
+                <textarea placeholder="备注" rows="8" ng-model="vm.detail"></textarea>
             </label>
             <div class="padding">
                 <button type="button" ng-click="save()" class="button button-full button-positive">提交</button>

+ 23 - 5
wl/platforms/android/assets/www/templates/car/detail.html

xqd
@@ -10,16 +10,34 @@
                 </div>
 
                 <div class="item item-body">
+                    <p>车牌号:{{vm.truck.data.truck_no}}</p>
+                    <p>车类型:{{vm.truck.data.type}}</p>
                     <p>出发地:{{vm.begin_address | fullAddress}}</p>
                     <p>途经:{{vm.midway_address | fullAddress}}</p>
                     <p>目的地:{{vm.end_address | fullAddress}}</p>
-                    <p>车名:{{vm.truck.data.name}}</p>
-                    <p>车类型:{{vm.truck.data.type}}</p>
-                    <p>车牌:{{vm.truck.data.truck_no}}</p>
-                    <p>载重:{{vm.truck.data.load_weight}}</p>
                     <p>
-                        {{vm.detail}}
+                      备注:{{vm.detail}}
                     </p>
+
+                </div>
+
+                <div class="item item-body">
+                    <p>联系人:{{vm.contact_name}}</p>
+                    <p>联系电话:{{vm.contact_phone}}</p>
+                    <p>信息有效期:{{vm.expiry_date}}</p>
+                </div>
+
+                <div class="item item-body">
+                    <p>车名:{{vm.truck.data.name}}</p>
+                    <p>载重:{{vm.truck.data.load_weight}}</p>
+                    <p>车长:{{vm.truck.data.length}}</p>
+                    <p>车宽:{{vm.truck.data.width}}</p>
+                    <p>车高:{{vm.truck.data.height}}</p>
+                    <p>容量:{{vm.truck.data.capacity}}</p>
+                    <p>自重:{{vm.truck.data.truck_weight}}</p>
+                    <p>开始使用日期:{{vm.truck.data.begin_use_date}}</p>
+                    <p>报废日期:{{vm.truck.data.expire_date}}</p>
+                    
                     <p> 
                      {{vm.created_at}}
                     </p>

+ 1 - 1
wl/platforms/android/assets/www/templates/car/index.html

xqd
@@ -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 | 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> <span style="float:right">电话:{{item.contact_phone}}</span></p> 
                     </a>

+ 36 - 5
wl/platforms/android/assets/www/templates/goods/add.html

xqd
@@ -4,14 +4,45 @@
             <div class="item item-divider">
                 <span>请填写您要发布的货源信息</span>
             </div>
+            <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>
+            </div>
+            <div class="item item-input item-myselect">
+                <span class="input-label" style="width:15%">
+                    到达地址
+                </span>
+                <china-area-selector region="vm.end_addressPick"></china-area-selector>
+            </div>
+            <div class="item item-input item-myselect">
+                <span class="input-label" style="width:15%">
+                    途经地址
+                </span>
+                <china-area-selector region="vm.midway_addressPick"></china-area-selector>
+            </div>
+            <label class="item item-input">
+                <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.price"   type="number" placeholder="价格">
+                <input ng-model="vm.title" type="text" placeholder="名称">
             </label>
-            <ionic-city-picker options='vm.begin_addressPick'></ionic-city-picker>
-            <ionic-city-picker options='vm.end_addressPick'></ionic-city-picker>
-            <ionic-city-picker options='vm.midway_addressPick'></ionic-city-picker>
             <label class="item item-input">
-                <textarea placeholder="详情" rows="8" ng-model="vm.detail"></textarea>
+                <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>

+ 10 - 4
wl/platforms/android/assets/www/templates/goods/detail.html

xqd
@@ -13,13 +13,19 @@
                     <p>途经:{{vm.midway_address | fullAddress}}</p>
                     <p>目的地:{{vm.end_address | fullAddress}}</p>
                     <p>货物名称:{{vm.title}}</p>
-                    <p>联系人:{{vm.contact_name}}</p>
-                    <p>联系电话:{{vm.contact_phone}}</p>
                     <p>
                         {{vm.detail}}
                     </p>
-                    <p style="color:red"> 
-                     有效期:{{vm.created_at}}
+                </div>
+
+
+                <div class="item item-body">
+                    <p>联系人:{{vm.contact_name}}</p>
+                    <p>联系电话:{{vm.contact_phone}}</p>
+                    <p>信息有效期:{{vm.expiry_date}}</p>
+            
+                    <p> 
+                     {{vm.created_at}}
                     </p>
                 </div>
             </div>

+ 2 - 2
wl/platforms/android/assets/www/templates/goods/index.html

xqd
@@ -36,10 +36,10 @@
                 </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>
+                        <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>

+ 3 - 3
wl/platforms/android/assets/www/templates/home/index.html

xqd
@@ -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>

+ 15 - 3
wl/platforms/android/res/xml/config.xml

xqd xqd
@@ -4,9 +4,6 @@
     <feature name="ActionSheet">
         <param name="android-package" value="nl.xservices.plugins.actionsheet.ActionSheet" />
     </feature>
-    <feature name="RareloopAppVersion">
-        <param name="android-package" value="com.rareloop.cordova.appversion.RareloopAppVersion" />
-    </feature>
     <feature name="Camera">
         <param name="android-package" value="org.apache.cordova.camera.CameraLauncher" />
     </feature>
@@ -36,10 +33,25 @@
         <param name="android-package" value="io.ionic.keyboard.IonicKeyboard" />
         <param name="onload" value="true" />
     </feature>
+    <feature name="RareloopAppVersion">
+        <param name="android-package" value="com.rareloop.cordova.appversion.RareloopAppVersion" />
+    </feature>
     <icon density="ldpi" src="resources/android/icon/icon.png" />
     <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.

+ 20 - 20
wl/www/js/controllers/my.js

xqd
@@ -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);

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

xqd
@@ -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>