Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
cloud-platform-ui
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
youjj
cloud-platform-ui
Commits
a04b5e83
Commit
a04b5e83
authored
Jul 18, 2019
by
hanfeng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
增加会员列表
parent
ebfc0d08
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
288 additions
and
10 deletions
+288
-10
index.js
src/api/admin/UserMember/index.js
+1
-0
index.js
src/api/admin/member/index.js
+22
-0
index.vue
src/views/userManagement/memberManagement/index.vue
+255
-0
index.vue
src/views/userManagement/userList/index.vue
+10
-10
No files found.
src/api/admin/UserMember/index.js
View file @
a04b5e83
...
@@ -15,3 +15,4 @@ export function saveNewMemberObject(obj) {
...
@@ -15,3 +15,4 @@ export function saveNewMemberObject(obj) {
data
:
obj
data
:
obj
});
});
}
}
src/api/admin/member/index.js
0 → 100644
View file @
a04b5e83
import
fetch
from
'utils/fetch'
;
export
function
getMembers
()
{
return
fetch
({
url
:
'api/admin/member/Manage/getMembers'
,
method
:
'get'
});
}
export
function
delMembershipGrade
(
id
)
{
return
fetch
({
url
:
'api/admin/member/Manage/delMembershipGrade'
+
id
,
method
:
'delete'
});
}
export
function
addMembershipGrade
(
obj
)
{
return
fetch
({
url
:
'api/admin/member'
,
method
:
'post'
,
data
:
obj
});
}
src/views/userManagement/memberManagement/index.vue
View file @
a04b5e83
<
template
>
<div
class=
"app-container calendar-list-container"
>
<div>
<el-button
class=
"filter-item"
style=
"margin-left: 10px;"
@
click=
"newMembershipGrade"
type=
"primary"
icon=
"edit"
>
添加会员等级
</el-button>
</div>
<el-table
:key=
'tableKey'
:data=
"list"
v-loading
.
body=
"listLoading"
border
fit
highlight-current-row
style=
"width: 100%"
>
<el-table-column
width=
"205"
align=
"center"
label=
"等级序号"
>
<template
scope=
"scope"
>
<span>
{{
scope
.
row
.
level
}}
</span>
</
template
>
</el-table-column>
<el-table-column
width=
"205"
align=
"center"
label=
"名称"
>
<
template
scope=
"scope"
>
<span>
{{
scope
.
row
.
name
}}
</span>
</
template
>
</el-table-column>
<el-table-column
width=
"205"
align=
"center"
label=
"图标"
>
<
template
scope=
"scope"
>
<span>
<img
class=
"image"
:src=
"scope.row.icon"
/></span>
</
template
>
</el-table-column>
<el-table-column
width=
"205"
align=
"center"
label=
"折扣"
>
<
template
scope=
"scope"
>
<span>
{{
scope
.
row
.
discount
}}
</span>
</
template
>
</el-table-column>
<el-table-column
width=
"205"
align=
"center"
label=
"免费天数"
>
<
template
scope=
"scope"
>
<span>
{{
scope
.
row
.
number
}}
</span>
</
template
>
</el-table-column>
<el-table-column
width=
"205"
align=
"center"
label=
"价格"
>
<
template
scope=
"scope"
>
<span>
{{
scope
.
row
.
price
}}
</span>
</
template
>
</el-table-column>
<el-table-column
width=
"205"
align=
"center"
label=
"有效期"
>
<
template
scope=
"scope"
>
<span>
{{
scope
.
row
.
endDate
}}
</span>
</
template
>
</el-table-column>
<el-table-column
align=
"center"
label=
"操作"
width=
"212"
>
<
template
scope=
"scope"
>
<el-button
size=
"small"
type=
"danger"
@
click=
"membershipGrade(scope.row)"
>
删除
</el-button>
</
template
>
</el-table-column>
</el-table>
<div>
<el-dialog
title=
"增加会员等级"
:visible
.
sync=
"addMembershipGrade"
class=
"member"
>
<el-form
:model=
"add"
ref=
"userMembership"
label-width=
"100px"
>
<el-row>
<el-col
:span=
"16"
>
<el-form-item
label=
"会员等级名称"
prop=
"buyCount"
>
<el-input
type=
"text"
v-model=
"add.name"
placeholder=
"请填写会员等级名称"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col
:span=
"24"
>
<el-form-item
label=
"有效期"
prop=
"endDate"
>
<el-select
class=
"filter-item"
v-model=
"add.endDate"
placeholder=
"请选择有效期"
>
<el-option
v-for=
"(val, key, index) in endDatelist "
:key=
"val.id"
:label=
"val.name"
:value=
"val.id"
></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col
:span=
"16"
>
<el-form-item
label=
"折扣"
prop=
"buyCount"
>
<el-input
type=
"text"
v-model=
"add.discount"
placeholder=
"请填写折扣"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col
:span=
"16"
>
<el-form-item
label=
"免费天数"
prop=
"totalNumber"
>
<el-input
type=
"text"
v-model=
"add.number"
placeholder=
"请填免费天数"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col
:span=
"16"
>
<el-form-item
label=
"价格"
prop=
"rentFreeDays"
placeholder=
"请填价格"
>
<el-input
type=
"text"
v-model=
"add.price"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col
:span=
"16"
>
<el-form-item
label=
"价格"
prop=
"rentFreeDays"
placeholder=
"请填价格"
>
<el-input
type=
"text"
v-model=
"add.price"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-form-item
label=
"图标"
:style=
"{display:'block'}"
>
<el-upload
class=
"upload-demo"
:headers=
"getHeaderWithToken"
:action=
"BASE_API+'/api/universal/file/app/unauth/admin/upload'"
:show-file-list=
"false"
:on-success=
"handleAvatarSuccess"
list-type=
"picture"
>
<img
v-if=
"$utils.isString(add.icon) && !$utils.isEmpty(add.icon)"
:src=
"add.icon"
style=
"width:300px;max-height:300px;"
>
<i
v-else
class=
"el-icon-plus avatar-uploader-icon"
style=
"lineHeight:100px;width:300px;height: 100px;border: 1px dashed #ccc;"
></i>
</el-upload>
</el-form-item>
</el-row>
</el-form>
<div
slot=
"footer"
class=
"dialog-footer"
>
<el-button
type=
"primary"
@
click=
"cancelSetMemberArea('userMembership')"
>
取消
</el-button>
<el-button
type=
"primary"
@
click=
"saveMember('userMembership')"
>
确 定
</el-button>
</div>
</el-dialog>
</div>
</div>
</template>
<
script
>
import
{
getMembers
,
delMembershipGrade
,
addMembershipGrade
}
from
'src/api/admin/member/index'
import
{
mapGetters
}
from
'vuex'
;
import
{
getToken
}
from
'src/utils/auth'
;
export
default
{
name
:
'membershipGrade'
,
data
()
{
return
{
list
:
[],
listLoading
:
true
,
tableKey
:
0
,
addMembershipGrade
:
false
,
BASE_API
:
process
.
env
.
BASE_API
,
add
:
{
level
:
undefined
,
name
:
undefined
,
discount
:
undefined
,
number
:
undefined
,
price
:
undefined
,
endDate
:
undefined
,
icon
:
undefined
},
endDatelist
:[
// {id:-1,name:'永久'},
{
id
:
0
,
name
:
'半年'
},
{
id
:
1
,
name
:
'一年'
},
{
id
:
2
,
name
:
'二年'
},
{
id
:
3
,
name
:
'三年'
},
{
id
:
4
,
name
:
'四年'
},
{
id
:
5
,
name
:
'五年'
},
]
}
},
created
()
{
this
.
getList
();
}
,
computed
:
{
...
mapGetters
([
'elements'
]),
/**
* 获取token
*/
getHeaderWithToken
()
{
return
{
Authorization
:
getToken
()};
},
}
,
methods
:
{
getList
()
{
getMembers
().
then
(
res
=>
{
res
.
data
.
endDate
=
(
res
.
data
.
endDate
==
'-1'
)
?
'永久'
:
res
.
data
.
endDate
this
.
list
=
res
.
data
this
.
listLoading
=
false
;
}
)
},
/**
* 删除会员等级
* */
delete
(
row
)
{
delMembershipGrade
(
row
.
id
).
then
(
res
=>
{
if
(
res
.
rel
)
{
this
.
$notify
.
success
({
title
:
'成功'
,
message
:
`success`
})
}
else
{
this
.
$notify
.
warning
({
title
:
'失败'
,
message
:
`failed`
})
}
this
.
getList
()
})
},
newMembershipGrade
(){
this
.
addMembershipGrade
=
true
},
/**
* 新建会员等级
* **/
save
(){
addMembershipGrade
(
this
.
add
).
then
(
res
=>
{
if
(
res
.
rel
)
{
this
.
$notify
.
success
({
title
:
'成功'
,
message
:
`success`
})
}
else
{
this
.
$notify
.
warning
({
title
:
'失败'
,
message
:
`failed`
})
}
this
.
getList
()
}
)
},
/**
* 封面图上传
* **/
handleAvatarSuccess
(
res
,
file
){
this
.
add
.
icon
=
res
.
data
;
},
}
}
</
script
>
<
style
>
textarea
{
display
:
none
;
}
.image
{
width
:
50px
;
height
:
50px
;
}
</
style
>
src/views/userManagement/userList/index.vue
View file @
a04b5e83
...
@@ -64,7 +64,7 @@
...
@@ -64,7 +64,7 @@
<span>
{{
scope
.
row
.
userId
}}
</span>
<span>
{{
scope
.
row
.
userId
}}
</span>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
<el-table-column
width=
"
20
0"
align=
"center"
label=
"手机号"
>
<el-table-column
width=
"
14
0"
align=
"center"
label=
"手机号"
>
<
template
scope=
"scope"
>
<
template
scope=
"scope"
>
<span>
{{
scope
.
row
.
username
}}
</span>
<span>
{{
scope
.
row
.
username
}}
</span>
</
template
>
</
template
>
...
@@ -79,12 +79,12 @@
...
@@ -79,12 +79,12 @@
<span>
{{
scope
.
row
.
source
}}
</span>
<span>
{{
scope
.
row
.
source
}}
</span>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
<el-table-column
width=
"1
0
0"
align=
"center"
label=
"真实姓名"
>
<el-table-column
width=
"1
1
0"
align=
"center"
label=
"真实姓名"
>
<
template
scope=
"scope"
>
<
template
scope=
"scope"
>
<span>
{{
scope
.
row
.
realName
}}
</span>
<span>
{{
scope
.
row
.
realName
}}
</span>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
<el-table-column
width=
"1
8
0"
align=
"center"
label=
"会员类型"
>
<el-table-column
width=
"1
1
0"
align=
"center"
label=
"会员类型"
>
<
template
scope=
"scope"
>
<
template
scope=
"scope"
>
<span>
{{
scope
.
row
.
memberName
}}
</span>
<span>
{{
scope
.
row
.
memberName
}}
</span>
</
template
>
</
template
>
...
@@ -94,12 +94,12 @@
...
@@ -94,12 +94,12 @@
<span>
{{
scope
.
row
.
timeOfMembership
}}
</span>
<span>
{{
scope
.
row
.
timeOfMembership
}}
</span>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
<el-table-column
width=
"
20
0"
align=
"center"
label=
"免费总天数"
>
<el-table-column
width=
"
11
0"
align=
"center"
label=
"免费总天数"
>
<
template
scope=
"scope"
>
<
template
scope=
"scope"
>
<span>
{{
scope
.
row
.
totalNumber
}}
</span>
<span>
{{
scope
.
row
.
totalNumber
}}
</span>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
<el-table-column
width=
"
20
0"
align=
"center"
label=
"剩余天数"
>
<el-table-column
width=
"
11
0"
align=
"center"
label=
"剩余天数"
>
<
template
scope=
"scope"
>
<
template
scope=
"scope"
>
<span>
{{
scope
.
row
.
rentFreeDays
}}
</span>
<span>
{{
scope
.
row
.
rentFreeDays
}}
</span>
</
template
>
</
template
>
...
@@ -109,7 +109,7 @@
...
@@ -109,7 +109,7 @@
<!-- <span>{{scope.row.updName}}</span>-->
<!-- <span>{{scope.row.updName}}</span>-->
<!-- </template>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- </el-table-column>-->
<el-table-column
align=
"center"
label=
"操作"
width=
"4
0
0"
>
<el-table-column
align=
"center"
label=
"操作"
width=
"4
8
0"
>
<
template
scope=
"scope"
>
<
template
scope=
"scope"
>
<el-button
size=
"small"
type=
"success"
@
click=
"viewDetails(scope.row)"
>
查看详情
<el-button
size=
"small"
type=
"success"
@
click=
"viewDetails(scope.row)"
>
查看详情
</el-button>
</el-button>
...
@@ -419,7 +419,7 @@
...
@@ -419,7 +419,7 @@
</el-form>
</el-form>
</div>
</div>
<el-form
:model=
"userOrderMessage"
ref=
"alterUserOrder"
label-width=
"100px"
>
<!-- <el-form :model="userOrderMessage" ref="alterUserOrder" label-width="100px">--
>
<el-table
<el-table
:data=
"orderData"
:data=
"orderData"
...
@@ -454,7 +454,7 @@
...
@@ -454,7 +454,7 @@
</el-button>
</el-button>
</el-table-column>
</el-table-column>
</el-table>
</el-table>
</el-form
>
<!-- </el-form>--
>
<div
v-show=
"!orderListLoading"
class=
"pagination-container"
>
<div
v-show=
"!orderListLoading"
class=
"pagination-container"
>
<el-pagination
@
size-change=
"orderSizeChange"
@
current-change=
"orderCurrentChange"
<el-pagination
@
size-change=
"orderSizeChange"
@
current-change=
"orderCurrentChange"
:current-page
.
sync=
"orderQuery.page"
:page-sizes=
"[10,20,30, 50]"
:page-size=
"orderQuery.limit"
:current-page
.
sync=
"orderQuery.page"
:page-sizes=
"[10,20,30, 50]"
:page-size=
"orderQuery.limit"
...
@@ -522,7 +522,7 @@
...
@@ -522,7 +522,7 @@
}
from
'src/api/admin/UserMember/index'
;
}
from
'src/api/admin/UserMember/index'
;
export
default
{
export
default
{
name
:
'
u
ser'
,
name
:
'
appU
ser'
,
data
()
{
data
()
{
return
{
return
{
orderData
:
[],
orderData
:
[],
...
@@ -962,7 +962,7 @@
...
@@ -962,7 +962,7 @@
this
.
orderQuery
.
userId
=
this
.
saveUserId
this
.
orderQuery
.
userId
=
this
.
saveUserId
let
query
=
JSON
.
parse
(
JSON
.
stringify
(
this
.
orderQuery
))
let
query
=
JSON
.
parse
(
JSON
.
stringify
(
this
.
orderQuery
))
query
.
status
=
query
.
status
?
query
.
status
-
1
:
null
query
.
status
=
query
.
status
?
query
.
status
-
1
:
null
alert
(
JSON
.
stringify
(
query
))
//
alert(JSON.stringify(query))
page
(
query
).
then
(
page
(
query
).
then
(
res
=>
{
res
=>
{
...
...
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