Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
cauchy-ui
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ui
cauchy-ui
Commits
0f540afc
Commit
0f540afc
authored
Sep 01, 2021
by
郭志伟
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'fix/charge' into 'master'
fix(route.js): 移除重定向限制 See merge request
!10
parents
53d6db37
8bb2f85d
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
6 deletions
+6
-6
routes.js
src/router/routes.js
+1
-1
index.vue
src/views/home/index.vue
+3
-3
index.vue
src/views/pay/index.vue
+1
-1
AccountInput.vue
src/views/vipLife/components/AccountInput.vue
+1
-1
No files found.
src/router/routes.js
View file @
0f540afc
export
default
[
export
default
[
{
{
path
:
'
/
'
,
path
:
'
/
'
,
redirect
:
'
/
vipLif
e
'
redirect
:
'
/
hom
e
'
},
},
{
{
path
:
'
/home
'
,
path
:
'
/home
'
,
...
...
src/views/home/index.vue
View file @
0f540afc
...
@@ -20,7 +20,7 @@
...
@@ -20,7 +20,7 @@
:disabled=
"!disabled"
:disabled=
"!disabled"
@
click=
"goOrder"
@
click=
"goOrder"
>
>
{{
selectedRechargeInfo
.
price
?
`¥${selectedRechargeInfo.p
rice
}
`
:
''
}}
立即充值
{{
selectedRechargeInfo
.
salePrice
?
`¥${selectedRechargeInfo.saleP
rice
}
`
:
''
}}
立即充值
<
/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
:
p
rice
,
totalFee
:
saleP
rice
,
terminal
:
'
H5
'
,
terminal
:
'
H5
'
,
account
:
this
.
rechargePhoneInfo
?.
phoneNo
,
account
:
this
.
rechargePhoneInfo
?.
phoneNo
,
registrationLocation
:
this
.
rechargePhoneInfo
?.
phoneNoHome
,
registrationLocation
:
this
.
rechargePhoneInfo
?.
phoneNoHome
,
...
...
src/views/pay/index.vue
View file @
0f540afc
...
@@ -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
.
faceValue
New
||
0
)).
toFixed
(
2
)
:
this
.
displayInfo
.
orderAmt
;
:
this
.
displayInfo
.
orderAmt
;
const
txt
=
`实际支付
${
finalCount
||
'
0.00
'
}
`
;
const
txt
=
`实际支付
${
finalCount
||
'
0.00
'
}
`
;
this
.
accountS
=
{
this
.
accountS
=
{
...
...
src/views/vipLife/components/AccountInput.vue
View file @
0f540afc
...
@@ -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
>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment