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

common/api/shop.js

@@ -97,12 +97,29 @@ export default {
 					quantity: quantity
 				});
 			},
-			// 订单结算数据
-			settlementOrder({ cart_id }) {
+			// 订单步骤1：展示结算数据
+			settlementOrder({ ifcart, cart_id }) {
 				return vm.$u.post('buy/buy_step1', {
+					ifcart: ifcart,
 					cart_id: cart_id,
 				});
 			},
+			// 订单步骤2：发起订单，返回订单信息
+			sendOrder({ ifcart, cart_id, address_id, buy_city_id }) {
+				return vm.$u.post('buy/buy_step2', {
+					ifcart: ifcart,
+					cart_id: cart_id,
+					address_id: address_id,
+					buy_city_id: buy_city_id,
+				});
+			},
+			// 订单步骤3：发起支付（第三方统一下单）
+			sendPay({ pay_sn, payment_code }) {
+				return vm.$u.post('Payment/real_order', {
+					pay_sn: pay_sn,
+					payment_code: payment_code,
+				});
+			},
 			// 选择地区计算运费 
 			getFreight({ freight_hash, city_id, area_id }) {
 				return vm.$u.post('Buy/change_addr', {

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 });