baimeng %!s(int64=9) %!d(string=hai) anos
pai
achega
13898df8cf

+ 1 - 0
wl/doc/req.txt

xqd
@@ -3,3 +3,4 @@
 3.  会员系统:可以发布货源,货车主可以发布车源信息,然后可以车主可以去拍货源的单。
 4. 用户中心,可以修改密码 ,查看订单信息 ,可以查看余额.
 
+http://120.25.204.211/apidoc/

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

xqd xqd
@@ -25,6 +25,7 @@
 
 .list-set-arrow .item, .item.item-set-arrow { background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20viewBox%3D\'0%200%2060%20120\'%20xmlns%3D\'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg\'%3E%3Cpath%20d%3D\'m60%2061.5-38.25%2038.25-9.75-9.75%2029.25-28.5-29.25-28.5%209.75-9.75z\'%20fill%3D\'%23c7c7cc\'%2F%3E%3C%2Fsvg%3E"); background-position: -webkit-calc(100% - 15px) center; background-position: calc(100% - 15px) center; background-repeat: no-repeat; background-size: 10px 20px; padding-right: 30px; }
 .list-set-arrow .item-arrow-no, .item-arrow-no { background-image: none; padding-right: 15px; }
+
 .item-arrow-no .badge { right: 15px; }
 .list-user-set .item.item-icon-left { padding: 12px 16px 12px 54px; border-color: #EEE; }
 .list-user-set .item.item-icon-left i img { margin-top: 6px; }
@@ -54,4 +55,37 @@
 .list-pay .item-avatar { min-height: 60px; padding: 10px 120px 10px 10px; }
 .list-pay .item-avatar p { color: #999 }
 .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 }
+.list-pay .item-avatar b { position: absolute; width: 110px; text-align: right; top: 20px; right: 10px; font-size: 18px }
+
+.app-link { padding: 10px 5px 2px 5px; margin: 0 5 0 auto; background-color: #FFF; }
+.app-link-item { text-align: center; }
+.app-link-item i { background: no-repeat center / auto 40px; width: 40px; height: 40px; display: inline-block; position: relative }
+.app-link-item i img { height: 24px; }
+.app-link-item span { display: block; font-size:20px; line-height:1.4 }
+.app-link-item p { text-align: center; display: block; line-height: 20px; font-size: 14px; font-weight: bold }
+.app-link-item i.i-applink-add { background-image: url(../img/icon/i_applink_add.png); }
+ 
+.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 }
+.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; }
+.item-avatar-icon .badge {font-weight:bold;color:red; left: -8px; top: 0px;   min-width: 18px;   text-align:center; min-height: 18px; font-size: 10px; right: auto;display:inline-block;transform:rotate(-40deg);-webkit-transform:rotate(-40deg)}
+.item-avatar-icon .item-avatar-type { position: absolute; right: 10px; top: 25px; z-index:-1; text-align:center;  display: inline-block; width: 50px; font-size: 12px;margin-right:12px;font-weight:700 }
+.item-avatar-type .ok {color:forestgreen} .no {color:red}
+.item-avatar-icon h2 { line-height: 30px; }
+.item-avatar-icon p { color: #999; }
+
+.nerve-loading {
+	stroke:#fff}
+.pop-msg {
+	font-size:40px}
+.nerve .pop-alert .popup .popup-head {
+	padding:25px 10px}
+.mustfill {
+    color:red
+}
+input.ion-amap-place[readonly] { background-color: transparent; cursor: text; }

BIN=BIN
wl/www/img/box_bottom_bg.png


BIN=BIN
wl/www/img/icon/i_applink_add.png


BIN=BIN
wl/www/img/logo.png


BIN=BIN
wl/www/img/photo_default_orange.jpg


BIN=BIN
wl/www/img/photo_default_turquoise.jpg


+ 0 - 1
wl/www/index.html

xqd
@@ -6,7 +6,6 @@
     <title>物流3</title>
     <link href="lib/ionic/css/ionic.css" rel="stylesheet">
     <link href="css/style.css" rel="stylesheet">
-    <link href="css/index.css" rel="stylesheet">
 </head>
 <body ng-app="app">
     <ion-nav-bar class="bar-positive">

+ 5 - 4
wl/www/js/config/router.js

xqd xqd
@@ -31,12 +31,12 @@
                 }
             }
         })
