diff --git a/flash-waimai-manage/src/api/carservice/company.js b/flash-waimai-manage/src/api/carservice/company.js
index 70b09455be17c09948b21b4c5a29c772b33fb2f6..3f073b58f480ca28f8dcddce0ed1c6d388d0a486 100644
--- a/flash-waimai-manage/src/api/carservice/company.js
+++ b/flash-waimai-manage/src/api/carservice/company.js
@@ -1,64 +1,65 @@
 import request from '@/utils/carrequest'
 
-export function getCompanyList(params) {
-  return request({
-    url: '/platform/api/v1/manage/companies/?page=0&size=30',
-    method: 'get',
-    params
-  })
-}
+/**
+ * N001 创建车队账号
+ */
 
-export function createCompany(params) {
+export function save(data) {
   return request({
     url: '/platform/api/v1/manage/companies/',
     method: 'post',
-    params
+    data: data
   })
 }
 
-// export function save(params) {
-//   return request({
-//     url: '/message',
-//     method: 'post',
-//     params
-//   })
-// }
+/**
+ * N002 查询车队列表
+ */
 
-export function clear() {
+export function list() {
   return request({
-    url: '/message',
-    method: 'delete'
+    url: '/platform/api/v1/manage/companies/?page=0&size=30',
+    method: 'get'
   })
 }
 
-export function tree() {
+/**
+ * N008 查询车队路线列表
+ */
+
+export function getCompanyRoutes(companyId) {
   return request({
-    url: '/dept/tree',
+    url: '/platform/api/v1/manage/companies/' + companyId + '/routes/?page=0&size=30',
     method: 'get'
   })
 }
 
-export function list() {
+/**
+ * N009 查询车队班次列表
+ */
+
+export function getCompanyNumbers(companyId) {
   return request({
-    url: '/platform/api/v1/manage/companies/?page=0&size=30',
+    url: '/platform/api/v1/manage/companies/' + companyId + '/numbers/?page=0&size=30',
     method: 'get'
   })
 }
 
-export function save(data) {
-  return request({
-    url: '/platform/api/v1/manage/companies/',
-    method: 'post',
-    data: data
-  })
-}
+/**
+ * TODO 修改车队信息
+ * params : companyId
+ * data: data
+ * response: '修改成功'
+ */
 
-export function del(id) {
-  return request({
-    url: '/dept',
-    method: 'delete',
-    params: {
-      id: id
-    }
-  })
-}
+/**
+ * TODO 删除车队
+ * params : companyId
+ * response: '删除成功'
+ */
+
+/**
+ * TODO 冻结车队
+ * params : companyId
+ * response: '冻结成功'
+ */
diff --git a/flash-waimai-manage/src/api/carservice/numbers.js b/flash-waimai-manage/src/api/carservice/numbers.js
new file mode 100644
index 0000000000000000000000000000000000000000..9f1013afa21466bafa73ed32b4478ef580fbe7b9
--- /dev/null
+++ b/flash-waimai-manage/src/api/carservice/numbers.js
@@ -0,0 +1,79 @@
+// 班次请求
+import request from '@/utils/carrequest'
+
+/**
+ * N003 查询车队详情
+ */
+
+export function getCompanyDetail(companyId) {
+  return request({
+    url: '/platform/api/v1/manage/companies/' + companyId,
+    method: 'get'
+  })
+}
+
+/**
+ * N006 查询路线详情
+ */
+
+export function getRoutesDetail(routeId) {
+  return request({
+    url: '/platform/api/v1/manage/routes/' + routeId,
+    method: 'get'
+  })
+}
+
+/**
+ * N0301 创建班次
+ */
+
+export function createNumbers(data) {
+  return request({
+    url: '/company/api/v1/numbers/',
+    method: 'post',
+    data: data
+  })
+}
+
+/**
+ * N0302 查询车队班次列表
+ */
+
+export function getNumbersList(companyId) {
+  return request({
+    url: '/company/api/v1/numbers/' + companyId + '&page=0&size=30',
+    method: 'get'
+  })
+}
+
+/**
+ * N303 查询班次详情
+ */
+export function getNumbersDetail(companyId, numberId) {
+  return request({
+    url: '/company/api/v1/numbers/' + numberId + '?companyId=' + companyId,
+    method: 'get'
+  })
+}
+
+/**
+ * N304 发布班次
+ */
+
+export function publishNumbers(companyId, numberId) {
+  return request({
+    url: '/company/api/v1/numbers/' + numberId + '?companyId=' + companyId,
+    method: 'get'
+  })
+}
+
+/**
+ * N305 批量发布班次
+ */
+export function batchPublishNumbers(data) {
+  return request({
+    url: '/company/api/v1/numbers/services/batchPublish',
+    method: 'post',
+    data: data
+  })
+}
diff --git a/flash-waimai-manage/src/api/carservice/orders.js b/flash-waimai-manage/src/api/carservice/orders.js
new file mode 100644
index 0000000000000000000000000000000000000000..e0aea977d037b42020e9fdb77baabbb1c5fb18a3
--- /dev/null
+++ b/flash-waimai-manage/src/api/carservice/orders.js
@@ -0,0 +1,2 @@
+// 订单请求
+
diff --git a/flash-waimai-manage/src/api/carservice/routes.js b/flash-waimai-manage/src/api/carservice/routes.js
index 8d728d149bbab0ca3fda28292843e964576e91a4..041a24b1577dc64173e4a5e12497520fbeda691d 100644
--- a/flash-waimai-manage/src/api/carservice/routes.js
+++ b/flash-waimai-manage/src/api/carservice/routes.js
@@ -1,33 +1,31 @@
 import request from '@/utils/carrequest'
 
 /**
- * 获取搜索地址
+ * N003 查询车队详情
+ * 用于查询车队名称
  */
-export function searchplace(cityid, value) {
+
+export function getRoutesBelongs(id) {
   return request({
-    url: '/v1/pois',
-    method: 'get',
-    params: {
-      type: 'search',
-      city_id: cityid,
-      keyword: value
-    }
+    url: '/platform/api/v1/manage/companies/' + id,
+    method: 'get'
   })
 }
 
 /**
- * category 种类列表
+ * N004 创建车队路线
  */
 
-export function foodCategory(params) {
+export function addRoutes(data) {
   return request({
-    url: '/shopping/v2/restaurant/category',
-    method: 'get'
+    url: '/platform/api/v1/manage/routes/',
+    method: 'post',
+    data: data
   })
 }
 
 /**
- * 获取线路列表
+ * N005 查询路线列表
  */
 
 export function getRoutes(params) {
@@ -39,11 +37,35 @@ export function getRoutes(params) {
 }
 
 /**
- * 获取餐馆数量
+ * N007 冻结车队路线
+ */
+
+export function freezeRoutes(id) {
+  return request({
+    url: '/platform/api/v1/manage/routes/' + id + '/freeze',
+    method: 'post'
+    // data: data
+  })
+}
+
+/**
+ * N006 查询路线详情
  */
-export function getResturantsCount(params) {
+
+export function getRoutesDetail(routeId) {
+  return request({
+    url: '/platform/api/v1/manage/routes/' + routeId,
+    method: 'get'
+  })
+}
+
+/**
+ * N010 查询路线班次列表
+ */
+
+export function getRoutesNumbers(routeId) {
   return request({
-    url: '/shopping/restaurants/count',
+    url: '/platform/api/v1/manage/routes/' + routeId + '/numbers/?page=0&size=30',
     method: 'get'
   })
 }
@@ -52,11 +74,10 @@ export function getResturantsCount(params) {
  * 添加商铺
  */
 
-export function addShop(params) {
+export function foodCategory(params) {
   return request({
-    url: '/shopping/addShop',
-    method: 'post',
-    params
+    url: '/shopping/v2/restaurant/category',
+    method: 'get'
   })
 }
 
diff --git a/flash-waimai-manage/src/api/carservice/user.js b/flash-waimai-manage/src/api/carservice/user.js
new file mode 100644
index 0000000000000000000000000000000000000000..e7b72d0fb48457f2c1873cbdaee6355c56010573
--- /dev/null
+++ b/flash-waimai-manage/src/api/carservice/user.js
@@ -0,0 +1,164 @@
+// 用户
+import request from '@/utils/carrequest'
+
+/**
+ * N101 查询有效路线列表
+ */
+export function getRoutesList() {
+  return request({
+    url: '/user/api/v1/routes/?&page=0&size=30',
+    method: 'get'
+  })
+}
+
+/**
+ * N102 查询路线详情
+ */
+export function getRoutesDetail(routeId) {
+  return request({
+    url: '/user/api/v1/routes/' + routeId,
+    method: 'get'
+  })
+}
+
+/**
+ * N103 查询可报名班次列表
+ */
+export function getEnableNumbersList() {
+  return request({
+    url: '/user/api/v1/numbers/services/listEnterable?&page=0&size=30',
+    method: 'get'
+  })
+}
+
+/**
+ * N104 查询班次详情
+ */
+export function getNumbersDetail(numberId) {
+  return request({
+    url: '/user/api/v1/numbers/' + numberId,
+    method: 'get'
+  })
+}
+
+/**
+ * N105 查询指定班次是否可以报名
+ * 每日 18 点（不含）前次日及以后发车班次可以报名，每日 18 点（含）后隔日及以后发车班次可以报名
+ */
+export function checkNumbersEnable(numberId) {
+  return request({
+    url: '/user/api/v1/numbers/' + numberId + '/enterable',
+    method: 'get'
+  })
+}
+
+/**
+ * N106 查询指定始发终到日期的班次列表
+ */
+export function getAssignNumbersList(start, end, date) {
+  return request({
+    url: `/user/api/v1/numbers/?start=${start}&end=${end}&date=${date}&page=0&size=30`,
+    method: 'get'
+  })
+}
+
+/**
+ * N107 创建报名订单
+ */
+export function createOrders(data) {
+  return request({
+    url: '/user/api/v1/orders/',
+    method: 'post',
+    data: data
+  })
+}
+
+/**
+ * N110 查询报名订单列表
+ */
+export function getEnableOrdersList(userId) {
+  return request({
+    url: `/user/api/v1/orders/?userId=${userId}&page=0&size=30`,
+    method: 'get'
+  })
+}
+
+/**
+ * N108 查询是否可以支付
+ */
+export function checkOrdersPayable(orderId, userId) {
+  return request({
+    url: `/user/api/v1/orders/${orderId}/payable?userId=${userId}`,
+    method: 'get'
+  })
+}
+
+/**
+ * N109 查询支付结果
+ */
+export function getOrdersPayStatus(orderId, userId) {
+  return request({
+    url: `/user/api/v1/orders/${orderId}/payStatus?userId=${userId}`,
+    method: 'get'
+  })
+}
+
+/**
+ * N111 查询报名订单详情
+ */
+export function getOrdersDetail(orderId, userId) {
+  return request({
+    url: `/user/api/v1/orders/${orderId}?userId=${userId}`,
+    method: 'get'
+  })
+}
+
+/**
+ * N112 查询是否可以核销
+ */
+export function checkOrdersVerify(orderId, userId) {
+  return request({
+    url: `/user/api/v1/orders/${orderId}/verifyable?userId=${userId}`,
+    method: 'get'
+  })
+}
+
+/**
+ * N113 查询核销信息
+ */
+export function getOrdersVerify(orderId, userId) {
+  return request({
+    url: `/user/api/v1/orders/${orderId}/verification?userId=${userId}`,
+    method: 'get'
+  })
+}
+
+/**
+ * N114 查询是否可以退款
+ */
+export function checkOrdersRefund(orderId, userId) {
+  return request({
+    url: `/user/api/v1/orders/${orderId}/refundable?userId=${userId}`,
+    method: 'get'
+  })
+}
+
+/**
+ * N115 发起第三方退款
+ */
+export function pushOrdersRefund(orderId, userId) {
+  return request({
+    url: `/user/api/v1/orders/${orderId}/refund?userId=${userId}`,
+    method: 'get'
+  })
+}
+
+/**
+ * N116 查询退款结果
+ */
+export function getOrdersRefundResult(orderId, userId) {
+  return request({
+    url: `/user/api/v1/orders/${orderId}/refundStatus?userId=${userId}`,
+    method: 'get'
+  })
+}
diff --git a/flash-waimai-manage/src/api/carservice/verification.js b/flash-waimai-manage/src/api/carservice/verification.js
new file mode 100644
index 0000000000000000000000000000000000000000..96cb903764df1706a2c517facaef29d076c565c5
--- /dev/null
+++ b/flash-waimai-manage/src/api/carservice/verification.js
@@ -0,0 +1,72 @@
+// 核销请求
+import request from '@/utils/carrequest'
+
+/**
+ * N201 查询核销路线列表
+ */
+export function getVerificationRoutesList(userId) {
+  return request({
+    url: '/verification/api/v1/routes/?userId=' + userId + '&page=0&size=30',
+    method: 'get'
+  })
+}
+
+/**
+ * N202 查询核销路线详情
+ */
+export function getVerificationRoutesDetail(routeId) {
+  return request({
+    url: '/verification/api/v1/routes/' + routeId,
+    method: 'get'
+  })
+}
+
+/**
+ * N203 查询路线核销班次列表
+ */
+export function getRoutesVerificationNumbersList(routeId) {
+  return request({
+    url: '/verification/api/v1/routes/' + routeId + '/numbers?page=0&size=30',
+    method: 'get'
+  })
+}
+
+/**
+ * N204 查询核销班次列表
+ */
+export function getVerificationNumbersList(userId) {
+  return request({
+    url: '/verification/api/v1/numbers/?userId=' + userId + '&page=0&size=30',
+    method: 'get'
+  })
+}
+
+/**
+ * N205 查询核销班次详情
+ */
+export function getVerificationNumbersDetail(numberId, userId) {
+  return request({
+    url: '/verification/api/v1/numbers/' + numberId + '?userId=' + userId,
+    method: 'get'
+  })
+}
+
+/**
+ * N206 查询核销信息
+ */
+export function getVerificationInfo(orderId) {
+  return request({
+    url: '/verification/api/v1/services/info?orderId=' + orderId,
+    method: 'get'
+  })
+}
+
+/**
+ * N207 核销
+ */
+export function getVerificationVerify(orderId) {
+  return request({
+    url: '/verification/api/v1/services/verify?orderId=' + orderId,
+    method: 'get'
+  })
+}
diff --git a/flash-waimai-manage/src/router/index.js b/flash-waimai-manage/src/router/index.js
index ec5203f7c0087e09d5905082ea671a4181004596..09a44606a492c614803db4563e8316c9335ee440 100644
--- a/flash-waimai-manage/src/router/index.js
+++ b/flash-waimai-manage/src/router/index.js
@@ -216,18 +216,25 @@ export const asyncRouterMap = [
         meta: { title: '增加线路' }
       },
       {
-        path: 'shift',
-        name: 'shift',
+        path: 'numbers',
+        name: 'numbers',
         hidden: false,
-        component: () => import('@/views/car/shift/index'),
+        component: () => import('@/views/car/numbers/index'),
         meta: { title: '班次管理' }
       },
       {
-        path: 'shift/add',
+        path: 'numbers/add',
         name: 'add',
         hidden: true,
-        component: () => import('@/views/car/shift/add'),
+        component: () => import('@/views/car/numbers/add'),
         meta: { title: '增加班次' }
+      },
+      {
+        path: 'orders',
+        name: 'aordersdd',
+        hidden: false,
+        component: () => import('@/views/car/orders/index'),
+        meta: { title: '订单管理' }
       }
     ]
   },
diff --git a/flash-waimai-manage/src/utils/carrequest.js b/flash-waimai-manage/src/utils/carrequest.js
index 6f0328a366d3acad145c772cb4f2366ce5712c0f..20a0ac16f23f380e42f4d5a7ac45d05754d95fb3 100644
--- a/flash-waimai-manage/src/utils/carrequest.js
+++ b/flash-waimai-manage/src/utils/carrequest.js
@@ -37,7 +37,7 @@ carservice.interceptors.response.use(
      * code为非20000是抛错 可结合自己业务进行修改
      */
     const res = response.data
-    console.log(res)
+    // console.log(res)
     // if (res.code !== 20000) {
     //   // 50008:非法的token; 50012:其他客户端登录了;  50014:Token 过期了;
     //   if (res.code === 50008 || res.code === 50012 || res.code === 50014) {
@@ -48,6 +48,8 @@ carservice.interceptors.response.use(
     // }
     if (res.content && res.content.length > 0) {
       return res.content
+    } else {
+      return res
     }
   },
   error => {
diff --git a/flash-waimai-manage/src/views/car/company/company.js b/flash-waimai-manage/src/views/car/company/company.js
index 0ddc0132d4a40bd38850b0786178b4f262c50ac0..ee3379069c6ceec895e39b43433ff3a8c6935d06 100644
--- a/flash-waimai-manage/src/views/car/company/company.js
+++ b/flash-waimai-manage/src/views/car/company/company.js
@@ -1,5 +1,5 @@
 import treeTable from '@/components/TreeTable'
-import { list, save, del } from '@/api/carservice/company'
+import { list, save } from '@/api/carservice/company'
 
 export default {
   name: 'customTreeTableDemo',
diff --git a/flash-waimai-manage/src/views/car/shift/add.vue b/flash-waimai-manage/src/views/car/numbers/add.vue
similarity index 100%
rename from flash-waimai-manage/src/views/car/shift/add.vue
rename to flash-waimai-manage/src/views/car/numbers/add.vue
diff --git a/flash-waimai-manage/src/views/car/shift/index.vue b/flash-waimai-manage/src/views/car/numbers/index.vue
similarity index 92%
rename from flash-waimai-manage/src/views/car/shift/index.vue
rename to flash-waimai-manage/src/views/car/numbers/index.vue
index c3f342b3c797f4f097760b307519870a6f49636e..f65520a988122a67e479b728940fe5ffa0a5cf8f 100644
--- a/flash-waimai-manage/src/views/car/shift/index.vue
+++ b/flash-waimai-manage/src/views/car/numbers/index.vue
@@ -210,7 +210,6 @@ import {
   updateResturant,
   stopResturant,
   auditResturant,
-  searchplace,
   deleteResturant,
   check
 } from "@/api/carservice/routes";
@@ -244,11 +243,13 @@ export default {
         limit: 20,
         name: undefined,
         state: ""
-      }
+      },
+      routeId: 0
     };
   },
   created() {
     this.initData();
+    this.routeId = this.$route.query.routeId;
     // this.uploadHeaders["Authorization"] = getToken();
   },
 
@@ -284,37 +285,38 @@ export default {
       }
     },
     async fetchListData() {
-      getRoutes().then(res => {
-        console.log(res);
-        const restaurants = res;
-        this.total = res.length;
-        console.log(this.total);
-        restaurants.forEach(item => {
-          const tableData = {};
-          tableData.name = item.routeId;
-          tableData.address = item.companyId;
-          tableData.companyId = item.companyId;
-          tableData.description = item.description;
-          tableData.start = item.start;
-          tableData.end = item.end;
-          tableData.id = item.id;
-          tableData.phone = item.phone;
-          tableData.rating = item.rating;
-          tableData.recent_order_num = item.recent_order_num;
-          tableData.category = item.category;
-          tableData.image_path = item.image_path;
-          tableData.state = item.state;
-          tableData.stateStr = item.status;
-          tableData.auditRemark = item.auditRemark;
-          tableData.disabled = item.disabled;
-          tableData.unliquidatedAmount = item.unliquidatedAmount;
-          tableData.totalAmount = item.totalAmount;
-          tableData.isInSchool = item.isInSchool + "";
-          tableData.platform_rate = item.platform_rate;
-          this.tableData.push(tableData);
-          this.shopDetail = tableData;
-        });
-      });
+      console.log(this.$route.query.routeId);
+      // getRoutes().then(res => {
+      //   console.log(res);
+      //   const restaurants = res;
+      //   this.total = res.length;
+      //   console.log(this.total);
+      //   restaurants.forEach(item => {
+      //     const tableData = {};
+      //     tableData.name = item.routeId;
+      //     tableData.address = item.companyId;
+      //     tableData.companyId = item.companyId;
+      //     tableData.description = item.description;
+      //     tableData.start = item.start;
+      //     tableData.end = item.end;
+      //     tableData.id = item.id;
+      //     tableData.phone = item.phone;
+      //     tableData.rating = item.rating;
+      //     tableData.recent_order_num = item.recent_order_num;
+      //     tableData.category = item.category;
+      //     tableData.image_path = item.image_path;
+      //     tableData.state = item.state;
+      //     tableData.stateStr = item.status;
+      //     tableData.auditRemark = item.auditRemark;
+      //     tableData.disabled = item.disabled;
+      //     tableData.unliquidatedAmount = item.unliquidatedAmount;
+      //     tableData.totalAmount = item.totalAmount;
+      //     tableData.isInSchool = item.isInSchool + "";
+      //     tableData.platform_rate = item.platform_rate;
+      //     this.tableData.push(tableData);
+      //     this.shopDetail = tableData;
+      //   });
+      // });
     },
     async fetchData() {
       getResturants(this.listQuery).then(response => {
diff --git a/flash-waimai-manage/src/views/car/orders/index.vue b/flash-waimai-manage/src/views/car/orders/index.vue
new file mode 100644
index 0000000000000000000000000000000000000000..922e871a7549daaf99cd3d9bd669cde6a761162f
--- /dev/null
+++ b/flash-waimai-manage/src/views/car/orders/index.vue
@@ -0,0 +1,622 @@
+<template>
+  <div class="app-container">
+    <div class="block">
+      <el-row :gutter="20" v-permission="['/car/company']">
+        <el-col :span="6">
+          <el-input v-model="listQuery.name" placeholder="线路名称"></el-input>
+        </el-col>
+        <el-col :span="6">
+          <el-select v-model="listQuery.state" placeholder="请选择审核状态">
+            <el-option
+              v-for="item in stateList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+        </el-col>
+        <el-col :span="6">
+          <el-button
+            type="success"
+            icon="el-icon-search"
+            @click.native="search"
+            >{{ $t("button.search") }}</el-button
+          >
+          <el-button
+            type="primary"
+            icon="el-icon-refresh"
+            @click.native="reset"
+            >{{ $t("button.reset") }}</el-button
+          >
+        </el-col>
+      </el-row>
+      <br />
+      <div class="block">
+        <el-button
+          type="success"
+          icon="el-icon-plus"
+          @click.native="addRoutes"
+          v-permission="['/car/company']"
+          >{{ $t("button.add") }}</el-button
+        >
+      </div>
+      <div class="table_container" v-permission="['/business/shop/audit']">
+        <el-table :data="tableData" style="width: 100%">
+          <el-table-column type="expand">
+            <template slot-scope="props">
+              <el-form
+                label-position="left"
+                inline
+                class="demo-table-expand"
+                label-width="120px"
+              >
+                <el-form-item label="线路名称">
+                  <span>{{ props.row.routeId }}</span>
+                </el-form-item>
+                <el-form-item label="所属车队">
+                  <span>{{ props.row.fleetName }}</span>
+                </el-form-item>
+                <el-form-item label="线路介绍">
+                  <span>{{ props.row.description }}</span>
+                </el-form-item>
+                <el-form-item label="起点">
+                  <span>{{ props.row.start }}</span>
+                </el-form-item>
+                <el-form-item label="终点">
+                  <span>{{ props.row.end }}</span>
+                </el-form-item>
+                <!-- <el-form-item label="线路 ID">
+                  <span>{{ props.row.id }}</span>
+                </el-form-item> -->
+                <el-form-item label="联系电话">
+                  <span>{{ props.row.phone }}</span>
+                </el-form-item>
+                <el-form-item label="评分">
+                  <span>{{ props.row.rating }}</span>
+                </el-form-item>
+                <el-form-item label="销售量">
+                  <span>{{ props.row.recent_order_num }}</span>
+                </el-form-item>
+                <!-- <el-form-item label="分类">
+                  <span>{{ props.row.category }}</span>
+                </el-form-item> -->
+                <el-form-item label="分类">
+                  <span>{{
+                    props.row.end === "火车站" ? "校内" : "校外"
+                  }}</span>
+                </el-form-item>
+                <el-form-item label="审批状态">
+                  <span>{{ props.row.stateStr }}</span>
+                </el-form-item>
+                <el-form-item label="审批结果">
+                  <span>{{ props.row.auditRemark }}</span>
+                </el-form-item>
+                <el-form-item label="未结算交易额(元)">
+                  <span>{{ props.row.unliquidatedAmount }}</span>
+                </el-form-item>
+                <el-form-item label="已结算交易额(元)">
+                  <span>{{ props.row.totalAmount }}</span>
+                </el-form-item>
+                <el-form-item label="平台收取费率(%)">
+                  <span>{{ props.row.platform_rate }}</span>
+                </el-form-item>
+              </el-form>
+            </template>
+          </el-table-column>
+          <el-table-column label="线路名称" prop="routeId"> </el-table-column>
+          <el-table-column label="所属车队" prop="fleetName"> </el-table-column>
+          <el-table-column label="线路介绍" prop="description">
+          </el-table-column>
+          <el-table-column label="操作" width="450">
+            <template slot-scope="scope">
+              <!-- <el-button
+                v-if="scope.row.state == '0'"
+                size="mini"
+                type="primary"
+                v-permission="['/business/shop/audit']"
+                @click="handleAudit(scope.$index, scope.row)"
+                >审核
+              </el-button>
+              <el-button
+                size="mini"
+                type="warning"
+                v-permission="['/car/company']"
+                @click="handleCheck(scope.$index, scope.row)"
+                >结算
+              </el-button> -->
+              <el-button
+                v-if="scope.row.disabled == 0"
+                size="mini"
+                type="danger"
+                v-permission="['/car/company']"
+                @click="handleStop(scope.$index, scope.row, 1)"
+                >冻结
+              </el-button>
+              <el-button
+                v-if="scope.row.disabled == 1"
+                size="mini"
+                type="primary"
+                v-permission="['/car/company']"
+                @click="handleStop(scope.$index, scope.row, 0)"
+                >启用
+              </el-button>
+              <!-- <el-button
+                size="mini"
+                type="primary"
+                v-permission="['/car/company']"
+                @click="handleEdit(scope.$index, scope.row)"
+                >编辑
+              </el-button> -->
+              <!-- <el-button
+                size="mini"
+                type="success"
+                v-permission="['/business/food/edit']"
+                @click="addFood(scope.$index, scope.row)"
+                >添加路线
+              </el-button> -->
+              <el-button
+                size="mini"
+                type="info"
+                @click="viewShifts(scope.$index, scope.row)"
+                >查看班次
+              </el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+        <el-pagination
+          background
+          layout="total, sizes, prev, pager, next, jumper"
+          :page-sizes="[10, 20, 50, 100, 500]"
+          :page-size="listQuery.limit"
+          :total="total"
+          @size-change="changeSize"
+          @current-change="fetchPage"
+          @prev-click="fetchPrev"
+          @next-click="fetchNext"
+        >
+        </el-pagination>
+      </div>
+
+      <el-dialog title="路线审核" :visible.sync="audit.show" width="30%">
+        <el-input
+          type="textarea"
+          :rows="2"
+          placeholder="请输入拒绝原因"
+          v-model="audit.auditRemark"
+        >
+        </el-input>
+        <span slot="footer" class="dialog-footer">
+          <el-button type="danger" @click="handleAuditConfirm(-1)"
+            >拒绝</el-button
+          >
+          <el-button type="primary" @click="handleAuditConfirm(1)"
+            >通过</el-button
+          >
+        </span>
+      </el-dialog>
+    </div>
+  </div>
+</template>
+
+<script>
+import { getApiUrl } from "@/utils/utils";
+// import { getToken } from "@/utils/auth";
+
+import permission from "@/directive/permission/index.js";
+import {
+  getRoutes,
+  getRoutesBelongs,
+  getResturantsCount,
+  foodCategory,
+  updateResturant,
+  stopResturant,
+  auditResturant,
+  deleteResturant,
+  check,
+  freezeRoutes
+} from "@/api/carservice/routes";
+
+export default {
+  directives: { permission },
+  data() {
+    return {
+      // city: {},
+      // count: 0,
+      fileMgrUrl: getApiUrl() + "/file",
+      uploadHeaders: {
+        Authorization: ""
+      },
+      tableData: [],
+      currentPage: 1,
+      selectTable: {},
+      dialogFormVisible: false,
+      categoryOptions: [],
+      selectedCategory: [],
+      address: {},
+      total: 0,
+      stateList: [
+        { label: "审核中", value: "0" },
+        { label: "审核通过", value: "1" },
+        { label: "审核拒绝", value: "-1" }
+      ],
+      audit: { show: false, auditRemark: "" },
+      listQuery: {
+        page: 1,
+        limit: 20,
+        name: undefined,
+        state: ""
+      }
+    };
+  },
+  created() {
+    this.initData();
+    // this.uploadHeaders["Authorization"] = getToken();
+  },
+
+  methods: {
+    async initData() {
+      this.fetchListData();
+    },
+    async getCategory() {
+      try {
+        const response = await foodCategory();
+        const categories = response.data;
+        categories.forEach(item => {
+          if (item.sub_categories.length) {
+            const addnew = {
+              value: item.name,
+              label: item.name,
+              children: []
+            };
+            item.sub_categories.forEach((subitem, index) => {
+              if (index === 0) {
+                return;
+              }
+              addnew.children.push({
+                value: subitem.name,
+                label: subitem.name
+              });
+            });
+            this.categoryOptions.push(addnew);
+          }
+        });
+      } catch (err) {
+        console.log("获取商铺种类失败", err);
+      }
+    },
+    async fetchListData() {
+      await getRoutes().then(res => {
+        console.log(res);
+        const routes = res;
+        this.total = res.length;
+        console.log(this.total);
+        routes.forEach(item => {
+          const tableData = {};
+          tableData.routeId = item.routeId;
+          tableData.companyId = item.companyId;
+          tableData.description = item.remark;
+          tableData.start = item.start;
+          tableData.end = item.end;
+          // tableData.id = item.id;
+          // tableData.rating = item.rating;
+          getRoutesBelongs(item.companyId)
+            .then(res => {
+              tableData.address = res.nickname;
+              tableData.fleetName = res.nickname;
+              tableData.phone = res.username;
+              tableData.disabled = 0;
+            })
+            .then(() => this.tableData.push(tableData));
+        });
+      });
+    },
+    async fetchData() {
+      getResturants(this.listQuery).then(response => {
+        const restaurants = response.data.records;
+        this.total = response.data.total;
+        this.tableData = [];
+        restaurants.forEach(item => {
+          const tableData = {};
+          tableData.name = item.name;
+          tableData.address = item.address;
+          tableData.description = item.description;
+          tableData.id = item.id;
+          tableData.phone = item.phone;
+          tableData.rating = item.rating;
+          tableData.recent_order_num = item.recent_order_num;
+          tableData.category = item.category;
+          tableData.image_path = item.image_path;
+          tableData.state = item.state;
+          tableData.stateStr = item.stateStr;
+          tableData.auditRemark = item.auditRemark;
+          tableData.disabled = item.disabled;
+          tableData.unliquidatedAmount = item.unliquidatedAmount;
+          tableData.totalAmount = item.totalAmount;
+          tableData.isInSchool = item.isInSchool + "";
+          tableData.platform_rate = item.platform_rate;
+          this.tableData.push(tableData);
+          this.shopDetail = tableData;
+        });
+      });
+    },
+
+    search() {
+      this.fetchData();
+    },
+    reset() {
+      this.listQuery.name = "";
+      this.listQuery.state = "";
+      this.fetchData();
+    },
+    handleSizeChange(val) {
+      console.log(`每页 ${val} 条`);
+    },
+    handleCurrentChange(val) {
+      this.currentPage = val;
+      this.offset = (val - 1) * this.limit;
+      this.getResturants();
+    },
+    fetchNext() {
+      this.listQuery.page = this.listQuery.page + 1;
+      this.fetchData();
+    },
+    fetchPrev() {
+      this.listQuery.page = this.listQuery.page - 1;
+      this.fetchData();
+    },
+    fetchPage(page) {
+      this.listQuery.page = page;
+      this.fetchData();
+    },
+    changeSize(limit) {
+      this.listQuery.limit = limit;
+      this.fetchData();
+    },
+    handleStop(index, row, disabled) {
+      let me = this;
+      this.$confirm("确认" + (disabled == 1 ? "冻结线路" : "启用线路") + "?", {
+        confirmButtonText: "确认",
+        cancelButtonText: "取消"
+      })
+        .then(({ value }) => {
+          console.log(row);
+          row.disabled = disabled;
+          // freezeRoutes()
+          // stopResturant({ id: row.id, disabled: disabled }).then(response => {
+          //   this.$message({
+          //     type: "success",
+          //     message: (disabled == 1 ? "停用商铺" : "启用商铺") + "成功"
+          //   });
+          //   me.fetchData();
+          // });
+        })
+        .catch(({ value }) => {});
+    },
+    handleAuditConfirm(state) {
+      if (state == "-1") {
+        if (this.audit.auditRemark == "") {
+          this.$message({
+            type: "warning",
+            message: "请输入拒绝原因"
+          });
+          return;
+        }
+      }
+      const params = {
+        id: this.selectTable.id,
+        state: state,
+        auditRemark: this.audit.auditRemark
+      };
+      console.log(params);
+
+      auditResturant(params).then(response => {
+        this.$message({
+          type: "success",
+          message: "审核成功"
+        });
+        this.fetchData();
+      });
+      this.audit.show = false;
+    },
+    handleAudit(index, row) {
+      this.audit.show = true;
+      this.selectTable = row;
+    },
+    handleCheck(index, row) {
+      if (row.unliquidatedAmount == "" || row.unliquidatedAmount == "0") {
+        this.$message({
+          type: "warning",
+          message: "没有可结算的交易额"
+        });
+        return;
+      }
+      let me = this;
+      this.$confirm("待结算金额" + row.unliquidatedAmount + "元,确认结算?", {
+        confirmButtonText: "确认",
+        cancelButtonText: "取消"
+      })
+        .then(({ value }) => {
+          check({ id: row.id }).then(response => {
+            this.$message({
+              type: "success",
+              message: "结算成功"
+            });
+            me.fetchData();
+          });
+        })
+        .catch(({ value }) => {});
+    },
+    handleEdit(index, row) {
+      console.log("row", row);
+      this.selectTable = row;
+      this.selectTable.image =
+        getApiUrl() + "/file/getImgStream?fileName=" + row.image_path;
+      this.address.address = row.address;
+      this.dialogFormVisible = true;
+      this.selectedCategory = row.category.split("/");
+      if (!this.categoryOptions.length) {
+        this.getCategory();
+      }
+    },
+    addRoutes() {
+      this.$router.push({
+        path: "/car/routes/addroutes"
+        // query: { restaurant_id: row.id }
+      });
+    },
+    addFood(index, row) {
+      this.$router.push({
+        path: "/business/food/add",
+        query: { restaurant_id: row.id }
+      });
+    },
+    viewFood(index, row) {
+      this.$router.push({
+        path: "/business/food",
+        query: { route_id: row.id }
+      });
+    },
+    viewShifts(index, row) {
+      console.log(index);
+      console.log(row);
+      this.$router.push({
+        path: "/car/shift",
+        query: { routeId: row.routeId }
+      });
+    },
+    async handleDelete(index, row) {
+      try {
+        const res = await deleteResturant(row.id);
+        if (res.status == 1) {
+          this.$message({
+            type: "success",
+            message: "删除店铺成功"
+          });
+          this.tableData.splice(index, 1);
+        } else {
+          throw new Error(res.message);
+        }
+      } catch (err) {
+        this.$message({
+          type: "error",
+          message: err.message
+        });
+        console.log("删除店铺失败");
+      }
+    },
+    async querySearchAsync(queryString, cb) {
+      if (queryString) {
+        try {
+          const cityList = await searchplace(this.city.id, queryString);
+          if (cityList instanceof Array) {
+            cityList.map(item => {
+              item.value = item.address;
+              return item;
+            });
+            cb(cityList);
+          }
+        } catch (err) {
+          console.log(err);
+        }
+      }
+    },
+    addressSelect(vale) {
+      const { address, latitude, longitude } = vale;
+      this.address = { address, latitude, longitude };
+    },
+    handleServiceAvatarScucess(res, file) {
+      this.selectTable.image_path = res.data.realFileName;
+      this.selectTable.image =
+        getApiUrl() + "/file/getImgStream?fileName=" + res.data.realFileName;
+    },
+    beforeAvatarUpload(file) {
+      const isRightType =
+        file.type === "image/jpeg" || file.type === "image/png";
+      const isLt2M = file.size / 1024 / 1024 < 2;
+
+      if (!isRightType) {
+        this.$message.error("上传头像图片只能是 JPG 格式!");
+      }
+      if (!isLt2M) {
+        this.$message.error("上传头像图片大小不能超过 2MB!");
+      }
+      return isRightType && isLt2M;
+    },
+    async updateShop() {
+      this.dialogFormVisible = false;
+      try {
+        Object.assign(this.selectTable, this.address);
+        this.selectTable.category = this.selectedCategory.join("/");
+        updateResturant(this.selectTable).then(response => {
+          this.$message({
+            type: "success",
+            message: "更新店铺信息成功"
+          });
+          this.getResturants();
+        });
+      } catch (err) {
+        console.log("更新餐馆信息失败", err);
+        this.$message({
+          type: "error",
+          message: err
+        });
+      }
+    }
+  }
+};
+</script>
+
+<style lang="less">
+.demo-table-expand {
+  font-size: 0;
+}
+
+.demo-table-expand label {
+  width: 90px;
+  color: #99a9bf;
+}
+
+.demo-table-expand .el-form-item {
+  margin-right: 0;
+  margin-bottom: 0;
+  width: 50%;
+}
+
+.table_container {
+  padding: 20px;
+}
+
+.Pagination {
+  display: flex;
+  justify-content: flex-start;
+  margin-top: 8px;
+}
+
+.avatar-uploader .el-upload {
+  border: 1px dashed #d9d9d9;
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+}
+
+.avatar-uploader .el-upload:hover {
+  border-color: #20a0ff;
+}
+
+.avatar-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+  width: 120px;
+  height: 120px;
+  line-height: 120px;
+  text-align: center;
+}
+
+.avatar {
+  width: 120px;
+  height: 120px;
+  display: block;
+}
+</style>
diff --git a/flash-waimai-manage/src/views/car/routes/addroutes.vue b/flash-waimai-manage/src/views/car/routes/addroutes.vue
index 8fcdb0a11d5efa7600fbeab8d0684962d1934846..dd3ab2ecc0a6ac2ba178b71acabf4dc27b7720b6 100644
--- a/flash-waimai-manage/src/views/car/routes/addroutes.vue
+++ b/flash-waimai-manage/src/views/car/routes/addroutes.vue
@@ -13,7 +13,7 @@
             <el-form-item label="路线名称" prop="name">
               <el-input v-model="formData.name"></el-input>
             </el-form-item>
-            <el-form-item label="所属车队" prop="address">
+            <el-form-item label="所属车队ID" prop="companyId">
               <!-- <el-autocomplete
                 v-model="formData.address"
                 :fetch-suggestions="querySearchAsync"
@@ -31,8 +31,8 @@
                 maxLength="11"
               ></el-input>
             </el-form-item>
-            <el-form-item label="路线简介" prop="description">
-              <el-input v-model="formData.description"></el-input>
+            <el-form-item label="路线简介" prop="remark">
+              <el-input v-model="formData.remark"></el-input>
             </el-form-item>
             <!-- <el-form-item label="店铺标语" prop="promotion_info">
               <el-input v-model="formData.promotion_info"></el-input>
@@ -110,7 +110,7 @@
                 :max="100"
               ></el-input-number>
             </el-form-item> -->
-            <el-form-item label="线路时间" style="white-space: nowrap;">
+            <!-- <el-form-item label="线路时间" style="white-space: nowrap;">
               <el-time-select
                 placeholder="起始时间"
                 v-model="formData.startTime"
@@ -132,7 +132,7 @@
                 }"
               >
               </el-time-select>
-            </el-form-item>
+            </el-form-item> -->
 
             <!-- <el-form-item label="上传店铺头像">
               <el-upload
@@ -151,7 +151,7 @@
                 <i v-else class="el-icon-plus avatar-uploader-icon"></i>
               </el-upload>
             </el-form-item> -->
-            <el-form-item label="上传证件">
+            <!-- <el-form-item label="上传证件">
               <el-upload
                 class="avatar-uploader"
                 :action="fileMgrUrl"
@@ -167,7 +167,7 @@
                 />
                 <i v-else class="el-icon-plus avatar-uploader-icon"></i>
               </el-upload>
-            </el-form-item>
+            </el-form-item> -->
             <!-- <el-form-item label="上传餐饮服务许可证">
               <el-upload
                 class="avatar-uploader"
@@ -254,6 +254,7 @@ import { getApiUrl } from "@/utils/utils";
 import { getToken } from "@/utils/auth";
 import { cityGuess, searchplace } from "@/api/getData";
 import { addShop, foodCategory } from "@/api/business/shop";
+import { addRoutes } from "@/api/carservice/routes";
 
 export default {
   data() {
@@ -288,7 +289,9 @@ export default {
       },
       rules: {
         // name: [{ required: true, message: "请输入店铺名称", trigger: "blur" }],
-        address: [{ required: true, message: "请输入车队ID", trigger: "blur" }]
+        // address: [
+        //   { required: true, message: "请输入登录账号", trigger: "blur" }
+        // ]
         // phone: [
         //   { required: true, message: "请输入联系电话" },
         //   { type: "number", message: "电话号码必须是数字" }
@@ -326,7 +329,7 @@ export default {
   },
   mounted() {
     this.initData();
-    this.uploadHeaders["Authorization"] = getToken();
+    // this.uploadHeaders["Authorization"] = getToken();
   },
   methods: {
     async initData() {
@@ -474,53 +477,56 @@ export default {
     submitForm(formName) {
       this.$refs[formName].validate(async valid => {
         if (valid) {
-          Object.assign(
-            this.formData,
-            { activities: this.activities },
-            {
-              category: this.selectedCategory.join("/")
-            }
-          );
-          const activities = this.formData.activities;
-          const activitiesJson = JSON.stringify(activities);
-          delete this.formData.activities;
-          this.formData.activitiesJson = activitiesJson;
-          addShop(this.formData).then(response => {
-            this.$message({
-              type: "success",
-              message: "添加成功"
-            });
-            this.formData = {
-              name: "", //店铺名称
-              address: "", //地址
-              latitude: "",
-              longitude: "",
-              description: "", //介绍
-              phone: "",
-              promotion_info: "",
-              float_delivery_fee: 5, //运费
-              float_minimum_order_amount: 20, //起价
-              is_premium: true,
-              deliveryMode: true,
-              news: true,
-              bao: true,
-              zhun: true,
-              piao: true,
-              startTime: "",
-              endTime: "",
-              image_path: "",
-              business_license_image: "",
-              catering_service_license_image: ""
-            };
-            this.selectedCategory = ["快餐便当", "简餐"];
-            this.activities = [
-              {
-                icon_name: "减",
-                name: "满减优惠",
-                description: "满30减5，满60减8"
-              }
-            ];
+          console.log(this.formData);
+          Object.assign(this.formData, {
+            companyId: parseInt(this.formData.companyId)
+          });
+          console.log(this.formData);
+          addRoutes(this.formData).then(res => {
+            console.log(res);
           });
+
+          // const activities = this.formData.activities;
+          // const activitiesJson = JSON.stringify(activities);
+          // delete this.formData.activities;
+          // this.formData.activitiesJson = activitiesJson;
+          // addRoutes();
+          // addShop(this.formData).then(response => {
+          //   this.$message({
+          //     type: "success",
+          //     message: "添加成功"
+          //   });
+          //   this.formData = {
+          //     name: "", //店铺名称
+          //     address: "", //地址
+          //     latitude: "",
+          //     longitude: "",
+          //     description: "", //介绍
+          //     phone: "",
+          //     promotion_info: "",
+          //     float_delivery_fee: 5, //运费
+          //     float_minimum_order_amount: 20, //起价
+          //     is_premium: true,
+          //     deliveryMode: true,
+          //     news: true,
+          //     bao: true,
+          //     zhun: true,
+          //     piao: true,
+          //     startTime: "",
+          //     endTime: "",
+          //     image_path: "",
+          //     business_license_image: "",
+          //     catering_service_license_image: ""
+          //   };
+          //   this.selectedCategory = ["快餐便当", "简餐"];
+          //   this.activities = [
+          //     {
+          //       icon_name: "减",
+          //       name: "满减优惠",
+          //       description: "满30减5，满60减8"
+          //     }
+          //   ];
+          // });
         } else {
           this.$notify.error({
             title: "错误",
diff --git a/flash-waimai-manage/src/views/car/routes/index.vue b/flash-waimai-manage/src/views/car/routes/index.vue
index 0b8cdbe59a3e6f8b4b2edebe02e7d2f8614e8a69..922e871a7549daaf99cd3d9bd669cde6a761162f 100644
--- a/flash-waimai-manage/src/views/car/routes/index.vue
+++ b/flash-waimai-manage/src/views/car/routes/index.vue
@@ -52,10 +52,10 @@
                 label-width="120px"
               >
                 <el-form-item label="线路名称">
-                  <span>{{ props.row.name }}</span>
+                  <span>{{ props.row.routeId }}</span>
                 </el-form-item>
                 <el-form-item label="所属车队">
-                  <span>{{ props.row.companyId }}</span>
+                  <span>{{ props.row.fleetName }}</span>
                 </el-form-item>
                 <el-form-item label="线路介绍">
                   <span>{{ props.row.description }}</span>
@@ -104,13 +104,13 @@
               </el-form>
             </template>
           </el-table-column>
-          <el-table-column label="线路名称" prop="name"> </el-table-column>
-          <el-table-column label="所属车队" prop="address"> </el-table-column>
+          <el-table-column label="线路名称" prop="routeId"> </el-table-column>
+          <el-table-column label="所属车队" prop="fleetName"> </el-table-column>
           <el-table-column label="线路介绍" prop="description">
           </el-table-column>
           <el-table-column label="操作" width="450">
             <template slot-scope="scope">
-              <el-button
+              <!-- <el-button
                 v-if="scope.row.state == '0'"
                 size="mini"
                 type="primary"
@@ -124,42 +124,42 @@
                 v-permission="['/car/company']"
                 @click="handleCheck(scope.$index, scope.row)"
                 >结算
-              </el-button>
+              </el-button> -->
               <el-button
                 v-if="scope.row.disabled == 0"
                 size="mini"
                 type="danger"
-                v-permission="['/business/shop/audit']"
+                v-permission="['/car/company']"
                 @click="handleStop(scope.$index, scope.row, 1)"
-                >停用
+                >冻结
               </el-button>
               <el-button
                 v-if="scope.row.disabled == 1"
                 size="mini"
                 type="primary"
-                v-permission="['/business/shop/audit']"
+                v-permission="['/car/company']"
                 @click="handleStop(scope.$index, scope.row, 0)"
                 >启用
               </el-button>
-              <el-button
+              <!-- <el-button
                 size="mini"
                 type="primary"
-                v-permission="['/business/shop/edit']"
+                v-permission="['/car/company']"
                 @click="handleEdit(scope.$index, scope.row)"
                 >编辑
-              </el-button>
-              <el-button
+              </el-button> -->
+              <!-- <el-button
                 size="mini"
                 type="success"
                 v-permission="['/business/food/edit']"
                 @click="addFood(scope.$index, scope.row)"
                 >添加路线
-              </el-button>
+              </el-button> -->
               <el-button
                 size="mini"
                 type="info"
-                @click="viewFood(scope.$index, scope.row)"
-                >查看路线
+                @click="viewShifts(scope.$index, scope.row)"
+                >查看班次
               </el-button>
             </template>
           </el-table-column>
@@ -202,18 +202,19 @@
 <script>
 import { getApiUrl } from "@/utils/utils";
 // import { getToken } from "@/utils/auth";
-import { cityGuess } from "@/api/getData";
+
 import permission from "@/directive/permission/index.js";
 import {
   getRoutes,
+  getRoutesBelongs,
   getResturantsCount,
   foodCategory,
   updateResturant,
   stopResturant,
   auditResturant,
-  searchplace,
   deleteResturant,
-  check
+  check,
+  freezeRoutes
 } from "@/api/carservice/routes";
 
 export default {
@@ -285,35 +286,28 @@ export default {
       }
     },
     async fetchListData() {
-      getRoutes().then(res => {
+      await getRoutes().then(res => {
         console.log(res);
-        const restaurants = res;
+        const routes = res;
         this.total = res.length;
         console.log(this.total);
-        restaurants.forEach(item => {
+        routes.forEach(item => {
           const tableData = {};
-          tableData.name = item.routeId;
-          tableData.address = item.companyId;
+          tableData.routeId = item.routeId;
           tableData.companyId = item.companyId;
-          tableData.description = item.description;
+          tableData.description = item.remark;
           tableData.start = item.start;
           tableData.end = item.end;
-          tableData.id = item.id;
-          tableData.phone = item.phone;
-          tableData.rating = item.rating;
-          tableData.recent_order_num = item.recent_order_num;
-          tableData.category = item.category;
-          tableData.image_path = item.image_path;
-          tableData.state = item.state;
-          tableData.stateStr = item.status;
-          tableData.auditRemark = item.auditRemark;
-          tableData.disabled = item.disabled;
-          tableData.unliquidatedAmount = item.unliquidatedAmount;
-          tableData.totalAmount = item.totalAmount;
-          tableData.isInSchool = item.isInSchool + "";
-          tableData.platform_rate = item.platform_rate;
-          this.tableData.push(tableData);
-          this.shopDetail = tableData;
+          // tableData.id = item.id;
+          // tableData.rating = item.rating;
+          getRoutesBelongs(item.companyId)
+            .then(res => {
+              tableData.address = res.nickname;
+              tableData.fleetName = res.nickname;
+              tableData.phone = res.username;
+              tableData.disabled = 0;
+            })
+            .then(() => this.tableData.push(tableData));
         });
       });
     },
@@ -381,18 +375,21 @@ export default {
     },
     handleStop(index, row, disabled) {
       let me = this;
-      this.$confirm("确认" + (disabled == 1 ? "停用商铺" : "启用商铺") + "?", {
+      this.$confirm("确认" + (disabled == 1 ? "冻结线路" : "启用线路") + "?", {
         confirmButtonText: "确认",
         cancelButtonText: "取消"
       })
         .then(({ value }) => {
-          stopResturant({ id: row.id, disabled: disabled }).then(response => {
-            this.$message({
-              type: "success",
-              message: (disabled == 1 ? "停用商铺" : "启用商铺") + "成功"
-            });
-            me.fetchData();
-          });
+          console.log(row);
+          row.disabled = disabled;
+          // freezeRoutes()
+          // stopResturant({ id: row.id, disabled: disabled }).then(response => {
+          //   this.$message({
+          //     type: "success",
+          //     message: (disabled == 1 ? "停用商铺" : "启用商铺") + "成功"
+          //   });
+          //   me.fetchData();
+          // });
         })
         .catch(({ value }) => {});
     },
@@ -477,7 +474,15 @@ export default {
     viewFood(index, row) {
       this.$router.push({
         path: "/business/food",
-        query: { restaurant_id: row.id }
+        query: { route_id: row.id }
+      });
+    },
+    viewShifts(index, row) {
+      console.log(index);
+      console.log(row);
+      this.$router.push({
+        path: "/car/shift",
+        query: { routeId: row.routeId }
       });
     },
     async handleDelete(index, row) {
diff --git a/flash-waimai-manage/src/views/layout/components/Navbar.vue b/flash-waimai-manage/src/views/layout/components/Navbar.vue
index 1ab3a9ec5c9918018c01ed643c720e31ca69262d..1f58902fb30eb23f1aa27b26f83ee27c4ba918a3 100644
--- a/flash-waimai-manage/src/views/layout/components/Navbar.vue
+++ b/flash-waimai-manage/src/views/layout/components/Navbar.vue
@@ -8,7 +8,6 @@
     <breadcrumb></breadcrumb>
     <div class="right-menu">
       <template>
-        <!-- <div><el-button @click="toSearch">校园时代</el-button></div> -->
         <lang-select class="international right-menu-item" />
       </template>
       <el-dropdown class="avatar-container right-menu-item" trigger="click">
@@ -63,17 +62,6 @@ export default {
       this.$store.dispatch("LogOut").then(() => {
         location.reload(); // 为了重新实例化vue-router对象 避免bug
       });
-    },
-    toSearch(e) {
-      console.log(e);
-      // getCompanyList();
-      createCompany(
-        JSON.stringify({
-          companyName: "SA",
-          username: "SAU",
-          remark: ""
-        })
-      );
     }
   }
 };