init new

wl/www/css/style.css

@@ -68,7 +68,8 @@
 .app-link-item { text-align: center; }
 .app-link-item i { background: no-repeat center / auto 50px; width: 60px; height: 50px; 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;color:white;font-weight:bold }
+.app-link-item span { display: block; font-size:20px; line-height:1.4;color:#fff;font-weight:bold }
+.app-link-item .gray { display: block; font-size:20px; line-height:1.4;color:#333;font-weight:bold }
 .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-item i.i-applink-addcar { background-image: url(../img/icon/addcar.png); }
@@ -106,7 +107,7 @@ input.ion-amap-place[readonly] { background-color: transparent; cursor: text; }
 } 
 .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;  }
-
+.home a{font-size: 18px}
 .loginform input {height:50px;width:auto   }
-.loginform i { color:orange}
+.loginform i { color:orange;width: 30px;font-size: 25px;}
 .headbck { background-color:rgba(252,124,5,1.00);}

wl/www/js/config/router.js

@@ -213,6 +213,6 @@
                 }
             }
         })
-        $urlRouterProvider.otherwise('/wl/goods');
+        $urlRouterProvider.otherwise('/wl/home');
     }]);
 })(angular.module('app'));

wl/www/js/controllers/account.js

@@ -19,7 +19,8 @@
                 }
             }, function (erro) {
                 msg.hide();
-                msg.error(JSON.stringify(erro.data));
+                // msg.error(erro.data.message);
+                msg.error(erro.data.message);
             });
         }
     }]);
@@ -83,7 +84,7 @@
              
             }, function (erro) {
                 msg.hide();
-                msg.error(JSON.stringify(erro.data));
+                msg.error(erro.data.message);
             });
         }
         $scope.getVerifyCode = function () {

wl/www/js/controllers/car.js

@@ -27,7 +27,7 @@
                     $scope.$broadcast('scroll.infiniteScrollComplete');
                 }
             }, function (erro) {
-                msg.error(JSON.stringify(erro.data));
+                msg.error(erro.data.message);
             });
         }
         $scope.toggleRight = function () {
@@ -53,7 +53,7 @@
                 $scope.truckOpt.push({ id: item.id, name: item.name })
             });
         }, function (erro) {
-            msg.error(JSON.stringify(erro.data));
+            msg.error(erro.data.message);
         });
         $scope.save = function () {
             var price = new Number($scope.vm.price);
@@ -92,7 +92,7 @@
                 msg.hide();
             }, function (erro) {
                 msg.hide();
-                msg.error(JSON.stringify(erro.data));
+                msg.error(erro.data.message);
             });
         }
     }]);
@@ -108,7 +108,7 @@
                         $state.go('wl.car_success', { item: $scope.vm });
                     }, function (erro) {
                         msg.hide();
-                        msg.error(JSON.stringify(erro.data));
+                        msg.error(erro.data.message);
                     })
                 } else {
 

wl/www/js/controllers/goods.js

@@ -27,7 +27,7 @@
                     $scope.$broadcast('scroll.infiniteScrollComplete');
                 }
             }, function (erro) {
-                msg.error(JSON.stringify(erro.data));
+                msg.error(erro.data.message);
             });
         }
         $scope.toggleRight = function () {
@@ -75,7 +75,7 @@
                 msg.hide();
             }, function (erro) {
                 msg.hide();
-                msg.error(JSON.stringify(erro.data));
+                msg.error(erro.data.message);
             });
         }
     }]);
@@ -92,7 +92,7 @@
                         $state.go('wl.goods_success', {item:$scope.vm});
                     }, function (erro) {
                         msg.hide();
-                        msg.error(JSON.stringify(erro.data));
+                        msg.error(erro.data.message);
                     })
                 } else {
 

wl/www/js/controllers/home.js

@@ -8,13 +8,13 @@
         goodsService.listGoods({ type: 1, pageIndex: 1 }).then(function (result) {
             $scope.goods = result.data.data;
         }, function (erro) {
-            msg.error(JSON.stringify(erro.data));
+            msg.error(erro.data.message);
         });
         $scope.cars = [];
         carService.listCars({ type: 2, pageIndex: 1 }).then(function (result) {
             $scope.cars = result.data.data;
         }, function (erro) {
-            msg.error(JSON.stringify(erro.data));
+            msg.error(erro.data.message);
         });
         $scope.detail = function (item) {
             if ($scope.vm.showIndex == 1) //货源

wl/www/js/controllers/my.js

@@ -4,13 +4,43 @@
             $state.go('wl.my_profile');
         }
     }]);
