Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
E
ElectricitySheep
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
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
黄媛媛
ElectricitySheep
Commits
06e9893f
Commit
06e9893f
authored
Aug 18, 2020
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面修改
parent
06bd1df3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
558 additions
and
524 deletions
+558
-524
pintuanActive.vue
src/components/pintuan/pintuanActive.vue
+25
-22
regionChoice.vue
src/components/setup/view/regionChoice.vue
+533
-502
No files found.
src/components/pintuan/pintuanActive.vue
View file @
06e9893f
...
...
@@ -243,8 +243,8 @@
<div
flex=
"dir:left"
>
<span
class=
"box-grow-0"
style=
"color:#606266"
>
商品
</span>
<div
style=
"width: 100%;margin:0 10px"
>
<el-input
placeholder=
"请输入限购数量"
@
keyup
.
native=
"checkInteger(addMsg,'Confine_Count','-')"
v-model=
"addMsg.Confine_Count"
size=
"small"
:disabled=
"addMsg.Confine_Count <=-1"
>
<el-input
placeholder=
"请输入限购数量"
@
keyup
.
native=
"checkInteger(addMsg,'Confine_Count','-')"
v-model=
"addMsg.Confine_Count"
size=
"small"
:disabled=
"addMsg.Confine_Count <=-1"
>
<
template
slot=
"append"
>
件
</
template
>
</el-input>
</div>
...
...
@@ -255,7 +255,8 @@
<div
flex=
"dir:left"
style=
"margin-top: 10px;"
>
<span
class=
"box-grow-0"
style=
"color:#606266"
>
订单
</span>
<div
style=
"width: 100%;margin:0 10px"
>
<el-input
placeholder=
"请输入限购数量"
@
keyup
.
native=
"checkInteger(addMsg,'Confine_Order_Count','-')"
v-model=
"addMsg.Confine_Order_Count"
size=
"small"
<el-input
placeholder=
"请输入限购数量"
@
keyup
.
native=
"checkInteger(addMsg,'Confine_Order_Count','-')"
v-model=
"addMsg.Confine_Order_Count"
size=
"small"
:disabled=
"addMsg.Confine_Order_Count<=-1"
>
<
template
slot=
"append"
>
单
</
template
>
</el-input>
...
...
@@ -295,20 +296,20 @@
</el-switch>
</el-form-item>
<el-form-item
v-if=
"addMsg.Is_Area_Limit == 1"
label=
"允许购买区域"
>
<span
v-if=
"addMsg.Area
_limi
t.length == 0"
@
click=
"addArea"
class=
"blue point"
>
+添加地区
</span>
<div
v-if=
"addMsg.Area
_limi
t.length > 0"
style=
"border: 1px solid #EBEEF5;padding:20px"
<span
v-if=
"addMsg.Area
Lis
t.length == 0"
@
click=
"addArea"
class=
"blue point"
>
+添加地区
</span>
<div
v-if=
"addMsg.Area
Lis
t.length > 0"
style=
"border: 1px solid #EBEEF5;padding:20px"
flex=
"dir:left box:last"
>
<div>
<div
flex=
"dir:left"
style=
"flex-wrap: wrap; width: 90%;"
>
<span>
区域:
</span>
<el-tag
v-for=
"item in addMsg.Area
_limi
t"
:key=
"item.Id"
type=
"info"
style=
"margin:5px"
>
<el-tag
v-for=
"item in addMsg.Area
Lis
t"
:key=
"item.Id"
type=
"info"
style=
"margin:5px"
>
{{ item.AreaName }}
</el-tag>
</div>
</div>
<div>
<img
@
click=
"editQy"
style=
"cursor:pointer;"
src=
"../../assets/img/userman/edit.png"
alt=
""
/>
<img
@
click=
"(addMsg.Area
_limit = []), (AreaList = [])"
style=
"margin-left:15px;cursor:pointer;
"
src=
"../../assets/img/userman/del.png"
alt=
""
/>
<img
@
click=
"(addMsg.Area
List = []), (ChooseAreaList = [])
"
s
tyle=
"margin-left:15px;cursor:pointer;"
s
rc=
"../../assets/img/userman/del.png"
alt=
""
/>
</div>
</div>
</el-form-item>
...
...
@@ -491,7 +492,7 @@
</el-dialog>
<!--区域-->
<el-dialog
custom-class=
"regionDig"
title=
"区域"
:visible
.
sync=
"dialogFormVisible"
>
<regionChoice
@
event1=
"change($event)"
:List=
"AreaList"
ref=
"child"
></regionChoice>
<regionChoice
@
event1=
"change($event)"
:List=
"
Choose
AreaList"
ref=
"child"
></regionChoice>
<div
slot=
"footer"
class=
"dialog-footer"
>
<el-button
type=
"primary"
size=
"small"
@
click=
"Addto"
>
确 定
</el-button>
</div>
...
...
@@ -550,7 +551,7 @@
Pieces
:
0
,
//单品满件包邮
Forehead
:
0
,
//单品满额包邮
Is_Area_Limit
:
0
,
//区域购买
Area
_limi
t
:
[],
//购买区域
Area
Lis
t
:
[],
//购买区域
Give_integral
:
0
,
//积分赠送
Give_integral_type
:
1
,
//积分赠送=>1固定值 2百分比
Is_forehead_integral
:
0
,
//积分抵扣
...
...
@@ -583,7 +584,7 @@
formName
:
''
,
imgDialog
:
false
,
//区域
AreaList
:
[],
ChooseAreaList
:
[],
dialogFormVisible
:
false
,
rules
:
{
StartTime
:
[{
...
...
@@ -646,7 +647,10 @@
this
.
addMsg
.
Pieces
=
Mydata
.
Pieces
;
this
.
addMsg
.
Forehead
=
Mydata
.
Forehead
;
this
.
addMsg
.
Is_Area_Limit
=
Mydata
.
Is_Area_Limit
;
this
.
addMsg
.
Area_limit
=
Mydata
.
Area_limit
;
if
(
Mydata
.
AreaList
&&
Mydata
.
AreaList
)
{
this
.
addMsg
.
AreaList
=
Mydata
.
AreaList
;
this
.
ChooseAreaList
=
Mydata
.
AreaList
;
}
this
.
addMsg
.
Give_integral
=
Mydata
.
Give_integral
;
this
.
addMsg
.
Give_integral_type
=
Mydata
.
Give_integral_type
;
this
.
addMsg
.
Is_forehead_integral
=
Mydata
.
Is_forehead_integral
;
...
...
@@ -821,37 +825,36 @@
this
.
imgDialog
=
false
;
},
//添加区域
addArea
(){
addArea
()
{
this
.
dialogFormVisible
=
true
;
this
.
AreaList
=
[];
this
.
addMsg
.
Area
_limi
t
=
[];
this
.
Choose
AreaList
=
[];
this
.
addMsg
.
Area
Lis
t
=
[];
setTimeout
(()
=>
{
this
.
$refs
.
child
.
Receive
(
this
.
AreaList
);
this
.
$refs
.
child
.
Receive
(
this
.
Choose
AreaList
);
},
1000
);
},
//点击区域弹窗确定
Addto
()
{
this
.
addMsg
.
Area
_limi
t
=
[];
this
.
AreaList
.
forEach
(
item
=>
{
this
.
addMsg
.
Area
Lis
t
=
[];
this
.
Choose
AreaList
.
forEach
(
item
=>
{
let
obj
=
{
Id
:
item
.
RegionId
,
AreaId
:
item
.
RegionId
,
AreaName
:
item
.
RegionName
};
this
.
addMsg
.
Area
_limi
t
.
push
(
obj
);
this
.
addMsg
.
Area
Lis
t
.
push
(
obj
);
});
this
.
dialogFormVisible
=
false
;
},
change
(
data
)
{
this
.
AreaList
=
data
;
this
.
Choose
AreaList
=
data
;
},
editQy
()
{
this
.
dialogFormVisible
=
true
;
setTimeout
(()
=>
{
this
.
$refs
.
child
.
Receive
(
this
.
AreaList
);
this
.
$refs
.
child
.
Receive
(
this
.
Choose
AreaList
);
},
1000
);
}
}
};
...
...
src/components/setup/view/regionChoice.vue
View file @
06e9893f
This diff is collapsed.
Click to expand it.
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