Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
phsl
/
admin
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
8a225e66
authored
Sep 15, 2024
by
YunaiV
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
【功能修复】商城:满减送的条件类型的满足价格不对的问题
parent
48e78c38
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
1 deletions
+18
-1
src/views/mall/promotion/rewardActivity/RewardForm.vue
+6
-0
src/views/mall/promotion/rewardActivity/components/RewardRule.vue
+12
-1
No files found.
src/views/mall/promotion/rewardActivity/RewardForm.vue
View file @
8a225e66
...
...
@@ -119,6 +119,9 @@ const open = async (type: string, id?: number) => {
// 规则分转元
data
.
rules
?.
forEach
((
item
:
any
)
=>
{
item
.
discountPrice
=
fenToYuan
(
item
.
discountPrice
||
0
)
if
(
data
.
conditionType
===
PromotionConditionTypeEnum
.
PRICE
.
type
)
{
item
.
limit
=
fenToYuan
(
item
.
limit
||
0
)
}
})
formData
.
value
=
data
// 获得商品范围
...
...
@@ -151,6 +154,9 @@ const submitForm = async () => {
// 规则元转分
data
.
rules
.
forEach
((
item
)
=>
{
item
.
discountPrice
=
yuanToFen
(
item
.
discountPrice
||
0
)
if
(
data
.
conditionType
===
PromotionConditionTypeEnum
.
PRICE
.
type
)
{
item
.
limit
=
yuanToFen
(
item
.
limit
||
0
)
}
})
// 设置商品范围
setProductScopeValues
(
data
)
...
...
src/views/mall/promotion/rewardActivity/components/RewardRule.vue
View file @
8a225e66
...
...
@@ -10,14 +10,25 @@
<el-form
ref=
"formRef"
:model=
"rule"
>
<el-form-item
label=
"优惠门槛:"
label-width=
"100px"
prop=
"limit"
>
满
<el-input-number
v-if=
"PromotionConditionTypeEnum.PRICE.type === formData.conditionType"
v-model=
"rule.limit"
:min=
"0"
:precision=
"2"
:step=
"0.1"
class=
"w-150px! p-x-20px!"
placeholder=
""
type=
"number"
controls-position=
"right"
/>
<el-input
v-else
v-model=
"rule.limit"
:min=
"0"
class=
"w-150px! p-x-20px!"
placeholder=
""
type=
"number"
/>
<!-- TODO @puhui999:走字典数据? -->
{{
PromotionConditionTypeEnum
.
PRICE
.
type
===
formData
.
conditionType
?
'元'
:
'件'
}}
</el-form-item>
<el-form-item
label=
"优惠内容:"
label-width=
"100px"
>
...
...
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