-    app.controller('mySettingCtrl', ['$scope', 'data', '$state', '$http', function ($scope, data, $state, $http) {
+    app.controller('mySettingCtrl', ['$scope', 'data', '$state', '$http','$ionicModal', function ($scope, data, $state, $http,$ionicModal) {
         $scope.logout = function () {
             data.remove('user');
             data.remove('token');
             $http.defaults.headers.common["Authorization"] =undefined;
             $state.go('login');
         }
+        $ionicModal.fromTemplateUrl('low.html', {
+            scope: $scope,
+            animation: 'slide-in-up'
+        }).then(function(modal) {
+            $scope.modal1 = modal;
+        });
+        $ionicModal.fromTemplateUrl('compay.html', {
+            scope: $scope,
+            animation: 'slide-in-up'
+        }).then(function(modal) {
+            $scope.modal2 = modal;
+        });
+        $scope.openModal1 = function() {
+            $scope.modal1.show();
+        };
+        $scope.closeModal1 = function() {
+            $scope.modal1.hide();
+        };
+        $scope.openModal2 = function() {
+            alert(111);
+            $scope.modal2.show();
+        };
+        $scope.closeModal2 = function() {
+            $scope.modal2.hide();
+        };
+        // Cleanup the modal when we're done with it!
+        $scope.$on('$destroy', function() {
+            $scope.modal1.remove();
+            $scope.modal2.remove();
+        });
     }]);
     app.controller('mySetPasswordCtrl', ['$scope', '$state', function ($scope,$state) {
         $scope.vm = {
@@ -94,7 +124,7 @@
                     $scope.$broadcast('scroll.infiniteScrollComplete');
                 }
             }, function (erro) {
-                msg.error(JSON.stringify(erro.data));
+                msg.error(erro.data.message);
             });
         }
         $scope.add = function () {
@@ -138,7 +168,7 @@
                 $state.go('wl.my_truck');
             }, function (erro) {
                 msg.hide();
-                msg.error(JSON.stringify(erro.data));
+                msg.error(erro.data.message);
             });
         }
      
@@ -169,7 +199,7 @@
                     $scope.$broadcast('scroll.infiniteScrollComplete');
                 }
             }, function (erro) {
-                msg.error(JSON.stringify(erro.data));
+                msg.error(erro.data.message);
             });
         }
         
@@ -205,7 +235,7 @@
                     $scope.$broadcast('scroll.infiniteScrollComplete');
                 }
             }, function (erro) {
-                msg.error(JSON.stringify(erro.data));
+                msg.error(erro.data.message);
             });
         }
 

wl/www/templates/account/login.html

@@ -7,7 +7,7 @@
         <form>
             <div class="list loginform">
                 <label class="item item-input">
-                    <i class="icon ion-iphone placeholder-icon"  ></i>
+                    <i class="icon ion-android-phone-portrait placeholder-icon"  ></i>
                     <input type="text" ng-model="vm.mobile" placeholder="手机号码">
                 </label>
                    <label class="item item-input">

wl/www/templates/car/detail.html

@@ -20,8 +20,13 @@
                 </div>
 
             </div>
-            <div class="padding">
-                <button type="button" ng-click="bill()" class="button button-full button-positive">下单</button>
+            <div class="row padding">
+                <div class="col-50">
+                    <button type="button" ng-click="bill()" class="button button-full button-positive">立马拍单</button>
+                </div>
+                <div class="col-50">
+                    <a href="tel:{{vm.contact_phone}}" class="button button-full button-energized">拨打电话</a>
+                </div>
             </div>
         </div>   
     </ion-content>

