Commit 0f540afc authored by 郭志伟's avatar 郭志伟

Merge branch 'fix/charge' into 'master'

fix(route.js): 移除重定向限制

See merge request !10
parents 53d6db37 8bb2f85d
export default [ export default [
{ {
path: '/', path: '/',
redirect: '/vipLife' redirect: '/home'
}, },
{ {
path: '/home', path: '/home',
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
:disabled="!disabled" :disabled="!disabled"
@click="goOrder" @click="goOrder"
> >
{{ selectedRechargeInfo.price ? `¥${selectedRechargeInfo.price}` : '' }} 立即充值 {{ selectedRechargeInfo.salePrice ? `¥${selectedRechargeInfo.salePrice}` : '' }} 立即充值
</cr-button> </cr-button>
</div> </div>
</div> </div>
...@@ -81,13 +81,13 @@ export default { ...@@ -81,13 +81,13 @@ export default {
this.selectedRechargeInfo = rechargeInfo; this.selectedRechargeInfo = rechargeInfo;
}, },
async goOrderApi() { async goOrderApi() {
const { skuNo, price } = this.selectedRechargeInfo; const { skuNo, price, salePrice } = this.selectedRechargeInfo;
this.$track.registeredEvents('h5_RechargeCenterPagePhoneBillClick', { this.$track.registeredEvents('h5_RechargeCenterPagePhoneBillClick', {
recharge_type: this.phoneRecharge[`${this.rechargeType}Type`] === 601 ? '快充' : '慢充', recharge_type: this.phoneRecharge[`${this.rechargeType}Type`] === 601 ? '快充' : '慢充',
cost_value: price cost_value: price
}); });
const [res, error] = await orderApi.orderCreate({ const [res, error] = await orderApi.orderCreate({
totalFee: price, totalFee: salePrice,
terminal: 'H5', terminal: 'H5',
account: this.rechargePhoneInfo?.phoneNo, account: this.rechargePhoneInfo?.phoneNo,
registrationLocation: this.rechargePhoneInfo?.phoneNoHome, registrationLocation: this.rechargePhoneInfo?.phoneNoHome,
......
...@@ -356,7 +356,7 @@ export default { ...@@ -356,7 +356,7 @@ export default {
}; };
} else if (accountStatus === ACCOUNT_APPLY_SUCCESS) { } else if (accountStatus === ACCOUNT_APPLY_SUCCESS) {
const finalCount = this.showCoupon const finalCount = this.showCoupon
? (this.displayInfo.orderAmt - (this.selectedCoupon.faceValue || 0)).toFixed(2) ? (this.displayInfo.orderAmt - (this.selectedCoupon.faceValueNew || 0)).toFixed(2)
: this.displayInfo.orderAmt; : this.displayInfo.orderAmt;
const txt = `实际支付${finalCount || '0.00'}`; const txt = `实际支付${finalCount || '0.00'}`;
this.accountS = { this.accountS = {
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
:placeholder="`请输入${info.name || ''}账号`" :placeholder="`请输入${info.name || ''}账号`"
clearable clearable
class="Vl__account__field" class="Vl__account__field"
:type="info.type === 101 ? 'text' : 'number'" type="tel"
@input="checkPhone" @input="checkPhone"
> >
<template #button> <template #button>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment