diff --git a/components/QuickRechargePanel.vue b/components/QuickRechargePanel.vue
new file mode 100644
index 0000000..4895049
--- /dev/null
+++ b/components/QuickRechargePanel.vue
@@ -0,0 +1,153 @@
+
+
+ 请选择充值金额
+
+
+
+ {{ formatAmount(amount) }}
+
+
+
+
+
+
+
+
+
diff --git a/config/request.js b/config/request.js
index 79cf63e..a5cfc05 100644
--- a/config/request.js
+++ b/config/request.js
@@ -19,7 +19,7 @@ module.exports = vm => {
//#ifdef DEV_SERVER
console.log('DEV_SERVER')
- config.baseURL = 'http://t-app.beida666.com/prod-api'
+ config.baseURL = 'http://192.168.0.86:8080'
//#endif
//#ifdef QA_SERVER
diff --git a/pages/pay/index.vue b/pages/pay/index.vue
index f34e287..229536b 100644
--- a/pages/pay/index.vue
+++ b/pages/pay/index.vue
@@ -1,11 +1,21 @@
-
- {{ '充值金额' }}
-
+ 充值金额
+
+
{{ '待支付金额' }}
@@ -184,8 +194,8 @@
@@ -202,8 +212,8 @@
@@ -220,8 +230,8 @@
@@ -239,8 +249,8 @@
@@ -255,8 +265,8 @@
@@ -285,8 +295,8 @@
@@ -309,8 +319,8 @@
@@ -337,8 +347,8 @@
@@ -361,8 +371,8 @@
@@ -389,8 +399,8 @@
@@ -779,6 +789,7 @@
import * as api from '@/config/pay.js'
import QRCode from 'qrcodejs2'
import successDialog from '@/components/successDialog.vue'
+import QuickRechargePanel from '@/components/QuickRechargePanel.vue'
import * as act from '@/config/activity.js'
import {
PAY_REDIRECT_URL,
@@ -790,6 +801,7 @@ var payStatus
export default {
components: {
successDialog,
+ QuickRechargePanel,
},
data() {
return {
@@ -832,6 +844,8 @@ export default {
qrcodeimg: '',
onlinePay: true,
unBindCode: '',
+ quickAmounts: [330, 990, 4950, 10000, 30000, 50000], // 快速充值金额选项
+ isQuickSelected: false, // 标记是否是快速选择触发的金额变化
}
},
computed: {
@@ -842,6 +856,16 @@ export default {
return false
},
},
+ watch: {
+ rechargeAmount(newVal, oldVal) {
+ // 当充值金额变化时,如果不是快速选择触发的,则清空快速选择状态
+ if (!this.isQuickSelected && newVal && this.$refs.quickRechargePanel) {
+ this.$refs.quickRechargePanel.clear()
+ }
+ // 重置标志位
+ this.isQuickSelected = false
+ },
+ },
async onLoad(options) {
this.paramsPost = JSON.parse(options.paramsPost || '{}')
await this.getPayConfig()
@@ -917,6 +941,11 @@ export default {
stringToBoolean(str) {
return str === 'true' ? true : false
},
+ // 处理快速充值金额选择
+ onAmountSelected(data) {
+ this.isQuickSelected = true // 标记这是快速选择触发的
+ this.rechargeAmount = data.amount.toString()
+ },
//查询充值抽奖次数
getLuckdrawDetail() {
// 抽奖支付处理(查询订单支付信息以及显示等)
@@ -1503,8 +1532,8 @@ export default {
}
.contxt {
- margin-top: -220rpx;
- padding: 0 26rpx;
+ // margin-top: -220rpx;
+ padding: 40rpx 26rpx 0;
padding-bottom: 300rpx;
}
@@ -1560,7 +1589,7 @@ export default {
.pf {
display: flex;
align-items: center;
- font-size: 12px;
+ font-size: 28rpx;
font-family:
PingFang SC-Semibold,
PingFang SC;
@@ -1600,7 +1629,7 @@ export default {
.flex_ac_i {
display: flex;
align-items: center;
- font-size: 12px;
+ font-size: 28rpx;
font-family:
PingFang SC-Regular,
PingFang SC;
@@ -1768,4 +1797,9 @@ export default {
justify-content: space-between;
padding-bottom: 15px;
}
+.recharge-input {
+ ::v-deep .uni-input-placeholder {
+ font-size: 48rpx;
+ }
+}