-        .state('wl.index_sub', {
-            url: '/goods/sub/:type',
+        .state('wl.goods_add', {
+            url: '/goods/add',
             views: {
                 'wl-goods': {
-                    templateUrl: 'templates/goods/index-sub.html',
-                    controller: 'goodsSubCtrl'
+                    templateUrl: 'templates/goods/add.html',
+                    controller: 'goodsAddCtrl'
                 }
             }
         })
@@ -187,6 +187,7 @@
                 }
             }
         });
+
         $urlRouterProvider.otherwise('/wl/goods');
     }]);
 })(angular.module('app'));

+ 15 - 8
wl/www/js/controllers/account.js

xqd
@@ -5,14 +5,21 @@
             password:''
         };
         $scope.login = function () {
-            data.setObject('user', { mobile: $scope.vm.mobile });
-            data.set('token', '111111');
-            $state.go('wl.home');
-            //userService.login($scope.vm.mobile, $scope.vm.password).then(function (result) {
-
-            //}, function (error) {
-            //    msg.error(error);
-            //});
+            msg.loading('登录中...');
+            userService.login($scope.vm.mobile, $scope.vm.password).then(function (result) {
+                msg.hide();
+                data.setObject('user', result.data.data);
+                data.set('token', result.data.meta.token);
+                if (result.data.data.type == 1) {//托运方
+                    $state.go('wl.car');
+                }
+                if (result.data.data.type == 2) {//承运方
+                    $state.go('wl.goods');
+                }
+            }, function (erro) {
+                msg.hide();
+                msg.error(JSON.stringify(erro.data));
+            });
         }
     }]);
     app.controller('registerCtrl', ["$scope", 'msg', 'util', 'userService', '$timeout', '$state', 'data', function ($scope, msg, util, userService, $timeout, $state, data) {

+ 5 - 55
wl/www/js/controllers/goods.js

xqd
@@ -1,61 +1,11 @@
 (function (app) {
     app.controller('goodsCtrl', ["$scope","$state", function ($scope,$state) {
-     $scope.goSub=function(type) {
-         $state.go('wl.index_sub',{type:type});
-     }
-    }]);
-    app.controller('goodsSubCtrl', ["$scope","$state","$stateParams","$ionicSideMenuDelegate"
-    , function ($scope,$state,$stateParams,$ionicSideMenuDelegate) {
-     $scope.type=$stateParams.type;
-       $scope.filter = {
-         subType:''
-       };
-        $scope.subTypeOpt = [];
-       switch($scope.type){
-           case '装修':
-            $scope.subTypeOpt=[ ];
-           break;
-           case '建材':
-            $scope.subTypeOpt=[{name:'空调',value:'空调'},{name:'地暖',value:'地暖'}
-            ,{name:'卫浴',value:'卫浴'},{name:'瓷砖、地板',value:'瓷砖地板'}];
-           break;
-           case '家电':
-            $scope.subTypeOpt=[ ];
-           break;
-           case '家具':
-            $scope.subTypeOpt=[ ];
-           break;
-           case '丽人':
-            $scope.subTypeOpt=[{name:'美容',value:'美容'},{name:'整形',value:'整形'}
-            ,{name:'牙科',value:'牙科'},{name:'减肥(产后塑形)',value:'减肥'}
-            ,{name:'月子',value:'月子'},{name:'私立妇幼保健院',value:'私立妇幼保健院'} ];
-           break;
-           case '婚恋':
-            $scope.subTypeOpt=[{name:'婚庆公司',value:'婚庆公司'},{name:'婚恋网站',value:'婚恋网站'}
-            ,{name:'婚纱摄影',value:'婚纱摄影'},{name:'婚纱礼服',value:'婚纱礼服'} ];
-           break;
-           case '教育培训':
-            $scope.subTypeOpt=[{name:'幼教',value:'幼教'},{name:'职业技术',value:'职业技术'} ,
-            {name:'特长培训',value:'特长培训'} ,{name:'职业培训',value:'职业培训'},{name:'升学培训',value:'升学培训'}   ];
-           break;
-                   case '保险':
-            $scope.subTypeOpt=[{name:'个人车险',value:'个人车险'},{name:'团体车险',value:'团体车险'}];
-           break;
-                   case '旅游':
-       
-           break;
-            
-       }
-        $scope.toggleRight = function () {
-            //$scope.load(true);
-            $ionicSideMenuDelegate.toggleRight();
-        };
-        $scope.load=function (init) {
-    
-        }
-        $scope.godetail = function () {
-            $state.go('wl.bill_detail');
+        $scope.add = function () {
+            $state.go('wl.goods_add');
         }
+    }]);
+    app.controller('goodsAddCtrl', ["$scope", "$state",function ($scope,$state) {
+     
     }]);
     app.controller('goodsDetailCtrl', ["$scope", function ($scope) {
 

+ 2 - 2
wl/www/js/services/userservice.js

xqd
@@ -3,9 +3,9 @@
         return {
             login:function (username,password) {
                 return $http({
-                    url: config.server + '/oauth/access_token',
+                    url: config.server + 'api/auth/login',
                     method: "post",
-                    data: { username: username, password: password, grant_type: 'password', client_id: 'api', client_secret: 'api' }
+                    data: { phone: username, password: password }
                 })
             },
             getVerifyCode: function (mobile) {

+ 29 - 0
wl/www/templates/goods/add.html

xqd
@@ -0,0 +1,29 @@
+<ion-view view-title="发布货源">
+    <ion-content>
+        <div class="list">
+            <div class="item item-divider">
+                <span>请填写您要发布的货源信息</span>
+                 
+            </div>
+            <label class="item item-input ">
+                <span class="input-label">银行卡号</span>
+                <input style="text-align:right" type="text" placeholder="银行卡号">
+            </label>
+            <label class="item item-input ">
+                <span class="input-label">所属银行</span>
+                <input style="text-align:right" type="text" placeholder="所属银行">
+            </label>
+            <label class="item item-input ">
+                <span class="input-label">开户行所在地</span>
+                <input style="text-align:right" type="text" placeholder="开户行所在地">
+            </label>
+            <label class="item item-input ">
+                <span class="input-label">预留手机</span>
+                <input style="text-align:right" type="text" placeholder="开户行所在地">
+            </label>
+            <div class="padding">
+                <button type="button" ng-click="save()" class="button button-full button-positive">提交</button>
+            </div>
+        </div>
+    </ion-content>
+</ion-view>

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

xqd
@@ -1,4 +1,4 @@
-ion-view view-title="账单明细">
+<ion-view view-title="账单明细">
     <ion-content>
             <div class="list">
             <div class="casehistory-item">

+ 0 - 79
wl/www/templates/goods/index-sub.html

xqd
@@ -1,79 +0,0 @@
-<ion-view  view-title="{{type}}">
-    <ion-nav-buttons side="right">
-        <button class="button ion-navicon  icon-right button-clear " ng-click="toggleRight()"></button>
-    </ion-nav-buttons>
-    <ion-side-menus enable-menu-with-back-views="false">
-        <ion-side-menu-content>
-            <ion-content>
-                <!--下拉刷新-->
-                <ion-refresher pulling-text="下拉刷新" on-refresh="load(true)">
-                </ion-refresher>
-                <div class="padding">
-                    <div class="casehistory-item">
-                        <div class="clearfix">
-                            <div class="casehistory-item-photo selftest-item-photo">
-                                <img src="../img/demo/test_pic1.jpg" />
-                            </div>
-                            <div class="casehistory-item-info  casehistory-photo-item-info">
-                                <p><span>成都华美美容整形----春熙店</span></p>
-                                <p>6890元|6期,正常</p>
-                                <p>应还款日:2016/8/3</p>
-                                <p>本期待还款金额:1350元</p>
-                            </div>
-                        </div>
-                        <div class="row row-border">
-                            <button class="button  button-clear button-positive  button-block button-small" ng-click="godetail()">查看详细</button>
-                        </div>
-                    </div>
-                    <div class="casehistory-item">
-                        <div class="clearfix">
-                            <div class="casehistory-item-photo selftest-item-photo">
-                                <img src="../img/demo/test_pic2.jpg" />
-                            </div>
-                            <div class="casehistory-item-info  casehistory-photo-item-info">
-                                <p><span>平安车险----华泰保险代理</span></p>
-                                <p> 5420元|6期,<span style="color:red">逾期3天</span></p>
-                                <p>应还款日:2016/8/3</p>
-                                <p>本期待还款金额:950元</p>
-                            </div>
-                        </div>
-                        <div class="row row-border">
-                            <button class="button  button-clear button-positive  button-block button-small" ng-click="godetail()">查看详细</button>
-                        </div>
-                    </div>
-                    <div class="casehistory-item">
-                        <div class="clearfix">
-                            <div class="casehistory-item-photo selftest-item-photo">
-                                <img src="../img/demo/test_pic3.jpg" />
-                            </div>
-                            <div class="casehistory-item-info  casehistory-photo-item-info">
-                                <p><span>亚飞牙科----琴台路店</span></p>
-                                <p> 3000元|6期,正常</p>
-                                <p>应还款日:2016/8/3</p>
-                                <p>本期待还款金额:550元</p>
-                            </div>
-                        </div>
-                        <div class="row row-border">
-                            <button class="button  button-clear button-positive  button-block button-small" ng-click="godetail()">查看详细</button>
-                        </div>
-                    </div>
-                </div>
-            </ion-content>
-            <!--上拉更多-->
-            <ion-infinite-scroll ng-if="filter.hasMore" on-infinite="load(false)" distance="10%"></ion-infinite-scroll>
-        </ion-side-menu-content>
-        <ion-side-menu side="right">
-            <ion-content>
-                <div class="list">
-                    <div class="padding">
-                         <label class="item  item-select">
-                            筛选
-                             <select ng-model="filter.subType" ng-options="o.value as o.name for o in subTypeOpt"></select>
-                         </label>
-                        <button class="button button-assertive button-block button-radius-full" ng-click="toggleRight()">应用</button>
-                    </div>
-                </div>
-            </ion-content>
-        </ion-side-menu>
-    </ion-side-menus>
-</ion-view>

+ 24 - 126
wl/www/templates/goods/index.html

xqd
@@ -1,143 +1,41 @@
-<ion-view view-title="U惠多多">
+<ion-view view-title="货源">
     <ion-content>
-        <ion-slide-box class="swiper-index-slide">
-            <ion-slide>
-                <div class="slider-img"></div>
-            </ion-slide>
-        </ion-slide-box>
         <div class="app-link-bottom"></div>
         <div class="row app-link">
             <div class="col-25">
-                <a ng-click="goSub('装修')">
+                <a  ng-click="add()">
                     <div class="app-link-item">
-                        <i class="i-applink-zhuangxiu"></i>
-                        <span>装修</span>
+                        <i class="i-applink-add"></i>
+                        <span>发布货源</span>
                     </div>
                 </a>
             </div>
-            <div class="col-25">
-                <a ng-click="goSub('建材')">
-                    <div class="app-link-item">
-                        <i class="i-applink-jiancai"></i>
-                        <span>建材</span>
-                    </div>
-                </a>
-            </div>
-            <div class="col-25">
-                <a ng-click="goSub('家电')">
-                    <div class="app-link-item">
-                        <i class="i-applink-jiadian"></i>
-                        <span>家电</span>
-                    </div>
-                </a>
-            </div>
-            <div class="col-25">
-                <a ng-click="goSub('家具')">
-                    <div class="app-link-item">
-                        <i class="i-applink-jiaju"></i>
-                        <span>家具</span>
-                    </div>
-                </a>
-            </div>
-
-        </div>
-        <div class="row app-link" style="margin-top:5px">
-            <div class="col-25">
-                <a ng-click="goSub('丽人')">
-                    <div class="app-link-item">
-                        <i class="i-applink-liren"></i>
-                        <span>丽人</span>
-                    </div>
-                </a>
-            </div>
-            <div class="col-25">
-                <a ng-click="goSub('婚恋')">
-                    <div class="app-link-item">
-                        <i class="i-applink-hunlian"></i>
-                        <span>婚恋</span>
-                    </div>
-                </a>
-            </div>
-            <div class="col-25">
-                <a ng-click="goSub('教育培训')">
-                    <div class="app-link-item">
-                        <i class="i-applink-jiaoyu"></i>
-                        <span>教育培训</span>
-                    </div>
-                </a>
-            </div>
-            <div class="col-25">
-                <a ng-click="goSub('保险')">
-                    <div class="app-link-item">
-                        <i class="i-applink-baoxian"></i>
-                        <span>保险</span>
-                    </div>
-                </a>
-            </div>
-
-        </div>
-        <div class="row app-link" style="margin-top:5px">
-            <div class="col-25">
-                <a ng-click="goSub('旅游')">
-                    <div class="app-link-item">
-                        <i class="i-applink-lvyou"></i>
-                        <span>旅游</span>
-                    </div>
-                </a>
-            </div>
-
-
         </div>
         <div class="app-link-bottom"></div>
         <div class="list">
             <!--下拉刷新-->
             <!--<ion-refresher pulling-text="下拉刷新" on-refresh="load(true)">
             </ion-refresher>-->
-
-            <div class="casehistory-item">
-
-                <div class="casehistory-item-photo selftest-item-photo">
-                    <img src="../img/demo/test_pic1.jpg" />
-                </div>
-                <div class="casehistory-item-info  casehistory-photo-item-info">
-                    <p><span>成都华美美容整形----春熙店</span></p>
-                    <p>6890元|6期,正常</p>
-                    <p>应还款日:2016/8/3</p>
-                    <p>本期待还款金额:1350元</p>
-                </div>
-
-                <div class="row row-border">
-                    <button class="button  button-clear button-positive  button-block button-small" ng-click="godetail()">查看详细</button>
-                </div>
-            </div>
-            <div class="casehistory-item">
-                <div class="casehistory-item-photo selftest-item-photo">
-                    <img src="../img/demo/test_pic2.jpg" />
-                </div>
-                <div class="casehistory-item-info  casehistory-photo-item-info">
-                    <p><span>平安车险----华泰保险代理</span></p>
-                    <p> 5420元|6期,<span style="color:red">逾期3天</span></p>
-                    <p>应还款日:2016/8/3</p>
-                    <p>本期待还款金额:950元</p>
-                </div>
-                <div class="row row-border">
-                    <button class="button  button-clear button-positive  button-block button-small" ng-click="godetail()">查看详细</button>
-                </div>
-            </div>
-            <div class="casehistory-item">
-                <div class="casehistory-item-photo selftest-item-photo">
-                    <img src="../img/demo/test_pic3.jpg" />
-                </div>
-                <div class="casehistory-item-info  casehistory-photo-item-info">
-                    <p><span>亚飞牙科----琴台路店</span></p>
-                    <p> 3000元|6期,正常</p>
-                    <p>应还款日:2016/8/3</p>
-                    <p>本期待还款金额:550元</p>
-                </div>
-                <div class="row row-border">
-                    <button class="button  button-clear button-positive  button-block button-small" ng-click="godetail()">查看详细</button>
-                </div>
-            </div>
+            <a class="item item-thumbnail-left" href="#">
+                <img src="../../img/photo_default_orange.jpg" />
+                <h2>Pretty Hate Machine</h2>
+                <p>Nine Inch Nails</p>
+            </a>
+            <a class="item item-thumbnail-left" href="#">
+                <img src="../../img/photo_default_orange.jpg" />
+                <h2>Pretty Hate Machine</h2>
+                <p>Nine Inch Nails</p>
+            </a>
+            <a class="item item-thumbnail-left" href="#">
+                <img src="../../img/photo_default_orange.jpg" />
+                <h2>Pretty Hate Machine</h2>
+                <p>Nine Inch Nails</p>
+            </a>
+            <a class="item item-thumbnail-left" href="#">
+                <img src="../../img/photo_default_orange.jpg" />
+                <h2>Pretty Hate Machine</h2>
+                <p>Nine Inch Nails</p>
+            </a>
         </div>
 
         <!--上拉更多-->