diff --git a/src/api/app/account.js b/src/api/app/account.js new file mode 100644 index 0000000..5e394cb --- /dev/null +++ b/src/api/app/account.js @@ -0,0 +1,11 @@ +import request from '@/utils/request' + +/** + * 获取用户的收款账户列表 + */ +export function appGroupAccount() { + return request({ + url: '/app/account', + method: 'get' + }) +} diff --git a/src/api/app/user.js b/src/api/app/user.js new file mode 100644 index 0000000..85393d4 --- /dev/null +++ b/src/api/app/user.js @@ -0,0 +1,8 @@ +import request from '@/utils/request' + +export function appGetUserInfo() { + return request({ + url: '/app/user/userInfo', + method: 'get' + }) +} diff --git a/src/api/mch/recharge.js b/src/api/mch/recharge.js new file mode 100644 index 0000000..5821b47 --- /dev/null +++ b/src/api/mch/recharge.js @@ -0,0 +1,10 @@ +import request from '@/utils/request' + +// 商户统计信息 +export function mchRechargeCount(params) { + return request({ + url: '/app/bill/landlordCount', + method: 'get', + params + }) +} diff --git a/src/assets/icons/svg/bank.svg b/src/assets/icons/svg/bank.svg new file mode 100644 index 0000000..151ffa8 --- /dev/null +++ b/src/assets/icons/svg/bank.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/svg/qrcode.svg b/src/assets/icons/svg/qrcode.svg new file mode 100644 index 0000000..31855ec --- /dev/null +++ b/src/assets/icons/svg/qrcode.svg @@ -0,0 +1 @@ + diff --git a/src/components/LineField/index.vue b/src/components/LineField/index.vue new file mode 100644 index 0000000..b637d64 --- /dev/null +++ b/src/components/LineField/index.vue @@ -0,0 +1,62 @@ + + + + + {{label}} + + + + {{value}} + + + + + + + + diff --git a/src/components/RangePicker/index.vue b/src/components/RangePicker/index.vue index 0dc4946..5aba0e6 100644 --- a/src/components/RangePicker/index.vue +++ b/src/components/RangePicker/index.vue @@ -1,5 +1,11 @@ - + @@ -9,6 +15,10 @@ export default { name: 'rangePicker', props: { + clearable: { + type: Boolean, + default: false, + }, // 双向绑定值 value: { type: Number, diff --git a/src/views/index.vue b/src/views/index.vue index 9f149b8..9ebd8a8 100644 --- a/src/views/index.vue +++ b/src/views/index.vue @@ -31,6 +31,7 @@ export default { padding: 32px; background-color: rgb(240, 242, 245); position: relative; + min-height: calc(100vh - 84px); .chart-wrapper { background: #fff; diff --git a/src/views/mch/index/components/MchAccount.vue b/src/views/mch/index/components/MchAccount.vue new file mode 100644 index 0000000..26db194 --- /dev/null +++ b/src/views/mch/index/components/MchAccount.vue @@ -0,0 +1,137 @@ + + + + + 微信支付 + + + + 已绑定 + + + 去绑定 + + + + + + + + {{data.BANK_CARD[0].cardInfo.bankName}} + + + + 银行卡 + + + + + {{data.BANK_CARD[0].accountNo}} + + + 去绑定 + + + + + + 线下收款码 + + + + 已绑定 + + + 去绑定 + + + + + + + + + + + + + + diff --git a/src/views/mch/index/components/MchRechargeCountReport.vue b/src/views/mch/index/components/MchRechargeCountReport.vue new file mode 100644 index 0000000..008669e --- /dev/null +++ b/src/views/mch/index/components/MchRechargeCountReport.vue @@ -0,0 +1,86 @@ + + + + + + {{queryParams.year}}年{{queryParams.month}}月收入 + {{totalIncome | money}} + 元 + + + + + + + + + diff --git a/src/views/mch/index/components/MchUserProfile.vue b/src/views/mch/index/components/MchUserProfile.vue new file mode 100644 index 0000000..b6f60b1 --- /dev/null +++ b/src/views/mch/index/components/MchUserProfile.vue @@ -0,0 +1,75 @@ + + + + + + + + + + + + + + + + 跟随渠道 + + + {{user.serviceRate}} {{serviceUnit(user.serviceType)}} + + + + 跟随渠道 + + + {{user.withdrawServiceRate}} {{serviceUnit(user.withdrawServiceType)}} + + + + + + + + + + diff --git a/src/views/mch/index/index.vue b/src/views/mch/index/index.vue index 472fe09..06d2803 100644 --- a/src/views/mch/index/index.vue +++ b/src/views/mch/index/index.vue @@ -1,13 +1,48 @@ - + + + + 欢迎!{{name}}! + + + + + + + + + + + + + + + + + + + diff --git a/src/views/mch/receiveBill/index.vue b/src/views/mch/receiveBill/index.vue index 5e30dce..c608ac4 100644 --- a/src/views/mch/receiveBill/index.vue +++ b/src/views/mch/receiveBill/index.vue @@ -197,8 +197,7 @@ export default { {key: 'billId', visible: true, label: '编号', minWidth: "50", sortable: true, overflow: false, align: 'center'}, {key: 'deviceId', visible: true, label: '设备', minWidth: null, sortable: true, overflow: false, align: 'center'}, {key: 'type', visible: true, label: '账单类型', minWidth: null, sortable: true, overflow: false, align: 'center'}, - {key: 'billTime', visible: true, label: '账单时间', minWidth: "100", sortable: false, overflow: false, align: 'center'}, - {key: 'status', visible: true, label: '账单状态', minWidth: null, sortable: true, overflow: false, align: 'center'}, + {key: 'billTime', visible: true, label: '账期', minWidth: "100", sortable: false, overflow: false, align: 'center'}, {key: 'amount', visible: true, label: '账单金额', minWidth: null, sortable: true, overflow: false, align: 'center'}, {key: 'receivedAmount', visible: true, label: '已付金额', minWidth: null, sortable: true, overflow: false, align: 'center'}, {key: 'description', visible: true, label: '账单描述', minWidth: "300", sortable: true, overflow: false, align: 'center'}, diff --git a/src/views/ss/receiveBill/index.vue b/src/views/ss/receiveBill/index.vue index dd00803..da0839d 100644 --- a/src/views/ss/receiveBill/index.vue +++ b/src/views/ss/receiveBill/index.vue @@ -206,7 +206,7 @@ export default { {key: 'userName', visible: true, label: '用户名称', minWidth: null, sortable: true, overflow: false, align: 'center'}, {key: 'deviceId', visible: true, label: '设备', minWidth: null, sortable: true, overflow: false, align: 'center'}, {key: 'type', visible: true, label: '账单类型', minWidth: null, sortable: true, overflow: false, align: 'center'}, - {key: 'billTime', visible: true, label: '账单时间', minWidth: "100", sortable: false, overflow: false, align: 'center'}, + {key: 'billTime', visible: true, label: '账期', minWidth: "100", sortable: false, overflow: false, align: 'center'}, {key: 'status', visible: true, label: '账单状态', minWidth: null, sortable: true, overflow: false, align: 'center'}, {key: 'amount', visible: true, label: '账单金额', minWidth: null, sortable: true, overflow: false, align: 'center'}, {key: 'receivedAmount', visible: true, label: '已收金额', minWidth: null, sortable: true, overflow: false, align: 'center'}, diff --git a/src/views/system/smUser/components/userRechargeReport.vue b/src/views/system/smUser/components/userRechargeReport.vue index 7478a8f..6948c16 100644 --- a/src/views/system/smUser/components/userRechargeReport.vue +++ b/src/views/system/smUser/components/userRechargeReport.vue @@ -48,7 +48,6 @@ export default { methods: { // 当年份发生变化 onChangeYear(year) { - console.log(year); this.queryParams.year = year; this.getReportData(this.mchId); }, diff --git a/src/views/system/smUser/detail.vue b/src/views/system/smUser/detail.vue index f41d577..dbdfc1e 100644 --- a/src/views/system/smUser/detail.vue +++ b/src/views/system/smUser/detail.vue @@ -29,7 +29,7 @@ 跟随渠道 - + {{userData.withdrawServiceRate}} {{serviceUnit(userData.withdrawServiceType)}} @@ -96,7 +96,7 @@ export default { name: 'User/:userId', mixins: [$view, $serviceType], components: { Suit, Account, RecordBalance, Store, Access, UserRechargeReport, UserAccount, UserDevice, LineChart}, - dicts: ['sm_user_type', 'service_type'], + dicts: ['sm_user_type', 'service_type', 'withdraw_service_type'], computed: { serviceUnit() { return (type) => {