diff --git a/src/api/system/order.js b/src/api/system/order.js index fad0709..6c9f661 100644 --- a/src/api/system/order.js +++ b/src/api/system/order.js @@ -12,7 +12,7 @@ export function listOrder(query) { // 查询订单详细 export function getOrder(id) { return request({ - url: "/order/" + id, + url: "/order/back/" + id, method: "get", }); } diff --git a/src/views/shop/shop/components/machine.vue b/src/views/shop/shop/components/machine.vue index 3d5ee46..4651372 100644 --- a/src/views/shop/shop/components/machine.vue +++ b/src/views/shop/shop/components/machine.vue @@ -8,11 +8,9 @@ <el-table-column label="设备型号" align="center" prop="type" /> <el-table-column label="绑定时间" align="center" prop="bindTime" /> <el-table-column label="状态" align="center" prop="state"> - <template slot-scope="scope"> - <span v-if="scope.row.state == '1'">正常</span> - <span v-if="scope.row.state == '11'">忙碌</span> - <span v-if="scope.row.state == '99'">离线</span> - </template> + <template slot-scope="scope"> + {{formatterState(scope.row)}} + </template> </el-table-column> <el-table-column label="操作" align="center" class-name="small-padding fixed-width"> @@ -72,6 +70,27 @@ export default { //this.getList() }, 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() { this.loading = true;