code merge

wl/config.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8"?>
 <widget id="com.uhisport.football" version="0.0.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
   <name>掌上物流网</name>
   <description>
@@ -7,55 +7,48 @@
   <author email="you@example.com" href="http://example.com.com/">
       Your Name Here
     </author>
-  <content src="index.html"/>
-  <access origin="*"/>
-  <preference name="webviewbounce" value="false"/>
-  <preference name="UIWebViewBounce" value="false"/>
-  <preference name="DisallowOverscroll" value="true"/>
-  <preference name="android-minSdkVersion" value="16"/>
-  <preference name="BackupWebStorage" value="none"/>
-  <preference name="KeepRunning" value="True"/>
-  <preference name="ShowTitle" value="True"/>
-  <preference name="InAppBrowserStorageEnabled" value="True"/>
-  <preference name="SuppressesIncrementalRendering" value="True"/>
-  <preference name="windows-target-version" value="10.0"/>
-  <preference name="SplashScreen" value="screen"/>
-  <preference name="SplashScreenDelay" value="3000"/>
-  <feature name="StatusBar">
-    <param name="ios-package" onload="true" value="CDVStatusBar"/>
-  </feature>
-  <plugin name="cordova-plugin-device" spec="~1.1.1"/>
-  <plugin name="cordova-plugin-console" spec="~1.0.2"/>
-  <plugin name="cordova-plugin-whitelist" spec="~1.2.1"/>
-  <plugin name="cordova-plugin-statusbar" spec="~2.1.0"/>
-  <plugin name="ionic-plugin-keyboard" spec="~1.0.8"/>
-  <plugin name="cordova-plugin-camera" version="2.2.0"/>
+  <content src="index.html" />
+  <platform name="android">
+    <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" />
+  </platform>
   <platform name="ios">
-    <icon src="resources/ios/icon/icon.png" width="57" height="57"/>
-    <icon src="resources/ios/icon/icon@2x.png" width="114" height="114"/>
-    <icon src="resources/ios/icon/icon-40.png" width="40" height="40"/>
-    <icon src="resources/ios/icon/icon-40@2x.png" width="80" height="80"/>
-    <icon src="resources/ios/icon/icon-50.png" width="50" height="50"/>
-    <icon src="resources/ios/icon/icon-50@2x.png" width="100" height="100"/>
-    <icon src="resources/ios/icon/icon-60.png" width="60" height="60"/>
-    <icon src="resources/ios/icon/icon-60@2x.png" width="120" height="120"/>
-    <icon src="resources/ios/icon/icon-60@3x.png" width="180" height="180"/>
-    <icon src="resources/ios/icon/icon-72.png" width="72" height="72"/>
-    <icon src="resources/ios/icon/icon-72@2x.png" width="144" height="144"/>
-    <icon src="resources/ios/icon/icon-76.png" width="76" height="76"/>
-    <icon src="resources/ios/icon/icon-76@2x.png" width="152" height="152"/>
-    <icon src="resources/ios/icon/icon-small.png" width="29" height="29"/>
-    <icon src="resources/ios/icon/icon-small@2x.png" width="58" height="58"/>
-    <icon src="resources/ios/icon/icon-small@3x.png" width="87" height="87"/>
-    <splash src="resources/ios/splash/Default-568h@2x~iphone.png" height="1136" width="640"/>
-    <splash src="resources/ios/splash/Default-667h.png" height="1334" width="750"/>
-    <splash src="resources/ios/splash/Default-736h.png" height="2208" width="1242"/>
-    <splash src="resources/ios/splash/Default-Landscape-736h.png" height="1242" width="2208"/>
-    <splash src="resources/ios/splash/Default-Landscape@2x~ipad.png" height="1536" width="2048"/>
-    <splash src="resources/ios/splash/Default-Landscape~ipad.png" height="768" width="1024"/>
-    <splash src="resources/ios/splash/Default-Portrait@2x~ipad.png" height="2048" width="1536"/>
-    <splash src="resources/ios/splash/Default-Portrait~ipad.png" height="1024" width="768"/>
-    <splash src="resources/ios/splash/Default@2x~iphone.png" height="960" width="640"/>
-    <splash src="resources/ios/splash/Default~iphone.png" height="480" width="320"/>
+    <icon height="180" src="resources/android/icon/icon.png" width="180" />
+    <icon height="60" src="resources/android/icon/icon.png" width="60" />
+    <icon height="120" src="resources/android/icon/icon.png" width="120" />
+    <icon height="76" src="resources/android/icon/icon.png" width="76" />
+    <icon height="152" src="resources/android/icon/icon.png" width="152" />
+    <icon height="40" src="resources/android/icon/icon.png" width="40" />
+    <icon height="80" src="resources/android/icon/icon.png" width="80" />
+    <icon height="57" src="resources/android/icon/icon.png" width="57" />
+    <icon height="114" src="resources/android/icon/icon.png" width="114" />
+    <icon height="72" src="resources/android/icon/icon.png" width="72" />
+    <icon height="144" src="resources/android/icon/icon.png" width="144" />
+    <icon height="29" src="resources/android/icon/icon.png" width="29" />
+    <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" />
   </platform>
+  <access origin="*" />
+  <preference name="webviewbounce" value="false" />
+  <preference name="UIWebViewBounce" value="false" />
+  <preference name="DisallowOverscroll" value="true" />
+  <preference name="android-minSdkVersion" value="16" />
+  <preference name="BackupWebStorage" value="none" />
+  <feature name="StatusBar">
+    <param name="ios-package" onload="true" value="CDVStatusBar" />
+  </feature>
+  <preference name="KeepRunning" value="True" />
+  <preference name="ShowTitle" value="True" />
+  <preference name="InAppBrowserStorageEnabled" value="True" />
+  <preference name="SuppressesIncrementalRendering" value="True" />
+  <preference name="windows-target-version" value="10.0" />
+  <plugin name="cordova-plugin-device" spec="~1.1.1" />
+  <plugin name="cordova-plugin-console" spec="~1.0.2" />
+  <plugin name="cordova-plugin-whitelist" spec="~1.2.1" />
+  <plugin name="cordova-plugin-statusbar" spec="~2.1.0" />
+  <plugin name="ionic-plugin-keyboard" spec="~1.0.8" />
+  <plugin name="cordova-plugin-camera" version="2.2.0" />
 </widget>

wl/platforms/android/AndroidManifest.xml

@@ -11,5 +11,4 @@
         </activity>
     </application>
     <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="23" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 </manifest>

