diff --git a/src/routers/index.js b/src/routers/index.js index 5add8a0..6b9d9f4 100644 --- a/src/routers/index.js +++ b/src/routers/index.js @@ -29,6 +29,7 @@ const PointRecord = () => import(/* webpackChunkName: "PointRecord" */ '@/views/ const MyTicket = () => import(/* webpackChunkName: "MyTicket" */ '@/views/person/myTicket.vue'); const UserInfo = () => import(/* webpackChunkName: "UserInfo" */ '@/views/person/userInfo.vue'); const Account = () => import(/* webpackChunkName: "Account" */ '@/views/person/account.vue'); +const RecordDetail = () => import(/* webpackChunkName: "RecordDetail" */ '@/views/home/recordDetail.vue'); Vue.use(Router); @@ -51,6 +52,15 @@ const routes = [ title: '首页' } }, + { + path: '/recordDetail', + name: 'recordDetail', + component: RecordDetail, + meta: { + isShowNav: true, + title: '交易详情' + } + }, /* { path: '/demo', name: 'demo', diff --git a/src/services/apiUrl.js b/src/services/apiUrl.js index 6e1472f..62e3618 100644 --- a/src/services/apiUrl.js +++ b/src/services/apiUrl.js @@ -29,6 +29,12 @@ export const apiUrl = { getUnverifiedAmountOnDate: '/api/couponOrder/getUnverifiedAmountOnDate', //首页账单列表 listBillOweAndWaitPay:"/api/bill/listBillOweAndWaitPay", + //未核销的券包 + couponOrderListUnVerified: '/api/couponOrder/listUnverified', + //交易记录list + couponOrderListVerified: '/api/couponOrder/listVerified', + //刷卡支付交易流水分页列表接口 + micropayListMicroPay: '/api/micropay/listMicroPay', loginOut: '/api/loginOut', diff --git a/src/stores/index.js b/src/stores/index.js index c2a9c63..e87b251 100644 --- a/src/stores/index.js +++ b/src/stores/index.js @@ -11,7 +11,7 @@ Vue.use(Vuex) export default new Vuex.Store({ state: { - token: '914e314e-81cb-4064-93f8-79b9ac5cc7d1', + token: '461675506000465920', merchant_id:'', merchant_id_scan:'', diff --git a/src/views/home/index.vue b/src/views/home/index.vue index b085382..850bd8a 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -19,7 +19,7 @@
交易记录
今日交易额: 0元
@@ -33,7 +33,7 @@核销记录
今日核销额: 0元
@@ -47,7 +47,7 @@收银记录
今日收银: 0元
@@ -133,6 +133,14 @@ export default { toWriteoff(path){ this.$router.push(path) }, + goToDetail (index) { + this.$router.push({ + path: '/recordDetail', + query: { + index + } + }) + }, listBillOweAndWaitPay(data) { this.$http.listBillOweAndWaitPay({ method: 'post', diff --git a/src/views/home/recordDetail.vue b/src/views/home/recordDetail.vue new file mode 100644 index 0000000..2b7d07d --- /dev/null +++ b/src/views/home/recordDetail.vue @@ -0,0 +1,458 @@ + +{{dealTime(currentDate)}}
+ +