baimeng há 9 anos atrás
pai
commit
2308b170a1

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

xqd xqd
@@ -31,6 +31,9 @@
                 </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>
@@ -38,7 +41,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>

+ 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>

+ 1 - 1
wl/www/js/controllers/car.js

xqd
@@ -56,7 +56,7 @@
     app.controller('carAddCtrl', ["$scope", "$state", "carService", "msg", function ($scope, $state, carService, msg) {
         $scope.vm = { type: 1 };
         $scope.vm.begin_addressPick = {
-         
+          
         }
         $scope.vm.end_addressPick = {
         

+ 18 - 3
wl/www/templates/car/add.html

xqd
@@ -7,9 +7,24 @@
             <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">
                     车辆