From 1b55ce53f83cdbfd7db8dd3700d646130c100bdf Mon Sep 17 00:00:00 2001 From: GL <954534408@qq.com> Date: Thu, 22 Oct 2020 18:18:54 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=AE=8C=E5=96=84=E5=AF=BC=E8=88=AA?= =?UTF-8?q?=E6=94=B6=E6=AC=BE=E6=A8=A1=E5=9D=97=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/services/apiUrl.js | 12 ++ src/stores/index.js | 11 +- src/views/home/index.vue | 26 ++- src/views/navigation/consume/current.vue | 136 ++++++++++++++-- src/views/navigation/consume/todayConsume.vue | 154 +++++++++++++++--- 5 files changed, 302 insertions(+), 37 deletions(-) diff --git a/src/services/apiUrl.js b/src/services/apiUrl.js index d3b5e4a..34f8ff3 100644 --- a/src/services/apiUrl.js +++ b/src/services/apiUrl.js @@ -32,4 +32,16 @@ export const apiUrl = { cancel: "/api/couponOrder/verify", // 已被核销的券包 couponOrderListVerified: '/api/couponOrder/listVerified', + /** + * B端用户详情 + */ + userDetail: '/api/user/detail', + /** + *C端扫B端储值卡交易流水(消费记录 + 补贴)列表接口 + */ + cardPayList:"/api/cardPay/list", + /** + *C端扫B端储值卡交易流水SUM + */ + payMum:"/api/cardPay/sum", } diff --git a/src/stores/index.js b/src/stores/index.js index ded46aa..b530970 100644 --- a/src/stores/index.js +++ b/src/stores/index.js @@ -12,13 +12,20 @@ Vue.use(Vuex) export default new Vuex.Store({ state: { token: '', - + merchant_id:'', + merchant_id_scan:'', }, mutations: { setToken (state, token) { state.token = token - } + }, + setMerchantId(state,id){ + state.merchant_id = id + }, + setMerchantIdScan(state,id){ + state.merchant_id_scan = id + }, }, actions: { doLogin ({commit}, res) { diff --git a/src/views/home/index.vue b/src/views/home/index.vue index 7231b6a..2c42635 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -65,6 +65,9 @@ diff --git a/src/views/navigation/consume/current.vue b/src/views/navigation/consume/current.vue index ce6a1b4..b071fea 100644 --- a/src/views/navigation/consume/current.vue +++ b/src/views/navigation/consume/current.vue @@ -16,13 +16,13 @@