Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
J
jiedao-app-customer-new-master
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
lanbaoming
jiedao-app-customer-new-master
Commits
02ca041d
Commit
02ca041d
authored
Oct 11, 2024
by
chenwei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed defect | 501 | APP确认兑换提交成功后,应返回兑换礼品页面,不是返回首页
parent
ec9b5cf6
Changes
4
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
173 additions
and
153 deletions
+173
-153
cityListPicker.vue
src/pages/my_info/cityListPicker.vue
+1
-1
order_mail.vue
src/pages/order_mail/order_mail.vue
+156
-146
integral.js
src/static/lang/en/integral.js
+8
-3
integral.js
src/static/lang/zh/integral.js
+8
-3
No files found.
src/pages/my_info/cityListPicker.vue
View file @
02ca041d
...
...
@@ -132,7 +132,7 @@ export default {
this
.
$emit
(
'
reLoad
'
,
this
.
form
)
},
// 搜索查询
async
searchChange
(
e
)
{
searchChange
(
e
)
{
this
.
reset
()
},
reset
()
{
...
...
src/pages/order_mail/order_mail.vue
View file @
02ca041d
This diff is collapsed.
Click to expand it.
src/static/lang/en/integral.js
View file @
02ca041d
...
...
@@ -10,14 +10,14 @@ export default {
pointsCampaign
:
'
points campaign
'
,
pointsRemark
:
'
Redemption points are different at different pick-up points
'
,
outlets
:
'
Please select the pick-up point
'
,
remainder
:
val
=>
{
remainder
:
(
val
)
=>
{
return
`剩余
${
val
}
份`
},
orderMail
:
'
Confirm the order
'
,
code
:
'
Get a verification code
'
,
codePlaceloader
:
'
Please enter a verification code
'
,
codeError
:
'
The verification code is incorrect
'
,
codeTimeText
:
val
=>
{
codeTimeText
:
(
val
)
=>
{
return
`
${
val
}
秒后重新获取`
},
remark
:
'
Please enter a comment
'
,
...
...
@@ -25,11 +25,16 @@ export default {
redeemType
:
'
Redemption Method
'
,
activityTime
:
'
Event time
'
,
textLength
:
'
Enter up to 100 words
'
,
totalScore
:
num
=>
{
totalScore
:
(
num
)
=>
{
return
`已选
${
num
}
件,合计积分:`
},
totalScore1
:
'
integral
'
,
addAddress
:
'
new address for additional shipments
'
,
totalScoreError
:
'
Insufficient points
'
,
to
:
'
to
'
,
gift
:
'
gift:
'
,
Num
:
'
Quantity:
'
,
total
:
'
Total Score:
'
,
exchangeType
:
'
Exchange Method:
'
,
deliveryAddress
:
'
Delivery Address:
'
}
src/static/lang/zh/integral.js
View file @
02ca041d
...
...
@@ -10,14 +10,14 @@ export default {
pointsCampaign
:
'
积分活动
'
,
pointsRemark
:
'
不同提货点兑换积分不同
'
,
outlets
:
'
请选择提货点
'
,
remainder
:
val
=>
{
remainder
:
(
val
)
=>
{
return
`剩余
${
val
}
份`
},
orderMail
:
'
确定订单
'
,
code
:
'
获取验证码
'
,
codePlaceloader
:
'
请输入验证码
'
,
codeError
:
'
验证码错误
'
,
codeTimeText
:
val
=>
{
codeTimeText
:
(
val
)
=>
{
return
`
${
val
}
秒后重新获取`
},
remark
:
'
请输入备注
'
,
...
...
@@ -25,11 +25,16 @@ export default {
redeemType
:
'
兑换方式
'
,
activityTime
:
'
活动时间
'
,
textLength
:
'
最多输入100字
'
,
totalScore
:
num
=>
{
totalScore
:
(
num
)
=>
{
return
`已选
${
num
}
件,合计积分:`
},
totalScore1
:
'
积分
'
,
addAddress
:
'
新增收货地址
'
,
totalScoreError
:
'
积分不足
'
,
to
:
'
至
'
,
gift
:
'
礼品:
'
,
Num
:
'
数量:
'
,
total
:
'
合计积分:
'
,
exchangeType
:
'
兑换方式:
'
,
deliveryAddress
:
'
邮寄地址:
'
}
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