Merge branch 'master' of ssh://git.9026.com:2212/baimeng/wuliu

wl/www/js/controllers/my.js

@@ -308,7 +308,7 @@
                 var more = (result.data.data.length >= $scope.filter.pageSize);
                 $scope.filter.hasMore = more;
                 $scope.items = $scope.items.concat(result.data.data);
-                debugger;
+              
                 if (init) {
                     $scope.$broadcast('scroll.refreshComplete');
                 } else {

wl/www/templates/my/order.html

@@ -15,10 +15,10 @@
                 <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 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 class="button button-stable" ng-click="delete(item,$event)">
                             删除订单
                         </button>
                     </div>