diff --git a/api/exchange.js b/api/exchange.js index 9702944..699fc68 100644 --- a/api/exchange.js +++ b/api/exchange.js @@ -44,3 +44,15 @@ export function getSiteQrCode(data) { export function getUserExchangeQrcode() { return request.get(`exchange/user_qr_code`); } +// 额度变更记录 - 统计 +export function recordQuota() { + return request.get(`exchange/record_quota`); +} +// 额度变更记录 - 列表 +export function recordQuotaList(data) { + return request.get(`exchange/record_quota_list`,data); +} +// 积分变更记录 - 列表 +export function recordIntegralList(data) { + return request.get(`exchange/record_integral_list`,data); +} diff --git a/config/app.js b/config/app.js index 6a45260..e76d97b 100644 --- a/config/app.js +++ b/config/app.js @@ -6,13 +6,13 @@ let VUE_APP_WS_URL = `ws://${location.hostname}?type=user` let openPlantGrass = '-openPlantGrass-' // 网络接口修改此字符 小程序域名要求https -// let httpApi = 'https://bt.test.cdlfjy.com/' // 开发 -let httpApi = 'https://mp.scwmbh.cn/' // 生产 +let httpApi = 'https://bt.test.cdlfjy.com/' // 开发 +// let httpApi = 'https://mp.scwmbh.cn/' // 生产 // 聊天接口修改此字符 小程序聊天要求wss 例如: -// let wsApi = 'wss://bt.test.cdlfjy.com' -let wsApi = 'wss://mp.scwmbh.cn' +let wsApi = 'wss://bt.test.cdlfjy.com' +// let wsApi = 'wss://mp.scwmbh.cn' module.exports = { diff --git a/pages.json b/pages.json index e08747a..a04d865 100644 --- a/pages.json +++ b/pages.json @@ -555,11 +555,21 @@ { "path": "online_payment/site/list", "style": { - "navigationBarTitleText": "兑换站列表" + "navigationBarTitleText": "酒道馆列表" + } + }, + { + "path": "online_payment/record/quota", + "style": { + "navigationBarTitleText": "酒卡变更记录" + } + }, + { + "path": "online_payment/record/integral", + "style": { + "navigationBarTitleText": "积分变更记录" } } - - ] }, { diff --git a/pages/user/index.vue b/pages/user/index.vue index 27a49c9..1ab1d75 100644 --- a/pages/user/index.vue +++ b/pages/user/index.vue @@ -60,18 +60,26 @@ - + + + + + {{userInfo.total_visit_product || 0}} 浏览记录 + + {{userInfo.available || 0}} + 酒卡额度 + + + {{userInfo.exchange_integral || 0}} + 我的积分 + diff --git a/pages/users/online_payment/exchange/index.vue b/pages/users/online_payment/exchange/index.vue index c2f7733..3df0a2f 100644 --- a/pages/users/online_payment/exchange/index.vue +++ b/pages/users/online_payment/exchange/index.vue @@ -5,7 +5,7 @@ - 提货点:{{ point_info.title || '请选择提货点' }} + 酒道馆:{{ point_info.title || '请选择酒道馆' }} {{ point_info.id > 0 ? '切换' : '选择' }} @@ -69,7 +69,7 @@ - + 搜索 取消 diff --git a/pages/users/online_payment/record/integral.vue b/pages/users/online_payment/record/integral.vue new file mode 100644 index 0000000..5aae1cd --- /dev/null +++ b/pages/users/online_payment/record/integral.vue @@ -0,0 +1,129 @@ + + + + + diff --git a/pages/users/online_payment/record/quota.vue b/pages/users/online_payment/record/quota.vue new file mode 100644 index 0000000..e35c0fb --- /dev/null +++ b/pages/users/online_payment/record/quota.vue @@ -0,0 +1,230 @@ + + + + +