Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
J
jiedao-app-operator-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-operator-master
Commits
8849fbe9
Commit
8849fbe9
authored
Sep 05, 2024
by
chenwei
2
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复问题
parent
ff4def43
Changes
5
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
367 additions
and
345 deletions
+367
-345
operatingGift.vue
src/views/ecw/giftManagement/components/operatingGift.vue
+15
-17
index.vue
src/views/ecw/giftManagement/index.vue
+133
-118
index.vue
...cw/memberManagement/addIntegrationRuleOperation/index.vue
+16
-12
index.vue
src/views/ecw/memberManagement/exchangeRecord/index.vue
+200
-195
chooseGift.vue
...agement/exchangeRecordOperation/components/chooseGift.vue
+3
-3
No files found.
src/views/ecw/giftManagement/components/operatingGift.vue
View file @
8849fbe9
...
@@ -79,11 +79,9 @@
...
@@ -79,11 +79,9 @@
:rules="rules.nodeIds.points"
:rules="rules.nodeIds.points"
>
>
<el-input
<el-input
type=
"number"
v-model.trim.number=
"item.points"
v-model.trim=
"item.points"
:placeholder=
"$t('请输入')"
:placeholder=
"$t('请输入')"
:disabled=
"isDisable"
:disabled=
"isDisable"
onkeyup=
"this.value=this.value.replace(/(^\s*)|(\s*$)/g,'')"
/>
</el-form-item
/>
</el-form-item
></el-col>
></el-col>
<el-col
:span=
"1"
>
<el-col
:span=
"1"
>
...
@@ -130,12 +128,10 @@
...
@@ -130,12 +128,10 @@
<el-form-item
:label=
"$t('允许兑换次数')"
prop=
"allowCount"
>
<el-form-item
:label=
"$t('允许兑换次数')"
prop=
"allowCount"
>
<el-input
<el-input
class=
"input-item-width"
class=
"input-item-width"
type=
"number"
v-model.trim.number=
"queryParams.allowCount"
v-model.trim=
"queryParams.allowCount"
:placeholder=
"$t('请输入')"
:placeholder=
"$t('请输入')"
clearable
clearable
:disabled=
"isDisable"
:disabled=
"isDisable"
onkeyup=
"this.value=this.value.replace(/(^\s*)|(\s*$)/g,'')"
/>
/>
</el-form-item>
</el-form-item>
<el-row
:gutter=
"10"
>
<el-row
:gutter=
"10"
>
...
@@ -351,6 +347,7 @@ export default {
...
@@ -351,6 +347,7 @@ export default {
message
:
this
.
$t
(
"
请输入兑换积分
"
),
message
:
this
.
$t
(
"
请输入兑换积分
"
),
trigger
:
"
blur
"
,
trigger
:
"
blur
"
,
},
},
{
type
:
"
number
"
,
message
:
"
输入数字
"
,
trigger
:
"
blur
"
},
],
],
},
},
...
@@ -374,6 +371,7 @@ export default {
...
@@ -374,6 +371,7 @@ export default {
message
:
this
.
$t
(
"
请输入允许兑换次数
"
),
message
:
this
.
$t
(
"
请输入允许兑换次数
"
),
trigger
:
"
blur
"
,
trigger
:
"
blur
"
,
},
},
{
type
:
"
number
"
,
message
:
"
输入数字
"
,
trigger
:
"
blur
"
},
],
],
remarkZh
:
[
remarkZh
:
[
{
{
...
@@ -459,7 +457,7 @@ export default {
...
@@ -459,7 +457,7 @@ export default {
};
};
</
script
>
</
script
>
<
style
>
<
style
>
.input-item-width
{
.input-item-width
{
width
:
194px
;
width
:
194px
;
}
}
</
style
>
</
style
>
src/views/ecw/giftManagement/index.vue
View file @
8849fbe9
This diff is collapsed.
Click to expand it.
src/views/ecw/memberManagement/addIntegrationRuleOperation/index.vue
View file @
8849fbe9
...
@@ -5,6 +5,7 @@
...
@@ -5,6 +5,7 @@
ref=
"queryForm"
ref=
"queryForm"
size=
"small"
size=
"small"
:rules=
"rules"
:rules=
"rules"
class=
"integral-rule-operate"
:disabled=
"showViewTime"
:disabled=
"showViewTime"
label-width=
"120px"
label-width=
"120px"
>
>
...
@@ -177,11 +178,7 @@
...
@@ -177,11 +178,7 @@
</el-option>
</el-option>
</el-select>
</el-select>
</el-form-item>
</el-form-item>
<el-form-item
<el-form-item
:label=
"$t('积分')"
v-if=
"queryParams.type == '1'"
required
>
:label=
"$t('积分')"
v-if=
"queryParams.type == '1'"
required
>
<el-row
<el-row
type=
"flex"
type=
"flex"
justify=
"start"
justify=
"start"
...
@@ -283,7 +280,7 @@
...
@@ -283,7 +280,7 @@
clearable
clearable
placement=
"bottom-start"
placement=
"bottom-start"
v-model=
"queryParams.dateRangeCreateTime"
v-model=
"queryParams.dateRangeCreateTime"
style=
"width:
24
0px"
style=
"width:
30
0px"
value-format=
"yyyy-MM-dd HH:mm:ss"
value-format=
"yyyy-MM-dd HH:mm:ss"
range-separator=
"-"
range-separator=
"-"
:start-placeholder=
"$t('开始日期')"
:start-placeholder=
"$t('开始日期')"
...
@@ -591,6 +588,8 @@ export default {
...
@@ -591,6 +588,8 @@ export default {
};
};
const
validatehigh
=
(
rule
,
value
,
callback
)
=>
{
const
validatehigh
=
(
rule
,
value
,
callback
)
=>
{
const
index
=
Number
(
rule
.
field
.
split
(
"
.
"
)[
2
]);
const
index
=
Number
(
rule
.
field
.
split
(
"
.
"
)[
2
]);
console
.
log
(
"
000000
"
,
index
);
console
.
log
(
"
0000001
"
,
this
.
queryParams
.
extraOrderV
);
if
(
index
==
"
0
"
)
{
if
(
index
==
"
0
"
)
{
if
(
if
(
this
.
queryParams
.
extraOrderV
.
orderVRule
[
index
].
low
&&
this
.
queryParams
.
extraOrderV
.
orderVRule
[
index
].
low
&&
...
@@ -608,7 +607,7 @@ export default {
...
@@ -608,7 +607,7 @@ export default {
}
else
{
}
else
{
callback
();
callback
();
}
}
}
else
if
(
index
>
"
0
"
)
{
}
else
if
(
index
>
0
)
{
if
(
if
(
this
.
queryParams
.
extraOrderV
.
orderVRule
[
index
].
low
&&
this
.
queryParams
.
extraOrderV
.
orderVRule
[
index
].
low
&&
this
.
queryParams
.
extraOrderV
.
orderVRule
[
index
].
low
>=
this
.
queryParams
.
extraOrderV
.
orderVRule
[
index
].
low
>=
...
@@ -616,6 +615,7 @@ export default {
...
@@ -616,6 +615,7 @@ export default {
)
{
)
{
callback
(
this
.
$t
(
"
本次最终积分应大于本次开始积分
"
));
callback
(
this
.
$t
(
"
本次最终积分应大于本次开始积分
"
));
}
else
if
(
}
else
if
(
this
.
queryParams
.
extraOrderV
.
orderVRule
[
index
+
1
]?.
low
&&
this
.
queryParams
.
extraOrderV
.
orderVRule
[
index
].
high
<=
this
.
queryParams
.
extraOrderV
.
orderVRule
[
index
].
high
<=
this
.
queryParams
.
extraOrderV
.
orderVRule
[
index
+
1
].
low
this
.
queryParams
.
extraOrderV
.
orderVRule
[
index
+
1
].
low
)
{
)
{
...
@@ -1057,6 +1057,7 @@ export default {
...
@@ -1057,6 +1057,7 @@ export default {
},
},
//保存
//保存
handleSaveIntegralRule
()
{
handleSaveIntegralRule
()
{
console
.
log
(
"
23333
"
);
this
.
$refs
[
"
queryForm
"
].
validate
((
valid
)
=>
{
this
.
$refs
[
"
queryForm
"
].
validate
((
valid
)
=>
{
if
(
valid
)
{
if
(
valid
)
{
let
params
=
deepClone
(
this
.
queryParams
);
let
params
=
deepClone
(
this
.
queryParams
);
...
@@ -1139,6 +1140,9 @@ export default {
...
@@ -1139,6 +1140,9 @@ export default {
};
};
</
script
>
</
script
>
<
style
lang=
"scss"
scoped
>
<
style
lang=
"scss"
scoped
>
::v-deep
.integral-rule-operate
.el-input
{
width
:
300px
;
}
.del-btn
{
.del-btn
{
color
:
red
;
color
:
red
;
padding-left
:
120px
;
padding-left
:
120px
;
...
...
src/views/ecw/memberManagement/exchangeRecord/index.vue
View file @
8849fbe9
This diff is collapsed.
Click to expand it.
src/views/ecw/memberManagement/exchangeRecordOperation/components/chooseGift.vue
View file @
8849fbe9
...
@@ -325,7 +325,7 @@ export default {
...
@@ -325,7 +325,7 @@ export default {
pointsRequireSymbol
:
null
,
pointsRequireSymbol
:
null
,
pickMethod
:
null
,
pickMethod
:
null
,
nodeId
:
null
,
nodeId
:
null
,
status
:
null
,
status
:
"
1
"
,
remark
:
null
,
remark
:
null
,
quantityRemainSymbol
:
null
,
quantityRemainSymbol
:
null
,
quantityRemain
:
null
,
quantityRemain
:
null
,
...
@@ -363,7 +363,7 @@ export default {
...
@@ -363,7 +363,7 @@ export default {
pointsRequireSymbol
:
null
,
pointsRequireSymbol
:
null
,
pickMethod
:
null
,
pickMethod
:
null
,
nodeId
:
null
,
nodeId
:
null
,
status
:
null
,
status
:
"
1
"
,
remark
:
null
,
remark
:
null
,
quantityRemainSymbol
:
null
,
quantityRemainSymbol
:
null
,
quantityRemain
:
null
,
quantityRemain
:
null
,
...
@@ -478,7 +478,7 @@ export default {
...
@@ -478,7 +478,7 @@ export default {
level
:
null
,
level
:
null
,
source
:
null
,
source
:
null
,
customerService
:
null
,
customerService
:
null
,
status
:
null
,
status
:
"
1
"
,
department
:
null
,
department
:
null
,
creditLevel
:
null
,
creditLevel
:
null
,
country
:
null
,
country
:
null
,
...
...
chenwei
@chenwei
mentioned in commit
9d1f4bd9
·
Sep 05, 2024
mentioned in commit
9d1f4bd9
mentioned in commit 9d1f4bd997e3d1d3c07aa21e0d1247e02bc420ef
Toggle commit list
chenwei
@chenwei
mentioned in merge request
!26 (merged)
·
Sep 05, 2024
mentioned in merge request
!26 (merged)
mentioned in merge request !26
Toggle commit list
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