diff --git a/config/request.js b/config/request.js index 0cf3490..a7de8a3 100644 --- a/config/request.js +++ b/config/request.js @@ -20,7 +20,7 @@ module.exports = vm => { //#ifdef DEV_SERVER console.log('DEV_SERVER') - config.baseURL = 'http://t-app.beida777.com/prod-api' + config.baseURL = 'http://192.168.0.86:8080' //#endif //#ifdef QA_SERVER diff --git a/pages.json b/pages.json index 42c9a65..2de85e3 100644 --- a/pages.json +++ b/pages.json @@ -17,6 +17,13 @@ "navigationBarBackgroundColor": "#fff" } }, + { + "path": "pages/pay/success", + "style": { + "navigationBarTitleText": "支付成功", + "navigationBarBackgroundColor": "#fff" + } + }, { "path": "pages/makerspace/index", "style": { diff --git a/pages/mine/balance/index.vue b/pages/mine/balance/index.vue index b1daaef..9ce3107 100644 --- a/pages/mine/balance/index.vue +++ b/pages/mine/balance/index.vue @@ -130,7 +130,7 @@ export default { }, onLoad() { let params = { - ifcz: true, + isRecharge: true, } this.topList[0].path = '/pages/pay/index?paramsPost=' + JSON.stringify(params) @@ -257,7 +257,7 @@ export default { } } else { let paramsPost = { - ifcz: true, + isRecharge: true, } uni.navigateTo({ url: `${item.path}?paramsPost=${encodeURIComponent(JSON.stringify(paramsPost))}`, diff --git a/pages/pay/hiPay.vue b/pages/pay/hiPay.vue index 001f437..4848cc1 100644 --- a/pages/pay/hiPay.vue +++ b/pages/pay/hiPay.vue @@ -6,193 +6,168 @@ --> @@ -300,7 +272,7 @@ export default { content: '支付成功', wxPopup: false, luckydrawData: {}, - ifcz: false, + isRecharge: false, czJe: '', tlList: [], } @@ -314,8 +286,8 @@ export default { ) this.pkCountry = uni.getStorageSync('pkCountry') - // if (this.paramsPost.ifcz) { - // this.ifcz = this.paramsPost.ifcz + // if (this.paramsPost.isRecharge) { + // this.isRecharge = this.paramsPost.isRecharge // this.businessType = 3 // uni.setNavigationBarTitle({ // title: '充值' @@ -324,7 +296,7 @@ export default { // uni.setNavigationBarTitle({ // title: '订单支付' // }); - // this.ifcz = false + // this.isRecharge = false // if (JSON.parse(options.paramsPost).orderType == 4) { this.orderCode = this.paramsPost.orderCode // this.luckydrawData = this.paramsPost.luckydrawData @@ -374,7 +346,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 @@ -411,7 +383,7 @@ export default { }) }, fansOrder() { - api.fansOrder(this.orderCode).then((res) => { + api.fansOrder(this.orderCode).then(res => { this.isLoading = false this.isPw = false removeToken() @@ -436,7 +408,7 @@ export default { pkSettleCountry: this.pkCountry, } this.isLoading = true - url(obj).then((res) => { + url(obj).then(res => { if (res.code == 200) { // this.isPw = false // this.$refs.hiSuccess.showSuccess(res.data) @@ -481,7 +453,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 @@ -497,7 +469,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 @@ -512,7 +484,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 @@ -530,7 +502,7 @@ export default { payType: 2, appletFlag: 0, } - api.unifiedorder(params).then((res) => { + api.unifiedorder(params).then(res => { let url = 'https://cloud1-8gp1n6uofa17e2e2-1315820965.tcloudbaseapp.com/jump_mp.html?sign=8587800b05c859700944247c03eeae1c&t=1698224973&state=' + res.data @@ -547,7 +519,7 @@ export default { payType: 2, appletFlag: 0, } - api.unifiedorder(params).then((res) => { + api.unifiedorder(params).then(res => { let url = 'https://cloud1-1gql8u3v1fe85a37-1322999719.tcloudbaseapp.com/jump_mp.html?sign=d77deffc9e8aecd2b721f8430c376370&t=1705374125&state=' + res.data @@ -562,7 +534,7 @@ export default { payChannel: val, payType: 2, } - api.unifiedorder(params).then((res) => { + api.unifiedorder(params).then(res => { this.wxPopup = true this.$nextTick(() => { new QRCode( @@ -593,7 +565,7 @@ export default { } }, getPayConfig() { - api.payConfig().then((res) => { + api.payConfig().then(res => { this.payList = res.data this.$nextTick(() => { this.$refs.collapse.init() @@ -602,7 +574,7 @@ export default { }) }, getBankList() { - api.jdBankList().then((res) => { + api.jdBankList().then(res => { this.jdList = res.data }) // api.hfBankList().then((res) => { @@ -623,7 +595,7 @@ export default { orderCode: this.orderCode, pkSettleCountry: this.pkCountry, }) - .then((res) => { + .then(res => { this.orderData = res.data this.downTime() }) @@ -645,13 +617,13 @@ export default { orderCode: this.orderCode, pkSettleCountry: this.pkCountry, }) - .then((res) => { + .then(res => { // this.payDetail = res.data this.$set(this, 'payDetail', res.data) }) }, reset() { - this.$store.dispatch('GetInfo').then((res) => { + this.$store.dispatch('GetInfo').then(res => { uni.reLaunch({ url: '/pages/index/index', }) @@ -669,7 +641,7 @@ export default { // this.showSucce = true this.fansOrder() } else { - api.payStatus(data).then((res) => { + api.payStatus(data).then(res => { that.sucPay = res.data }) } @@ -710,7 +682,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; @@ -719,7 +693,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; @@ -728,7 +704,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; @@ -755,7 +733,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; @@ -793,7 +773,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; @@ -915,14 +897,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/index.vue b/pages/pay/index.vue index 48ae254..3a21fbf 100644 --- a/pages/pay/index.vue +++ b/pages/pay/index.vue @@ -3,9 +3,9 @@ -