12

wl/www/js/controllers/my.js

@@ -197,6 +197,7 @@
                     msg.loading('删除中...');
                     myService.deleteTruck(item.id).then(function (result) {
                         msg.hide();
+                        $scope.load(true);
                     }, function (erro) {
                         msg.hide();
                         msg.error(erro.data.message);
@@ -317,7 +318,27 @@
                 msg.error(erro.data.message);
             });
         }
+        $scope.pay = function (item,$event) {
+            $event.stopPropagation();
+            //to do 
+        }
+        $scope.delete = function (item,$event) {
+            $event.stopPropagation();
+            msg.confirm('删除提示', '确定删除？').then(function (res) {
+                if (res) {
+                    msg.loading('删除中...');
+                    myService.deleteOrder(item.id).then(function (result) {
+                        msg.hide();
+                        $scope.load(true);
+                    }, function (erro) {
+                        msg.hide();
+                        msg.error(erro.data.message);
+                    })
+                } else {
 
+                }
+            });
+        }
         $scope.detail = function (item) {
             $state.go('wl.my_order_detail', { item: item });
         }

wl/www/js/services/myservice.js

@@ -30,9 +30,15 @@
             },
             listOrders: function (filter) {
                 return $http({
-                    url: config.server + 'api/user/orders?include=message&page=' + filter.page,
+                    url: config.server + 'api/user/orders?include=message,user&page=' + filter.page,
                     method: "get"
                 })
+            },
+            deleteOrder: function (id) {
+                return $http({
+                    url: config.server + 'api/orders/' + id,
+                    method: "delete"
+                })
             }
         };
     }]);

wl/www/templates/my/order-detail.html

@@ -3,17 +3,22 @@
         <div class="list">
             <div class="list card">
                 <div class="item item-avatar">
-                    <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>
+                    <img ng-src="{{wm.user.data.avatar | avator}}" />
+                    <h2 style="white-space:normal">【{{vm.message.data.begin_address | shortAddress}}】-【{{vm.message.data.end_address | shortAddress}}】</h2>
+                    <p>价格:<b style="color:red">￥{{vm.message.data.price}}</b></p>
                 </div>
                 <div class="item item-body">
-                 
+                    <p>出发地：{{vm.message.data.begin_address | fullAddress}}</p>
+                    <p>途经：{{vm.message.data.midway_address | fullAddress}}</p>
+                    <p>目的地：{{vm.message.data.end_address | fullAddress}}</p>
+                    <p>货物名称：{{vm.message.data.title}}</p>
+                    <p>联系人：{{vm.message.data.contact_name}}</p>
+                    <p>联系电话：{{vm.message.data.contact_phone}}</p>
                     <p>
-                       内容:{{vm.message_id}}
+                        {{vm.message.data.detail}}
                     </p>
-                    <p>
-                        {{vm.created_at}}
+                    <p style="color:red">
+                        有效期：{{vm.message.data.created_at}}
                     </p>
                 </div>
             </div>

wl/www/templates/my/order.html

@@ -3,10 +3,28 @@
         <!--下拉刷新-->
         <ion-refresher pulling-text="下拉刷新" on-refresh="load(true)">
         </ion-refresher>
+        <div style="color:gray;text-align:center;font-size:15px;margin:10px 0 10px 0">订单问题请联系客服</div>
         <div class="list">
-            <a class="item" ng-repeat="item in items" ng-click="detail(item)">
-               状态：{{item.state}}, 时间{{item.created_time}},交易人:{{item.trade_user_id}}
-            </a>
+            <div class="item" ng-repeat="item in items" ng-click="detail(item)">
+                <h2>【{{item.message.data.begin_address | shortAddress}}】-【{{item.message.data.end_address | shortAddress}}】</h2>
+                <p>
+                    <span style="float:left"><b style="color:orangered">￥{{item.message.data.price}}</b><em style="padding-left:3px;font-size:0.75em">起</em></span>
+                    <span style="float:right">途经：{{item.message.data.midway_address | shortAddress}}</span>
+                </p>
+                <p><span style="float:left">联系人：{{item.message.data.contact_name}}</span> <span style="float:right">电话：{{item.message.data.contact_phone}}</span></p>
+                <div style="float:right;margin-top:15px">
+                    <span >合计：<b style="color:orangered">￥{{item.message.data.price}}</b></span>
+                    <div style="margin-top:10px">
+                        <button class="button button-stable" style="color:orangered;margin-right:10px;font-weight:bold" ng-click="pay(item,,$event)">
+                            去支付
+                        </button>
+                        <button class="button button-stable" ng-click="delete(item,,$event)">
+                            删除订单
+                        </button>
+                    </div>
+                </div>
+            </div>
+            
         </div>
         <!--上拉更多-->
         <ion-infinite-scroll ng-if="filter.hasMore" on-infinite="load(false)" distance="10%"></ion-infinite-scroll>