baimeng há 9 anos atrás
pai
commit
a88222a240

+ 3 - 1
wl/doc/req.txt

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

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


+ 10 - 0
wl/www/js/config/router.js

xqd
@@ -50,6 +50,16 @@
                 }
             }
         })
+       .state('wl.goods_success', {
+           url: '/goods/success',
+                  params: { item: null },
+                  views: {
+                      'wl-goods': {
+                          templateUrl: 'templates/goods/success.html',
+                          controller: 'goodsSuccessCtrl'
+                      }
+                  }
+              })
         //车源管理
         .state('wl.car', {
             url: '/car',

+ 22 - 2
wl/www/js/controllers/goods.js

xqd
@@ -76,12 +76,32 @@
             });
         }
     }]);
-    app.controller('goodsDetailCtrl', ["$scope", '$stateParams', function ($scope, $stateParams) {
+    app.controller('goodsDetailCtrl', ["$scope", '$stateParams', 'msg', 'orderService', '$state', function ($scope, $stateParams, msg, orderService, $state) {
         $scope.vm = $stateParams.item;
         //下单
         $scope.bill = function () {
+            msg.confirm('下单提示', '确定下单?').then(function (res) {
+                if (res) {
+                    msg.loading('下单中...');
+                    orderService.addOrder({ message_id: $scope.vm.id }).then(function (result) {
+                        msg.hide();
+                        $state.go('wl.goods_success', {item:$scope.vm});
+                    }, function (erro) {
+                        msg.hide();
+                        msg.error(JSON.stringify(erro.data));
+                    })
+                } else {
 
+                }
+            });
+        }
+    }]);
+    app.controller('goodsSuccessCtrl', ['$scope', '$state', '$ionicHistory', '$stateParams', function ($scope, $state, $ionicHistory, $stateParams) {
+        $scope.vm = $stateParams.item;
+        //下单成功
+        $scope.back = function () {
+            $ionicHistory.clearHistory();
+            $state.go('wl.goods');
         }
     }]);
-
 })(angular.module('app.controllers'));

+ 17 - 48
wl/www/templates/goods/detail.html

xqd
@@ -1,55 +1,24 @@
 <ion-view view-title="货源信息">
     <ion-content>
         <div class="list">
-            <div class="item item-divider">
-                货源
+            <div class="list card">
+                <div class="item item-avatar">
+                    <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>
+                        {{vm.detail}}
+                    </p>
+                    <p> 
+                     {{vm.created_at}}
+                    </p>
+                </div>
+
             </div>
-            <label class="item">
-                <span class="input-label">
-                   出发地:
-                </span>
-               <span style="text-align:right">{{vm.begin_address}}</span>
-            </label>
-            <label class="item">
-                <span class="input-label">
-                    抵达地:
-                </span>
-                <span  style="text-align:right">{{vm.end_address}}</span>
-            </label>
-            <label class="item">
-                <span class="input-label">
-                    途经地:
-                </span>
-                <span style="text-align:right">{{vm.midway_address}}</span>
-            </label>
-            <label class="item item-input">
-              <span class="input-label">
-        到达时间:
-    </span>
-    <span style="text-align:right">{{vm.goods_arrive_time}}</span>
-        </label> 
-            <label class="item">
-                <span class="input-label">
-                    价格(元):
-                </span>
-                <span style="text-align:right">¥{{vm.begin_address}}</span>
-            </label>
-            <label class="item">
-                <span class="input-label">
-                    联系人:
-                </span>
-                <span style="text-align:right">{{vm.contact_name}}</span>
-            </label>
-            <label class="item">
-                <span class="input-label">
-                    联系电话:
-                </span>
-                <span style="text-align:right">{{vm.contact_phone}}</span>
-            </label> 
-            <label class="item">
-             {{vm.detail}}
-            </label> 
-            
             <div class="padding">
                 <button type="button" ng-click="bill()" class="button button-full button-positive">下单</button>
             </div>

+ 3 - 3
wl/www/templates/goods/index.html

xqd xqd
@@ -5,6 +5,9 @@
     <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="app-link-bottom"></div>
                 <div class="row app-link">
                     <div class="col-25">
@@ -18,9 +21,6 @@
                 </div>
                 <div class="app-link-bottom"></div>
                 <div class="list">
-                    <!--下拉刷新-->
-                    <ion-refresher pulling-text="下拉刷新" on-refresh="load(true)">
-                    </ion-refresher>
                     <a class="item" ng-repeat="item in items" ng-click="detail(item)">
 
                         <h2>从{{item.begin_address}}到{{item.end_address}}</h2>

+ 15 - 0
wl/www/templates/goods/success.html

xqd
@@ -0,0 +1,15 @@
+<ion-view view-title="下单成功">
+    <ion-content>
+        <div class="card">
+            <div class="item item-text-wrap">
+                <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>
+            </div>
+        </div>
+        <div class="padding">
+            <button type="button" ng-click="back()" class="button button-full button-positive">返回</button>
+        </div>
+    </ion-content>
+</ion-view>