diff --git a/App.vue b/App.vue index db52928..bedadc4 100644 --- a/App.vue +++ b/App.vue @@ -21,6 +21,11 @@ export default { 'pages/pay/hiPay', ] if (whiteList.indexOf(options.path) !== -1) return + const isRegiestLogin = uni.getStorageSync('regiest-login') + if (isRegiestLogin) { + uni.removeStorageSync('regiest-login') + removeToken() + } this.$store.dispatch('GetInfo') this.$store.dispatch('getCarLength') uni.hideTabBar({}) diff --git a/config/balance.js b/config/balance.js index 684b394..6c2a59f 100644 --- a/config/balance.js +++ b/config/balance.js @@ -1,202 +1,230 @@ const http = uni.$u.http // 钱包余额 -export const getWalletBalance = (params) => http.get('/member/api/wallet/balance', { - params -}) +export const getWalletBalance = params => + http.get('/member/api/wallet/balance', { + params, + }) -//提现账户 -export const getPkBdAccountList = (params) => http.get('/system/api/account/pkBdAccountList', { - params -}) +//提现账户 +export const getPkBdAccountList = params => + http.get('/system/api/account/pkBdAccountList', { + params, + }) //提现选择银行卡 -export const getDefaultBank = (params) => http.get('/member/api/bank/default-bank', { - params -}) - -//校验是否绑定银行卡 -export const checkIsbindBank = (params) => http.get('/member/api/bank/is-bind', { - params -}) +export const getDefaultBank = params => + http.get('/member/api/bank/default-bank', { + params, + }) //提现页面展示 -export const getWidthdrawShow = (params) => http.get('/member/api/withdraw/show/add', { - params -}) +export const getWidthdrawShow = params => + http.get('/member/api/withdraw/show/add', { + params, + }) //确认提现 -export const addWithdraw = (params) => http.post('/member/api/withdraw/add', params) - +export const addWithdraw = params => + http.post('/member/api/withdraw/add', params) //提现明细列表 -export const getWithdrawList = (params) => http.get('/member/api/withdraw/list-detail', { - params -}) +export const getWithdrawList = params => + http.get('/member/api/withdraw/list-detail', { + params, + }) //提现撤销 -export const cancelWithdraw = (params) => http.get('/member/api/withdraw/cancel', { - params -}) +export const cancelWithdraw = params => + http.get('/member/api/withdraw/cancel', { + params, + }) //获取转账转出账户 -export const getTransferAccount = (params) => http.get('/member/api/transfer/transfer-account', { - params -}) +export const getTransferAccount = params => + http.get('/member/api/transfer/transfer-account', { + params, + }) //根据用户编号查询用户姓名 -export const getTransferChineseName = (params) => http.get('/member/api/transfer/chinese-name', { - params -}) +export const getTransferChineseName = params => + http.get('/member/api/transfer/chinese-name', { + params, + }) //查询选择账户可转账余额 -export const getTransferMember = (params) => http.get('/member/api/transfer/member-balance', { - params -}) +export const getTransferMember = params => + http.get('/member/api/transfer/member-balance', { + params, + }) //确认转账 -export const addTransfer = (params) => http.post('/member/api/transfer/add', params) +export const addTransfer = params => + http.post('/member/api/transfer/add', params) //钱包银行卡列表 -export const getBankList = (params) => http.get('/member/api/bank/list', { - params -}) +export const getBankList = params => + http.get('/member/api/bank/list', { + params, + }) //解除绑定 -export const removeBankBind = (params) => http.get('/member/api/bank/unbind-bank', { - params -}) +export const removeBankBind = params => + http.get('/member/api/bank/unbind-bank', { + params, + }) //获取银行验证码 -export const getVerification = (params) => http.get('/member/api/sms/verification', { - params -}) +export const getVerification = params => + http.get('/member/api/sms/verification', { + params, + }) //绑定银行卡校验 -export const verifyBankCard = (params) => http.post('/member/api/bank/verify-bank-card', params) - -//是否配置白名单 白名单不进行银行卡四要素校验 -export const checkIfWhite = (params) => http.get('/member/api/bank/is-white-list', { - params -}) +export const verifyBankCard = params => + http.post('/member/api/bank/verify-bank-card', params) //银行卡选择下拉选 -export const getBankCardChoiceList = (params) => http.get('/system/api/bank/list', { - params -}) +export const getBankCardChoiceList = params => + http.get('/system/api/bank/list', { + params, + }) //钱包绑卡 -export const bindWalletBankAdd = (params) => http.post('/member/api/bank/add', params) +export const bindWalletBankAdd = params => + http.post('/member/api/bank/add', params) // 交易明细 -export const getTransactionDetails = (params) => http.post('/member/api/wallet/transaction-details?pageNum=' + params - .pageNum + "&pageSize=" + params.pageSize, params) - +export const getTransactionDetails = params => + http.post( + '/member/api/wallet/transaction-details?pageNum=' + + params.pageNum + + '&pageSize=' + + params.pageSize, + params + ) //交易类型下拉选 -export const getTradeTypeList = (params) => http.get('/member/api/wallet/trade-type', { - params -}) +export const getTradeTypeList = params => + http.get('/member/api/wallet/trade-type', { + params, + }) //币种-账户类型下拉选 -export const getEnumsAccountList = (params) => http.get('/system/api/account/pkBdAccountList', { - params -}) +export const getEnumsAccountList = params => + http.get('/system/api/account/pkBdAccountList', { + params, + }) //意见反馈类型 -export const getFeedbackType = (params) => http.get('/system/pub/enums/feedback-type', { - params -}) +export const getFeedbackType = params => + http.get('/system/pub/enums/feedback-type', { + params, + }) //提交意见反馈列表 -export const saveFeedBack = (params) => http.post('/system/api/feedback/save', params) - - +export const saveFeedBack = params => + http.post('/system/api/feedback/save', params) // 公告、站内信、意见反馈数 -export const getNoticeCount = (params) => http.get('/system/api/notice/index-count', { - params -}) +export const getNoticeCount = params => + http.get('/system/api/notice/index-count', { + params, + }) // 公告站内信列表 公告1站内信2 -export const getNoticeList = (params) => http.get('/system/api/notice/index-list', { - params -}) +export const getNoticeList = params => + http.get('/system/api/notice/index-list', { + params, + }) //意见列表 -export const getFeedbackList = (params) => http.get('/system/api/feedback/index-list', { - params -}) - +export const getFeedbackList = params => + http.get('/system/api/feedback/index-list', { + params, + }) //获取公告、站内信详情 -export const getNoticeDetail = (params) => http.get('/system/api/notice/index-detail', { - params -}) +export const getNoticeDetail = params => + http.get('/system/api/notice/index-detail', { + params, + }) //二级密码校验 -export const checkPwd = (params) => http.get('/member/api/recharge/check-pwd', { - params -}) +export const checkPwd = params => + http.get('/member/api/recharge/check-pwd', { + params, + }) //是否进行实名认证 -export const getIfAuth = (params) => http.get('/member/api/authentication/is-auth', { - params -}) - +export const getIfAuth = params => + http.get('/member/api/authentication/is-auth', { + params, + }) //证件类型 -export const getCardType = (params) => http.get('/system/pub/enums/id-type', { - params -}) +export const getCardType = params => + http.get('/system/pub/enums/id-type', { + params, + }) //实名认证 -export const addAuthentication = (params) => http.post('/member/api/authentication/add', params) +export const addAuthentication = params => + http.post('/member/api/authentication/add', params) //上传图片 -export const getUploadUrl = (params) => http.post('/system/upload', params) +export const getUploadUrl = params => http.post('/system/upload', params) //成长之路-等级 -export const getGrowUpGrade = (params) => http.get('/member/api/member-footmark/grow-up-footmark-grade', { - params -}) +export const getGrowUpGrade = params => + http.get('/member/api/member-footmark/grow-up-footmark-grade', { + params, + }) //成长之路-奖衔 -export const getGrowUpAwards = (params) => http.get('/member/api/member-footmark/grow-up-footmark-awards', { - params -}) - +export const getGrowUpAwards = params => + http.get('/member/api/member-footmark/grow-up-footmark-awards', { + params, + }) //是否上传营业执照 -export const getIsExist = (params) => http.get('/member/api/business/license/is-exist', { - params -}) +export const getIsExist = params => + http.get('/member/api/business/license/is-exist', { + params, + }) //上传营业执照 -export const addLicense = (params) => http.post('/member/api/business/license/add', params) +export const addLicense = params => + http.post('/member/api/business/license/add', params) //营业执照详情 -export const getLicenseDetail = (params) => http.get('/member/api/business/license/detail', { - params -}) +export const getLicenseDetail = params => + http.get('/member/api/business/license/detail', { + params, + }) //修改营业执照 -export const updateLicense = (params) => http.post('/member/api/business/license/update', params) +export const updateLicense = params => + http.post('/member/api/business/license/update', params) //ocr -export const ocrIdCard = (params) => http.post('/member/api/authentication/invoke-idCard', params) +export const ocrIdCard = params => + http.post('/member/api/authentication/invoke-idCard', params) //ocrBack -export const ocrIdCardBack = (params) => http.post('/member/api/authentication/invoke-idCard-back', params) +export const ocrIdCardBack = params => + http.post('/member/api/authentication/invoke-idCard-back', params) //实名认证详情 -export const authenticationDetails = (params) => http.get('/member/api/authentication/detail', { - params -}) +export const authenticationDetails = params => + http.get('/member/api/authentication/detail', { + params, + }) //实名认证详情续约用 -export const agreementName = (params) => http.get('/member/api/authentication/agreement-real-name', { - params -}) +export const agreementName = params => + http.get('/member/api/authentication/agreement-real-name', { + params, + }) //设置默认银行卡 -export const updateDefault = (params) => http.get('/member/api/bank/update-default', { - params -}) - +export const updateDefault = params => + http.get('/member/api/bank/update-default', { + params, + }) diff --git a/pages/bonus/index.vue b/pages/bonus/index.vue index 3d29c95..175e8a6 100644 --- a/pages/bonus/index.vue +++ b/pages/bonus/index.vue @@ -131,15 +131,13 @@ export default { }, methods: { setDefaultDateRange() { - const end = new Date() - const start = new Date() - end.setDate(end.getDate() - 1) - start.setDate(start.getDate() - 15) // 默认查询最近15天 + const end = dayjs().subtract(1, 'day') + const start = dayjs().subtract(15, 'day') + this.startDate = start.format('YYYY-MM-DD') + this.endDate = end.format('YYYY-MM-DD') - this.startDate = this.formatDate(start) - this.endDate = this.formatDate(end) - this.startDateValue = Number(start) - this.endDateValue = Number(end) + this.startDateValue = Number(start.toDate()) + this.endDateValue = Number(end.toDate()) }, formatDate(date) { return dayjs(date).format('YYYY-MM-DD') diff --git a/pages/mine/balance/withdrawal.vue b/pages/mine/balance/withdrawal.vue index 1fa0bab..c784a59 100644 --- a/pages/mine/balance/withdrawal.vue +++ b/pages/mine/balance/withdrawal.vue @@ -7,7 +7,7 @@ :rules="rules" ref="uForm" > - + {{ '提现' }} - + + 请先绑定默认银行卡 + - + /> --> @@ -193,8 +202,9 @@ export default { bankData: {}, widthDrwaData: {}, ifeye: false, - canbind: false, + canbind: true, showWithdrawalGuide: false, + unBindDefaultModal: false, } }, watch: { @@ -205,7 +215,7 @@ export default { url: '/pages/mine/balance/withdrawlDetail', }) }, - onLoad() { + onShow() { this.getList() }, methods: { @@ -233,18 +243,20 @@ export default { } }) bal.getDefaultBank().then(res => { - this.bankData = res.data - this.dataForm.pkBank = res.data.pkId - }) - //校验是否绑定银行卡 - bal.checkIsbindBank().then(res => { - if (res.flag == 'Y') { - this.canbind = false - } else if (res.flag == 'N') { - this.canbind = true + if (res.data && Object.keys(res.data).length > 0) { + this.bankData = res.data + this.dataForm.pkBank = res.data.pkId + } else { + this.unBindDefaultModal = true } }) }, + unBindDefaultConfirm() { + this.unBindDefaultModal = false + uni.navigateTo({ + url: '/pages/mine/bindBank/index', + }) + }, submit() { this.$refs.uForm .validate() @@ -252,13 +264,17 @@ export default { bal.addWithdraw(this.dataForm).then(res => { if (res.code == 200) { this.$refs.uToast.show({ - message: res.msg, + message: res.msg || '提现成功', type: 'success', }) - // 显示提现引导弹窗 setTimeout(() => { - this.showWithdrawalGuide = true - }, 300) + uni.navigateBack() + }, 500) + + // 显示提现引导弹窗 + // setTimeout(() => { + // this.showWithdrawalGuide = true + // }, 300) } }) }) diff --git a/pages/mine/bindBank/bindBank.vue b/pages/mine/bindBank/bindBank.vue index 788b9b6..607f799 100644 --- a/pages/mine/bindBank/bindBank.vue +++ b/pages/mine/bindBank/bindBank.vue @@ -7,21 +7,9 @@ :rules="rules" ref="uForm" > - - - + + + @@ -95,6 +101,7 @@ v-if="userInfo.pkCountry == 1 && cancode" label-width="200rpx" :label="'验证码'" + required prop="verificationCode" borderBottom ref="item1" @@ -131,6 +138,13 @@ > + + + 银行卡号、真实姓名、证件号码、联系方式,请与银行预留信息保持一致 + + {{ '确定' }} @@ -221,18 +235,8 @@ export default { onLoad() { this.userInfo = uni.getStorageSync('User') this.getList() - this.checkIfWhite() }, methods: { - checkIfWhite() { - ban.checkIfWhite().then(res => { - if (res.code == 200 && res.flag == 'N') { - this.cancode = true - } else if (res.code == 200 && res.flag == 'Y') { - this.cancode = false - } - }) - }, codeChange(text) { this.tips = text }, @@ -295,9 +299,7 @@ export default { .then(res => { // 没有三方接口 临机写死 this.ifpass = true - this.bindBank() - return if (this.userInfo.pkCountry == 1) { if (this.cancode) { ban @@ -374,5 +376,37 @@ export default { border-radius: 38rpx; color: #fff; } + + .tip-wrapper { + margin: 20rpx 20rpx 0 20rpx; + + .tip-content { + display: flex; + align-items: flex-start; + background: linear-gradient(135deg, #fff3e0 0%, #fff8f0 100%); + border: 2rpx solid #ffb74d; + border-radius: 16rpx; + padding: 20rpx 24rpx; + box-shadow: 0 4rpx 12rpx rgba(255, 183, 77, 0.1); + + .tip-icon { + color: #ff9800; + font-size: 28rpx; + font-weight: bold; + margin-right: 16rpx; + margin-top: 2rpx; + flex-shrink: 0; + } + + .tip-text { + flex: 1; + font-size: 24rpx; + line-height: 36rpx; + color: #e65100; + font-weight: 500; + letter-spacing: 0.5rpx; + } + } + } } diff --git a/pages/mine/bindBank/index.vue b/pages/mine/bindBank/index.vue index 762bb3d..975470c 100644 --- a/pages/mine/bindBank/index.vue +++ b/pages/mine/bindBank/index.vue @@ -1,225 +1,265 @@ \ No newline at end of file + .footerbtn { + display: flex; + align-items: center; + padding: 40rpx; + background: #ffffff; + font-size: 24rpx; + font-weight: 600; + border-radius: 20rpx; + margin-top: 32rpx; + width: 100%; + } +} +