wl/www/templates/goods/detail.html

@@ -24,11 +24,12 @@
             </div>
             <div class="row padding">
                 <div class="col-50">
-                <button type="button" ng-click="bill()" class="button button-full button-positive">立马拍单</button>
+                    <button type="button" ng-click="bill()" class="button button-full button-positive">立马拍单</button>
                 </div>
                 <div class="col-50">
-                    <input type="tel"  class="button button-full button-energized" value="立马拍单"/>
+                    <a href="tel:{{vm.contact_phone}}" class="button button-full button-energized">拨打电话</a>
                 </div>
+            </div>
         </div>   
     </ion-content>
 </ion-view>

wl/www/templates/home/index.html

@@ -17,7 +17,7 @@
                 <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>
+                        <span class="gray">货源</span>
                     </div>
                 </a>
             </div>
@@ -25,7 +25,7 @@
                 <a  ng-click="go('wl.car')">
                     <div class="app-link-item">
                         <i class="i-applink-car"></i>
-                        <span>车源</span>
+                        <span class="gray">车源</span>
                     </div>
                 </a>
             </div>
@@ -33,7 +33,7 @@
                 <a ng-click="go('wl.my_order')" >
                     <div class="app-link-item">
                         <i class="i-applink-order"></i>
-                        <span>订单</span>
+                        <span class="gray">订单</span>
                     </div>
                 </a>
             </div>
@@ -41,14 +41,14 @@
                 <a  ng-click="go('wl.my')">
                     <div class="app-link-item">
                         <i class="i-applink-my"></i>
-                        <span>我的</span>
+                        <span class="gray">我的</span>
                     </div>
                 </a>
             </div>
 
         </div>
         <div class="app-link-bottom"></div>
-        <div class="button-bar bar-calm bar-button-selftest" >
+        <div class="button-bar bar-calm bar-button-selftest home" >
             <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>

wl/www/templates/my/setting.html

@@ -1,17 +1,55 @@
-<ion-view view-title="设置" >
-    <ion-content >
+<ion-view view-title="设置">
+    <ion-content>
+        <div style="background:none;padding:80px 0;text-align:center;">
+            <div  class="user-photo" style="width: 100px;height: 100px">
+              <img ng-src="img/logo.png"  style="width: 100px;height: 100px" />
+            </div>
+            
+            <div class="user-info">
+                <div><span style="color: #444;">掌上物流网</span></div>
+                <div><span style="color: #444;">版本V1.0.0</span></div>
+            </div>
+        </div>
         <div class="list">
-            <!--<label class="item item-input" ng-if="appversion.length>0">
-                <span class="input-label">
-                    当前版本
+            <label class="item item-input "  ng-click="openModal2()">
+                <span class="input-label">公司介绍
                 </span>
-                {{appversion}}
-            </label>-->
+            </label>
+            <label class="item item-input " ng-click="openModal1()">
+                <span class="input-label">法律条文
+                </span></a>
+            </label>
         </div>
          <div class="padding">
              <a class="button button-radius-full button-assertive button-full" ng-click="logout()">
                  退出登录
              </a>
          </div>
+
     </ion-content>
 </ion-view>
+
+<script id="low.html" type="text/ng-template">
+  <ion-modal-view>
+    <ion-header-bar>
+      <h1 class="title">法律条文</h1>
+      <button class="button button-primary" ng-click="modal1.hide()">关闭</button>
+    </ion-header-bar>
+    <ion-content>
+      法律条文法律条文法律条文法律条文法律条文!
+    </ion-content>
+  </ion-modal-view>
+</script>
+
+
+<script id="compay.html" type="text/ng-template">
+  <ion-modal-view>
+    <ion-header-bar>
+      <h1 class="title">公司介绍</h1>
+      <button class="button button-primary" ng-click="modal2.hide()">关闭</button>
+    </ion-header-bar>
+    <ion-content>
+      公司介绍公司介绍公司介绍公司介绍公司介绍公司介绍!
+    </ion-content>
+  </ion-modal-view>
+</script>