diff --git a/package-lock.json b/package-lock.json index 725477a..0a578d4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7456,6 +7456,11 @@ "minimist": "^1.2.5" } }, + "moment": { + "version": "2.29.1", + "resolved": "https://registry.npm.taobao.org/moment/download/moment-2.29.1.tgz?cache=0&sync_timestamp=1601983320283&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fmoment%2Fdownload%2Fmoment-2.29.1.tgz", + "integrity": "sha1-sr52n6MZQL6e7qZGnAdeNQBvo9M=" + }, "move-concurrently": { "version": "1.0.1", "resolved": "https://registry.npm.taobao.org/move-concurrently/download/move-concurrently-1.0.1.tgz", diff --git a/src/main.js b/src/main.js index fe9055a..c0cb08a 100644 --- a/src/main.js +++ b/src/main.js @@ -28,7 +28,7 @@ Vue.config.devtools = process.env.NODE_ENV === 'development'; Vue.config.productionTip = process.env.NODE_ENV === 'production'; window.EventBus = new Vue(); -import { Button, NumberKeyboard, Form, Field, DatetimePicker, Icon, List,} from 'vant'; +import { Button, NumberKeyboard, Form, Field, DatetimePicker, Icon, List, Toast,} from 'vant'; Vue.use(Button); Vue.use(NumberKeyboard); Vue.use(Form); @@ -36,6 +36,7 @@ Vue.use(Field); Vue.use(DatetimePicker); Vue.use(Icon); Vue.use(List); +Vue.use(Toast); // 注册过滤器 Object.keys(filters).forEach((key) => { diff --git a/src/routers/index.js b/src/routers/index.js index f7340ac..7023c88 100644 --- a/src/routers/index.js +++ b/src/routers/index.js @@ -25,8 +25,9 @@ const Login = () => import(/* webpackChunkName: "login" */ '@/views/login'); const Home = () => import(/* webpackChunkName: "home" */ '@/views/home'); const Person = () => import(/* webpackChunkName: "person" */ '@/views/person'); const PointRecord = () => import(/* webpackChunkName: "PointRecord" */ '@/views/person/pointRecord.vue'); -const MyTicket = () => import(/* webpackChunkName: "PointRecord" */ '@/views/person/myTicket.vue'); +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'); Vue.use(Router); @@ -68,6 +69,15 @@ const routes = [ title: '我的' } }, + { + path: '/account', + name: 'account', + component: Account, + meta: { + isShowNav: false, + title: '收款账户管理' + } + }, { path: '/myTicket', name: 'myTicket', diff --git a/src/services/apiUrl.js b/src/services/apiUrl.js index 34f8ff3..1fe2eb9 100644 --- a/src/services/apiUrl.js +++ b/src/services/apiUrl.js @@ -19,6 +19,16 @@ export const apiUrl = { wxMerchantcouponSend: "/api/couponSend/list", // 商户注券记录 wxMerchantcouponStory: "/api/couponSend/actionLog", + //查询商户授权状态 + getOpenIdByPhone:"/api/merchant/getOpenIdByPhone", + //查询账户信息 + findAccountById:"/api/merchant/findAccountById", + //删除分账账户 + deleteByReceiverId: "/api/merchant/deleteByReceiverId", + //某日期交易总流水 + getUnverifiedAmountOnDate: '/api/couponOrder/getUnverifiedAmountOnDate', + //首页账单列表 + listBillOweAndWaitPay:"/api/bill/listBillOweAndWaitPay", loginOut: '/api/loginOut', diff --git a/src/stores/index.js b/src/stores/index.js index b530970..c2a9c63 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: '', + token: '914e314e-81cb-4064-93f8-79b9ac5cc7d1', merchant_id:'', merchant_id_scan:'', diff --git a/src/styles/variables.less b/src/styles/variables.less index e4023da..a6055ca 100644 --- a/src/styles/variables.less +++ b/src/styles/variables.less @@ -24,6 +24,7 @@ @fontSize12: .33rem; @fontSize14: .38rem; +@fontSize15: .41rem; @fontSize16: .43rem; @fontSize18: .48rem; @fontSize20: .53rem; diff --git a/src/views/home/index.vue b/src/views/home/index.vue index 2c42635..dcd712e 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -8,14 +8,12 @@
富茂服务商
-