Mike 9 éve
szülő
commit
d0c810d9f3

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


+ 2 - 1
wl/platforms/android/assets/www/js/controllers/car.js

xqd xqd
@@ -1,5 +1,5 @@
 (function (app) {
-    app.controller('carCtrl', ["$scope", "$ionicSideMenuDelegate", "$state", 'carService', 'msg', '$rootScope', function ($scope, $ionicSideMenuDelegate, $state, carService, msg, $rootScope) {
+    app.controller('carCtrl', ["$scope", "$ionicSideMenuDelegate", "$state", 'carService', 'msg', '$rootScope','config', function ($scope, $ionicSideMenuDelegate, $state, carService, msg, $rootScope,config) {
         $scope.filter = {
             hasMore: false,
             pageIndex: 0,
@@ -9,6 +9,7 @@
             end_address: '',
             midway_address: ''
         }
+        $scope.host = config.server +'/upload/photo/';
         if ($rootScope.location) {
             var city = $rootScope.location.city;
             if (city) {

+ 2 - 1
wl/platforms/android/assets/www/js/controllers/home.js

xqd
@@ -1,6 +1,7 @@
 (function (app) {
-    app.controller('homeCtrl', ["$scope", 'goodsService', 'carService', 'msg', '$state', '$ionicHistory', function ($scope, goodsService, carService, msg, $state, $ionicHistory) {
+    app.controller('homeCtrl', ["$scope", 'goodsService', 'carService', 'msg', '$state', '$ionicHistory','config', function ($scope, goodsService, carService, msg, $state, $ionicHistory,config) {
         $scope.vm = { showIndex: 1 };
+        $scope.host = config.server +'/upload/photo/';
         $scope.changeTab = function (i) {
             $scope.vm.showIndex = i;
         }

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

xqd
@@ -38,7 +38,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" />
+                        <img ng-src="{{host}}{{item.truck.data.photo | truckPhoto}}" />
                         <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> 

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

xqd
@@ -26,10 +26,10 @@
                 <input ng-model="vm.price" type="text" placeholder="价格">
             </label>
             <label class="item item-input">
-                <input ng-model="vm.contact_phone" type="text" placeholder="联系人">
+                <input ng-model="vm.contact_name" type="text" placeholder="联系人">
             </label>
             <label class="item item-input">
-                <input ng-model="vm.contact_name" type="text" placeholder="联系电话">
+                <input ng-model="vm.contact_phone" type="text" placeholder="联系电话">
             </label>
             <label class="item item-input">
                 <input ng-model="vm.expiry_date" type="text" placeholder="信息有效期">

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

xqd
@@ -62,7 +62,7 @@
         </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}}" />
+                <img ng-src="{{host}}{{item.truck.data.photo | truckPhoto}}" />
                 <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>

+ 1 - 4
wl/www/css/style.css

xqd
@@ -110,7 +110,4 @@ 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:#FC810E;}
-.item-myselect select {
-    border:none
-}
+.headbck { background-color:#FC810E;}

BIN
wl/www/img/icon/search.png


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

xqd xqd
@@ -1,5 +1,5 @@
 (function (app) {
-    app.controller('carCtrl', ["$scope", "$ionicSideMenuDelegate", "$state", 'carService', 'msg', '$rootScope', function ($scope, $ionicSideMenuDelegate, $state, carService, msg, $rootScope) {
+    app.controller('carCtrl', ["$scope", "$ionicSideMenuDelegate", "$state", 'carService', 'msg', '$rootScope','config', function ($scope, $ionicSideMenuDelegate, $state, carService, msg, $rootScope,config) {
         $scope.filter = {
             hasMore: false,
             pageIndex: 0,
@@ -9,6 +9,7 @@
             end_address: '',
             midway_address: ''
         }
+        $scope.host = config.server +'/upload/photo/';
         if ($rootScope.location) {
             var city = $rootScope.location.city;
             if (city) {

+ 2 - 1
wl/www/js/controllers/home.js

xqd
@@ -1,6 +1,7 @@
 (function (app) {
-    app.controller('homeCtrl', ["$scope", 'goodsService', 'carService', 'msg', '$state', '$ionicHistory', function ($scope, goodsService, carService, msg, $state, $ionicHistory) {
+    app.controller('homeCtrl', ["$scope", 'goodsService', 'carService', 'msg', '$state', '$ionicHistory','config', function ($scope, goodsService, carService, msg, $state, $ionicHistory,config) {
         $scope.vm = { showIndex: 1 };
+        $scope.host = config.server +'/upload/photo/';
         $scope.changeTab = function (i) {
             $scope.vm.showIndex = i;
         }

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

xqd
@@ -184,7 +184,7 @@
                 }
             });
         }
-        $scope.$on('$ionicView.beforEnter', function (viewResult) {
+        $scope.$on('$ionicView.beforeEnter', function (viewResult) {
             $scope.load(true);
         });
     }]);

+ 1 - 1
wl/www/templates/car/detail.html

xqd
@@ -39,7 +39,7 @@
                     <p>报废日期:{{vm.truck.data.expire_date}}</p>
                     
                     <p> 
-                     {{vm.created_at}}
+                     发布时间:{{vm.created_at}}
                     </p>
                 </div>
 

+ 1 - 1
wl/www/templates/car/index.html

xqd
@@ -38,7 +38,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" />
+                        <img ng-src="{{host}}{{item.truck.data.photo | truckPhoto}}" />
                         <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> 

+ 2 - 2
wl/www/templates/goods/add.html

xqd
@@ -26,10 +26,10 @@
                 <input ng-model="vm.price" type="text" placeholder="价格">
             </label>
             <label class="item item-input">
-                <input ng-model="vm.contact_phone" type="text" placeholder="联系人">
+                <input ng-model="vm.contact_name" type="text" placeholder="联系人">
             </label>
             <label class="item item-input">
-                <input ng-model="vm.contact_name" type="text" placeholder="联系电话">
+                <input ng-model="vm.contact_phone" type="text" placeholder="联系电话">
             </label>
             <label class="item item-input">
                 <input ng-model="vm.expiry_date" type="text" placeholder="信息有效期">

+ 1 - 1
wl/www/templates/goods/detail.html

xqd
@@ -25,7 +25,7 @@
                     <p>信息有效期:{{vm.expiry_date}}</p>
             
                     <p> 
-                     {{vm.created_at}}
+                     发布时间:{{vm.created_at}}
                     </p>
                 </div>
             </div>

+ 1 - 1
wl/www/templates/home/index.html

xqd
@@ -62,7 +62,7 @@
         </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}}" />
+                <img ng-src="{{host}}{{item.truck.data.photo | truckPhoto}}" />
                 <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>

+ 0 - 3
wl/www/templates/my/order-detail.html

xqd
@@ -17,9 +17,6 @@
                     <p>
                         {{vm.message.data.detail}}
                     </p>
-                    <p style="color:red">
-                        有效期:{{vm.message.data.created_at}}
-                    </p>
                 </div>
             </div>
         </div>