diff --git a/config/balance.js b/config/balance.js index 684b394..5730f60 100644 --- a/config/balance.js +++ b/config/balance.js @@ -1,202 +1,242 @@ 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 getDefaultBank = params => + http.get('/member/api/bank/default-bank', { + params, + }) //校验是否绑定银行卡 -export const checkIsbindBank = (params) => http.get('/member/api/bank/is-bind', { - params -}) +export const checkIsbindBank = params => + http.get('/member/api/bank/is-bind', { + 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 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 checkIfWhite = params => + http.get('/member/api/bank/is-white-list', { + 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/config/request.js b/config/request.js index ef3e1f9..2d42436 100644 --- a/config/request.js +++ b/config/request.js @@ -13,7 +13,7 @@ module.exports = vm => { //#ifdef DEV_SERVER console.log('DEV_SERVER') - config.baseURL = 'http://t-app.beida413.com/prod-api' + config.baseURL = 'https://t-app.beida666.com/prod-api' //#endif //#ifdef QA_SERVER diff --git a/pages/mine/balance/index.vue b/pages/mine/balance/index.vue index 7044bc5..90b22d6 100644 --- a/pages/mine/balance/index.vue +++ b/pages/mine/balance/index.vue @@ -1,333 +1,383 @@ \ No newline at end of file + .balance_line { + display: flex; + align-items: center; + justify-content: space-between; + font-size: 24rpx; + font-family: Source Han Sans CN; + font-weight: 400; + color: #333333; + margin-top: 5rpx; + } + } + } +} + diff --git a/pages/pay/index.vue b/pages/pay/index.vue index e1126a7..1295210 100644 --- a/pages/pay/index.vue +++ b/pages/pay/index.vue @@ -1,42 +1,42 @@ - @@ -818,8 +763,8 @@ export default { this.paramsPost ) this.pkCountry = uni.getStorageSync('pkCountry') - if (this.paramsPost.ifcz) { - this.ifcz = this.paramsPost.ifcz + if (this.paramsPost.isRecharge) { + this.ifcz = this.paramsPost.isRecharge this.businessType = 3 uni.setNavigationBarTitle({ title: '充值', @@ -862,6 +807,9 @@ export default { this.getPayConfig() clearInterval(this.clockTime) }, + onUnload() { + clearInterval(this?.clockTime) + }, onShow() { // 获取银行卡 @@ -873,7 +821,7 @@ export default { .unBind({ bindCode: this.unBindCode, }) - .then((res) => { + .then(res => { if (res.code == 200) { uni.showToast({ title: '解绑成功', @@ -901,7 +849,7 @@ export default { pkBaseId: this.luckydrawData.pkBaseId, payNum: this.luckydrawData.payNum, }) - .then((res) => { + .then(res => { if (res.code == 200) { this.orderData.orderAmount = res.data.toBePaidMoney this.payDetail = res.data @@ -971,7 +919,7 @@ export default { specialArea: this.specialArea, payPwd: this.codeValue, pkSettleCountry: this.pkCountry, - makerSpaceMember: this.paramsPost?.makerSpaceMember||'', + makerSpaceMember: this.paramsPost?.makerSpaceMember || '', } } if (this.paramsPost?.orderType === 4) { @@ -982,7 +930,7 @@ export default { pkBaseId: this.luckydrawData.pkBaseId, pkSettleCountry: this.pkCountry, } - api.payDrawGift(obj).then((res) => { + api.payDrawGift(obj).then(res => { if (res.code == 200) { // this.$message({ // message: res.msg, @@ -998,7 +946,7 @@ export default { } }) } else { - url(obj).then((res) => { + url(obj).then(res => { if (res.code == 200) { this.isPw = false if ( @@ -1057,7 +1005,7 @@ export default { .preCharge({ rechargeAmount: this.czJe, }) - .then((res) => { + .then(res => { this.paramsPost = res.data this.orderCode = res.orderCode if (this.whatPay == 11) { @@ -1100,7 +1048,7 @@ export default { payType: 3, //银行卡 bindCode: this.hfList[indexed].bindCode, } - api.unifiedorder(params).then((response) => { + api.unifiedorder(params).then(response => { this.isBank = 'hf' this.bindCode = this.hfList[indexed].bindCode this.isPw = true @@ -1111,7 +1059,7 @@ export default { .preCharge({ rechargeAmount: this.czJe, }) - .then((res) => { + .then(res => { let params = { businessType: 3, //订单类型充值 businessCode: res.orderCode, @@ -1119,7 +1067,7 @@ export default { payType: 3, //银行卡 bindCode: this.hfList[indexed].bindCode, } - api.unifiedorder(params).then((response) => { + api.unifiedorder(params).then(response => { this.isBank = 'hf' this.bindCode = this.hfList[indexed].bindCode this.orderCode = res.orderCode @@ -1139,7 +1087,7 @@ export default { payType: 3, //银行卡 bindCode: this.jdList[indexed].bindCode, } - api.unifiedorder(params).then((response) => { + api.unifiedorder(params).then(response => { this.isBank = 'jd' this.bindCode = this.jdList[indexed].bindCode this.isPw = true @@ -1150,7 +1098,7 @@ export default { .preCharge({ rechargeAmount: this.czJe, }) - .then((res) => { + .then(res => { let params = { businessType: 3, //订单类型充值 businessCode: res.orderCode, @@ -1158,7 +1106,7 @@ export default { payType: 3, //银行卡 bindCode: this.jdList[indexed].bindCode, } - api.unifiedorder(params).then((response) => { + api.unifiedorder(params).then(response => { this.isBank = 'jd' this.bindCode = this.jdList[indexed].bindCode this.orderCode = res.orderCode @@ -1177,7 +1125,7 @@ export default { payType: 3, //银行卡 bindCode: this.tlList[indexed].bindCode, } - api.unifiedorder(params).then((response) => { + api.unifiedorder(params).then(response => { this.isBank = 'tl' this.bindCode = this.tlList[indexed].bindCode this.isPw = true @@ -1188,7 +1136,7 @@ export default { .preCharge({ rechargeAmount: this.czJe, }) - .then((res) => { + .then(res => { let params = { businessType: 3, //订单类型充值 businessCode: res.orderCode, @@ -1196,7 +1144,7 @@ export default { payType: 3, //银行卡 bindCode: this.tlList[indexed].bindCode, } - api.unifiedorder(params).then((response) => { + api.unifiedorder(params).then(response => { this.isBank = 'tl' this.bindCode = this.tlList[indexed].bindCode this.orderCode = res.orderCode @@ -1214,7 +1162,7 @@ export default { .preCharge({ rechargeAmount: this.czJe, }) - .then((res) => { + .then(res => { this.paramsPost = res.data this.orderCode = res.orderCode if (this.whatPay == 12) { @@ -1226,7 +1174,7 @@ export default { this.isBank = '' this.isPw = true } else { - api.generate().then((res) => { + api.generate().then(res => { uni.setStorageSync('mToken', res.msg) }) this.isBank = '' @@ -1251,7 +1199,7 @@ export default { payType: 2, } } - api.unifiedorder(params).then((res) => { + api.unifiedorder(params).then(res => { this.wxPopup = true let that = this this.$nextTick(() => { @@ -1295,7 +1243,7 @@ export default { payType: 2, } } - api.unifiedorder(params).then((res) => { + api.unifiedorder(params).then(res => { this.wxPopup = true let that = this this.$nextTick(() => { @@ -1339,7 +1287,7 @@ export default { payType: 1, } } - api.unifiedorder(params).then((res) => { + api.unifiedorder(params).then(res => { this.wxPopup1 = true let that = this this.$nextTick(() => { @@ -1385,12 +1333,13 @@ export default { appletFlag: 0, } } - api.unifiedorder(params).then((res) => { + api.unifiedorder(params).then(res => { let url = 'https://clooud1-5g23d3je04dda65b-1326540601.tcloudbaseapp.com/jump_mp.html?sign=20f03b022bc39e837056bdbe475632c8&t=1715569339&state=' + - res.data + '&payment=0' - // https://clooud1-5g23d3je04dda65b-1326540601.tcloudbaseapp.com/jump_mp.html?sign=812bf9ab54292b1fb7161a3a6f7fa0f6&t=1715570889&state=' + - // res.data + '&payment=0' + res.data + + '&payment=0' + // https://clooud1-5g23d3je04dda65b-1326540601.tcloudbaseapp.com/jump_mp.html?sign=812bf9ab54292b1fb7161a3a6f7fa0f6&t=1715570889&state=' + + // res.data + '&payment=0' window.open(url) }) this.checkPayStatus(params) @@ -1415,12 +1364,13 @@ export default { appletFlag: 0, } } - api.unifiedorder(params).then((res) => { + api.unifiedorder(params).then(res => { let url = 'https://clooud1-5g23d3je04dda65b-1326540601.tcloudbaseapp.com/jump_mp.html?sign=20f03b022bc39e837056bdbe475632c8&t=1715569339&state=' + - res.data+ '&payment=1' - // https://clooud1-5g23d3je04dda65b-1326540601.tcloudbaseapp.com/jump_mp.html?sign=812bf9ab54292b1fb7161a3a6f7fa0f6&t=1715570889&state=' + - // res.data + '&payment=1' + res.data + + '&payment=1' + // https://clooud1-5g23d3je04dda65b-1326540601.tcloudbaseapp.com/jump_mp.html?sign=812bf9ab54292b1fb7161a3a6f7fa0f6&t=1715570889&state=' + + // res.data + '&payment=1' window.open(url) }) this.checkPayStatus(params) @@ -1436,12 +1386,12 @@ export default { } }, getPayConfig() { - api.payConfig().then((res) => { + api.payConfig().then(res => { this.payList = res.data }) }, getBankList() { - api.jdBankList().then((res) => { + api.jdBankList().then(res => { this.jdList = res.data }) // api.hfBankList().then((res) => { @@ -1462,7 +1412,7 @@ export default { orderCode: this.orderCode, pkSettleCountry: this.pkCountry, }) - .then((res) => { + .then(res => { this.orderData = res.data this.downTime() }) @@ -1484,7 +1434,7 @@ export default { orderCode: this.orderCode, pkSettleCountry: this.pkCountry, }) - .then((res) => { + .then(res => { // this.payDetail = res.data this.$set(this, 'payDetail', res.data) this.$nextTick(() => { @@ -1494,7 +1444,7 @@ export default { }) }, reset() { - this.$store.dispatch('GetInfo').then((res) => { + this.$store.dispatch('GetInfo').then(res => { uni.reLaunch({ url: '/pages/index/index', }) @@ -1513,7 +1463,7 @@ export default { this.specialArea == 7 || this.specialArea == 24 ) { - api.registerInfo(this.orderCode).then((res) => { + api.registerInfo(this.orderCode).then(res => { this.$refs.successDialog.showSuccess(res.data) }) } else { @@ -1522,7 +1472,7 @@ export default { this.showSucce = true } } else { - api.payStatus(data).then((res) => { + api.payStatus(data).then(res => { that.sucPay = res.data }) } @@ -1563,7 +1513,9 @@ export default { .tit { font-size: 24px; - font-family: PingFang SC-Semibold, PingFang SC; + font-family: + PingFang SC-Semibold, + PingFang SC; font-weight: 600; text-align: center; color: #333333; @@ -1572,7 +1524,9 @@ export default { .tit1 { font-size: 24px; - font-family: PingFang SC-Semibold, PingFang SC; + font-family: + PingFang SC-Semibold, + PingFang SC; font-weight: 600; color: #e02b26; text-align: center; @@ -1581,7 +1535,9 @@ export default { .tit2 { font-size: 11px; - font-family: PingFang SC-Regular, PingFang SC; + font-family: + PingFang SC-Regular, + PingFang SC; font-weight: 400; color: #666666; display: flex; @@ -1608,7 +1564,9 @@ export default { display: flex; align-items: center; font-size: 12px; - font-family: PingFang SC-Semibold, PingFang SC; + font-family: + PingFang SC-Semibold, + PingFang SC; font-weight: 600; color: #333333; @@ -1646,7 +1604,9 @@ export default { display: flex; align-items: center; font-size: 12px; - font-family: PingFang SC-Regular, PingFang SC; + font-family: + PingFang SC-Regular, + PingFang SC; font-weight: 400; color: #333333; @@ -1773,14 +1733,18 @@ export default { justify-content: space-between; color: #666; font-size: 12px; - font-family: PingFang SC-Semibold, PingFang SC; + font-family: + PingFang SC-Semibold, + PingFang SC; font-weight: 600; color: #999; } .tTit { font-size: 12px; - font-family: PingFang SC-Semibold, PingFang SC; + font-family: + PingFang SC-Semibold, + PingFang SC; font-weight: 600; color: #666; } diff --git a/pages/selfService/realName/realName.vue b/pages/selfService/realName/realName.vue index 6079e2a..9ed76bb 100644 --- a/pages/selfService/realName/realName.vue +++ b/pages/selfService/realName/realName.vue @@ -44,6 +44,7 @@ > @@ -54,7 +55,11 @@ prop="sex" ref="item1" > - + - - - --> + { this.$refs.uploadImg1.deletePic({ index: 0 }) @@ -486,10 +493,13 @@ export default { } }, imageUploaded1(url) { + if (!url) return this.dataForm.idFront = url + this.getIdCardInfo(url) }, imageUploaded2(url) { this.dataForm.idBack = url + this.idBackChange(url) }, // radio选择发生变化 radioGroupChange(e) { diff --git a/pages/selfService/updateDomicile/addDomicile.vue b/pages/selfService/updateDomicile/addDomicile.vue index debeca2..5bbcb0f 100644 --- a/pages/selfService/updateDomicile/addDomicile.vue +++ b/pages/selfService/updateDomicile/addDomicile.vue @@ -38,7 +38,7 @@ v-model="dataForm.changeMemberName" placeholder-class="place-class" class="border-color" - placeholder="请输入收货人姓名" + placeholder="请输入新会员姓名" />