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
e74d36e9
Commit
e74d36e9
authored
Aug 14, 2020
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面修改
parent
a298fd6a
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
30 additions
and
30 deletions
+30
-30
pintuanActive.vue
src/components/pintuan/pintuanActive.vue
+7
-2
distributePrice.vue
src/components/pintuan/pintuanPlugin/distributePrice.vue
+5
-19
memberPrice.vue
src/components/pintuan/pintuanPlugin/memberPrice.vue
+18
-9
No files found.
src/components/pintuan/pintuanActive.vue
View file @
e74d36e9
...
@@ -402,7 +402,7 @@
...
@@ -402,7 +402,7 @@
</el-tab-pane>
</el-tab-pane>
<el-tab-pane
label=
"会员价设置"
>
<el-tab-pane
label=
"会员价设置"
>
<memberPrice
v-if=
"TempSpecList&&TempSpecList.length>0"
:addMsg=
"addMsg"
:SpecList=
"TempSpecList"
<memberPrice
v-if=
"TempSpecList&&TempSpecList.length>0"
:addMsg=
"addMsg"
:SpecList=
"TempSpecList"
:SpecificationPriceList=
"TempGroupPriceList"
></memberPrice>
:SpecificationPriceList=
"TempGroupPriceList"
@
getMemberList=
"getMemberList"
></memberPrice>
</el-tab-pane>
</el-tab-pane>
</el-tabs>
</el-tabs>
</el-row>
</el-row>
...
@@ -807,6 +807,7 @@
...
@@ -807,6 +807,7 @@
getSpecPriceList
(
val
)
{
getSpecPriceList
(
val
)
{
this
.
addMsg
.
SpecificationPriceList
=
val
;
this
.
addMsg
.
SpecificationPriceList
=
val
;
},
},
//获取分销金额
getDisCommission
(
disCommissionArray
)
{
getDisCommission
(
disCommissionArray
)
{
if
(
this
.
addMsg
.
GroupList
&&
this
.
addMsg
.
GroupList
.
length
>
0
)
{
if
(
this
.
addMsg
.
GroupList
&&
this
.
addMsg
.
GroupList
.
length
>
0
)
{
this
.
addMsg
.
GroupList
.
forEach
(
item
=>
{
this
.
addMsg
.
GroupList
.
forEach
(
item
=>
{
...
@@ -819,7 +820,11 @@
...
@@ -819,7 +820,11 @@
}
}
})
})
}
}
console
.
log
(
" this.addMsg.GroupList"
,
this
.
addMsg
.
GroupList
);
console
.
log
(
"this.addMsg.GroupList"
,
this
.
addMsg
.
GroupList
);
},
//获取会员价列表
getMemberList
(
memberList
)
{
console
.
log
(
"this.addMsg.member"
,
memberList
);
}
}
}
}
};
};
...
...
src/components/pintuan/pintuanPlugin/distributePrice.vue
View file @
e74d36e9
...
@@ -90,11 +90,11 @@
...
@@ -90,11 +90,11 @@
<!--详细设置-->
<!--详细设置-->
<el-form-item
v-if=
"addMsg.SeparateDistributionType == 2"
>
<el-form-item
v-if=
"addMsg.SeparateDistributionType == 2"
>
<div
class=
"pintuan-share"
>
<div
class=
"pintuan-share"
>
<el-card
v-for=
"(
item,index) in DistributioncommissionList"
:key=
"i
ndex"
style=
"margin-bottom:20px;"
>
<el-card
v-for=
"(
rootItem,rootIndex) in DistributioncommissionList"
:key=
"rootI
ndex"
style=
"margin-bottom:20px;"
>
<div
slot=
"header"
class=
"clearfix"
>
<div
slot=
"header"
class=
"clearfix"
>
<div
class=
"box"
>
<div
class=
"box"
>
<div
style=
"display:inline-block;"
>
<div
style=
"display:inline-block;"
>
<el-tag
type=
"danger"
>
{{
i
tem.People_Num}}人团
</el-tag>
<el-tag
type=
"danger"
>
{{
rootI
tem.People_Num}}人团
</el-tag>
</div>
</div>
<label
style=
"margin-bottom:0;padding:18px 10px;"
>
批量设置
</label>
<label
style=
"margin-bottom:0;padding:18px 10px;"
>
批量设置
</label>
<el-select
placeholder=
"请选择层级"
v-model=
"fxVal"
style=
"width:130px;"
size=
"small"
>
<el-select
placeholder=
"请选择层级"
v-model=
"fxVal"
style=
"width:130px;"
size=
"small"
>
...
@@ -110,7 +110,7 @@
...
@@ -110,7 +110,7 @@
</el-input>
</el-input>
<el-button
size=
"small"
type=
"primary"
>
设置
</el-button>
<el-button
size=
"small"
type=
"primary"
>
设置
</el-button>
</div>
</div>
<el-table
ref=
"multipleTable"
:data=
"
i
tem.DistributioncommissionList"
tooltip-effect=
"dark"
<el-table
ref=
"multipleTable"
:data=
"
rootI
tem.DistributioncommissionList"
tooltip-effect=
"dark"
style=
"width: 100%;border:1px solid #E8EAEE"
>
style=
"width: 100%;border:1px solid #E8EAEE"
>
<el-table-column
type=
"selection"
width=
"55"
>
<el-table-column
type=
"selection"
width=
"55"
>
</el-table-column>
</el-table-column>
...
@@ -125,7 +125,7 @@
...
@@ -125,7 +125,7 @@
</el-table-column>
</el-table-column>
</template>
</template>
<
template
v-for=
"(item, index3) in DropdownList"
>
<
template
v-for=
"(item, index3) in DropdownList"
>
<el-table-column
:key=
"index3"
:label=
"item.Name"
>
<el-table-column
:key=
"index3
+'1000'
"
:label=
"item.Name"
>
<el-table-column
width=
"100"
v-if=
"butorTier > 0"
label=
"一级分销"
>
<el-table-column
width=
"100"
v-if=
"butorTier > 0"
label=
"一级分销"
>
<template
slot-scope=
"scope"
>
<template
slot-scope=
"scope"
>
<el-input
v-model=
"scope.row.GradeCommissionList[index3].OneCommission"
size=
"small"
></el-input>
<el-input
v-model=
"scope.row.GradeCommissionList[index3].OneCommission"
size=
"small"
></el-input>
...
@@ -165,11 +165,6 @@
...
@@ -165,11 +165,6 @@
//分销等级列表
//分销等级列表
DropdownList
:
[],
DropdownList
:
[],
DistributioncommissionList
:
[],
DistributioncommissionList
:
[],
tableData
:
[{
leval
:
'默认等级'
,
yiji
:
0
,
erji
:
3
}],
//普通设置数组
//普通设置数组
tempGeneralArray
:
[],
tempGeneralArray
:
[],
};
};
...
@@ -189,13 +184,9 @@
...
@@ -189,13 +184,9 @@
deep
:
true
deep
:
true
},
},
},
},
created
()
{
console
.
log
(
"SpecificationPriceList"
,
this
.
SpecificationPriceList
);
},
methods
:
{
methods
:
{
//切换显示
//切换显示
checkedChange
()
{
checkedChange
()
{
console
.
log
(
"tempGeneralArray,"
,
this
.
tempGeneralArray
)
this
.
DistributioncommissionList
=
[];
this
.
DistributioncommissionList
=
[];
//普通设置
//普通设置
if
(
this
.
addMsg
.
SeparateDistributionType
==
1
)
{
if
(
this
.
addMsg
.
SeparateDistributionType
==
1
)
{
...
@@ -220,7 +211,6 @@
...
@@ -220,7 +211,6 @@
AttrList
:
tempObj
.
AttrList
,
AttrList
:
tempObj
.
AttrList
,
Id
:
0
,
Id
:
0
,
Name
:
0
,
Name
:
0
,
SpecificationSort
:
tempObj
.
SpecificationSort
,
SpecificationSort
:
tempObj
.
SpecificationSort
,
GradeCommissionList
:
[],
GradeCommissionList
:
[],
};
};
...
@@ -237,7 +227,6 @@
...
@@ -237,7 +227,6 @@
this
.
DistributioncommissionList
.
push
(
obj
);
this
.
DistributioncommissionList
.
push
(
obj
);
})
})
}
}
console
.
log
(
"this.DistributioncommissionList"
,
this
.
DistributioncommissionList
);
},
},
handleSelectionChange
()
{
handleSelectionChange
()
{
...
@@ -292,10 +281,7 @@
...
@@ -292,10 +281,7 @@
mounted
()
{
mounted
()
{
this
.
getDistributor
();
this
.
getDistributor
();
this
.
GetDropdownList
();
this
.
GetDropdownList
();
},
}
computed
:
{
},
};
};
</
script
>
</
script
>
src/components/pintuan/pintuanPlugin/memberPrice.vue
View file @
e74d36e9
...
@@ -2,11 +2,11 @@
...
@@ -2,11 +2,11 @@
<div>
<div>
<el-form
label-width=
"180px"
>
<el-form
label-width=
"180px"
>
<el-form-item
label=
"是否享受会员功能"
size=
"small"
>
<el-form-item
label=
"是否享受会员功能"
size=
"small"
>
<el-switch
:active-value=
"1"
:inactive-value=
"2"
v-model=
"addMsg.EnjoyMember"
@
change=
"
check
Change"
>
<el-switch
:active-value=
"1"
:inactive-value=
"2"
v-model=
"addMsg.EnjoyMember"
@
change=
"
member
Change"
>
</el-switch>
</el-switch>
</el-form-item>
</el-form-item>
<el-form-item
label=
"是否单独设置会员价"
size=
"small"
>
<el-form-item
label=
"是否单独设置会员价"
size=
"small"
>
<el-switch
:active-value=
"1"
:inactive-value=
"2"
v-model=
"addMsg.SeparateSetMember"
@
change=
"
check
Change"
>
<el-switch
:active-value=
"1"
:inactive-value=
"2"
v-model=
"addMsg.SeparateSetMember"
@
change=
"
member
Change"
>
</el-switch>
</el-switch>
</el-form-item>
</el-form-item>
<el-form-item
v-if=
"addMsg.SeparateSetMember == 1 && configMemberList.length == 0"
label=
"会员价设置"
>
<el-form-item
v-if=
"addMsg.SeparateSetMember == 1 && configMemberList.length == 0"
label=
"会员价设置"
>
...
@@ -75,12 +75,24 @@
...
@@ -75,12 +75,24 @@
memberList
:
[],
//列表数据
memberList
:
[],
//列表数据
};
};
},
},
created
()
{
watch
:
{
'SpecificationPriceList'
:
{
handler
:
function
(
val
,
oldval
)
{
if
(
val
!=
oldval
)
{
this
.
memberChange
()
}
}
},
"memberList"
:
{
handler
:
function
(
val
,
oldval
)
{
this
.
$emit
(
'getMemberList'
,
this
.
memberList
);
},
deep
:
true
},
},
},
methods
:
{
methods
:
{
//数据改变
//数据改变
check
Change
()
{
member
Change
()
{
this
.
memberList
=
[];
this
.
memberList
=
[];
if
(
this
.
addMsg
.
SeparateSetMember
==
1
)
{
if
(
this
.
addMsg
.
SeparateSetMember
==
1
)
{
this
.
SpecificationPriceList
.
forEach
(
rootItem
=>
{
this
.
SpecificationPriceList
.
forEach
(
rootItem
=>
{
...
@@ -131,9 +143,6 @@
...
@@ -131,9 +143,6 @@
},
},
mounted
()
{
mounted
()
{
this
.
getConfigMemberList
();
this
.
getConfigMemberList
();
},
}
computed
:
{
},
};
};
</
script
>
</
script
>
\ No newline at end of file
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