diff --git a/api/exchange.js b/api/exchange.js index 0cfbd7d..ceb8f4c 100644 --- a/api/exchange.js +++ b/api/exchange.js @@ -1,4 +1,5 @@ import request from "@/utils/request.js"; +import {getStatisticsInfo} from "./admin"; // 在线买单 - 获取门店列表 export function searchMer(data) { return request.get("onlinePayment/searchMerList",data); @@ -64,3 +65,16 @@ export function quotaTransfer(data) { export function merBindShop(merId) { return request.get(`exchange/mer_bind_shop/${merId}`); } +// 惠民积分 - 统计 +export function quotaIntegralStatistics() { + return request.get(`exchange/quota_integral_statistics`); +} +// 惠民积分 - 各商户持有信息列表 +export function quotaIntegralHoldList(data) { + return request.get(`exchange/quota_integral_hold_list`,data); +} + + + + + diff --git a/pages.json b/pages.json index a98badb..45bd0b8 100644 --- a/pages.json +++ b/pages.json @@ -581,6 +581,12 @@ "navigationBarTitleText": "额度变更记录" } }, + { + "path": "online_payment/record/center", + "style": { + "navigationBarTitleText": "额度中心" + } + }, { "path": "online_payment/record/quota_transfer", "style": { diff --git a/pages/user/index.vue b/pages/user/index.vue index c72ec12..748cb1b 100644 --- a/pages/user/index.vue +++ b/pages/user/index.vue @@ -82,7 +82,6 @@ {{userInfo.exchange_integral || 0}} - 消费积分 @@ -93,6 +92,10 @@ {{ integral_surplus || 0}} 餐费积分 + + {{userInfo.quota_integral || 0}} + 惠民积分 + diff --git a/pages/users/online_payment/record/center.vue b/pages/users/online_payment/record/center.vue new file mode 100644 index 0000000..a2cd0ba --- /dev/null +++ b/pages/users/online_payment/record/center.vue @@ -0,0 +1,290 @@ + + + + + diff --git a/pages/users/online_payment/record/quota.vue b/pages/users/online_payment/record/quota.vue index 834e909..4ea77cb 100644 --- a/pages/users/online_payment/record/quota.vue +++ b/pages/users/online_payment/record/quota.vue @@ -53,6 +53,7 @@ export default{ page: 1, limit: 20, quota_type: 1, + mer_id: 0, }, total_page: 0, allow_page: false, @@ -60,11 +61,18 @@ export default{ }, onLoad(options){ this.searchData.quota_type = options.quota_type || 1; + this.searchData.mer_id = options.mer_id || 0; + // 额度类型:1=酒卡额度(瓶装酒),2=菜卡额度,3=封坛酒额度,4=加油卡额度,5=惠民积分 + let title = '瓶装酒'; + switch (Number(this.searchData.quota_type)) { + case 2:title = '特色菜卡';break; + case 3:title = '封坛酒';break; + case 4:title = '加油卡';break; + case 5:title = '惠民';break; + } uni.setNavigationBarTitle({ - title: this.searchData.quota_type == 2 ? '菜卡额度变更记录' : '酒卡额度变更记录' + title: title + '积分变更记录' }) - // this.getStatistics(); - // this.getList(); }, onShow() { this.getStatistics(); @@ -74,7 +82,7 @@ export default{ // 统计获取 getStatistics(){ let _this = this; - recordQuota({ quota_type: _this.searchData.quota_type }).then(res => { + recordQuota({ quota_type: _this.searchData.quota_type, mer_id: _this.searchData.mer_id }).then(res => { this.statistics_list = res.data || {}; }); }, diff --git a/pages/users/order_confirm/index.vue b/pages/users/order_confirm/index.vue index 31e736c..b2aeb70 100644 --- a/pages/users/order_confirm/index.vue +++ b/pages/users/order_confirm/index.vue @@ -372,8 +372,6 @@ --> - - - - - - 随机立减: -¥{{orderTotalRandomReduction}}