Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into zmr

common/api/user.js

@@ -236,10 +236,28 @@ export default {
 				if(refund_state) Object.assign(params, {refund_state: refund_state});
 				return vm.$u.post('Order/orderList', params);
 			},
+			// 售后列表
+			getAfterSaleList({ page }) {
+				return vm.$u.post('order/afterSaleList', { page: page });
+			},
 			// 订单详情
 			getOrderInfo({ order_id }) {
 				return vm.$u.post('Order/orderInfo', { order_id: order_id });
 			},
+			// 取消订单
+			cancelOrder({ order_id, msg = '' } = {}) {
+				let params = { order_id: order_id };
+				if(msg) Object.assign(params, {msg: msg});
+				return vm.$u.post('Order/buyer_cancel', params);
+			},
+			// 删除订单
+			deleteOrder({ order_id }) {
+				return vm.$u.post('order/order_delete', { order_id: order_id });
+			},
+			// 确认收货
+			confirmReceive ({ order_id }) {
+				return vm.$u.post('Order/order_receive', { order_id: order_id });
+			},
 			// 查询订单的评价信息
 			getOrderEvaluateInfo({ id }) {
 				return vm.$u.post('Order/getOrderEvaluateInfo', { id: id });