diff --git a/src/api/marketing.js b/src/api/marketing.js index c900678..b53e6c8 100644 --- a/src/api/marketing.js +++ b/src/api/marketing.js @@ -733,8 +733,15 @@ export function exchangeQuotaList(apiName = 'list',data) { // list=持有信息列表，record_list=变更记录列表 return request.get(`user/exchange_quota/quota_${apiName}`,data) } - - +// 兑换积分 - 顶部统计 +export function exchangeIntegralTitle() { + return request.get(`user/exchange_quota/integral_title`) +} +// 兑换积分 - 持有信息列表&变更记录列表 +export function exchangeIntegralList(apiName = 'list',data) { + // list=持有信息列表，record_list=变更记录列表 + return request.get(`user/exchange_quota/integral_${apiName}`,data) +} diff --git a/src/api/order.js b/src/api/order.js index 5461a9d..f1febfc 100644 --- a/src/api/order.js +++ b/src/api/order.js @@ -155,3 +155,11 @@ export function takeOrderListApi(data) { export function rechargeBalancei() { return request.get(`delivery/belence`) } +// 在线买单 - 统计 +export function getOnlineTitle() { + return request.get(`order/online_title`) +} +// 在线买单 - 列表 +export function getOnlineList(data) { + return request.get(`order/online_list`,data) +} diff --git a/src/router/modules/marketing.js b/src/router/modules/marketing.js index 75a36b8..897ca7e 100644 --- a/src/router/modules/marketing.js +++ b/src/router/modules/marketing.js @@ -465,7 +465,17 @@ const marketingRouter = noCache: true }, component: () => import('@/views/marketing/exchange/quota/index') - } + }, + { + path: 'integral', + name: `exchangeIntegral`, + meta: { + title: '兑换积分', + noCache: true + }, + component: () => import('@/views/marketing/exchange/integral/index') + }, + diff --git a/src/router/modules/order.js b/src/router/modules/order.js index 7363163..73c12e2 100644 --- a/src/router/modules/order.js +++ b/src/router/modules/order.js @@ -36,6 +36,14 @@ const orderRouter = title: '核销订单' }, component: () => import('@/views/order/orderCancellate/index') + }, + { + path: 'onlinePay', + name: 'OrderOnlinePay', + meta: { + title: '在线买单' + }, + component: () => import('@/views/order/onlinePay/index') } ] } diff --git a/src/views/marketing/exchange/integral/index.vue b/src/views/marketing/exchange/integral/index.vue new file mode 100644 index 0000000..4ec7445 --- /dev/null +++ b/src/views/marketing/exchange/integral/index.vue @@ -0,0 +1,226 @@ + + + + + diff --git a/src/views/order/onlinePay/index.vue b/src/views/order/onlinePay/index.vue new file mode 100644 index 0000000..fc7f834 --- /dev/null +++ b/src/views/order/onlinePay/index.vue @@ -0,0 +1,196 @@ + + + + +