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
a298fd6a
Commit
a298fd6a
authored
Aug 14, 2020
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面修改
parent
2ff203f2
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
108 additions
and
93 deletions
+108
-93
pintuanActive.vue
src/components/pintuan/pintuanActive.vue
+10
-5
distributePrice.vue
src/components/pintuan/pintuanPlugin/distributePrice.vue
+5
-5
memberPrice.vue
src/components/pintuan/pintuanPlugin/memberPrice.vue
+93
-83
No files found.
src/components/pintuan/pintuanActive.vue
View file @
a298fd6a
...
@@ -392,15 +392,17 @@
...
@@ -392,15 +392,17 @@
</el-card>
</el-card>
</el-tab-pane>
</el-tab-pane>
<el-tab-pane
label=
"阶梯团设置"
>
<el-tab-pane
label=
"阶梯团设置"
>
<groupStep
v-if=
"TempSpecList&&TempSpecList.length>0"
@
setNewVal=
"setNewVal"
:SpecList=
"TempSpecList"
<groupStep
v-if=
"TempSpecList&&TempSpecList.length>0"
:SpecList=
"TempSpecList"
:GroupPriceList=
"TempGroupPriceList"
:SpecPriceList=
"TempSpecPriceList"
></groupStep>
:SpecPriceList=
"TempSpecPriceList"
:GroupPriceList=
"TempGroupPriceList"
@
setNewVal=
"setNewVal"
>
</groupStep>
</el-tab-pane>
</el-tab-pane>
<el-tab-pane
label=
"分销价设置"
>
<el-tab-pane
label=
"分销价设置"
>
<distributePrice
v-if=
"TempSpecList&&TempSpecList.length>0"
:addMsg=
"addMsg"
:SpecList=
"TempSpecList"
<distributePrice
v-if=
"TempSpecList&&TempSpecList.length>0"
:addMsg=
"addMsg"
:SpecList=
"TempSpecList"
:
shareGroup_l
ist=
"TempGroupPriceList"
@
getDisCommission=
"getDisCommission"
></distributePrice>
:
SpecificationPriceL
ist=
"TempGroupPriceList"
@
getDisCommission=
"getDisCommission"
></distributePrice>
</el-tab-pane>
</el-tab-pane>
<el-tab-pane
label=
"会员价设置"
>
<el-tab-pane
label=
"会员价设置"
>
<memberPrice
:SpecificationPriceList=
"TempSpecPriceList"
:SpecificationList=
"TempSpecList"
></memberPrice>
<memberPrice
v-if=
"TempSpecList&&TempSpecList.length>0"
:addMsg=
"addMsg"
:SpecList=
"TempSpecList"
:SpecificationPriceList=
"TempGroupPriceList"
></memberPrice>
</el-tab-pane>
</el-tab-pane>
</el-tabs>
</el-tabs>
</el-row>
</el-row>
...
@@ -531,6 +533,8 @@
...
@@ -531,6 +533,8 @@
SeparateDistribution
:
2
,
//是否开启单独分销 1是 2否
SeparateDistribution
:
2
,
//是否开启单独分销 1是 2否
SeparateDistributionType
:
1
,
//单独分销类型 1普通设置 2详细设置
SeparateDistributionType
:
1
,
//单独分销类型 1普通设置 2详细设置
SeparateDistributionMoneyType
:
1
,
//分销佣金类型 2固定金额 1百分比
SeparateDistributionMoneyType
:
1
,
//分销佣金类型 2固定金额 1百分比
EnjoyMember
:
2
,
// 是否享受会员功能 1是 2否
SeparateSetMember
:
2
,
//是否单独设置会员价 1是 2否
},
},
IsShowSpec
:
false
,
//是否显示规格
IsShowSpec
:
false
,
//是否显示规格
TempSpecList
:
[],
//规格列表
TempSpecList
:
[],
//规格列表
...
@@ -567,7 +571,6 @@
...
@@ -567,7 +571,6 @@
trigger
:
"blur"
trigger
:
"blur"
}]
}]
},
},
};
};
},
},
created
()
{},
created
()
{},
...
@@ -646,6 +649,8 @@
...
@@ -646,6 +649,8 @@
if
(
this
.
addMsg
.
SeparateDistributionMoneyType
==
0
)
{
if
(
this
.
addMsg
.
SeparateDistributionMoneyType
==
0
)
{
this
.
addMsg
.
SeparateDistributionMoneyType
=
2
;
this
.
addMsg
.
SeparateDistributionMoneyType
=
2
;
}
}
this
.
addMsg
.
EnjoyMember
=
Mydata
.
EnjoyMember
;
this
.
addMsg
.
SeparateSetMember
=
Mydata
.
SeparateSetMember
;
this
.
IsShowSpec
=
true
;
this
.
IsShowSpec
=
true
;
}
else
{
}
else
{
this
.
Error
(
res
.
data
.
message
);
this
.
Error
(
res
.
data
.
message
);
...
...
src/components/pintuan/pintuanPlugin/distributePrice.vue
View file @
a298fd6a
...
@@ -153,7 +153,7 @@
...
@@ -153,7 +153,7 @@
</template>
</template>
<
script
>
<
script
>
export
default
{
export
default
{
props
:
[
"
shareGroup_l
ist"
,
"addMsg"
,
"SpecList"
],
props
:
[
"
SpecificationPriceL
ist"
,
"addMsg"
,
"SpecList"
],
data
()
{
data
()
{
return
{
return
{
fxVal
:
''
,
fxVal
:
''
,
...
@@ -175,7 +175,7 @@
...
@@ -175,7 +175,7 @@
};
};
},
},
watch
:
{
watch
:
{
'
shareGroup_l
ist'
:
{
'
SpecificationPriceL
ist'
:
{
handler
:
function
(
val
,
oldval
)
{
handler
:
function
(
val
,
oldval
)
{
if
(
val
!=
oldval
)
{
if
(
val
!=
oldval
)
{
this
.
checkedChange
()
this
.
checkedChange
()
...
@@ -190,7 +190,7 @@
...
@@ -190,7 +190,7 @@
},
},
},
},
created
()
{
created
()
{
console
.
log
(
"
shareGroup_list"
,
this
.
shareGroup_l
ist
);
console
.
log
(
"
SpecificationPriceList"
,
this
.
SpecificationPriceL
ist
);
},
},
methods
:
{
methods
:
{
//切换显示
//切换显示
...
@@ -199,7 +199,7 @@
...
@@ -199,7 +199,7 @@
this
.
DistributioncommissionList
=
[];
this
.
DistributioncommissionList
=
[];
//普通设置
//普通设置
if
(
this
.
addMsg
.
SeparateDistributionType
==
1
)
{
if
(
this
.
addMsg
.
SeparateDistributionType
==
1
)
{
this
.
shareGroup_l
ist
.
forEach
(
item
=>
{
this
.
SpecificationPriceL
ist
.
forEach
(
item
=>
{
var
obj
=
{
var
obj
=
{
People_Num
:
item
.
People_Num
,
People_Num
:
item
.
People_Num
,
DistributioncommissionList
:
JSON
.
parse
(
JSON
.
stringify
(
this
.
tempGeneralArray
)),
DistributioncommissionList
:
JSON
.
parse
(
JSON
.
stringify
(
this
.
tempGeneralArray
)),
...
@@ -209,7 +209,7 @@
...
@@ -209,7 +209,7 @@
}
}
//详细设置
//详细设置
else
if
(
this
.
addMsg
.
SeparateDistributionType
==
2
)
{
else
if
(
this
.
addMsg
.
SeparateDistributionType
==
2
)
{
this
.
shareGroup_l
ist
.
forEach
(
item
=>
{
this
.
SpecificationPriceL
ist
.
forEach
(
item
=>
{
var
obj
=
{
var
obj
=
{
People_Num
:
item
.
People_Num
,
People_Num
:
item
.
People_Num
,
DistributioncommissionList
:
[],
DistributioncommissionList
:
[],
...
...
src/components/pintuan/pintuanPlugin/memberPrice.vue
View file @
a298fd6a
...
@@ -2,128 +2,138 @@
...
@@ -2,128 +2,138 @@
<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=
"
0"
v-model=
"msg.EnjoyMember
"
>
<el-switch
:active-value=
"1"
:inactive-value=
"
2"
v-model=
"addMsg.EnjoyMember"
@
change=
"checkChange
"
>
</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=
"
0"
v-model=
"msg.SeparateSetMember
"
>
<el-switch
:active-value=
"1"
:inactive-value=
"
2"
v-model=
"addMsg.SeparateSetMember"
@
change=
"checkChange
"
>
</el-switch>
</el-switch>
</el-form-item>
</el-form-item>
<el-form-item
v-if=
"
msg.SeparateSetMember == 1 && huiy
List.length == 0"
label=
"会员价设置"
>
<el-form-item
v-if=
"
addMsg.SeparateSetMember == 1 && configMember
List.length == 0"
label=
"会员价设置"
>
<el-button
@
click=
"CommonJump('setMember')"
size=
"small"
type=
"danger"
>
如需设置请先添加会员
</el-button>
<el-button
@
click=
"CommonJump('setMember')"
size=
"small"
type=
"danger"
>
如需设置请先添加会员
</el-button>
</el-form-item>
</el-form-item>
<el-form-item
v-if=
"
<el-form-item
v-if=
"addMsg.SeparateSetMember== 1&&SpecificationPriceList.length>0"
label=
"会员价设置"
>
msg.SeparateSetMember == 1 &&
<template
v-for=
"(rootItem,rootIndex) in memberList"
>
SpecificationPriceList.length > 0
"
label=
"会员价设置"
>
<div
class=
"app-attr"
:key=
"rootIndex"
>
<div
class=
"app-attr"
>
<div
class=
"box"
>
<div
class=
"box"
>
<div
style=
"display:inline-block;"
>
<el-form-item
style=
"display:inline-block"
>
<el-tag
type=
"danger"
>
{{
rootItem
.
People_Num
}}
人团
</el-tag>
<el-input
style=
"width:500px;position:relative;top:5px"
size=
"small"
v-model=
"memberinput"
</div>
placeholder=
"请输入内容"
>
<el-form-item
style=
"display:inline-block"
>
<el-select
slot=
"prepend"
style=
"width:130px"
v-model=
"memberVal"
size=
"small"
>
<el-input
style=
"width:500px;position:relative;top:5px"
size=
"small"
v-model=
"setMsg.memberinput"
<el-option
v-for=
"(item, index) in huiyList"
:label=
"item.Name"
:value=
"item.Grade"
:key=
"index"
>
placeholder=
"请输入内容"
>
</el-option>
<el-select
slot=
"prepend"
style=
"width:130px"
v-model=
"setMsg.memberVal"
size=
"small"
>
</el-select>
<el-option
v-for=
"(item, index) in configMemberList"
:label=
"item.Name"
:value=
"item.Grade"
<el-button
@
click=
"HySet"
slot=
"append"
>
确定
</el-button>
:key=
"index"
>
</el-input>
</el-option>
</el-form-item>
</el-select>
</div>
<el-button
@
click=
"HySet"
slot=
"append"
>
确定
</el-button>
<el-table
ref=
"table"
border
style=
"width: 100%"
</el-input>
@
selection-change=
"TbaleSelectionChange"
>
</el-form-item>
<el-table-column
type=
"selection"
width=
"55"
>
</div>
</el-table-column>
<el-table
ref=
"table"
border
style=
"width: 100%"
:data=
"rootItem.GradeMemberList"
<template
v-for=
"(item, index) in SpecificationList"
>
@
selection-change=
"TbaleSelectionChange"
>
<el-table-column
:key=
"index+'16'"
:label=
"item.Name"
width=
"100"
>
<el-table-column
type=
"selection"
width=
"55"
>
<template
slot-scope=
"scope"
>
<span
v-if=
"index == index2"
v-for=
"(item2, index2) in scope.row.AttrList"
:key=
"index2+'17'"
>
{{
scope
.
row
.
AttrList
[
index2
].
SVName
}}
</span>
</
template
>
</el-table-column>
</template>
<
template
v-for=
"(item, index) in huiyList"
>
<el-table-column
:key=
"index+'18'"
:label=
"item.Name"
>
<template
slot-scope=
"scope"
>
<el-input
v-model=
"scope.row.GradePriceList[index].MemberPrice"
size=
"small"
></el-input>
</
template
>
</el-table-column>
</el-table-column>
</template>
<template
v-for=
"(item, index) in SpecList"
>
</el-table>
<el-table-column
:key=
"index+'16'"
:label=
"item.Name"
width=
"100"
>
</div>
<template
slot-scope=
"scope"
>
<span
v-if=
"index == index2"
v-for=
"(item2, index2) in scope.row.AttrList"
:key=
"index2+'17'"
>
{{
scope
.
row
.
AttrList
[
index2
].
SVName
}}
</span>
</
template
>
</el-table-column>
</template>
<
template
v-for=
"(item, index) in configMemberList"
>
<el-table-column
:key=
"index+'18'"
:label=
"item.Name"
>
<template
slot-scope=
"scope"
>
<el-input
v-model=
"scope.row.GradeMemberPriceList[index].MemberPrice"
size=
"small"
></el-input>
</
template
>
</el-table-column>
</template>
</el-table>
</div>
</template>
</el-form-item>
</el-form-item>
</el-form>
</el-form>
</div>
</div>
</template>
</template>
<
script
>
<
script
>
export
default
{
export
default
{
props
:
[
'SpecificationPriceList'
,
'Spec
ificationList'
],
props
:
[
'SpecificationPriceList'
,
'Spec
List'
,
"addMsg"
],
data
()
{
data
()
{
return
{
return
{
huiyList
:
[],
//会员数组
//会员配置数组
memberinput
:
""
,
//会员价设置输入
configMemberList
:
[],
memberVal
:
''
,
//会员类型下拉
//批量设置
setMsg
:
{
memberList2
:
[],
//列表数据
memberinput
:
""
,
//会员价设置输入
memberVal
:
''
,
//会员类型下拉
msg
:
{
},
EnjoyMember
:
1
,
//是否享受会员功能
memberList
:
[],
//列表数据
SeparateSetMember
:
0
,
//是否开启会员价
}
};
};
},
},
created
()
{
created
()
{
},
},
methods
:
{
methods
:
{
gethuiyList
()
{
//数据改变
let
msg
=
{
checkChange
()
{
this
.
memberList
=
[];
if
(
this
.
addMsg
.
SeparateSetMember
==
1
)
{
this
.
SpecificationPriceList
.
forEach
(
rootItem
=>
{
var
obj
=
{
People_Num
:
rootItem
.
People_Num
,
GradeMemberList
:
[],
}
rootItem
.
StepPriceList
.
forEach
(
subItem
=>
{
var
tempObj
=
JSON
.
parse
(
JSON
.
stringify
(
subItem
));
var
memObj
=
{
AttrList
:
tempObj
.
AttrList
,
Id
:
0
,
Name
:
0
,
SpecificationSort
:
tempObj
.
SpecificationSort
,
GradeMemberPriceList
:
[],
};
this
.
configMemberList
.
forEach
(
childItem
=>
{
memObj
.
GradeMemberPriceList
.
push
({
MemberGrade
:
childItem
.
Id
,
MemberPrice
:
0
});
});
obj
.
GradeMemberList
.
push
(
memObj
);
});
this
.
memberList
.
push
(
obj
);
});
}
},
//获取系统配置的会员列表
getConfigMemberList
()
{
let
qMsg
=
{
Grade
:
0
,
Grade
:
0
,
Name
:
""
,
Name
:
""
,
Enabled
:
1
Enabled
:
1
};
};
this
.
apipost
(
"/api/user/GetMemberGradeList"
,
msg
,
res
=>
{
this
.
apipost
(
"/api/user/GetMemberGradeList"
,
qMsg
,
res
=>
{
this
.
loading
=
false
;
if
(
res
.
data
.
resultCode
==
1
)
{
if
(
res
.
data
.
resultCode
==
1
)
{
let
pageData
=
res
.
data
.
data
;
this
.
configMemberList
=
res
.
data
.
data
;
this
.
huiyList
=
pageData
;
// this.huiyList.forEach(item => {
// let obj = {
// Name: item.Name,
// MemberGrade: item.Grade,
// MemberPrice: 0
// };
// this.memberList1[0].GradePriceList.push(obj);
// });
}
}
});
});
},
},
HySet
()
{
HySet
()
{
// this.memberList2.forEach(item => {
// this.memberCheck.forEach(check => {
// if (item.Id == check.Id) {
// item.GradePriceList.forEach(list1 => {
// if (list1.MemberGrade == this.memberVal) {
// list1.MemberPrice = this.memberinput;
// }
// });
// }
// });
// });
},
},
TbaleSelectionChange
(){
TbaleSelectionChange
()
{
}
}
},
},
mounted
()
{
mounted
()
{
this
.
get
huiy
List
();
this
.
get
ConfigMember
List
();
},
},
computed
:
{
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