Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
S
soss
Overview
Overview
Details
Activity
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
hooloo
web
soss
Commits
a33e1aba
Commit
a33e1aba
authored
May 31, 2022
by
lixiaomin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改用户页面
parent
53160080
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
80 additions
and
176 deletions
+80
-176
src/api/system/customer.js
+4
-3
src/views/customer/index.vue
+32
-50
src/views/customer/orderTable.vue
+38
-0
src/views/order/order/index.vue
+2
-2
src/views/order/refund/index.vue
+2
-2
src/views/system/role/index.vue
+2
-119
No files found.
src/api/system/customer.js
View file @
a33e1aba
...
@@ -11,10 +11,11 @@ export function listCustomer(query) {
...
@@ -11,10 +11,11 @@ export function listCustomer(query) {
}
}
// 查询用户详细
// 查询用户详细
export
function
getCustomer
(
userId
)
{
export
function
getCustomer
(
query
)
{
return
request
({
return
request
({
url
:
'/system/customer/'
+
parseStrEmpty
(
userId
),
url
:
'/system/customer/'
,
method
:
'get'
method
:
'get'
,
params
:
query
})
})
}
}
...
...
src/views/customer/index.vue
View file @
a33e1aba
...
@@ -73,43 +73,17 @@
...
@@ -73,43 +73,17 @@
<div
style=
"margin-left: 50px;"
>
<div
style=
"margin-left: 50px;"
>
<div
style=
"margin-bottom: 20px;"
>
消费
</div>
<div
style=
"margin-bottom: 20px;"
>
消费
</div>
<div>
地址
</div>
<div>
地址
</div>
</div>
</div>
</div>
</div>
<el-tabs
v-model=
"activeName"
@
tab-click=
"handleClick"
>
<el-tabs
v-model=
"activeName"
@
tab-click=
"handleClick"
>
<el-tab-pane
label=
"正常订单"
name=
"first"
>
<el-tab-pane
label=
"正常订单"
name=
"first"
>
<el-table
v-loading=
"loading"
:data=
"normalOrder"
>
<order-table
:orderList=
"orderList"
:orderTotal=
"orderTotal"
:loading=
"loading"
></order-table>
<el-table-column
label=
"订单编号"
align=
"center"
prop=
""
></el-table-column>
<el-table-column
label=
"商品数量"
align=
"center"
prop=
""
/>
<el-table-column
label=
"金额"
align=
"center"
prop=
""
/>
<el-table-column
label=
"城市"
align=
"center"
prop=
""
/>
<el-table-column
label=
"店铺"
align=
"center"
prop=
""
/>
<el-table-column
label=
"创建时间"
align=
"center"
prop=
""
/>
<el-table-column
label=
"状态"
align=
"center"
prop=
""
/>
</el-table>
</el-tab-pane>
</el-tab-pane>
<el-tab-pane
label=
"取消订单"
name=
"second"
>
<el-tab-pane
label=
"取消订单"
name=
"second"
>
<el-table
v-loading=
"loading"
:data=
"cancelOrder"
>
<order-table
:orderList=
"orderList"
:orderTotal=
"orderTotal"
:loading=
"loading"
></order-table>
<el-table-column
label=
"订单编号"
align=
"center"
prop=
""
></el-table-column>
<el-table-column
label=
"商品数量"
align=
"center"
prop=
""
/>
<el-table-column
label=
"金额"
align=
"center"
prop=
""
/>
<el-table-column
label=
"城市"
align=
"center"
prop=
""
/>
<el-table-column
label=
"店铺"
align=
"center"
prop=
""
/>
<el-table-column
label=
"创建时间"
align=
"center"
prop=
""
/>
<el-table-column
label=
"状态"
align=
"center"
prop=
""
/>
</el-table>
</el-tab-pane>
</el-tab-pane>
<el-tab-pane
label=
"退款订单"
name=
"third"
>
<el-tab-pane
label=
"退款订单"
name=
"third"
>
<el-table
v-loading=
"loading"
:data=
"refundOrder"
>
<order-table
:orderList=
"orderList"
:orderTotal=
"orderTotal"
:loading=
"loading"
></order-table>
<el-table-column
label=
"订单编号"
align=
"center"
prop=
""
></el-table-column>
<el-table-column
label=
"商品数量"
align=
"center"
prop=
""
/>
<el-table-column
label=
"金额"
align=
"center"
prop=
""
/>
<el-table-column
label=
"城市"
align=
"center"
prop=
""
/>
<el-table-column
label=
"店铺"
align=
"center"
prop=
""
/>
<el-table-column
label=
"创建时间"
align=
"center"
prop=
""
/>
<el-table-column
label=
"状态"
align=
"center"
prop=
""
/>
</el-table>
</el-tab-pane>
</el-tab-pane>
</el-tabs>
</el-tabs>
<div
slot=
"footer"
class=
"dialog-footer"
>
<div
slot=
"footer"
class=
"dialog-footer"
>
...
@@ -122,18 +96,16 @@
...
@@ -122,18 +96,16 @@
<
script
>
<
script
>
import
{
listCustomer
,
getCustomer
}
from
"@/api/system/customer"
;
import
{
listCustomer
,
getCustomer
}
from
"@/api/system/customer"
;
import
{
VueCropper
}
from
"vue-cropper
"
;
import
OrderTable
from
"./orderTable.vue
"
;
export
default
{
export
default
{
name
:
"Customer"
,
name
:
"Customer"
,
components
:
{
VueCropper
},
components
:
{
OrderTable
},
data
()
{
data
()
{
return
{
return
{
img
:
"/static/img/profile.473f5971.jpg"
,
img
:
"/static/img/profile.473f5971.jpg"
,
createdTime
:[],
createdTime
:[],
// 遮罩层
// 遮罩层
loading
:
true
,
loading
:
true
,
// 选中数组
ids
:
[],
// 非单个禁用
// 非单个禁用
single
:
true
,
single
:
true
,
// 非多个禁用
// 非多个禁用
...
@@ -147,13 +119,7 @@ export default {
...
@@ -147,13 +119,7 @@ export default {
// 弹出层标题
// 弹出层标题
title
:
""
,
title
:
""
,
// 是否显示弹出层
// 是否显示弹出层
open
:
false
,
open
:
false
,
// 退款订单
refundOrder
:
[],
// 正常订单
normalOrder
:[],
// 取消订单
cancelOrder
:[],
// 查询参数
// 查询参数
queryParams
:
{
queryParams
:
{
pageNum
:
1
,
pageNum
:
1
,
...
@@ -169,18 +135,27 @@ export default {
...
@@ -169,18 +135,27 @@ export default {
{
value
:
"2"
,
label
:
"无购买"
},
{
value
:
"2"
,
label
:
"无购买"
},
{
value
:
"3"
,
label
:
"有复购"
},
{
value
:
"3"
,
label
:
"有复购"
},
],
],
activeName
:
"first"
activeName
:
"first"
,
customerId
:
null
,
orderList
:[],
orderTotal
:
0
};
};
},
},
created
()
{
created
()
{
this
.
getList
();
this
.
getList
();
},
},
methods
:
{
methods
:
{
handleClick
(){
handleClick
(){
let
tag
=
""
;
if
(
this
.
activeName
==
"first"
){
tag
=
"1"
;
}
else
if
(
this
.
activeName
==
"second"
){
tag
=
"2"
;
}
else
if
(
this
.
activeName
==
"third"
){
tag
=
"3"
;
}
this
.
getOrderList
(
this
.
customerId
,
tag
);
},
},
/** 查询用户列表 */
/** 查询用户列表 */
getList
()
{
getList
()
{
...
@@ -194,12 +169,19 @@ export default {
...
@@ -194,12 +169,19 @@ export default {
});
});
},
},
getDetial
(
id
){
getDetial
(
id
){
this
.
customerId
=
id
;
this
.
open
=
true
;
this
.
open
=
true
;
this
.
title
=
"用户信息"
;
this
.
title
=
"用户信息"
;
getCustomer
(
id
).
then
((
response
)
=>
{
this
.
getOrderList
(
this
.
customerId
,
'1'
);
},
getOrderList
(
id
,
tag
)
{
this
.
loading
=
true
;
getCustomer
({
id
:
id
,
status
:
tag
}).
then
((
response
)
=>
{
if
(
response
.
code
==
"200"
){
if
(
response
.
code
==
"200"
){
this
.
form
=
response
.
data
this
.
orderList
=
response
.
rows
;
}
this
.
orderTotal
=
response
.
total
;
this
.
loading
=
false
;
}
});
});
},
},
// 取消按钮
// 取消按钮
...
...
src/views/customer/orderTable.vue
0 → 100644
View file @
a33e1aba
<
template
>
<div>
<el-table
v-loading=
"loading"
:data=
"orderList"
>
<el-table-column
label=
"订单编号"
align=
"center"
prop=
""
></el-table-column>
<el-table-column
label=
"商品数量"
align=
"center"
prop=
""
/>
<el-table-column
label=
"金额"
align=
"center"
prop=
""
/>
<el-table-column
label=
"城市"
align=
"center"
prop=
""
/>
<el-table-column
label=
"店铺"
align=
"center"
prop=
""
/>
<el-table-column
label=
"创建时间"
align=
"center"
prop=
""
/>
<el-table-column
label=
"状态"
align=
"center"
prop=
""
/>
</el-table>
<pagination
v-show=
"orderTotal > 0"
:total=
"orderTotal"
:page
.
sync=
"pageNum"
:limit
.
sync=
"pageSize"
@
pagination=
"getList"
/>
</div>
</
template
>
<
script
>
export
default
{
name
:
"orderTable"
,
props
:
[
'orderList'
,
'orderTotal'
,
'loading'
],
data
()
{
return
{
pageNum
:
1
,
pageSize
:
10
}
},
methods
:
{
getList
(){
}
}
}
</
script
>
\ No newline at end of file
src/views/order/order/index.vue
View file @
a33e1aba
...
@@ -207,11 +207,11 @@ export default {
...
@@ -207,11 +207,11 @@ export default {
},
},
/** 搜索按钮操作 */
/** 搜索按钮操作 */
handleQuery
()
{
handleQuery
()
{
if
(
this
.
createdTime
.
length
>
0
){
if
(
this
.
createdTime
!=
null
&&
this
.
createdTime
.
length
>
0
){
this
.
queryParams
.
createAtStart
=
this
.
createdTime
[
0
];
this
.
queryParams
.
createAtStart
=
this
.
createdTime
[
0
];
this
.
queryParams
.
createAtEnd
=
this
.
createdTime
[
1
];
this
.
queryParams
.
createAtEnd
=
this
.
createdTime
[
1
];
}
}
if
(
this
.
payTime
.
length
>
0
){
if
(
this
.
payTime
!=
null
&&
this
.
payTime
.
length
>
0
){
this
.
queryParams
.
payAtStart
=
this
.
payTime
[
0
];
this
.
queryParams
.
payAtStart
=
this
.
payTime
[
0
];
this
.
queryParams
.
payAtEnd
=
this
.
payTime
[
1
];
this
.
queryParams
.
payAtEnd
=
this
.
payTime
[
1
];
}
}
...
...
src/views/order/refund/index.vue
View file @
a33e1aba
...
@@ -197,11 +197,11 @@ export default {
...
@@ -197,11 +197,11 @@ export default {
},
},
/** 搜索按钮操作 */
/** 搜索按钮操作 */
handleQuery
()
{
handleQuery
()
{
if
(
this
.
createdTime
.
length
>
0
){
if
(
this
.
createdTime
!=
null
&&
this
.
createdTime
.
length
>
0
){
this
.
queryParams
.
createAtStart
=
this
.
createdTime
[
0
];
this
.
queryParams
.
createAtStart
=
this
.
createdTime
[
0
];
this
.
queryParams
.
createAtEnd
=
this
.
createdTime
[
1
];
this
.
queryParams
.
createAtEnd
=
this
.
createdTime
[
1
];
}
}
if
(
this
.
payTime
.
length
>
0
){
if
(
this
.
payTime
!=
null
&&
this
.
payTime
.
length
>
0
){
this
.
queryParams
.
payAtStart
=
this
.
payTime
[
0
];
this
.
queryParams
.
payAtStart
=
this
.
payTime
[
0
];
this
.
queryParams
.
payAtEnd
=
this
.
payTime
[
1
];
this
.
queryParams
.
payAtEnd
=
this
.
payTime
[
1
];
}
}
...
...
src/views/system/role/index.vue
View file @
a33e1aba
...
@@ -178,31 +178,8 @@
...
@@ -178,31 +178,8 @@
icon=
"el-icon-delete"
icon=
"el-icon-delete"
@
click=
"handleDelete(scope.row)"
@
click=
"handleDelete(scope.row)"
v-hasPermi=
"['system:role:remove']"
v-hasPermi=
"['system:role:remove']"
>
删除
</el-button
>
删除
</el-button
>
>
<el-dropdown
size=
"mini"
@
command=
"(command) => handleCommand(command, scope.row)"
v-hasPermi=
"['system:role:edit']"
>
<span
class=
"el-dropdown-link"
>
<i
class=
"el-icon-d-arrow-right el-icon--right"
></i>
更多
</span>
<el-dropdown-menu
slot=
"dropdown"
>
<el-dropdown-item
command=
"handleDataScope"
icon=
"el-icon-circle-check"
v-hasPermi=
"['system:role:edit']"
>
数据权限
</el-dropdown-item
>
<el-dropdown-item
command=
"handleAuthUser"
icon=
"el-icon-user"
v-hasPermi=
"['system:role:edit']"
>
分配用户
</el-dropdown-item
>
</el-dropdown-menu>
</el-dropdown>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
</el-table>
</el-table>
...
@@ -228,39 +205,6 @@
...
@@ -228,39 +205,6 @@
placeholder=
"请输入内容"
placeholder=
"请输入内容"
></el-input>
></el-input>
</el-form-item>
</el-form-item>
<el-row
:gutter=
"10"
class=
"mb8"
>
<el-col
:span=
"12"
>
<el-form-item
label=
"菜单权限"
>
<!-- <el-checkbox
v-model="menuExpand"
@change="handleCheckedTreeExpand($event, 'menu')"
>展开/折叠</el-checkbox
>
<el-checkbox
v-model="menuNodeAll"
@change="handleCheckedTreeNodeAll($event, 'menu')"
>全选/全不选</el-checkbox
>
<el-checkbox
v-model="form.menuCheckStrictly"
@change="handleCheckedTreeConnect($event, 'menu')"
>父子联动</el-checkbox
> -->
<div>
<el-tree
class=
"tree-border"
:data=
"menuOptions"
show-checkbox
ref=
"menu"
node-key=
"id"
:check-strictly=
"!form.menuCheckStrictly"
empty-text=
"加载中,请稍候"
:props=
"defaultProps"
></el-tree>
</div>
</el-form-item>
</el-col>
<el-col
:span=
"12"
>
<el-form-item
label=
"菜单权限"
>
<el-form-item
label=
"菜单权限"
>
<el-tree
<el-tree
class=
"tree-border"
class=
"tree-border"
...
@@ -273,73 +217,12 @@
...
@@ -273,73 +217,12 @@
:props=
"defaultProps"
:props=
"defaultProps"
></el-tree>
></el-tree>
</el-form-item>
</el-form-item>
</el-col>
</el-row>
</el-form>
</el-form>
<div
slot=
"footer"
class=
"dialog-footer"
>
<div
slot=
"footer"
class=
"dialog-footer"
>
<el-button
type=
"primary"
@
click=
"submitForm"
>
确 定
</el-button>
<el-button
type=
"primary"
@
click=
"submitForm"
>
确 定
</el-button>
<el-button
@
click=
"cancel"
>
取 消
</el-button>
<el-button
@
click=
"cancel"
>
取 消
</el-button>
</div>
</div>
</el-dialog>
</el-dialog>
<!-- 分配角色数据权限对话框 -->
<el-dialog
:title=
"title"
:visible
.
sync=
"openDataScope"
width=
"500px"
append-to-body
>
<el-form
:model=
"form"
label-width=
"80px"
>
<el-form-item
label=
"角色名称"
>
<el-input
v-model=
"form.roleName"
:disabled=
"true"
/>
</el-form-item>
<el-form-item
label=
"权限字符"
>
<el-input
v-model=
"form.roleKey"
:disabled=
"true"
/>
</el-form-item>
<el-form-item
label=
"权限范围"
>
<el-select
v-model=
"form.dataScope"
@
change=
"dataScopeSelectChange"
>
<el-option
v-for=
"item in dataScopeOptions"
:key=
"item.value"
:label=
"item.label"
:value=
"item.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item
label=
"数据权限"
v-show=
"form.dataScope == 2"
>
<el-checkbox
v-model=
"deptExpand"
@
change=
"handleCheckedTreeExpand($event, 'dept')"
>
展开/折叠
</el-checkbox
>
<el-checkbox
v-model=
"deptNodeAll"
@
change=
"handleCheckedTreeNodeAll($event, 'dept')"
>
全选/全不选
</el-checkbox
>
<el-checkbox
v-model=
"form.deptCheckStrictly"
@
change=
"handleCheckedTreeConnect($event, 'dept')"
>
父子联动
</el-checkbox
>
<el-tree
class=
"tree-border"
:data=
"deptOptions"
show-checkbox
default-expand-all
ref=
"dept"
node-key=
"id"
:check-strictly=
"!form.deptCheckStrictly"
empty-text=
"加载中,请稍候"
:props=
"defaultProps"
></el-tree>
</el-form-item>
</el-form>
<div
slot=
"footer"
class=
"dialog-footer"
>
<el-button
type=
"primary"
@
click=
"submitDataScope"
>
确 定
</el-button>
<el-button
@
click=
"cancelDataScope"
>
取 消
</el-button>
</div>
</el-dialog>
</div>
</div>
</template>
</template>
...
...
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