wl/platforms/android/android.json

@@ -33,12 +33,7 @@
             },
             "AndroidManifest.xml": {
                 "parents": {
-                    "/*": [
-                        {
-                            "xml": "<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\" />",
-                            "count": 1
-                        }
-                    ]
+                    "/*": []
                 }
             }
         }

wl/platforms/android/assets/www/css/style.css

@@ -1,4 +1,4 @@
-.logo {margin-top:10px;margin-left:23%;width:250px;height:200px }
+.logo {margin-top:10px;margin-left:23%;width:50%;height:35% }
 .image-default {
       background-image: url('../img/photo_default_turquoise.jpg');
 }
@@ -58,6 +58,10 @@
 .casehistory-photo-item-info p span { line-height: 24px; font-size: 14px }
 .list-pay .item-avatar { min-height: 60px; padding: 10px 120px 10px 10px; }
 .list-pay .item-avatar p { color: #999 }
+.app-link-item i.i-applink-goods { background-image: url(../img/icon/i_home_goods.png); }
+.app-link-item i.i-applink-car { background-image: url(../img/icon/i_home_car.png); }
+.app-link-item i.i-applink-order { background-image: url(../img/icon/i_home_order.png); }
+.app-link-item i.i-applink-my { background-image: url(../img/icon/i_home_my.png); }
 .list-pay .item-avatar .icon { position: absolute; left: 10px; max-height: 40px; max-width: 40px; color: #FFFFFF; line-height: 40px; font-weight: bold; font-size: 16px }
 .list-pay .item-avatar b { position: absolute; width: 110px; text-align: right; top: 20px; right: 10px; font-size: 18px }
 
@@ -72,8 +76,9 @@
 .app-link a { color: #999; font-size: 14px; line-height: 22px; }
 .app-link-item em { width: 9px; height: 9px; border-radius: 10px; background-color: rgba(252,101,34,1.00); position: absolute; z-index: 2; right: 0px; top: 0; }
 
-.swiper-index-slide { height: 120px; }
-.slider-img {background-image: url(../img/banner.png); height: 100%; width: 100%; -moz-background-size: cover; -webkit-background-size: cover; -o-background-size: cover; background-size: cover; background-position: center }
+.swiper-index-slide { height: 170px; }
+.swiper-index-slide .slider-slide .slider-img { height: 100%; width: 100%; -moz-background-size: cover; -webkit-background-size: cover; -o-background-size: cover; background-size: cover; background-position: center }
+ 
 .app-link-bottom { height: 8px; background: url(../img/box_bottom_bg.png) repeat-x bottom; margin-bottom: 5px; }
 
 .item-avatar-icon { min-height: 70px; padding: 7px 10px 7px 70px; position: relative; }
@@ -92,4 +97,10 @@
 .mustfill {
     color:red
 }
-input.ion-amap-place[readonly] { background-color: transparent; cursor: text; }
+input.ion-amap-place[readonly] { background-color: transparent; cursor: text; }
+.bar-button-selftest {
+    font-weight:bold;
+   
+} 
+.bar-button-selftest .button.button-calm.button-outline { border-color: #FFF; color:#0c60ee; }
+.bar-button-selftest .button.button-positive.button-outline { background-color: #ccc; color:#0c60ee;  }

wl/platforms/android/assets/www/index.html

@@ -28,6 +28,7 @@
 <script src="js/controllers/goods.js"></script>
 <script src="js/controllers/car.js"></script>
 <script src="js/controllers/my.js"></script>
+<script src="js/controllers/home.js"></script>
 <!--services-->
 <script src="js/services/msgservice.js"></script>
 <script src="js/services/dataservice.js"></script>
@@ -36,4 +37,7 @@
 <script src="js/services/carservice.js"></script>
 <script src="js/services/goodsservice.js"></script>
 <script src="js/services/orderservice.js"></script>
-<script src="js/services/myservice.js"></script>
+<script src="js/services/myservice.js"></script>
+<script src="js/services/nativeservices.js"></script>
+<!--filters-->
+<script src="js/filters/filter.js"></script>

wl/platforms/android/assets/www/js/app.js

@@ -9,12 +9,13 @@
        $ionicConfigProvider.form.checkbox("circle");
        $ionicConfigProvider.templates.maxPrefetch(0);
    }])
- .config(["$httpProvider", function ($httpProvider) {
-     //http配置
-     $httpProvider.defaults.headers.common['Authorization'] = 'Bearer ' + window.localStorage['token'];
+ .config(["$httpProvider", "$windowProvider", function ($httpProvider, $windowProvider) {
+     //var win = $windowProvider.$get();
+     ////http配置
+     //$httpProvider.defaults.headers.common['Authorization'] = 'Bearer ' + win.localStorage['token'];
  }])
-.run(["$ionicPlatform", "$location", "msg", "$rootScope", "$timeout", "$ionicHistory", "userService","$state",
-    function ($ionicPlatform, $location, msg, $rootScope, $timeout, $ionicHistory, userService, $state) {
+.run(["$ionicPlatform", "$location", "msg", "$rootScope", "$timeout", "$ionicHistory", "userService", "$state", "$http",
+    function ($ionicPlatform, $location, msg, $rootScope, $timeout, $ionicHistory, userService, $state, $http) {
     $ionicPlatform.registerBackButtonAction(function (e) {
         if ($location.path().indexOf("wl/") != -1) {
             if ($rootScope.backButtonPressedOnceToExit) {
@@ -44,7 +45,7 @@
         }
         if (!userService.isLogin()) {
             $state.go('login');
-        }
+        } 
     });
 }]);
  angular.module("app.controllers", []);

wl/platforms/android/assets/www/js/config/router.js

@@ -22,7 +22,16 @@
               controller: "frameCtrl",
               templateUrl: 'templates/tabs.html'
           })
-
+         //首页
+        .state('wl.home', {
+            url: '/home',
+            views: {
+                'wl-home': {
+                    templateUrl: 'templates/home/index.html',
+                    controller: 'homeCtrl'
+                }
+            }
+        })
          //货源管理
         .state('wl.goods', {  
             url: '/goods',

wl/platforms/android/assets/www/js/controllers/account.js

@@ -1,5 +1,5 @@
 (function (app) {
-    app.controller('loginCtrl', ["$scope", 'userService', "data", '$state', 'msg', function ($scope, userService, data, $state, msg) {
+    app.controller('loginCtrl', ["$scope", 'userService', "data", '$state', 'msg', '$http', function ($scope, userService, data, $state, msg, $http) {
         $scope.vm = {
             mobile: '',
             password:''
@@ -10,6 +10,7 @@
                 msg.hide();
                 data.setObject('user', result.data.user);
                 data.set('token', result.data.token);
+                $http.defaults.headers.common["Authorization"] = 'Bearer ' + result.data.token;
                 if (result.data.user.type == 1) {//托运方
                     $state.go('wl.car');
                 }
@@ -22,7 +23,7 @@
             });
         }
     }]);
-    app.controller('registerCtrl', ["$scope", 'msg', 'util', 'userService', '$timeout', '$state', 'data', function ($scope, msg, util, userService, $timeout, $state, data) {
+    app.controller('registerCtrl', ["$scope", 'msg', 'util', 'userService', '$timeout', '$state', 'data', '$http', function ($scope, msg, util, userService, $timeout, $state, data, $http) {
         $scope.vm = {
             mobile: '',
             password: '',
@@ -71,6 +72,7 @@
             }).then(function (result) {
                 data.setObject('user', { mobile: $scope.vm.mobile, type: $scope.vm.type });
                 data.set('token', result.data.token);
+                $http.defaults.headers.common["Authorization"] = 'Bearer ' + result.data.token;
                 msg.hide();
                 if ($scope.vm.type == 1) {//托运方
                     $state.go('wl.car');

wl/platforms/android/assets/www/js/controllers/home.js

@@ -0,0 +1,34 @@
+(function (app) {
+    app.controller('homeCtrl', ["$scope", 'goodsService', 'carService', 'msg', '$state', '$ionicHistory', function ($scope, goodsService, carService, msg, $state, $ionicHistory) {
+        $scope.vm = { showIndex: 1 };
+        $scope.changeTab = function (i) {
+            $scope.vm.showIndex = i;
+        }
+        $scope.goods = [];
+        goodsService.listGoods({page:1}).then(function (result) {
+            $scope.goods = result.data.data;
+        }, function (erro) {
+            msg.error(JSON.stringify(erro.data));
+        });
+        $scope.cars = [];
+        carService.listCars({ page: 1 }).then(function (result) {
+            $scope.cars = result.data.data;
+        }, function (erro) {
+            msg.error(JSON.stringify(erro.data));
+        });
+        $scope.detail = function (item) {
+            if ($scope.vm.showIndex == 1) //货源
+            {
+                $state.go('wl.goods_detail', {item:item});
+            }
+            if ($scope.vm.showIndex == 2) //车源
+            {
+                $state.go('wl.car_detail', { item: item });
+            }
+        }
+        $scope.go = function (target) {
+            $ionicHistory.clearHistory();
+            $state.go(target);
+        }
+    }]);
+})(angular.module('app.controllers'));

wl/platforms/android/assets/www/js/controllers/my.js

@@ -1,11 +1,14 @@
 (function (app) {
-    app.controller('myCtrl', ["$scope", function ($scope) {
-
+    app.controller('myCtrl', ["$scope","$state", function ($scope,$state) {
+        $scope.toProfile = function () {
+            $state.go('wl.my_profile');
+        }
     }]);
-    app.controller('mySettingCtrl', ['$scope', 'data', '$state', function ($scope, data, $state) {
+    app.controller('mySettingCtrl', ['$scope', 'data', '$state', '$http', function ($scope, data, $state, $http) {
         $scope.logout = function () {
             data.remove('user');
             data.remove('token');
+            $http.defaults.headers.common["Authorization"] =undefined;
             $state.go('login');
         }
     }]);
@@ -33,6 +36,7 @@
             msg.error(erro);
         });
         $scope.setAvator = function () {
+           // alert(typeof FileUploadOptions);
             var options = {
                 quality: 50,
                 destinationType: 1,
@@ -42,20 +46,24 @@
                 allowEdit:true
             };//https://cordova.apache.org/docs/en/latest/reference/cordova-plugin-camera/
             navigator.camera.getPicture(function (imageUri) {
+             //   alert(imageUri);
                 $scope.user.avatar = imageUri;
-                var options = new FileUploadOptions();
-                options.fileKey = "avatar";
-                options.fileName = "avatar.jpg";
-                options.mimeType = "image/jpeg";
-                var ft = new FileTransfer();
-                ft.upload(imageUri, encodeURI("http://120.25.204.211/api/user"), function(sucess) {
-                    alert(JSON.stringify(sucess));
-                }, function (fail) {
-                    alert(JSON.stringify(fail));
-                }, options);
-                ft.abort();
+               
+                //var uploadOptions = new FileUploadOptions();
+                //uploadOptions.fileKey = "avatar";
+                //alert(uploadOptions);
+                //uploadOptions.fileName = "avatar.jpg";
+                //uploadOptions.mimeType = "image/jpeg";
+                //var ft = new FileTransfer();
+                //alert(ft);
+                //ft.upload(imageUri, "http://120.25.204.211/api/user", function(sucess) {
+                //    alert(JSON.stringify(sucess));
+                //}, function (fail) {
+                //    alert(JSON.stringify(fail));
+                //}, options); 
+                //ft.abort();
             }, function (erro) {
-
+                alert(erro);
             }, options);
         }
         $scope.save = function () {

wl/platforms/android/assets/www/js/filters/filter.js

@@ -0,0 +1,35 @@
+(function (module) {
+    module.filter('gender', function () {
+
+        return function (input) {
+
+            switch (input) {
+                case 0:
+                    return "女";
+                case 1:
+                    return "男";
+                default:
+                    return "";
+            }
+        };
+    });
+    module.filter('trustHtml', ['$sce', function ($sce) {
+        return function (html) {
+            return $sce.trustAsHtml(html);
+        };
+    }]);
+    module.filter('trustUrl', ['$sce', function ($sce) {
+        return function (url) {
+            return $sce.trustAsResourceUrl(url);
+        };
+    }]);
+    module.filter('avator', function () {
+        return function (input) {
+            if (!input || input.length === 0) {
+                return "img/photo_default_turquoise.jpg";
+            }
+            return input;
+        };
+    });
+ 
+})(angular.module('app.filters'));

wl/platforms/android/assets/www/js/services/nativeservices.js

@@ -0,0 +1,66 @@
+(function (app) {
+     
+    app.factory("camera", ["$window",'msg', function ($window,msg) {
+        return {
+            chooseImage: function (cameraOptions) {
+                var q = $q.defer();
+                if (ionic.Platform.platforms[0] === "browser") {
+                    msg.text('不支持该操作');
+                }
+                var defaultOptions = {
+                    quality: 100,
+                    destinationType: 1,//0：Return base64 encoded string，1：Return file uri (content://media/external/images/media/2 for Android)，2：Return native uri (eg. asset-library://... for iOS)
+                    sourceType: 1,//0:Choose image from picture library (same as SAVEDPHOTOALBUM for Android),1:Take picture from camera,2:Choose image from picture library (same as PHOTOLIBRARY for Android)
+                    allowEdit: false,
+                    encodingType: 0,//0为jpg,1为png
+                    //targetWidth: 1920,
+                    //targetHeight: 1080,
+                    saveToPhotoAlbum: false,
+                    maximumImagesCount: 10  //选择图片时用的
+                };
+                var options = angular.extend(defaultCameraOptions, cameraOptions);
+                var sheetOptions = {
+                    title: '选择拍照方式',
+                    buttonLabels: ['拍摄照片', '从图库选择'],
+                    addCancelButtonWithLabel: '取消',
+                    androidEnableCancelButton: true
+                };
+                $cordovaActionSheet.show(sheetOptions)
+                    .then(function (index) {
+
+                        switch (index) {
+
+                            case 1: //拍摄图片
+                                {
+                                    options.sourceType = 1;
+                                    navigator.camera.getPicture(options).then(function (imageURI) {
+
+                                        q.resolve([imageURI]);
+
+                                    }, function (error) {
+
+                                        q.reject(error);
+                                    });
+                                }
+                                break;
+
+                            case 2:
+                                {
+                                    window.plugins.imagePicker.getPictures(function (results) {
+                                        q.resolve(results);
+                                    }, function (error) {
+                                        q.reject(error);
+                                    }, options);
+                                }
+                                break;
+                            default:
+
+                                q.reslove([]);
+                                break;
+                        }
+                    });
+                return q.promise;
+            } 
+        };
+    }]);
+})(angular.module('app.services'));

wl/platforms/android/assets/www/templates/car/detail.html

@@ -3,13 +3,14 @@
         <div class="list">
             <div class="list card">
                 <div class="item item-avatar">
-                    <img src="../../img/photo_default_turquoise.jpg" />
+                    <img src="img/photo_default_turquoise.jpg" />
                     <h2>{{vm.contact_name}}、{{vm.contact_phone}}</h2> 
                     <p>价格:<b style="color:red">￥{{vm.begin_address}}</b></p>
                 </div>
 
                 <div class="item item-body">
-                    <p style="font-weight:bold">从{{vm.begin_address}}到{{vm.end_address}},途径{{vm.midway_address}}</p>
+                    <p style="font-weight:bold">从{{vm.begin_address}}到{{vm.end_address}}</p>
+                    <p>途径{{vm.midway_address}}</p>
                     <p>
                         {{vm.detail}}
                     </p>

wl/platforms/android/assets/www/templates/car/index.html

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

wl/platforms/android/assets/www/templates/car/success.html

@@ -2,7 +2,7 @@
     <ion-content>
         <div class="card">
             <div class="item item-text-wrap">
-                <p><img src="../../img/icon/ok_apply.png" /></p>
+                <p><img src="img/icon/ok_apply.png" /></p>
                 <p>价格:<b style="color:red">￥{{vm.begin_address}}</b></p>
                 <p>从{{vm.begin_address}}到{{vm.end_address}},途径{{vm.midway_address}}</p>
                 <p>联系人：{{vm.contact_name}},联系电话：{{vm.contact_phone}}</p>

wl/platforms/android/assets/www/templates/goods/detail.html

@@ -3,13 +3,14 @@
         <div class="list">
             <div class="list card">
                 <div class="item item-avatar">
-                    <img src="../../img/photo_default_turquoise.jpg" />
+                    <img src="img/photo_default_turquoise.jpg" />
                     <h2>{{vm.contact_name}}、{{vm.contact_phone}}</h2>
                     <p>价格:<b style="color:red">￥{{vm.begin_address}}</b></p>
                 </div>
 
                 <div class="item item-body">
-                    <p style="font-weight:bold">从{{vm.begin_address}}到{{vm.end_address}},途径{{vm.midway_address}}</p>
+                    <p style="font-weight:bold">从{{vm.begin_address}}到{{vm.end_address}}</p>
+                    <p>途径{{vm.midway_address}}</p>
                     <p>
                         {{vm.detail}}
                     </p>

wl/platforms/android/assets/www/templates/goods/index.html

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

wl/platforms/android/assets/www/templates/goods/success.html

@@ -2,7 +2,7 @@
     <ion-content>
         <div class="card">
             <div class="item item-text-wrap">
-                <p><img src="../../img/icon/ok_apply.png" /></p>
+                <p><img src="img/icon/ok_apply.png" /></p>
                 <p>价格:<b style="color:red">￥{{vm.begin_address}}</b></p>
                 <p>从{{vm.begin_address}}到{{vm.end_address}},途径{{vm.midway_address}}</p>
                 <p>联系人：{{vm.contact_name}},联系电话：{{vm.contact_phone}}</p>

wl/platforms/android/assets/www/templates/home/index.html

@@ -0,0 +1,74 @@
+<ion-view view-title="掌上物流网">
+    <ion-content class="app-content-gray-bg">
+        <ion-slide-box class="swiper-index-slide"  >
+            <ion-slide  >
+                <img class="slider-img"  src="img/demo/banner.png" />
+            </ion-slide>
+            <ion-slide>
+                <img class="slider-img" src="img/demo/banner1.png" />
+            </ion-slide>
+            <ion-slide>
+                <img class="slider-img" src="img/demo/banner2.png" />
+            </ion-slide>
+        </ion-slide-box>
+        <div class="app-link-bottom"></div>
+        <div class="row app-link">
+            <div class="col-25">
+                <a ng-click="go('wl.goods')" >
+                    <div class="app-link-item">
+                        <i class="i-applink-goods"><em ng-if="vm.newTask"></em></i>
+                        <span>货源</span>
+                    </div>
+                </a>
+            </div>
+            <div class="col-25">
+                <a  ng-click="go('wl.car')">
+                    <div class="app-link-item">
+                        <i class="i-applink-car"></i>
+                        <span>车源</span>
+                    </div>
+                </a>
+            </div>
+            <div class="col-25">
+                <a ng-click="go('wl.my_order')" >
+                    <div class="app-link-item">
+                        <i class="i-applink-order"></i>
+                        <span>订单</span>
+                    </div>
+                </a>
+            </div>
+            <div class="col-25">
+                <a  ng-click="go('wl.my')">
+                    <div class="app-link-item">
+                        <i class="i-applink-my"></i>
+                        <span>我的</span>
+                    </div>
+                </a>
+            </div>
+
+        </div>
+        <div class="app-link-bottom"></div>
+        <div class="button-bar bar-calm bar-button-selftest" >
+            <a class="{{vm.showIndex==1?'button  button-calm button-outline button-small button-positive':'button button-calm button-outline button-small'}}" ng-click="changeTab(1)">货源信息</a>
+            <a class="{{vm.showIndex==2?'button  button-calm button-outline button-small button-positive':'button button-calm button-outline button-small'}}" ng-click="changeTab(2)">车源信息</a>
+        </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}}】-【{{item.end_address}}】</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}}</span></p>
+                <p><span style="float:left">联系人：{{item.contact_name}}</span> <span style="float:right">电话：{{item.contact_phone}}</span></p> 
+            </a>
+        </div>
+        <div class="list" ng-if="vm.showIndex==2">
+            <a class="item" ng-repeat="item in cars" ng-click="detail(item)">
+                <h2>【{{item.begin_address}}】-【{{item.end_address}}】</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}}</span>
+                </p>
+                <p><span style="float:left">联系人：{{item.contact_name}}</span> <span style="float:right">电话：{{item.contact_phone}}</span></p> 
+            </a>
+        </div>
+    </ion-content>
+</ion-view>

wl/platforms/android/assets/www/templates/my/index.html

@@ -2,10 +2,10 @@
     <ion-content class="app-content app-user-content">
         <div class="user-box">
             <a  class="user-photo">
-              <img ng-src="../../img/photo_default_turquoise.jpg"  />
+              <img ng-src="img/photo_default_turquoise.jpg"  />
             </a>
             
-            <div class="user-info">
+            <div class="user-info" ng-click="toProfile()">
                 <a >  <p><span>酉水东流</span></p>  </a>
             </div>
             <div class="msg-user">

wl/platforms/android/assets/www/templates/my/message-detail.html

@@ -3,7 +3,7 @@
         <div class="list">
             <div class="list card">
                 <div class="item item-avatar">
-                    <img src="../../img/photo_default_turquoise.jpg" />
+                    <img src="img/photo_default_turquoise.jpg" />
                     <h2>{{vm.contact_name}}、{{vm.contact_phone}}</h2>
                     <p>价格:<b style="color:red">￥{{vm.begin_address}}</b></p>
                 </div>

wl/platforms/android/assets/www/templates/my/order-detail.html

@@ -3,7 +3,7 @@
         <div class="list">
             <div class="list card">
                 <div class="item item-avatar">
-                    <img src="../../img/photo_default_turquoise.jpg" />
+                    <img src="img/photo_default_turquoise.jpg" />
                     <h2>交易人:{{vm.trade_user_id}},交易时间{{vm.deal_confirm_time}}</h2>
                     <p>状态:<b style="color:red">{{vm.state}}</b></p>
                 </div>
@@ -20,3 +20,4 @@
         </div>
     </ion-content>
 </ion-view>
+  

wl/platforms/android/assets/www/templates/my/profile.html

@@ -4,15 +4,16 @@
             <div class="item item-divider">
                 完善个人信息
             </div>
-            <a class="item">
-                <em class="fl">手机号</em>
-                <span style="float:right">{{user.phone}}</span>
-            </a>
             <a class="item item-avatar-right item-arrow-no" ng-click="setAvator()">
-                <img ng-src="user.avatar" />
+                <img ng-src="{{user.avatar | avator}}" />
                 <h2>上传照片</h2>
                 <p>头像</p>
             </a>
+            <a class="item">
+                <em class="fl">手机号</em>
+                <span style="float:right;margin-right:85px">{{user.phone}}</span>
+                <span class="badge badge-assertive">已认证</span>
+            </a>
             <label class="item item-input ">
                 <span class="input-label">姓名<span class="mustfill">*</span></span>
                 <input style="text-align:right" ng-model="user.name" type="text" placeholder="真实姓名">

wl/platforms/android/assets/www/templates/tabs.html

@@ -1,4 +1,7 @@
 <ion-tabs class="tabs-icon-top tabs-color-active-positive">
+    <ion-tab title="首页" icon-off="ion-ios-home-outline" icon-on="ion-ios-home" ng-click="go('wl.home')">
+        <ion-nav-view name="wl-home"></ion-nav-view>
+    </ion-tab>
   <ion-tab title="货源" icon-off="ion-ios-browsers-outline" icon-on="ion-ios-browsers" ng-click="go('wl.goods')" >
     <ion-nav-view name="wl-goods"></ion-nav-view>
   </ion-tab>

wl/platforms/android/gradle.properties

@@ -0,0 +1,4 @@
+systemProp.http.proxyHost=127.0.0.1
+systemProp.http.proxyPort=8888
+systemProp.https.proxyHost=127.0.0.1
+systemProp.https.proxyPort=8888

wl/platforms/android/res/xml/config.xml

@@ -19,6 +19,10 @@
         <param name="android-package" value="io.ionic.keyboard.IonicKeyboard" />
         <param name="onload" value="true" />
     </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" />
     <name>掌上物流网</name>
     <description>
         An Ionic Framework and Cordova project.

wl/www/css/style.css

@@ -1,4 +1,4 @@
-.logo {margin-top:10px;margin-left:23%;width:250px;height:200px }
+.logo {margin-top:10px;margin-left:23%;width:50%;height:35% }
 .image-default {
       background-image: url('../img/photo_default_turquoise.jpg');
 }
@@ -58,6 +58,10 @@
 .casehistory-photo-item-info p span { line-height: 24px; font-size: 14px }
 .list-pay .item-avatar { min-height: 60px; padding: 10px 120px 10px 10px; }
 .list-pay .item-avatar p { color: #999 }
+.app-link-item i.i-applink-goods { background-image: url(../img/icon/i_home_goods.png); }
+.app-link-item i.i-applink-car { background-image: url(../img/icon/i_home_car.png); }
+.app-link-item i.i-applink-order { background-image: url(../img/icon/i_home_order.png); }
+.app-link-item i.i-applink-my { background-image: url(../img/icon/i_home_my.png); }
 .list-pay .item-avatar .icon { position: absolute; left: 10px; max-height: 40px; max-width: 40px; color: #FFFFFF; line-height: 40px; font-weight: bold; font-size: 16px }
 .list-pay .item-avatar b { position: absolute; width: 110px; text-align: right; top: 20px; right: 10px; font-size: 18px }
 
@@ -72,8 +76,9 @@
 .app-link a { color: #999; font-size: 14px; line-height: 22px; }
 .app-link-item em { width: 9px; height: 9px; border-radius: 10px; background-color: rgba(252,101,34,1.00); position: absolute; z-index: 2; right: 0px; top: 0; }
 
-.swiper-index-slide { height: 120px; }
-.slider-img {background-image: url(../img/banner.png); height: 100%; width: 100%; -moz-background-size: cover; -webkit-background-size: cover; -o-background-size: cover; background-size: cover; background-position: center }
+.swiper-index-slide { height: 170px; }
+.swiper-index-slide .slider-slide .slider-img { height: 100%; width: 100%; -moz-background-size: cover; -webkit-background-size: cover; -o-background-size: cover; background-size: cover; background-position: center }
+ 
 .app-link-bottom { height: 8px; background: url(../img/box_bottom_bg.png) repeat-x bottom; margin-bottom: 5px; }
 
 .item-avatar-icon { min-height: 70px; padding: 7px 10px 7px 70px; position: relative; }
@@ -92,4 +97,10 @@
 .mustfill {
     color:red
 }
-input.ion-amap-place[readonly] { background-color: transparent; cursor: text; }
+input.ion-amap-place[readonly] { background-color: transparent; cursor: text; }
+.bar-button-selftest {
+    font-weight:bold;
+   
+} 
+.bar-button-selftest .button.button-calm.button-outline { border-color: #FFF; color:#0c60ee; }
+.bar-button-selftest .button.button-positive.button-outline { background-color: #ccc; color:#0c60ee;  }

wl/www/index.html

@@ -28,6 +28,7 @@
 <script src="js/controllers/goods.js"></script>
 <script src="js/controllers/car.js"></script>
 <script src="js/controllers/my.js"></script>
+<script src="js/controllers/home.js"></script>
 <!--services-->
 <script src="js/services/msgservice.js"></script>
 <script src="js/services/dataservice.js"></script>
@@ -36,4 +37,7 @@
 <script src="js/services/carservice.js"></script>
 <script src="js/services/goodsservice.js"></script>
 <script src="js/services/orderservice.js"></script>
-<script src="js/services/myservice.js"></script>
+<script src="js/services/myservice.js"></script>
+<script src="js/services/nativeservices.js"></script>
+<!--filters-->
+<script src="js/filters/filter.js"></script>

wl/www/js/app.js

@@ -9,12 +9,13 @@
        $ionicConfigProvider.form.checkbox("circle");
        $ionicConfigProvider.templates.maxPrefetch(0);
    }])
- .config(["$httpProvider", function ($httpProvider) {
-     //http配置
-     $httpProvider.defaults.headers.common['Authorization'] = 'Bearer ' + window.localStorage['token'];
+ .config(["$httpProvider", "$windowProvider", function ($httpProvider, $windowProvider) {
+     //var win = $windowProvider.$get();
+     ////http配置
+     //$httpProvider.defaults.headers.common['Authorization'] = 'Bearer ' + win.localStorage['token'];
  }])
-.run(["$ionicPlatform", "$location", "msg", "$rootScope", "$timeout", "$ionicHistory", "userService","$state",
-    function ($ionicPlatform, $location, msg, $rootScope, $timeout, $ionicHistory, userService, $state) {
+.run(["$ionicPlatform", "$location", "msg", "$rootScope", "$timeout", "$ionicHistory", "userService", "$state", "$http",
+    function ($ionicPlatform, $location, msg, $rootScope, $timeout, $ionicHistory, userService, $state, $http) {
     $ionicPlatform.registerBackButtonAction(function (e) {
         if ($location.path().indexOf("wl/") != -1) {
             if ($rootScope.backButtonPressedOnceToExit) {
@@ -44,7 +45,7 @@
         }
         if (!userService.isLogin()) {
             $state.go('login');
-        }
+        } 
     });
 }]);
  angular.module("app.controllers", []);

wl/www/js/config/router.js

@@ -22,7 +22,16 @@
               controller: "frameCtrl",
               templateUrl: 'templates/tabs.html'
           })
-
+         //首页
+        .state('wl.home', {
+            url: '/home',
+            views: {
+                'wl-home': {
+                    templateUrl: 'templates/home/index.html',
+                    controller: 'homeCtrl'
+                }
+            }
+        })
          //货源管理
         .state('wl.goods', {  
             url: '/goods',

wl/www/js/controllers/account.js

@@ -1,5 +1,5 @@
 (function (app) {
-    app.controller('loginCtrl', ["$scope", 'userService', "data", '$state', 'msg', function ($scope, userService, data, $state, msg) {
+    app.controller('loginCtrl', ["$scope", 'userService', "data", '$state', 'msg', '$http', function ($scope, userService, data, $state, msg, $http) {
         $scope.vm = {
             mobile: '',
             password:''
@@ -10,6 +10,7 @@
                 msg.hide();
                 data.setObject('user', result.data.user);
                 data.set('token', result.data.token);
+                $http.defaults.headers.common["Authorization"] = 'Bearer ' + result.data.token;
                 if (result.data.user.type == 1) {//托运方
                     $state.go('wl.car');
                 }
@@ -22,7 +23,7 @@
             });
         }
     }]);
-    app.controller('registerCtrl', ["$scope", 'msg', 'util', 'userService', '$timeout', '$state', 'data', function ($scope, msg, util, userService, $timeout, $state, data) {
+    app.controller('registerCtrl', ["$scope", 'msg', 'util', 'userService', '$timeout', '$state', 'data', '$http', function ($scope, msg, util, userService, $timeout, $state, data, $http) {
         $scope.vm = {
             mobile: '',
             password: '',
@@ -71,6 +72,7 @@
             }).then(function (result) {
                 data.setObject('user', { mobile: $scope.vm.mobile, type: $scope.vm.type });
                 data.set('token', result.data.token);
+                $http.defaults.headers.common["Authorization"] = 'Bearer ' + result.data.token;
                 msg.hide();
                 if ($scope.vm.type == 1) {//托运方
                     $state.go('wl.car');

wl/www/js/controllers/home.js

@@ -0,0 +1,34 @@
+(function (app) {
+    app.controller('homeCtrl', ["$scope", 'goodsService', 'carService', 'msg', '$state', '$ionicHistory', function ($scope, goodsService, carService, msg, $state, $ionicHistory) {
+        $scope.vm = { showIndex: 1 };
+        $scope.changeTab = function (i) {
+            $scope.vm.showIndex = i;
+        }
+        $scope.goods = [];
+        goodsService.listGoods({page:1}).then(function (result) {
+            $scope.goods = result.data.data;
+        }, function (erro) {
+            msg.error(JSON.stringify(erro.data));
+        });
+        $scope.cars = [];
+        carService.listCars({ page: 1 }).then(function (result) {
+            $scope.cars = result.data.data;
+        }, function (erro) {
+            msg.error(JSON.stringify(erro.data));
+        });
+        $scope.detail = function (item) {
+            if ($scope.vm.showIndex == 1) //货源
+            {
+                $state.go('wl.goods_detail', {item:item});
+            }
+            if ($scope.vm.showIndex == 2) //车源
+            {
+                $state.go('wl.car_detail', { item: item });
+            }
+        }
+        $scope.go = function (target) {
+            $ionicHistory.clearHistory();
+            $state.go(target);
+        }
+    }]);
+})(angular.module('app.controllers'));

wl/www/js/controllers/my.js

@@ -1,11 +1,14 @@
 (function (app) {
-    app.controller('myCtrl', ["$scope", function ($scope) {
-
+    app.controller('myCtrl', ["$scope","$state", function ($scope,$state) {
+        $scope.toProfile = function () {
+            $state.go('wl.my_profile');
+        }
     }]);
-    app.controller('mySettingCtrl', ['$scope', 'data', '$state', function ($scope, data, $state) {
+    app.controller('mySettingCtrl', ['$scope', 'data', '$state', '$http', function ($scope, data, $state, $http) {
         $scope.logout = function () {
             data.remove('user');
             data.remove('token');
+            $http.defaults.headers.common["Authorization"] =undefined;
             $state.go('login');
         }
     }]);
@@ -33,6 +36,7 @@
             msg.error(erro);
         });
         $scope.setAvator = function () {
+           // alert(typeof FileUploadOptions);
             var options = {
                 quality: 50,
                 destinationType: 1,
@@ -42,20 +46,24 @@
                 allowEdit:true
             };//https://cordova.apache.org/docs/en/latest/reference/cordova-plugin-camera/
             navigator.camera.getPicture(function (imageUri) {
+             //   alert(imageUri);
                 $scope.user.avatar = imageUri;
-                var options = new FileUploadOptions();
-                options.fileKey = "avatar";
-                options.fileName = "avatar.jpg";
-                options.mimeType = "image/jpeg";
-                var ft = new FileTransfer();
-                ft.upload(imageUri, encodeURI("http://120.25.204.211/api/user"), function(sucess) {
-                    alert(JSON.stringify(sucess));
-                }, function (fail) {
-                    alert(JSON.stringify(fail));
-                }, options);
-                ft.abort();
+               
+                //var uploadOptions = new FileUploadOptions();
+                //uploadOptions.fileKey = "avatar";
+                //alert(uploadOptions);
+                //uploadOptions.fileName = "avatar.jpg";
+                //uploadOptions.mimeType = "image/jpeg";
+                //var ft = new FileTransfer();
+                //alert(ft);
+                //ft.upload(imageUri, "http://120.25.204.211/api/user", function(sucess) {
+                //    alert(JSON.stringify(sucess));
+                //}, function (fail) {
+                //    alert(JSON.stringify(fail));
+                //}, options); 
+                //ft.abort();
             }, function (erro) {
-
+                alert(erro);
             }, options);
         }
         $scope.save = function () {

wl/www/js/filters/filter.js

@@ -0,0 +1,35 @@
+(function (module) {
+    module.filter('gender', function () {
+
+        return function (input) {
+
+            switch (input) {
+                case 0:
+                    return "女";
+                case 1:
+                    return "男";
+                default:
+                    return "";
+            }
+        };
+    });
+    module.filter('trustHtml', ['$sce', function ($sce) {
+        return function (html) {
+            return $sce.trustAsHtml(html);
+        };
+    }]);
+    module.filter('trustUrl', ['$sce', function ($sce) {
+        return function (url) {
+            return $sce.trustAsResourceUrl(url);
+        };
+    }]);
+    module.filter('avator', function () {
+        return function (input) {
+            if (!input || input.length === 0) {
+                return "img/photo_default_turquoise.jpg";
+            }
+            return input;
+        };
+    });
+ 
+})(angular.module('app.filters'));

wl/www/js/services/nativeservices.js

@@ -0,0 +1,66 @@
+(function (app) {
+     
+    app.factory("camera", ["$window",'msg', function ($window,msg) {
+        return {
+            chooseImage: function (cameraOptions) {
+                var q = $q.defer();
+                if (ionic.Platform.platforms[0] === "browser") {
+                    msg.text('不支持该操作');
+                }
+                var defaultOptions = {
+                    quality: 100,
+                    destinationType: 1,//0：Return base64 encoded string，1：Return file uri (content://media/external/images/media/2 for Android)，2：Return native uri (eg. asset-library://... for iOS)
+                    sourceType: 1,//0:Choose image from picture library (same as SAVEDPHOTOALBUM for Android),1:Take picture from camera,2:Choose image from picture library (same as PHOTOLIBRARY for Android)
+                    allowEdit: false,
+                    encodingType: 0,//0为jpg,1为png
+                    //targetWidth: 1920,
+                    //targetHeight: 1080,
+                    saveToPhotoAlbum: false,
+                    maximumImagesCount: 10  //选择图片时用的
+                };
+                var options = angular.extend(defaultCameraOptions, cameraOptions);
+                var sheetOptions = {
+                    title: '选择拍照方式',
+                    buttonLabels: ['拍摄照片', '从图库选择'],
+                    addCancelButtonWithLabel: '取消',
+                    androidEnableCancelButton: true
+                };
+                $cordovaActionSheet.show(sheetOptions)
+                    .then(function (index) {
+
+                        switch (index) {
+
+                            case 1: //拍摄图片
+                                {
+                                    options.sourceType = 1;
+                                    navigator.camera.getPicture(options).then(function (imageURI) {
+
+                                        q.resolve([imageURI]);
+
+                                    }, function (error) {
+
+                                        q.reject(error);
+                                    });
+                                }
+                                break;
+
+                            case 2:
+                                {
+                                    window.plugins.imagePicker.getPictures(function (results) {
+                                        q.resolve(results);
+                                    }, function (error) {
+                                        q.reject(error);
+                                    }, options);
+                                }
+                                break;
+                            default:
+
+                                q.reslove([]);
+                                break;
+                        }
+                    });
+                return q.promise;
+            } 
+        };
+    }]);
+})(angular.module('app.services'));

wl/www/templates/car/detail.html

@@ -3,13 +3,14 @@
         <div class="list">
             <div class="list card">
                 <div class="item item-avatar">
-                    <img src="../../img/photo_default_turquoise.jpg" />
+                    <img src="img/photo_default_turquoise.jpg" />
                     <h2>{{vm.contact_name}}、{{vm.contact_phone}}</h2> 
                     <p>价格:<b style="color:red">￥{{vm.begin_address}}</b></p>
                 </div>
 
                 <div class="item item-body">
-                    <p style="font-weight:bold">从{{vm.begin_address}}到{{vm.end_address}},途径{{vm.midway_address}}</p>
+                    <p style="font-weight:bold">从{{vm.begin_address}}到{{vm.end_address}}</p>
+                    <p>途径{{vm.midway_address}}</p>
                     <p>
                         {{vm.detail}}
                     </p>

wl/www/templates/car/index.html

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

wl/www/templates/car/success.html

@@ -2,7 +2,7 @@
     <ion-content>
         <div class="card">
             <div class="item item-text-wrap">
-                <p><img src="../../img/icon/ok_apply.png" /></p>
+                <p><img src="img/icon/ok_apply.png" /></p>
                 <p>价格:<b style="color:red">￥{{vm.begin_address}}</b></p>
                 <p>从{{vm.begin_address}}到{{vm.end_address}},途径{{vm.midway_address}}</p>
                 <p>联系人：{{vm.contact_name}},联系电话：{{vm.contact_phone}}</p>

wl/www/templates/goods/detail.html

@@ -3,13 +3,14 @@
         <div class="list">
             <div class="list card">
                 <div class="item item-avatar">
-                    <img src="../../img/photo_default_turquoise.jpg" />
+                    <img src="img/photo_default_turquoise.jpg" />
                     <h2>{{vm.contact_name}}、{{vm.contact_phone}}</h2>
                     <p>价格:<b style="color:red">￥{{vm.begin_address}}</b></p>
                 </div>
 
                 <div class="item item-body">
-                    <p style="font-weight:bold">从{{vm.begin_address}}到{{vm.end_address}},途径{{vm.midway_address}}</p>
+                    <p style="font-weight:bold">从{{vm.begin_address}}到{{vm.end_address}}</p>
+                    <p>途径{{vm.midway_address}}</p>
                     <p>
                         {{vm.detail}}
                     </p>

wl/www/templates/goods/index.html

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

wl/www/templates/goods/success.html

@@ -2,7 +2,7 @@
     <ion-content>
         <div class="card">
             <div class="item item-text-wrap">
-                <p><img src="../../img/icon/ok_apply.png" /></p>
+                <p><img src="img/icon/ok_apply.png" /></p>
                 <p>价格:<b style="color:red">￥{{vm.begin_address}}</b></p>
                 <p>从{{vm.begin_address}}到{{vm.end_address}},途径{{vm.midway_address}}</p>
                 <p>联系人：{{vm.contact_name}},联系电话：{{vm.contact_phone}}</p>

wl/www/templates/home/index.html

@@ -0,0 +1,74 @@
+<ion-view view-title="掌上物流网">
+    <ion-content class="app-content-gray-bg">
+        <ion-slide-box class="swiper-index-slide"  >
+            <ion-slide  >
+                <img class="slider-img"  src="img/demo/banner.png" />
+            </ion-slide>
+            <ion-slide>
+                <img class="slider-img" src="img/demo/banner1.png" />
+            </ion-slide>
+            <ion-slide>
+                <img class="slider-img" src="img/demo/banner2.png" />
+            </ion-slide>
+        </ion-slide-box>
+        <div class="app-link-bottom"></div>
+        <div class="row app-link">
+            <div class="col-25">
+                <a ng-click="go('wl.goods')" >
+                    <div class="app-link-item">
+                        <i class="i-applink-goods"><em ng-if="vm.newTask"></em></i>
+                        <span>货源</span>
+                    </div>
+                </a>
+            </div>
+            <div class="col-25">
+                <a  ng-click="go('wl.car')">
+                    <div class="app-link-item">
+                        <i class="i-applink-car"></i>
+                        <span>车源</span>
+                    </div>
+                </a>
+            </div>
+            <div class="col-25">
+                <a ng-click="go('wl.my_order')" >
+                    <div class="app-link-item">
+                        <i class="i-applink-order"></i>
+                        <span>订单</span>
+                    </div>
+                </a>
+            </div>
+            <div class="col-25">
+                <a  ng-click="go('wl.my')">
+                    <div class="app-link-item">
+                        <i class="i-applink-my"></i>
+                        <span>我的</span>
+                    </div>
+                </a>
+            </div>
+
+        </div>
+        <div class="app-link-bottom"></div>
+        <div class="button-bar bar-calm bar-button-selftest" >
+            <a class="{{vm.showIndex==1?'button  button-calm button-outline button-small button-positive':'button button-calm button-outline button-small'}}" ng-click="changeTab(1)">货源信息</a>
+            <a class="{{vm.showIndex==2?'button  button-calm button-outline button-small button-positive':'button button-calm button-outline button-small'}}" ng-click="changeTab(2)">车源信息</a>
+        </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}}】-【{{item.end_address}}】</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}}</span></p>
+                <p><span style="float:left">联系人：{{item.contact_name}}</span> <span style="float:right">电话：{{item.contact_phone}}</span></p> 
+            </a>
+        </div>
+        <div class="list" ng-if="vm.showIndex==2">
+            <a class="item" ng-repeat="item in cars" ng-click="detail(item)">
+                <h2>【{{item.begin_address}}】-【{{item.end_address}}】</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}}</span>
+                </p>
+                <p><span style="float:left">联系人：{{item.contact_name}}</span> <span style="float:right">电话：{{item.contact_phone}}</span></p> 
+            </a>
+        </div>
+    </ion-content>
+</ion-view>

wl/www/templates/my/index.html

@@ -2,10 +2,10 @@
     <ion-content class="app-content app-user-content">
         <div class="user-box">
             <a  class="user-photo">
-              <img ng-src="../../img/photo_default_turquoise.jpg"  />
+              <img ng-src="img/photo_default_turquoise.jpg"  />
             </a>
             
-            <div class="user-info">
+            <div class="user-info" ng-click="toProfile()">
                 <a >  <p><span>酉水东流</span></p>  </a>
             </div>
             <div class="msg-user">