From b38e4cbfb17b9c73b999f07be5e0c1f51d548dff Mon Sep 17 00:00:00 2001 From: woody Date: Wed, 18 Jun 2025 15:57:29 +0800 Subject: [PATCH] =?UTF-8?q?feat(global):=20=E6=B5=8B=E8=AF=95=E8=B4=A6?= =?UTF-8?q?=E5=8F=B7memberCode=E5=8F=98=E6=9B=B4CN->BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/mine/balance/index.vue | 659 +++++++++-------- pages/mine/index.vue | 2 +- pages/pay/index.vue | 627 ++++++++--------- pages/pay/treePay.vue | 1291 ++++++++++++++++++---------------- 4 files changed, 1322 insertions(+), 1257 deletions(-) diff --git a/pages/mine/balance/index.vue b/pages/mine/balance/index.vue index 7044bc5..65726b7 100644 --- a/pages/mine/balance/index.vue +++ b/pages/mine/balance/index.vue @@ -1,333 +1,370 @@ \ 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/mine/index.vue b/pages/mine/index.vue index 678a371..37e6919 100644 --- a/pages/mine/index.vue +++ b/pages/mine/index.vue @@ -577,7 +577,7 @@ export default { api.getInfo().then(res => { if (res) { this.userInfo = res.data - if (this.userInfo.memberCode == 'CN68880628') { + if (this.userInfo.memberCode == 'BD68880628') { this.ifSpecial = true this.otherMenuList = [ { diff --git a/pages/pay/index.vue b/pages/pay/index.vue index e1126a7..4110f00 100644 --- a/pages/pay/index.vue +++ b/pages/pay/index.vue @@ -1,42 +1,42 @@ - @@ -873,7 +818,7 @@ export default { .unBind({ bindCode: this.unBindCode, }) - .then((res) => { + .then(res => { if (res.code == 200) { uni.showToast({ title: '解绑成功', @@ -901,7 +846,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 +916,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 +927,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 +943,7 @@ export default { } }) } else { - url(obj).then((res) => { + url(obj).then(res => { if (res.code == 200) { this.isPw = false if ( @@ -1057,7 +1002,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 +1045,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 +1056,7 @@ export default { .preCharge({ rechargeAmount: this.czJe, }) - .then((res) => { + .then(res => { let params = { businessType: 3, //订单类型充值 businessCode: res.orderCode, @@ -1119,7 +1064,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 +1084,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 +1095,7 @@ export default { .preCharge({ rechargeAmount: this.czJe, }) - .then((res) => { + .then(res => { let params = { businessType: 3, //订单类型充值 businessCode: res.orderCode, @@ -1158,7 +1103,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 +1122,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 +1133,7 @@ export default { .preCharge({ rechargeAmount: this.czJe, }) - .then((res) => { + .then(res => { let params = { businessType: 3, //订单类型充值 businessCode: res.orderCode, @@ -1196,7 +1141,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 +1159,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 +1171,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 +1196,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 +1240,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 +1284,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 +1330,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 +1361,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 +1383,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 +1409,7 @@ export default { orderCode: this.orderCode, pkSettleCountry: this.pkCountry, }) - .then((res) => { + .then(res => { this.orderData = res.data this.downTime() }) @@ -1484,7 +1431,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 +1441,7 @@ export default { }) }, reset() { - this.$store.dispatch('GetInfo').then((res) => { + this.$store.dispatch('GetInfo').then(res => { uni.reLaunch({ url: '/pages/index/index', }) @@ -1513,7 +1460,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 +1469,7 @@ export default { this.showSucce = true } } else { - api.payStatus(data).then((res) => { + api.payStatus(data).then(res => { that.sucPay = res.data }) } @@ -1563,7 +1510,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 +1521,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 +1532,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 +1561,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 +1601,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 +1730,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/pay/treePay.vue b/pages/pay/treePay.vue index fc85061..22b6cad 100644 --- a/pages/pay/treePay.vue +++ b/pages/pay/treePay.vue @@ -1,174 +1,223 @@ \ No newline at end of file +