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
ef55a917
Commit
ef55a917
authored
Oct 17, 2022
by
lixiaomin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改页面显示
parent
420ad519
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
23 additions
and
4 deletions
+23
-4
src/api/system/order.js
+1
-1
src/views/shop/shop/components/machine.vue
+22
-3
No files found.
src/api/system/order.js
View file @
ef55a917
...
@@ -12,7 +12,7 @@ export function listOrder(query) {
...
@@ -12,7 +12,7 @@ export function listOrder(query) {
// 查询订单详细
// 查询订单详细
export
function
getOrder
(
id
)
{
export
function
getOrder
(
id
)
{
return
request
({
return
request
({
url
:
"/order/"
+
id
,
url
:
"/order/
back/
"
+
id
,
method
:
"get"
,
method
:
"get"
,
});
});
}
}
...
...
src/views/shop/shop/components/machine.vue
View file @
ef55a917
...
@@ -9,9 +9,7 @@
...
@@ -9,9 +9,7 @@
<el-table-column
label=
"绑定时间"
align=
"center"
prop=
"bindTime"
/>
<el-table-column
label=
"绑定时间"
align=
"center"
prop=
"bindTime"
/>
<el-table-column
label=
"状态"
align=
"center"
prop=
"state"
>
<el-table-column
label=
"状态"
align=
"center"
prop=
"state"
>
<template
slot-scope=
"scope"
>
<template
slot-scope=
"scope"
>
<span
v-if=
"scope.row.state == '1'"
>
正常
</span>
{{
formatterState
(
scope
.
row
)
}}
<span
v-if=
"scope.row.state == '11'"
>
忙碌
</span>
<span
v-if=
"scope.row.state == '99'"
>
离线
</span>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
...
@@ -72,6 +70,27 @@ export default {
...
@@ -72,6 +70,27 @@ export default {
//this.getList()
//this.getList()
},
},
methods
:
{
methods
:
{
formatterState
(
row
){
if
(
row
.
state
==
'0'
){
return
"初始状态"
;
}
else
if
(
row
.
state
==
'1'
){
return
"待初始化"
;
}
else
if
(
row
.
state
==
'2'
){
return
"待绑定店铺"
;
}
else
if
(
row
.
state
==
'3'
){
return
"待运营测试"
;
}
else
if
(
row
.
state
==
'4'
){
return
"运行中"
;
}
else
if
(
row
.
state
==
'5'
){
return
"待机中"
;
}
else
if
(
row
.
state
==
'6'
){
return
"关闭"
;
}
else
if
(
row
.
state
==
'7'
){
return
"运维中"
;
}
else
if
(
row
.
state
==
'8'
){
return
"返厂"
;
}
},
/** 查询列表 */
/** 查询列表 */
getList
()
{
getList
()
{
this
.
loading
=
true
;
this
.
loading
=
true
;
...
...
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