门店

抖音同步
bug
2023-12-11 17:28:02 +08:00 · 2023-12-04 11:32:54 +08:00 · 2023-11-06 17:39:58 +08:00 · 2023-10-31 17:42:08 +08:00 · 2023-10-30 17:25:43 +08:00 · 2023-10-22 17:00:56 +08:00
49 changed files with 2722 additions and 581 deletions
--- a/.env.production
+++ b/.env.production
@@ -5,4 +5,4 @@ VUE_APP_TITLE = 开心学车管理系统
 ENV = 'production'

 # 开心学车管理系统/生产环境
-VUE_APP_BASE_API = '/duima'
+VUE_APP_BASE_API = '/zhaosheng'
--- a/public/favicon.ico
+++ b/public/favicon.ico
--- a/public/favicon2.ico
+++ b/public/favicon2.ico
--- a/public/index.html
+++ b/public/index.html
@@ -95,10 +95,10 @@
    <script src="/loading/index.js"></script>
    <script type="text/javascript">
      window._AMapSecurityConfig = {
-        securityJsCode: 'f653df5a2c5f44ae68faaab6f6a6b8ab'
+        securityJsCode: 'e7783f9551b7b38e1f485f99cb7d986f'
      };
    </script>
    <script src="http://res.wx.qq.com/connect/zh_CN/htmledition/js/wxLogin.js"></script>
-    <script src="https://webapi.amap.com/maps?v=1.4.15&key=713d839ff505943b0f18e6df45f3b0dc&plugin=AMap.Autocomplete,AMap.PlaceSearch,AMap.Geocoder,AMap.Scale"></script>
+    <script src="https://webapi.amap.com/maps?v=1.4.15&key=e92870cebfb5c7a9139f77bca1e7997a&plugin=AMap.Autocomplete,AMap.PlaceSearch,AMap.Geocoder,AMap.Scale"></script>
  </body>
 </html>
--- a/public/logo.png
+++ b/public/logo.png
--- a/public/logo1.png
+++ b/public/logo1.png
--- a/src/api/sch/school.js
+++ b/src/api/sch/school.js
@@ -39,5 +39,11 @@ export default {
      url: `/sch/school/${id}`,
      method: 'delete'
    });
+  },
+  createCode(id){
+    return request({
+      url: `/sch/school/create/${id}`,
+      method: 'post'
+    });
  }
 };
--- a/src/api/sch/shop.js
+++ b/src/api/sch/shop.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询抖音门店列表
+export function listShop(query) {
+  return request({
+    url: '/system/shop/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询抖音门店详细
+export function getShop(shopId) {
+  return request({
+    url: '/system/shop/' + shopId,
+    method: 'get'
+  })
+}
+
+// 新增抖音门店
+export function addShop(data) {
+  return request({
+    url: '/system/shop',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改抖音门店
+export function updateShop(data) {
+  return request({
+    url: '/system/shop',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除抖音门店
+export function delShop(shopId) {
+  return request({
+    url: '/system/shop/' + shopId,
+    method: 'delete'
+  })
+}
--- a/src/api/vip.js
+++ b/src/api/vip.js
@@ -0,0 +1,39 @@
+
+import request from '@/utils/request';
+
+// 查询车型列表
+export function getCarList(param) {
+  return request({
+    url: '/driver-api/tdSysUserMember/duima/car/list',
+    method: 'get',
+    params: param
+  });
+}
+
+// 查询会员列表
+export function getMemberList(param) {
+    return request({
+      url: '/driver-api/tdSysUserMember/duima/member/list',
+      method: 'get',
+      params: param
+    });
+  }
+
+
+  // 查询用户会员列表
+export function getUserMemberList(param) {
+    return request({
+      url: '/driver-api/tdSysUserMember/duima/user/member/list',
+      method: 'get',
+      params: param
+    });
+  }
+
+  //新增会员
+export function addUserMember(data) {
+  return request({
+    url: '/driver-api/tdSysUserMember/duima/user/member',
+    method: 'post',
+    data: data
+  });
+}
--- a/src/api/zs/clue.js
+++ b/src/api/zs/clue.js
@@ -210,3 +210,11 @@ export function saveCluePlace(data) {
    data: data
  });
 }
+
+export function getFollowCount() {
+  return request({
+    url: `/zs/clue/follow/count`,
+    method: 'get'
+  });
+}
+
--- a/src/api/zs/feedbackDetail.js
+++ b/src/api/zs/feedbackDetail.js
@@ -72,3 +72,22 @@ export function delFeedbackDetail(feedbackId) {
    method: 'delete'
  });
 }
+
+//查询接待人统计
+export function getCount(param){
+  return request({
+    url: '/zs/feedback/detail/count',
+    method: 'get',
+    params: param
+  })
+}
+
+
+//查询接待人接待详情
+export function getCountDetail(param){
+  return request({
+    url: '/zs/feedback/detail/count/detail',
+    method: 'get',
+    params: param
+  })
+}
--- a/src/assets/logo/logo.png
+++ b/src/assets/logo/logo.png
--- a/src/assets/logo/logo2.png
+++ b/src/assets/logo/logo2.png
--- a/src/permission.js
+++ b/src/permission.js
@@ -7,23 +7,27 @@
 */
 import router from './router';
 import store from './store';
-import {
-  Message
-} from 'element-ui';
+import { Message } from 'element-ui';
 import NProgress from 'nprogress';
 import 'nprogress/nprogress.css';
-import {
-  getToken
-} from '@/utils/auth';
-import {
-  isRelogin
-} from '@/utils/request';
+import { getToken } from '@/utils/auth';
+import { isRelogin } from '@/utils/request';

 NProgress.configure({
  showSpinner: false
 });

-const whiteList = ['/login', '/auth-redirect', '/bind', '/register', '/question', '/clue/feedback/follow', '/clue/feedback/arrival'];
+const whiteList = [
+  '/login',
+  '/auth-redirect',
+  '/bind',
+  '/register',
+  '/question',
+  '/clue/feedback/follow',
+  '/clue/feedback/arrival',
+  '/coach/count',
+  '/coach/count/detail'
+];

 router.beforeEach((to, from, next) => {
  NProgress.start();
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -29,186 +29,214 @@ import Layout from '@/layout';
 */

 // 公共路由
-export const constantRoutes = [{
-  path: '/redirect',
-  component: Layout,
-  hidden: true,
-  children: [{
-    path: '/redirect/:path(.*)',
-    component: () => import('@/views/redirect')
-  }]
-},
-{
-  path: '/login',
-  component: () => import('@/views/login'),
-  hidden: true
-},
-{
-  path: '/register',
-  component: () => import('@/views/register'),
-  hidden: true
-},
-{
-  path: '/question',
-  component: () => import('@/views/question'),
-  hidden: true
-},
-{
-  path: '/clue/feedback/follow',
-  component: () => import('@/views/zs/feedback/follow'),
-  hidden: true
-},
-{
-  path: '/clue/feedback/arrival',
-  component: () => import('@/views/zs/feedback/arrival'),
-  hidden: true
-},
-{
-  path: '/404',
-  component: () => import('@/views/error/404'),
-  hidden: true
-},
-{
-  path: '/401',
-  component: () => import('@/views/error/401'),
-  hidden: true
-},
-{
-  path: '',
-  component: Layout,
-  redirect: 'index',
-  children: [{
-    path: 'index',
-    component: () => import('@/views/index'),
-    name: 'Index',
-    meta: {
-      title: '首页',
-      icon: 'dashboard',
-      affix: true
-    }
-  }]
-},
-// {
-//   path: '/demo',
-//   component: Layout,
-//   redirect: 'noredirect',
-//   meta: {
-//     title: 'Demo',
-//     icon: 'xx'
-//   },
-//   children: [{
-//       path: '/base-page',
-//       component: () => import('@/views/demo/basePage/index'),
-//       name: 'BasePage',
-//       meta: {
-//         title: 'BasePage',
-//         icon: 'xx'
-//       }
-//     },
-//     {
-//       path: '/base-components',
-//       component: () => import('@/views/demo/baseComponents/index'),
-//       name: 'BaseComponents',
-//       meta: {
-//         title: 'BaseComponents',
-//         icon: 'xx'
-//       }
-//     }
-//   ]
-// },
-{
-  path: '/user',
-  component: Layout,
-  hidden: true,
-  redirect: 'noredirect',
-  children: [{
-    path: 'profile',
-    component: () => import('@/views/system/user/profile/index'),
-    name: 'Profile',
-    meta: {
-      title: '个人中心',
-      icon: 'user'
-    }
-  }]
-}
+export const constantRoutes = [
+  {
+    path: '/redirect',
+    component: Layout,
+    hidden: true,
+    children: [
+      {
+        path: '/redirect/:path(.*)',
+        component: () => import('@/views/redirect')
+      }
+    ]
+  },
+  {
+    path: '/login',
+    component: () => import('@/views/login'),
+    hidden: true
+  },
+  {
+    path: '/register',
+    component: () => import('@/views/register'),
+    hidden: true
+  },
+  {
+    path: '/question',
+    component: () => import('@/views/question'),
+    hidden: true
+  },
+  {
+    path: '/clue/feedback/follow',
+    component: () => import('@/views/zs/feedback/follow'),
+    hidden: true
+  },
+  {
+    path: '/clue/feedback/arrival',
+    component: () => import('@/views/zs/feedback/arrival'),
+    hidden: true
+  },
+  {
+    path: '/coach/count',
+    component: () => import('@/views/sch/coach/count'),
+    hidden: true
+  },
+  {
+    path: '/coach/count/detail',
+    component: () => import('@/views/sch/coach/count/detail'),
+    hidden: true
+  },
+  {
+    path: '/404',
+    component: () => import('@/views/error/404'),
+    hidden: true
+  },
+  {
+    path: '/401',
+    component: () => import('@/views/error/401'),
+    hidden: true
+  },
+  {
+    path: '',
+    component: Layout,
+    redirect: 'index',
+    children: [
+      {
+        path: 'index',
+        component: () => import('@/views/index'),
+        name: 'Index',
+        meta: {
+          title: '首页',
+          icon: 'dashboard',
+          affix: true
+        }
+      }
+    ]
+  },
+  // {
+  //   path: '/demo',
+  //   component: Layout,
+  //   redirect: 'noredirect',
+  //   meta: {
+  //     title: 'Demo',
+  //     icon: 'xx'
+  //   },
+  //   children: [{
+  //       path: '/base-page',
+  //       component: () => import('@/views/demo/basePage/index'),
+  //       name: 'BasePage',
+  //       meta: {
+  //         title: 'BasePage',
+  //         icon: 'xx'
+  //       }
+  //     },
+  //     {
+  //       path: '/base-components',
+  //       component: () => import('@/views/demo/baseComponents/index'),
+  //       name: 'BaseComponents',
+  //       meta: {
+  //         title: 'BaseComponents',
+  //         icon: 'xx'
+  //       }
+  //     }
+  //   ]
+  // },
+  {
+    path: '/user',
+    component: Layout,
+    hidden: true,
+    redirect: 'noredirect',
+    children: [
+      {
+        path: 'profile',
+        component: () => import('@/views/system/user/profile/index'),
+        name: 'Profile',
+        meta: {
+          title: '个人中心',
+          icon: 'user'
+        }
+      }
+    ]
+  }
 ];

 // 动态路由，基于用户权限动态去加载
-export const dynamicRoutes = [{
-  path: '/system/user-auth',
-  component: Layout,
-  hidden: true,
-  permissions: ['system:user:edit'],
-  children: [{
-    path: 'role/:userId(\\d+)',
-    component: () => import('@/views/system/user/authRole'),
-    name: 'AuthRole',
-    meta: {
-      title: '分配角色',
-      activeMenu: '/system/user'
-    }
-  }]
-},
-{
-  path: '/system/role-auth',
-  component: Layout,
-  hidden: true,
-  permissions: ['system:role:edit'],
-  children: [{
-    path: 'user/:roleId(\\d+)',
-    component: () => import('@/views/system/role/authUser'),
-    name: 'AuthUser',
-    meta: {
-      title: '分配用户',
-      activeMenu: '/system/role'
-    }
-  }]
-},
-{
-  path: '/system/dict-data',
-  component: Layout,
-  hidden: true,
-  permissions: ['system:dict:list'],
-  children: [{
-    path: 'index/:dictId(\\d+)',
-    component: () => import('@/views/system/dict/data'),
-    name: 'Data',
-    meta: {
-      title: '字典数据',
-      activeMenu: '/system/dict'
-    }
-  }]
-},
-{
-  path: '/monitor/job-log',
-  component: Layout,
-  hidden: true,
-  permissions: ['monitor:job:list'],
-  children: [{
-    path: 'index',
-    component: () => import('@/views/monitor/job/log'),
-    name: 'JobLog',
-    meta: {
-      title: '调度日志',
-      activeMenu: '/monitor/job'
-    }
-  }]
-},
-{
-  path: '/zs/clue-form',
-  component: Layout,
-  hidden: true,
-  permissions: ['zs:clue:add', 'zs:clue:edit'],
-  children: [{
-    path: 'index/:clueId(\\d+)',
-    component: () => import('@/views/zs/clue/ClueForm'),
-    name: 'ClueForm',
-    meta: {
-      title: '线索详情',
-      activeMenu: '/zs/clue'
-    }
-  }]
-}
+export const dynamicRoutes = [
+  {
+    path: '/system/user-auth',
+    component: Layout,
+    hidden: true,
+    permissions: ['system:user:edit'],
+    children: [
+      {
+        path: 'role/:userId(\\d+)',
+        component: () => import('@/views/system/user/authRole'),
+        name: 'AuthRole',
+        meta: {
+          title: '分配角色',
+          activeMenu: '/system/user'
+        }
+      }
+    ]
+  },
+  {
+    path: '/system/role-auth',
+    component: Layout,
+    hidden: true,
+    permissions: ['system:role:edit'],
+    children: [
+      {
+        path: 'user/:roleId(\\d+)',
+        component: () => import('@/views/system/role/authUser'),
+        name: 'AuthUser',
+        meta: {
+          title: '分配用户',
+          activeMenu: '/system/role'
+        }
+      }
+    ]
+  },
+  {
+    path: '/system/dict-data',
+    component: Layout,
+    hidden: true,
+    permissions: ['system:dict:list'],
+    children: [
+      {
+        path: 'index/:dictId(\\d+)',
+        component: () => import('@/views/system/dict/data'),
+        name: 'Data',
+        meta: {
+          title: '字典数据',
+          activeMenu: '/system/dict'
+        }
+      }
+    ]
+  },
+  {
+    path: '/monitor/job-log',
+    component: Layout,
+    hidden: true,
+    permissions: ['monitor:job:list'],
+    children: [
+      {
+        path: 'index',
+        component: () => import('@/views/monitor/job/log'),
+        name: 'JobLog',
+        meta: {
+          title: '调度日志',
+          activeMenu: '/monitor/job'
+        }
+      }
+    ]
+  },
+  {
+    path: '/zs/clue-form',
+    component: Layout,
+    hidden: true,
+    permissions: ['zs:clue:add', 'zs:clue:edit'],
+    children: [
+      {
+        path: 'index/:clueId(\\d+)',
+        component: () => import('@/views/zs/clue/ClueForm'),
+        name: 'ClueForm',
+        meta: {
+          title: '线索详情',
+          activeMenu: '/zs/clue'
+        }
+      }
+    ]
+  }
 ];

 // 防止连续点击多次路由报错
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -14,7 +14,7 @@
            </div>
          </el-card>
        </el-col> -->
-        <el-col :span="6">
+        <!-- <el-col :span="6">
          <el-card>
            <div slot="header">
              计划总结
@@ -27,9 +27,9 @@
              <div v-html="task" />
            </div>
          </el-card>
-        </el-col>
+        </el-col> -->

-        <el-col :span="6">
+        <el-col :span="12">
          <el-card>
            <div slot="header">团队业绩概况</div>
            <div class="card-panel">
@@ -50,7 +50,7 @@
          </el-card>
        </el-col>

-        <el-col :span="6">
+        <el-col :span="12">
          <el-card>
            <div slot="header">转化率</div>
            <div class="card-panel">
@@ -86,7 +86,7 @@
      <el-row :gutter="40" class="panel-group" style="margin-bottom: 20px"> -->

        <!-- 考勤信息 -->
-        <el-col :span="6">
+        <!-- <el-col :span="6">
          <el-card>
            <div slot="header">打卡异常信息</div>
            <div class="card-panel">
@@ -104,7 +104,7 @@
              </el-carousel>
            </div>
          </el-card>
-        </el-col>
+        </el-col> -->
      </el-row>

      <!-- 成交数排行榜  -->
@@ -236,12 +236,12 @@ export default {
        this.user = response.data
      })
    },
-    getCheckin() {
-      getCheckin().then((resp) => {
-        this.checkin_datas = resp.data
-        this.countNum = Math.ceil(this.checkin_datas.length / 5)
-      })
-    },
+    // getCheckin() {
+    //   getCheckin().then((resp) => {
+    //     this.checkin_datas = resp.data
+    //     this.countNum = Math.ceil(this.checkin_datas.length / 5)
+    //   })
+    // },
    handleEditTask(type) {
      this.taskType = type
      if (type === 2) {
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -4,15 +4,14 @@
      <h3 class="title">开心学车管理系统</h3>
      <el-tabs v-model="activeName" type="card">
        <el-tab-pane label="微信扫码" name="wx" style="height:200px">
-          <wxlogin v-if="!code && activeName === 'wx'" appid="wx203f734baa9c9845" :scope="'snsapi_login'" :theme="'black'" redirect_uri="https://xueche.ahduima.com/login" :href="href">
+          <wxlogin v-if="!code && activeName === 'wx'" appid="wxc9e106a4afd2b9dd" :scope="'snsapi_login'" :theme="'black'" redirect_uri="https://xueche.kxxc.top/login" :href="href">
          </wxlogin>
-          <!-- <div id="wxcode" v-if="!code && activeName === 'wx'"></div> -->
-          <!-- 绑定手机号框 -->
+   
          <div v-else v-loading="loading">
            <WxCode v-if="codeShow" :code="code" :openId="openId" />
          </div>
        </el-tab-pane>
-        <el-tab-pane label="账号密码" name="password" style="height:200px">
+        <el-tab-pane label="短信验证码" name="password" style="height:200px">
          <Password v-if="activeName === 'password'" />
        </el-tab-pane>
      </el-tabs>
@@ -91,7 +90,7 @@ export default {
      var obj = new WxLogin({
        self_redirect: true,
        id: "wxcode", // 页面显示二维码的容器id
-        appid: "wx203f734baa9c9845", // 微信官方提供的测试id
+        appid: "wxc9e106a4afd2b9dd", // 微信官方提供的测试id
        scope: "snsapi_login",
        redirect_uri: "https://xueche.ahduima.com/login", // 微信官方中的测试地址
        state: "bind",
--- a/src/views/sch/coach/components/CoachForm.vue
+++ b/src/views/sch/coach/components/CoachForm.vue
@@ -3,16 +3,12 @@
  <el-dialog title="接待人信息" :close-on-click-modal="false" append-to-body :visible.sync="visible" width="600px" @close="closeDialog">
    <div>
      <el-form ref="dialogForm" :model="dialogForm" :rules="dataRule" label-position="top" @keyup.enter.native="dialogFormSubmit()">
-        <el-form-item label="所属驾校" prop="schoolId">
+        <!-- <el-form-item label="所属驾校" prop="schoolId">
          <el-select v-model="dialogForm.schoolId" filterable placeholder="请选择" value-key="schoolId" clearable size="small" style="width:100%">
            <el-option v-for="(dict, index) in schoolOptions" :key="index" :label="dict.schoolName" :value="dict.schoolId" />
          </el-select>
-        </el-form-item>
-        <el-form-item label="所属场地" prop="placeId">
-          <el-select v-model="dialogForm.placeId" filterable placeholder="请选择" clearable value-key="placeId" size="small" style="width:100%">
-            <el-option v-for="(dict, index) in placeOptions.filter(item => item.schoolId === dialogForm.schoolId)" :key="index" :label="dict.name" :value="dict.placeId" />
-          </el-select>
-        </el-form-item>
+        </el-form-item> -->
+       
        <el-form-item label="接待人" prop="coachName">
          <el-input v-model="dialogForm.coachName" placeholder="请输入教练名" />
        </el-form-item>
@@ -22,6 +18,11 @@
        <el-form-item label="微信openid" prop="openId">
          <el-input v-model="dialogForm.openId" placeholder="请输入微信openid" />
        </el-form-item>
+        <el-form-item label="负责场地" prop="placeIdList">
+          <el-select v-model="dialogForm.placeIdList" multiple filterable  placeholder="请选择" clearable  size="small" style="width:100%">
+            <el-option v-for="(dict, index) in placeOptions" :key="index" :label="dict.name" :value="dict.placeId" />
+          </el-select>
+        </el-form-item>
      </el-form>

    </div>
@@ -53,18 +54,19 @@ export default {
      dialogForm: {
        coachId: null,
        deptId: null,
-        schoolId: null,
-        placeId: null,
+        // schoolId: null,
+        placeIdList: null,
+        placeNames: null,
        coachName: null,
        phone: null,
        openId: null
      },
      dataRule: {
-        schoolId: [{ required: true, message: '所属驾校不能为空', trigger: 'blur' }],
-        placeId: [{ required: true, message: '场地不能为空', trigger: 'blur' }],
+        // schoolId: [{ required: true, message: '所属驾校不能为空', trigger: 'blur' }],
+        placeIdList: [{ required: true, message: '负责场地不能为空', trigger: 'blur' }],
        coachName: [{ required: true, message: '教练名不能为空', trigger: 'blur' }],
-        phone: [{ required: true, message: '联系方式不能为空', trigger: 'blur' }]
-
+        phone: [{ required: true, message: '联系方式不能为空', trigger: 'blur' }],
+        openId: [{ required: true, message: '微信openId不能为空', trigger: 'blur' }]
      }
    };
  },
@@ -85,7 +87,7 @@ export default {
        coachId: null,
        deptId: null,
        schoolId: null,
-        placeId: null,
+        placeIdList: null,
        coachName: null,
        phone: null,
        openId: null
--- a/src/views/sch/coach/count/detail.vue
+++ b/src/views/sch/coach/count/detail.vue
@@ -0,0 +1,85 @@
+<!-- 接待人员详情页 -->
+<template>
+  <div class="app-container">
+    <el-form  ref="queryForm" :model="queryParams" size="small" :inline="true" label-width="68px" label-position="top">
+      <el-form-item label="时间" prop="type">
+        <el-radio-group v-model="queryParams.type">
+          <el-radio label="1">今日接待</el-radio>
+          <el-radio label="2">本月接待</el-radio>
+        </el-radio-group>      
+      </el-form-item>
+      <el-form-item label="到场状态" prop="arrivalStatusList">
+        <el-checkbox-group v-model="queryParams.arrivalStatusList">
+            <el-checkbox :label="1">未到场</el-checkbox>
+            <el-checkbox :label="2">到场未成交</el-checkbox>
+            <el-checkbox :label="3">到场已成交</el-checkbox>
+        </el-checkbox-group>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="getList">搜索</el-button>
+        <el-button type="primary" icon="el-icon-back" size="mini" @click="back">返回</el-button>
+
+      </el-form-item>
+    </el-form>
+
+    <el-table v-loading="loading" :data="coachList">
+      <el-table-column type="index" width="50" align="center" />
+      <el-table-column label="学员姓名" align="center" prop="name" />
+      <el-table-column label="联系方式" align="center" prop="phone" />
+      <el-table-column label="到场状态" align="center" prop="arrivalStatus" >
+        <template scope="scope">
+          <el-tag v-if="scope.row.arrivalStatus == 1">未到场</el-tag>
+          <el-tag v-if="scope.row.arrivalStatus == 2">到场未成交</el-tag>
+          <el-tag v-if="scope.row.arrivalStatus == 3">到场已成交</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="备注" align="center" prop="remark" />
+    </el-table>
+  </div>
+</template>
+
+<script>
+import { getCountDetail} from '@/api/zs/feedbackDetail';
+export default {
+  data() {
+    return {
+      // 遮罩层
+      loading: false,
+     
+      // 总条数
+      total: 0,
+      // 教练表格数据
+      coachList: [],
+      // 查询参数
+      queryParams: {
+        type: null, // 1本日统计 2本月统计
+        coachId: null,
+        arrivalStatusList: undefined
+      }
+    };
+  },
+  created() {
+    this.queryParams.type = this.$route.query.type;
+    this.queryParams.coachId = this.$route.query.coachId
+    if(this.queryParams.arrivalStatusList == undefined){
+      this.queryParams.arrivalStatusList = [1,2]
+    }
+    this.getList()
+  },
+  methods: {
+    /** 查询教练列表 */
+    getList() {
+      this.loading = true;
+      getCountDetail(this.queryParams).then(resp=> {
+        if(resp.code == 200 && resp.data){
+          this.coachList = resp.data
+          this.loading = false
+        }
+      })
+    },
+    back(){
+      window.history.back()
+    }
+  }
+};
+</script>
--- a/src/views/sch/coach/count/index.vue
+++ b/src/views/sch/coach/count/index.vue
@@ -0,0 +1,91 @@
+<template>
+  <!-- 接待人统计页面 -->
+  <div class="app-container" style="max-width: 600px; margin: auto;">
+    <el-form  ref="queryForm" :model="queryParams" size="small" :inline="true" label-width="68px" style="text-align: center;">
+      <el-form-item label="手机号" prop="phone">
+        <el-input v-model="queryParams.phone" placeholder="请输入手机号" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <!-- <el-form-item label="验证码" prop="code">
+        <el-input v-model="queryParams.code" placeholder="请输入验证码" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item> -->
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="getCount">查询</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-card class="box-card" v-if="show">
+      <div slot="header" class="clearfix" style="text-align: center;">
+        <span>接待统计</span>
+      </div>
+      <div>
+        <div><span>今日接到人数：{{countInfo.todayTotal == undefined ? 0 : countInfo.todayTotal}}</span></div>
+        <div><span>今日成交人数：{{countInfo.todaySuccess == undefined ? 0 : countInfo.todaySuccess}}</span></div>
+        <div><span>今日未成交人数：{{countInfo.todayUnSuccess == undefined ? 0 : countInfo.todayUnSuccess}}</span>
+          <router-link :to="'/coach/count/detail?coachId=' + coachId +'&type=1'" style="color: blue;"> 详情</router-link>
+        </div>
+      </div>
+      <el-divider></el-divider>
+      <div>
+        <div><span>本月接到人数：{{countInfo.monthTotal}}</span></div>
+        <div><span>本月成交人数：{{countInfo.monthSuccess}}</span></div>
+        <div><span>本月未成交人数：{{countInfo.monthUnSuccess}}</span> 
+          <router-link :to="'/coach/count/detail?coachId=' + coachId+'&type=2'" style="color: blue;"> 详情</router-link>
+        </div>
+      </div>
+    </el-card>
+  </div>
+</template>
+
+<script>
+import { getCount} from '@/api/zs/feedbackDetail';
+
+export default {
+  name: 'Count',
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 查询参数
+      queryParams: {
+        phone: null,
+        code: null
+      },
+      countInfo: {
+        todayTotal: 0,
+        todaySuccess: 0,
+        todayUnSuccess:0,
+        monthTotal: 0,
+        monthSuccess: 0,
+        monthUnSuccess:0
+      },
+      coachId: undefined,
+      show:false
+    };
+  },
+
+  methods: {
+    /** 查询统计结果 */
+    getCount() {
+      this.resetCount();
+      this.loading = true;
+      getCount(this.queryParams).then(resp => {
+        if(resp.code == 200 && resp.data ){
+          this.countInfo = resp.data;
+          this.coachId = resp.data.coachId;
+          this.show = true;
+        }
+      })
+    },
+    resetCount(){
+      this.countInfo= {
+        todayTotal: 0,
+        todaySuccess: 0,
+        todayUnSuccess:0,
+        monthTotal: 0,
+        monthSuccess: 0,
+        monthUnSuccess:0
+      }
+    }
+  }
+};
+</script>
--- a/src/views/sch/coach/index.vue
+++ b/src/views/sch/coach/index.vue
@@ -1,14 +1,9 @@
 <template>
  <div class="app-container">
    <el-form v-show="showSearch" ref="queryForm" :model="queryParams" size="small" :inline="true" label-width="68px">
-      <el-form-item label="所属驾校" prop="schoolId">
-        <el-select v-model="queryParams.schoolId" filterable placeholder="请选择" value-key="schoolId" clearable size="small">
-          <el-option v-for="(dict, index) in schoolOptions" :key="index" :label="dict.schoolName" :value="dict.schoolId" />
-        </el-select>
-      </el-form-item>
      <el-form-item label="所属场地" prop="placeId">
        <el-select v-model="queryParams.placeId" filterable placeholder="请选择" clearable value-key="placeId" size="small">
-          <el-option v-for="(dict, index) in placeOptions.filter(item => item.schoolId === queryParams.schoolId)" :key="index" :label="dict.name" :value="dict.placeId" />
+          <el-option v-for="(dict, index) in placeOptions" :key="index" :label="dict.name" :value="dict.placeId" />
        </el-select>
      </el-form-item>
      <el-form-item label="接待人" prop="coachName">
@@ -32,10 +27,9 @@

    <el-table v-loading="loading" :data="coachList">
      <el-table-column type="index" width="55" align="center" />
-      <el-table-column label="所属驾校" align="center" prop="schoolName" />
-      <el-table-column label="所属场地" align="center" prop="placeName" />
      <el-table-column label="接待人" align="center" prop="coachName" />
      <el-table-column label="联系方式" align="center" prop="phone" />
+      <el-table-column label="负责场地" align="center" prop="placeNames" />
      <el-table-column label="微信openid" align="center" prop="openId" />
      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
        <template slot-scope="scope">
--- a/src/views/sch/place/index
+++ b/src/views/sch/place/index
@@ -0,0 +1,747 @@
+
+<template>
+  <div class="amap-page-container">
+    <div id="map" class="amap-cavans" />
+    <el-input id="search" v-model="searchBody" class="search-body" placeholder="请输入..." @keyup.enter.native="submitSearch">
+      <el-button slot="append" icon="el-icon-search" @click="submitSearch" />
+    </el-input>
+    <div class="asider" :class="showSchool ? '' : 'hidden-school'">
+      <el-card class="box-card" :body-style="{ flex: 1, 'overflow-y': 'scroll', padding: 0 }">
+        <div slot="header" class="clearfix">
+          <div class="map-card-title">驾校列表</div>
+        </div>
+        <div v-for="school in schoolList" :key="school.schoolId" style="margin:10px;" :class="currentdeptId == school.schoolId ? 'actived-school' : ''">
+          <el-card :body-style="{ padding: '10px' }">
+            <div slot="header" class="clearfix">
+              <div class="map-card-title">{{ school.schoolName }}</div>
+              <el-switch v-model="school.showInMap" v-hasPermi="['sch:place:edit']" class="add-icon" active-text="展示" inactive-text="隐藏" @change="changeSchoolStatus(school)" />
+            </div>
+            <el-button @click="handleClickSchool(school)">{{ `数据管理(${getCount(school.schoolId)})` }}</el-button>
+            <el-tooltip v-hasPermi="['sch:place:add']" content="新增场地" placement="left" effect="dark">
+              <el-button icon="el-icon-plus" class="add-place-btn" @click="handleInsertPlace(school.schoolId)" />
+            </el-tooltip>
+          </el-card>
+        </div>
+      </el-card>
+      <div class="asider-sub">
+        <el-tooltip content="放大" placement="left" effect="dark">
+          <el-button icon="el-icon-plus" class="is-circle" :disabled="zomm >= 18" @click="bigger" />
+        </el-tooltip>
+        <el-tooltip content="缩小" placement="left" effect="dark">
+          <el-button icon="el-icon-minus" class="is-circle" :disabled="zomm <= 8" @click="smaller" />
+        </el-tooltip>
+        <div class="mt10">
+          <el-tooltip content="驾校" placement="left" effect="dark">
+            <el-button icon="el-icon-school" class="is-circle" @click="toggleSchool" />
+          </el-tooltip>
+          <el-tooltip content="定位" placement="left" effect="dark">
+            <el-button icon="el-icon-help" class="is-circle" @click="geolocation" />
+          </el-tooltip>
+          <el-tooltip content="测距" placement="left" effect="dark">
+            <el-button icon="el-icon-thumb" class="is-circle" @click="ranging" />
+          </el-tooltip>
+          <el-tooltip content="分享" placement="left" effect="dark">
+            <el-button icon="el-icon-share" class="is-circle" />
+          </el-tooltip>
+        </div>
+      </div>
+    </div>
+    <el-card v-if="placeDialogShow" class="place-dialog" :body-style="{ padding: '10px' }">
+      <div slot="header" class="clearfix">
+        <div class="map-card-title">场地设置</div>
+        <el-tooltip content="取点" placement="right" effect="dark">
+          <el-button icon="el-icon-location" class="add-icon" @click="getPoint" />
+        </el-tooltip>
+      </div>
+      <el-form ref="placeForm" :model="placeForm" label-width="70px">
+        <el-form-item label="所属驾校" prop="schoolId">
+          <el-select v-model="placeForm.schoolId" placeholder="请选择" clearable>
+            <el-option v-for="dict in schoolList" :key="dict.schoolId" :label="dict.schoolName" :value="dict.schoolId" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="名称" prop="name">
+          <el-input v-model="placeForm.name" placeholder="输入名称" />
+        </el-form-item>
+        <el-form-item label="旗子颜色" prop="flagColor">
+          <el-radio-group v-model="placeForm.flagColor">
+            <el-radio v-for="(item, index) in colorOptions" :key="index" :label="item">
+              <img :src="require(`@/assets/images/place/flag_${item}.png`)" width="20px">
+            </el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="地址" prop="address">
+          <el-input v-model="placeForm.address" placeholder="输入地址" />
+        </el-form-item>
+        <el-form-item label="经度" prop="lng">
+          <el-input v-model="placeForm.lng" placeholder="输入经度" />
+        </el-form-item>
+        <el-form-item label="纬度" prop="lat">
+          <el-input v-model="placeForm.lat" placeholder="输入纬度" />
+        </el-form-item>
+        <el-form-item label="所属区域" prop="area">
+          <el-select v-model="placeForm.area" placeholder="请选择" clearable size="small">
+            <el-option v-for="dict in areaOptions" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="电话" prop="phone">
+          <el-input v-model="placeForm.phone" placeholder="输入电话" />
+        </el-form-item>
+        <el-form-item label="负责人" prop="contact">
+          <el-input v-model="placeForm.contact" placeholder="输入负责人" />
+        </el-form-item>
+        <el-form-item label="是否推荐" prop="contact">
+          <el-radio v-model="placeForm.recommend" :label="true">是</el-radio>
+          <el-radio v-model="placeForm.recommend" :label="false">否</el-radio>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="placeForm.remark" placeholder="输入备注" type="textarea" :autosize="{ minRows: 2, maxRows: 4 }" />
+        </el-form-item>
+        <el-form-item style="text-align:right;">
+          <el-button v-hasPermi="['sch:place:edit']" type="primary" @click="onSubmit">保存</el-button>
+          <el-button @click="closePlaceDialog">取消</el-button>
+        </el-form-item>
+      </el-form>
+    </el-card>
+    <el-card :class="placeListDialogShow ? '' : 'hidden-place-list'" class="place-list-dialog" :style="{ right: showSchool ? '300px' : '0', top: fullScreenPlaceList ? '0px' : '420px' }" :body-style="{ padding: '10px', height: 'calc(100% - 52px)' }">
+      <div slot="header" class="clearfix">
+        <div class="map-card-title">
+          {{ placeListDialogTitle }}
+          <el-input v-model="tableSearch" placeholder="请输入搜索的内容" clearable />
+        </div>
+        <el-tooltip content="全屏" placement="top" effect="dark">
+          <el-button icon="el-icon-full-screen" class="add-icon" @click="fullScreenPlaceList = !fullScreenPlaceList" />
+        </el-tooltip>
+        <el-tooltip content="关闭" placement="top" effect="dark">
+          <el-button icon="el-icon-close" class="add-icon" @click="() => { placeListDialogShow = false; fullScreenPlaceList = false }" />
+        </el-tooltip>
+      </div>
+      <el-table :data="placeTableData" border stripe class="place-table-list" height="100%">
+        <el-table-column label="序号" type="index" fixed="left" width="50" />
+        <el-table-column prop="name" label="名称" min-width="100" />
+        <el-table-column prop="phone" label="电话" width="120" />
+        <el-table-column prop="contact" label="负责人" width="120" />
+        <el-table-column prop="address" label="地址" min-width="100" />
+        <el-table-column prop="lng" label="经度" width="110" />
+        <el-table-column prop="lat" label="纬度" width="110" />
+        <el-table-column prop="area" label="所属区域" width="110" />
+        <el-table-column label="展示" width="100">
+          <template slot-scope="scope">
+            <el-switch v-model="scope.row.showInMap" v-hasPermi="['sch:place:edit']" @change="changePlaceStatus(scope.row)" />
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" width="100">
+          <template slot-scope="scope">
+            <el-tooltip v-hasPermi="['sch:place:edit']" content="编辑" placement="top" effect="dark">
+              <el-button icon="el-icon-edit" type="primary" style="padding: 4px 8px;" @click="handleEditPlace(scope.row)" />
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-card>
+
+    <div v-if="isPointing || isRanging" class="map-tip" :style="{ transform: 'translate3D(' + (tipPostion.x + 15) + 'px,' + (tipPostion.y - 10) + 'px, 0)' }">{{ mapHelpText }}</div>
+    <i v-if="isPointing" class="el-icon-s-flag circle" :style="{ transform: 'translate3D(' + tipPostion.x + 'px,' + tipPostion.y + 'px, 0)' }" />
+  </div>
+</template>
+<!-- eslint-disable no-undef -->
+<script>
+import AMap from 'AMap';
+import { getMapData, addPlace, updatePlace, updateSchoolStatus } from '@/api/sch/place';
+export default {
+  name: 'Place',
+  data() {
+    return {
+      aMap: null,
+      zomm: 12,
+      showSchool: true,
+      isRanging: false,
+      aMapLocation: null,
+      aMouseTool: null,
+      searchBody: '',
+      placeSearch: null,
+      placeDialogShow: false,
+      isPointing: false,
+      placeForm: {
+        lat: undefined,
+        lng: undefined,
+        name: undefined,
+        address: undefined,
+        remark: undefined,
+        phone: undefined,
+        flagColor: 'red'
+      },
+      colorOptions: ['red', 'yellow', 'blue', 'green', 'purple', 'black'],
+      mapHelpText: '',
+      tipPostion: {
+        x: 0,
+        y: 0
+      },
+      geocoder: null,
+      locationMarker: null,
+      selectMarker: null,
+      placeListDialogShow: false,
+      placeListDialogTitle: '',
+      fullScreenPlaceList: false,
+      tableSearch: '',
+      tableData: [],
+      schoolList: [],
+      currentdeptId: undefined,
+      placeMarkerList: [],
+      areaOptions: []
+    };
+  },
+  computed: {
+    placeTableData: function () {
+      if (this.tableSearch) {
+        return this.tableData.filter((dataNews) => {
+          return (
+            dataNews.schoolId === this.currentdeptId &&
+            Object.keys(dataNews).some((key) => {
+              return String(dataNews[key]).toLowerCase().indexOf(this.tableSearch) > -1;
+            })
+          );
+        });
+      }
+      return this.tableData.filter((dataNews) => dataNews.schoolId === this.currentdeptId);
+    }
+  },
+  mounted() {
+    this.initMap();
+    this.getDicts('dm_area').then((response) => {
+      this.areaOptions = response.data;
+    });
+  },
+  methods: {
+    initMap() {
+      window.onLoad = () => {
+        this.aMap = new AMap.Map('map', {
+          zoom: this.zomm,
+          center: [117.226095, 31.814372],
+          zooms: [8, 18]
+        });
+        // 监听缩放
+        this.aMap.on('zoomend', () => {
+          this.zomm = this.aMap.getZoom();
+          this.$message('当前缩放等级:' + this.zomm);
+        });
+        // 监听点击
+        this.aMap.on('click', (ev) => {
+          if (this.isPointing) {
+            this.placeForm.lat = ev.lnglat.lat;
+            this.placeForm.lng = ev.lnglat.lng;
+            this.regeoCode();
+            if (this.selectMarker) {
+              this.selectMarker.setPosition([this.placeForm.lng, this.placeForm.lat]);
+            } else {
+              this.locationMarker.setPosition([this.placeForm.lng, this.placeForm.lat]);
+              this.aMap.add(this.locationMarker);
+            }
+            this.isPointing = false;
+          }
+        });
+        // 监听移动
+        this.aMap.on('mousemove', (ev) => {
+          if (this.isRanging) {
+            this.mapHelpText = '左键单击选点，双击/右键单击完成选点，再次点击测距按钮可退出测距模式，并清除测距结果';
+            this.tipPostion = {
+              x: ev.pixel.x,
+              y: ev.pixel.y
+            };
+          } else if (this.isPointing) {
+            this.mapHelpText = '点击地图添加标注';
+            this.tipPostion = {
+              x: ev.pixel.x,
+              y: ev.pixel.y
+            };
+          }
+        });
+        // 添加地图插件
+        AMap.plugin(['AMap.Scale', 'AMap.Geolocation', 'AMap.MouseTool', 'AMap.PlaceSearch', 'AMap.Autocomplete', 'AMap.Geocoder'], () => {
+          this.aMap.addControl(new AMap.Scale());
+          const geoLoca = new AMap.Geolocation({
+            showButton: false
+          });
+          this.aMapLocation = geoLoca;
+          this.aMap.addControl(geoLoca);
+          this.aMouseTool = new AMap.MouseTool(this.aMap);
+          const auto = new AMap.Autocomplete({
+            input: 'search' // 前端搜索框
+          });
+          this.placeSearch = new AMap.PlaceSearch({
+            map: this.aMap
+          });
+          AMap.event.addListener(auto, 'select', this.select);
+          this.geocoder = new AMap.Geocoder();
+          this.locationMarker = new AMap.Marker({
+            icon: require(`@/assets/images/place/flag_red.png`)
+          });
+        });
+        this.getPageData();
+      };
+      // this.importMap();
+    },
+    // 导入地图
+    // importMap() {
+    //   const url = 'https://webapi.amap.com/maps?v=1.4.15&key=0e62be0896c6b8d27d453445f0fb8bc4&callback=onLoad';
+    //   var jsapi = document.createElement('script');
+    //   jsapi.charset = 'utf-8';
+    //   jsapi.src = url;
+    //   document.head.appendChild(jsapi);
+    // },
+    toggleSchool() {
+      this.showSchool = !this.showSchool;
+    },
+    // 经纬度 -> 地址
+    regeoCode() {
+      this.geocoder.getAddress([this.placeForm.lng, this.placeForm.lat], (status, result) => {
+        if (status === 'complete' && result.regeocode) {
+          this.placeForm.address = result.regeocode.formattedAddress;
+        } else {
+          console.log('根据经纬度查询地址失败');
+        }
+      });
+    },
+    // 定位
+    geolocation() {
+      this.aMapLocation.getCurrentPosition();
+    },
+    // 测距
+    ranging() {
+      this.isPointing = false;
+      this.isRanging = !this.isRanging;
+      if (this.isRanging) {
+        this.aMap.setDefaultCursor('crosshair');
+        this.drawLine();
+      } else {
+        this.aMap.setDefaultCursor('default');
+        this.aMouseTool.close(true);
+      }
+    },
+    // 画线
+    drawLine() {
+      this.aMouseTool.rule({
+        startMarkerOptions: {
+          // 可缺省
+          icon: new AMap.Icon({
+            size: new AMap.Size(19, 31), // 图标大小
+            imageSize: new AMap.Size(19, 31),
+            image: 'https://webapi.amap.com/theme/v1.3/markers/b/start.png'
+          })
+        },
+        endMarkerOptions: {
+          // 可缺省
+          icon: new AMap.Icon({
+            size: new AMap.Size(19, 31), // 图标大小
+            imageSize: new AMap.Size(19, 31),
+            image: 'https://webapi.amap.com/theme/v1.3/markers/b/end.png'
+          }),
+          offset: new AMap.Pixel(-9, -31)
+        },
+        midMarkerOptions: {
+          // 可缺省
+          icon: new AMap.Icon({
+            size: new AMap.Size(19, 31), // 图标大小
+            imageSize: new AMap.Size(19, 31),
+            image: 'https://webapi.amap.com/theme/v1.3/markers/b/mid.png'
+          }),
+          offset: new AMap.Pixel(-9, -31)
+        },
+        lineOptions: {
+          // 可缺省
+          strokeStyle: 'solid',
+          strokeColor: '#FF33FF',
+          strokeOpacity: 1,
+          strokeWeight: 2
+        },
+        tmpLineOptions: {
+          strokeStyle: 'dashed',
+          strokeColor: '#FF33FF',
+          strokeOpacity: 1,
+          strokeWeight: 2
+        }
+      });
+    },
+    // 选择查询结果
+    select(e) {
+      this.placeSearch.setCity(e.poi.adcode);
+      this.placeSearch.search(e.poi.name); // 关键字查询查询
+    },
+    // 查询按钮/回车事件
+    submitSearch() {
+      this.placeSearch.search(this.searchBody);
+    },
+    // 缩放
+    bigger() {
+      this.zomm++;
+      this.aMap.setZoom(this.zomm);
+    },
+    smaller() {
+      this.zomm--;
+      this.aMap.setZoom(this.zomm);
+    },
+
+    // 点击数据管理
+    handleClickSchool(item) {
+      this.placeListDialogShow = true;
+      this.placeListDialogTitle = `数据管理 [${item.schoolName}]`;
+      this.currentdeptId = item.schoolId;
+    },
+    // 新增场地
+    handleInsertPlace(schoolId) {
+      if (this.selectMarker) {
+        this.selectMarker.setAnimation('AMAP_ANIMATION_NONE');
+        this.selectMarker = null;
+      }
+      this.placeDialogShow = true;
+      this.aMap.setDefaultCursor('default');
+      this.isRanging = false;
+      this.placeForm = {
+        lat: undefined,
+        lng: undefined,
+        name: undefined,
+        address: undefined,
+        remark: undefined,
+        phone: undefined,
+        schoolId: schoolId,
+        showInMap: true,
+        flagColor: 'red'
+      };
+    },
+    // 编辑场地
+    handleEditPlace(item) {
+      this.placeDialogShow = true;
+      this.aMap.setDefaultCursor('default');
+      if (this.selectMarker) {
+        this.selectMarker.setAnimation('AMAP_ANIMATION_NONE');
+      }
+      this.isRanging = false;
+      this.placeForm = Object.assign({}, item);
+      this.selectMarker = this.placeMarkerList.filter((marker) => marker.getExtData().placeId === item.placeId)[0];
+      this.selectMarker && this.selectMarker.setAnimation('AMAP_ANIMATION_BOUNCE');
+      this.aMap.setCenter([item.lng, item.lat]);
+    },
+    getPoint() {
+      this.isPointing = !this.isPointing;
+    },
+    // 保存
+    async onSubmit() {
+      // 保存接口
+      if (this.checkPlaceFormValidate()) {
+        // 先访问接口，返回id插入placeForm
+        const resp = this.savePlace(this.placeForm);
+        if (resp.code != 200) {
+          return;
+        } else {
+          this.$message.success('操作成功');
+        }
+        if (!this.placeForm.placeId && resp.data) {
+          this.$set(this.placeForm, 'placeId', resp.data);
+        }
+        // 移除选点用 的标记
+        this.aMap.remove(this.locationMarker);
+        // 根据form创建新marker 并添加到地图上
+        const tmpMarker = new AMap.Marker({
+          map: this.aMap,
+          position: [this.placeForm.lng, this.placeForm.lat],
+          icon: require(`@/assets/images/place/flag_${this.placeForm.flagColor}.png`),
+          label: {
+            content: this.placeForm.name,
+            direction: 'right'
+          },
+          extData: this.placeForm
+        });
+        // 新marker事件
+        tmpMarker.on('click', this.handleClickMarker);
+        // 如果当前选择的marker点存在（编辑）
+        if (this.selectMarker) {
+          // 地图上 移除选择的点
+          this.aMap.remove(this.selectMarker);
+          this.selectMarker = null;
+        }
+        // 关闭场地弹窗
+        this.placeDialogShow = false;
+        this.isPointing = false;
+
+        // 场地列表 移除原列表中操作的场地数据
+        const tmpArr = this.tableData.filter((item) => item.placeId !== this.placeForm.placeId);
+        // 新增新的场地
+        tmpArr.push(this.placeForm);
+        // 重置场地数组
+        this.tableData = tmpArr;
+        // 地图marker列表 移除操作的原marker 添加新marker进数组
+        const tmpArr1 = this.placeMarkerList.filter((item) => item.getExtData().placeId !== this.placeForm.placeId);
+        tmpArr1.push(tmpMarker);
+        this.placeMarkerList = tmpArr1;
+      }
+    },
+    async savePlace(item) {
+      if (item.placeId) {
+        return updatePlace(item);
+      } else {
+        return addPlace(item);
+      }
+    },
+    checkPlaceFormValidate() {
+      const valid = [];
+      if (!this.placeForm.name) {
+        valid.push('名称');
+      }
+      if (!this.placeForm.address) {
+        valid.push('地址');
+      }
+      if (!this.placeForm.lng) {
+        valid.push('经度');
+      }
+      if (!this.placeForm.lat) {
+        valid.push('纬度');
+      }
+      if (!this.placeForm.phone) {
+        valid.push('电话');
+      }
+      if (valid.length == 0) {
+        return true;
+      } else {
+        this.$message.error(`请将以下填写完整: ${valid.join(',')}`);
+        return false;
+      }
+    },
+    // 关闭场地弹窗
+    closePlaceDialog() {
+      this.placeDialogShow = false;
+      this.isPointing = false;
+      this.aMap.remove(this.locationMarker);
+      if (this.selectMarker) {
+        this.selectMarker.setAnimation('AMAP_ANIMATION_NONE');
+        this.selectMarker = null;
+      }
+    },
+    handleClickMarker(ev) {
+      if (this.selectMarker) {
+        this.selectMarker.setAnimation('AMAP_ANIMATION_NONE');
+      }
+      this.placeForm = ev.target.getExtData();
+      this.placeDialogShow = true;
+      ev.target.setAnimation('AMAP_ANIMATION_BOUNCE');
+      this.selectMarker = ev.target;
+    },
+    getPageData() {
+      getMapData().then((resp) => {
+        if (resp.code == 200) {
+          this.schoolList = resp.data.schoolList;
+          this.tableData = resp.data.placeList;
+          this.currentdeptId = this.schoolList[0].schoolId;
+          this.createMarkersInMap();
+        }
+      });
+    },
+    getCount(schoolId) {
+      return this.tableData.filter((item) => item.schoolId === schoolId).length;
+    },
+    // 重置markers
+    resetMarkers() {
+      this.aMap.clearMap();
+      this.createMarkersInMap();
+    },
+    // 生成markers
+    createMarkersInMap() {
+      for (let i = 0; i < this.tableData.length; i++) {
+        const element = this.tableData[i];
+        const tempSchool = this.schoolList.filter((item) => item.schoolId === element.schoolId)[0];
+        if (!element.schoolShow || !element.showInMap) {
+          continue;
+        }
+        const tmpMarker = new AMap.Marker({
+          map: this.aMap,
+          position: [element.lng, element.lat],
+          icon: require(`@/assets/images/place/flag_${element.flagColor}.png`),
+          label: {
+            content: element.name,
+            direction: 'right'
+          },
+          extData: element
+        });
+        tmpMarker.on('click', this.handleClickMarker);
+        this.placeMarkerList.push(tmpMarker);
+      }
+    },
+    // 修改驾校状态
+    changeSchoolStatus(item) {
+      // 访问接口，成功后重置markers
+      updateSchoolStatus(item).then((resp) => {
+        if (resp.code == 200) {
+          this.$message.success('操作成功');
+          // this.aMap.clearMap()
+          // this.getPageData()
+          this.resetMarkers();
+        }
+      });
+    },
+    // 修改场地状态
+    async changePlaceStatus(item) {
+      const resp = await updatePlace(item);
+      if (resp.code == 200) {
+        this.resetMarkers();
+      }
+    }
+  }
+};
+</script>
+
+<style scoped>
+.amap-page-container {
+  position: absolute;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+}
+
+.amap-cavans {
+  width: 100%;
+  height: 100%;
+}
+
+.asider {
+  position: absolute;
+  right: 0;
+  top: 0;
+  width: 300px;
+  height: 100%;
+  transition: 0.3s;
+  z-index: 9;
+}
+
+.box-card {
+  display: flex;
+  flex-direction: column;
+  height: 100%;
+}
+
+::v-deep .el-card__header {
+  padding: 10px 15px;
+}
+
+.clearfix {
+  display: flex;
+}
+
+.clearfix .map-card-title {
+  flex: 1;
+  line-height: 30px;
+}
+
+.clearfix .add-icon {
+  width: auto;
+  height: 30px;
+}
+
+.asider-sub {
+  position: absolute;
+  top: 40px;
+  left: -45px;
+  padding: 10px 10px 0 0;
+  z-index: 900;
+}
+
+.asider-sub .is-circle {
+  display: block;
+  margin: 0;
+  padding: 10px;
+  color: #464646;
+  border-radius: 0;
+  font-size: 16px;
+  box-shadow: 2px 2px 2px rgba(80, 80, 80, 0.67);
+}
+
+.mt10 {
+  margin-top: 10px;
+}
+
+.hidden-school {
+  transform: translateX(300px);
+}
+
+.search-body {
+  position: absolute;
+  top: 20px;
+  left: 20px;
+  width: 400px;
+}
+
+.add-place-btn {
+  float: right;
+  border: none;
+  font-size: 16px;
+  color: #409eff;
+}
+
+::v-deep .place-dialog {
+  position: absolute;
+  left: 20px;
+  top: 60px;
+  width: 350px;
+}
+
+.map-tip {
+  position: absolute;
+  left: 0;
+  top: 0;
+  max-width: 150px;
+  padding: 5px;
+  border-radius: 2px;
+  background: #000;
+  color: #fff;
+  opacity: 0.7;
+  font-size: 12px;
+  transition-duration: 1ms;
+}
+
+.circle {
+  position: absolute;
+  left: -8px;
+  top: -25px;
+  font-size: 24px;
+  color: red;
+  transition-duration: 1ms;
+}
+
+.place-dialog .el-form .el-form-item {
+  margin-bottom: 8px;
+}
+
+.place-list-dialog {
+  position: absolute;
+  top: 420px;
+  left: 0;
+  bottom: 0;
+  transition: 0.3s;
+  z-index: 151;
+  background: #e2e5ea;
+}
+
+.place-list-dialog .add-icon {
+  font-size: 18px;
+  border: none;
+}
+
+.hidden-place-list {
+  transform: translateY(100%);
+}
+
+.place-list-dialog .clearfix .map-card-title {
+  font-weight: bold;
+}
+
+.place-list-dialog .clearfix .map-card-title .el-input {
+  margin-left: 20px;
+  width: 240px;
+}
+
+.actived-school {
+  border: 2px solid #409eff !important;
+}
+
+::v-deep .el-radio__label {
+  vertical-align: middle;
+}
+</style>
--- a/src/views/sch/place/index.vue
+++ b/src/views/sch/place/index.vue
@@ -145,6 +145,7 @@
 </template>
 <!-- eslint-disable no-undef -->
 <script>
+import AMap from 'AMap';
 import { getMapData, addPlace, updatePlace, updateSchoolStatus } from '@/api/sch/place';
 export default {
  name: 'Place',
@@ -212,10 +213,9 @@ export default {
  },
  methods: {
    initMap() {
-      window.onLoad = () => {
        this.aMap = new AMap.Map('map', {
          zoom: this.zomm,
-          center: [117.226095, 31.814372],
+          center: [121.448641, 31.2071],
          zooms: [8, 18]
        });
        // 监听缩放
@@ -276,17 +276,16 @@ export default {
          });
        });
        this.getPageData();
-      };
-      this.importMap();
+      // this.importMap();
    },
    // 导入地图
-    importMap() {
-      const url = 'https://webapi.amap.com/maps?v=1.4.15&key=0e62be0896c6b8d27d453445f0fb8bc4&callback=onLoad';
-      var jsapi = document.createElement('script');
-      jsapi.charset = 'utf-8';
-      jsapi.src = url;
-      document.head.appendChild(jsapi);
-    },
+    // importMap() {
+    //   const url = 'https://webapi.amap.com/maps?v=1.4.15&key=0e62be0896c6b8d27d453445f0fb8bc4&callback=onLoad';
+    //   var jsapi = document.createElement('script');
+    //   jsapi.charset = 'utf-8';
+    //   jsapi.src = url;
+    //   document.head.appendChild(jsapi);
+    // },
    toggleSchool() {
      this.showSchool = !this.showSchool;
    },
--- a/src/views/sch/school/index.vue
+++ b/src/views/sch/school/index.vue
@@ -22,6 +22,12 @@
      <el-table-column label="负责人" prop="leader" />
      <el-table-column label="联系方式" prop="phone" />
      <el-table-column label="备注" prop="remark" />
+      <el-table-column label="小程序二维码" prop="jwlCodePath" >
+        <template slot-scope="scope">
+          <el-image v-if="scope.row.jwlCodePath != undefined" style="width: 100px; height: 100px"  :src="baseUrl + scope.row.jwlCodePath" ></el-image>
+          <el-button v-else v-hasPermi="['sch:school:create']" type="text" icon="el-icon-edit" @click="handleCreate(scope.row)">生成</el-button>
+        </template>
+      </el-table-column>
      <el-table-column label="创建时间" width="160">
        <template slot-scope="scope">
          <span>{{ parseTime(scope.row.createTime) }}</span>
@@ -62,7 +68,8 @@ export default {
      loading: {
        tableLoading: false
      },
-      dialogVisible: false
+      dialogVisible: false,
+      baseUrl: process.env.VUE_APP_BASE_API
    };
  },
  created() {
@@ -101,6 +108,14 @@ export default {
        this.$refs.dialogForm.init(item);
      });
    },
+    handleCreate(item){
+      schoolApi.createCode(item.schoolId).then(resp => {
+        if (resp.code === 200) {
+            this.getPageList();
+            this.$modal.msgSuccess('生成成功');
+          }
+      })
+    },
    // 删除操作
    handleDelete(item) {
      this.$modal
--- a/src/views/sch/shop/index.vue
+++ b/src/views/sch/shop/index.vue
@@ -0,0 +1,338 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="店铺名称" prop="shopName">
+        <el-input
+          v-model="queryParams.shopName"
+          placeholder="请输入店铺名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="区域" prop="area">
+        <el-input
+          v-model="queryParams.area"
+          placeholder="请输入区域"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="城市" prop="city">
+        <el-input
+          v-model="queryParams.city"
+          placeholder="请输入城市"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="联系人" prop="contacts">
+        <el-input
+          v-model="queryParams.contacts"
+          placeholder="请输入联系人"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="备注名" prop="remarkName">
+        <el-input
+          v-model="queryParams.remarkName"
+          placeholder="请输入备注名"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="备注id" prop="remarkId">
+        <el-input
+          v-model="queryParams.remarkId"
+          placeholder="请输入备注id"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['system:shop:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['system:shop:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['system:shop:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['system:shop:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="shopList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="门店id 和抖音门店id 一致" align="center" prop="shopId" />
+      <el-table-column label="店铺名称" align="center" prop="shopName" />
+      <el-table-column label="门店品类" align="center" prop="shopType" />
+      <el-table-column label="主营类目" align="center" prop="businessCategory" />
+      <el-table-column label="区域" align="center" prop="area" />
+      <el-table-column label="城市" align="center" prop="city" />
+      <el-table-column label="地址" align="center" prop="address" />
+      <el-table-column label="联系人" align="center" prop="contacts" />
+      <el-table-column label="营业状态" align="center" prop="status" />
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="备注名" align="center" prop="remarkName" />
+      <el-table-column label="备注id" align="center" prop="remarkId" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['system:shop:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['system:shop:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改抖音门店对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="店铺名称" prop="shopName">
+          <el-input v-model="form.shopName" placeholder="请输入店铺名称" />
+        </el-form-item>
+        <el-form-item label="主营类目" prop="businessCategory">
+          <el-input v-model="form.businessCategory" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+        <el-form-item label="区域" prop="area">
+          <el-input v-model="form.area" placeholder="请输入区域" />
+        </el-form-item>
+        <el-form-item label="城市" prop="city">
+          <el-input v-model="form.city" placeholder="请输入城市" />
+        </el-form-item>
+        <el-form-item label="地址" prop="address">
+          <el-input v-model="form.address" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+        <el-form-item label="联系人" prop="contacts">
+          <el-input v-model="form.contacts" placeholder="请输入联系人" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+        <el-form-item label="备注名" prop="remarkName">
+          <el-input v-model="form.remarkName" placeholder="请输入备注名" />
+        </el-form-item>
+        <el-form-item label="备注id" prop="remarkId">
+          <el-input v-model="form.remarkId" placeholder="请输入备注id" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listShop, getShop, delShop, addShop, updateShop } from "@/api/sch/shop";
+
+export default {
+  name: "Shop",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 抖音门店表格数据
+      shopList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        shopName: null,
+        shopType: null,
+        businessCategory: null,
+        area: null,
+        city: null,
+        address: null,
+        contacts: null,
+        status: null,
+        remarkName: null,
+        remarkId: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询抖音门店列表 */
+    getList() {
+      this.loading = true;
+      listShop(this.queryParams).then(response => {
+        this.shopList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        shopId: null,
+        shopName: null,
+        shopType: null,
+        businessCategory: null,
+        area: null,
+        city: null,
+        address: null,
+        contacts: null,
+        status: "0",
+        remark: null,
+        remarkName: null,
+        remarkId: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.shopId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加抖音门店";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const shopId = row.shopId || this.ids
+      getShop(shopId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改抖音门店";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.shopId != null) {
+            updateShop(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addShop(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const shopIds = row.shopId || this.ids;
+      this.$modal.confirm('是否确认删除抖音门店编号为"' + shopIds + '"的数据项？').then(function() {
+        return delShop(shopIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('system/shop/export', {
+        ...this.queryParams
+      }, `shop_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>
--- a/src/views/system/config/index.vue
+++ b/src/views/system/config/index.vue
@@ -21,7 +21,7 @@
      </el-form-item>
    </el-form>

-    <el-row :gutter="10" class="mb8">
+    <!-- <el-row :gutter="10" class="mb8">
      <el-col :span="1.5">
        <el-button v-hasPermi="['system:config:add']" type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button>
      </el-col>
@@ -38,7 +38,7 @@
        <el-button v-hasPermi="['system:config:remove']" type="danger" plain icon="el-icon-refresh" size="mini" @click="handleRefreshCache">刷新缓存</el-button>
      </el-col>
      <right-toolbar :show-search.sync="showSearch" @queryTable="getList" />
-    </el-row>
+    </el-row> -->

    <el-table v-loading="loading" :data="configList" @selection-change="handleSelectionChange">
      <el-table-column type="selection" width="55" align="center" />
@@ -60,7 +60,7 @@
      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
        <template slot-scope="scope">
          <el-button v-hasPermi="['system:config:edit']" size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)">修改</el-button>
-          <el-button v-hasPermi="['system:config:remove']" size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)">删除</el-button>
+          <!-- <el-button v-hasPermi="['system:config:remove']" size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)">删除</el-button> -->
        </template>
      </el-table-column>
    </el-table>
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -79,13 +79,13 @@
              </el-radio-group>
            </el-form-item>
          </el-col>
-          <el-col :span="12">
+          <!-- <el-col :span="12">
            <el-form-item label="所属区域" prop="areaList">
              <el-select v-model="form.areaList" placeholder="请选择" filterable multiple>
                <el-option label="区域1" :value="1" />
              </el-select>
            </el-form-item>
-          </el-col>
+          </el-col> -->
          <el-col :span="24">
            <el-form-item label="备注">
              <el-input v-model="form.remark" placeholder="请输入" type="textarea" :autosize="{ minRows: 3 }" />
--- a/src/views/system/employee/index.vue
+++ b/src/views/system/employee/index.vue
@@ -165,22 +165,18 @@
          </el-col>
        </el-row>

-        <!-- <el-col :span="12">
-            <el-form-item label="小程序权限">
-              <el-radio-group v-model="form.hasStudent">
-                <el-radio :label="true">开通</el-radio>
-                <el-radio :label="false">关闭</el-radio>
-              </el-radio-group>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="数据权限" prop="openId">
+            <el-radio-group v-model="form.dataScope">
+              <el-radio :label="1">全部数据</el-radio>
+              <!-- <el-radio :label="2">部门数据</el-radio> -->
+              <el-radio :label="3">个人数据</el-radio>
+            </el-radio-group>
            </el-form-item>
-          </el-col> -->
-        <!-- <el-col :span="12">
-            <el-form-item label="管理系统权限">
-              <el-radio-group v-model="form.hasSys">
-                <el-radio :label="true">开通</el-radio>
-                <el-radio :label="false">关闭</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col> -->
+          </el-col>
+        </el-row>
+
        <el-row>
          <el-col :span="24">
            <el-form-item label="备注">
@@ -210,7 +206,7 @@ import editor from '@/components/Editor';
 export default {
  name: 'Employee',
  components: { Treeselect, editor },
-  data () {
+  data() {
    return {
      // 遮罩层
      loading: true,
@@ -292,11 +288,11 @@ export default {
  },
  watch: {
    // 根据名称筛选部门树
-    deptName (val) {
+    deptName(val) {
      this.$refs.tree.filter(val);
    }
  },
-  created () {
+  created() {
    this.getList();
    this.getDeptTree();
    this._getRoleOptions();
@@ -328,7 +324,7 @@ export default {
  },
  methods: {
    /** 查询用户列表 */
-    getList () {
+    getList() {
      this.loading = true;
      empAPi.pageList(this.queryParams).then((response) => {
        this.userList = response.rows;
@@ -336,29 +332,29 @@ export default {
        this.loading = false;
      });
    },
-    _getRoleOptions () {
+    _getRoleOptions() {
      getRoleOptions().then((resp) => {
        this.roleOptions = resp.data;
      });
    },
    /** 查询部门下拉树结构 */
-    getDeptTree () {
+    getDeptTree() {
      deptTreeSelect().then((response) => {
        this.deptOptions = response.data;
      });
    },
    // 筛选节点
-    filterNode (value, data) {
+    filterNode(value, data) {
      if (!value) return true;
      return data.label.indexOf(value) !== -1;
    },
    // 节点单击事件
-    handleNodeClick (data) {
+    handleNodeClick(data) {
      this.queryParams.orgId = data.id;
      this.getList();
    },
    // 用户状态修改
-    handleStatusChange (row) {
+    handleStatusChange(row) {
      const text = row.status === '0' ? '启用' : '停用';
      this.$confirm('确认要"' + text + '""' + row.userName + '"用户吗?', '警告', {
        confirmButtonText: '确定',
@@ -380,12 +376,12 @@ export default {
        });
    },
    // 取消按钮
-    cancel () {
+    cancel() {
      this.open = false;
      this.reset();
    },
    // 表单重置
-    reset () {
+    reset() {
      this.form = {
        orgId: undefined,
        employeeName: undefined,
@@ -402,29 +398,30 @@ export default {
        areaList: [],
        weight: undefined,
        count: true,
-        signPlace: undefined
+        signPlace: undefined,
+        dataScope: 3// 默认个人数据
      };
      this.resetForm('form');
    },
    /** 搜索按钮操作 */
-    handleQuery () {
+    handleQuery() {
      this.queryParams.page = 1;
      this.getList();
    },
    /** 重置按钮操作 */
-    resetQuery () {
+    resetQuery() {
      this.resetForm('queryForm');
      this.handleQuery();
    },
    /** 新增按钮操作 */
-    handleAdd () {
+    handleAdd() {
      this.reset();
      this.getDeptTree();
      this.open = true;
      this.title = '添加员工';
    },
    /** 修改按钮操作 */
-    handleUpdate (row) {
+    handleUpdate(row) {
      this.reset();
      this.getDeptTree();
      this.form = Object.assign({}, row);
@@ -432,7 +429,7 @@ export default {
      this.title = '修改员工';
    },
    /** 重置密码按钮操作 */
-    handleReset (row) {
+    handleReset(row) {
      resetUserPwd({ employeeId: row.employeeId }).then((response) => {
        if (response.code === 200) {
          this.msgSuccess('重置密码成功!');
@@ -440,7 +437,7 @@ export default {
      });
    },
    /** 提交按钮 */
-    submitForm () {
+    submitForm() {
      this.$refs['form'].validate((valid) => {
        if (valid) {
          this.$set(this.form, 'deptId', this.$store.getters.schoolId);
@@ -464,18 +461,20 @@ export default {
        }
      });
    },
-    handleLogoff (row) {
+    handleLogoff(row) {
      this.$confirm('注销后将立即释放线索，并禁用该员工，是否确认注销?', '警告', {
        confirmButtonText: '确定',
        cancelButtonText: '取消',
        type: 'warning'
      }).then(function () {
        // 走释放线索逻辑，并禁用该用户
+        empAPi.delete(row.employeeId);
+        this.getList();
      }).then(() => {
        this.msgSuccess('注销成功！');
      });
    },
-    handleRelease (row) {
+    handleRelease(row) {
      this.$confirm('是否立刻释放该员工拥有的线索?', '警告', {
        confirmButtonText: '确定',
        cancelButtonText: '取消',
@@ -486,13 +485,15 @@ export default {
        this.msgSuccess('释放成功！');
      });
    },
-    handleRemove (row) {
+    handleRemove(row) {
      this.$confirm('是否删除该员工，建议只在数据错误时删除?', '警告', {
        confirmButtonText: '确定',
        cancelButtonText: '取消',
        type: 'warning'
-      }).then(function () {
+      }).then(() => {
        // 检查一下，如果被使用，提示不可删除
+        empAPi.delete(row.employeeId);
+        this.getList();
      }).then(() => {
        this.msgSuccess('删除成功！');
      });
--- a/src/views/vip/components/VipForm.vue
+++ b/src/views/vip/components/VipForm.vue
@@ -0,0 +1,113 @@
+<template>
+  <el-dialog title="VIP" :close-on-click-modal="false" append-to-body :visible.sync="visible" width="500px" @close="closeDialog">
+    <div>
+      <el-form ref="dialogForm" :model="dialogForm" :rules="dataRule"  @keyup.enter.native="dialogFormSubmit()">
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="手机号" prop="phone">
+              <el-input v-model="dialogForm.phone" placeholder="请输入" clearable />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="车型" prop="carTypeId">
+              <el-select v-model="dialogForm.carTypeId" clearable placeholder="选择车型">
+                <el-option v-for="item in carOptions" :key="item.carTypeId" :label="item.carName" :value="item.carTypeId" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="会员" prop="memberId">
+              <el-select v-model="dialogForm.memberId" clearable placeholder="选择车型">
+                <el-option v-for="item in memberOptions.filter(item => item.carTypeId === dialogForm.carTypeId)" :key="item.memberId" :label="item.memberName" :value="item.memberId" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+
+    </div>
+    <span slot="footer" class="dialog-footer">
+      <el-button plain @click="(visible = false)">取消</el-button>
+      <el-button v-jclick type="primary" :disabled="!canSubmit" @click="dialogFormSubmit()">确定</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+import { addUserMember, getCarList, getMemberList } from '@/api/vip';
+
+export default {
+  name:"VipForm",
+  data() {
+    return {
+      visible: false,
+      canSubmit: true,
+      dialogForm: {
+        userId: undefined,
+        memberId: undefined,
+        phone: undefined
+      },
+      dataRule: {
+        phone: [{ required: true, message: '手机号不为空', trigger: 'blur' },
+        { pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: '请输入正确的手机号码', trigger: 'blur' }],        carTypeId: [{ required: true, message: '车型不能为空', trigger: 'blur' }],
+        memberId: [{ required: true, message: '会员不能为空', trigger: 'blur' }]
+      },
+      carOptions:[],
+      memberOptions:[]
+    };
+  },
+  methods: {
+    init(info = undefined) {
+      // debugger
+      this.visible = true;
+      this.getCarList();
+      this.getMemberList();
+      this.$nextTick(() => {
+        this.resetDialogForm();
+        // this.$refs['dialogForm'].resetFields();
+        if (info) {
+          this.dialogForm = this.deepClone(info);
+        }
+      });
+    },
+    resetDialogForm() {
+      this.dialogForm = {
+        userId: undefined,
+        memberId: undefined,
+        phone: undefined
+      };
+    },
+    closeDialog() {
+      this.$emit('update:dialogVisible', false);
+    },
+    // 表单提交
+    dialogFormSubmit() {
+      this.$refs.dialogForm.validate((valid) => {
+        if (valid) {
+          addUserMember(this.dialogForm).then(response => {
+            if (response.code == 200) {
+              this.$modal.msgSuccess('新增成功');
+              this.$emit('update');
+              this.visible = false;
+            }
+          });
+        }
+      });
+    },
+    getCarList(){
+      getCarList().then(resp => {
+        this.carOptions = resp.data;
+      })
+    },
+    getMemberList(){
+      getMemberList().then(resp => {
+        this.memberOptions = resp.data
+      })
+    }
+  }
+};
+</script>
--- a/src/views/vip/index.vue
+++ b/src/views/vip/index.vue
@@ -0,0 +1,96 @@
+<template>
+    <div class="app-container" >
+      <el-form size="small" :inline="true" label-width="68px" @submit.native.prevent>
+        <el-row :gutter="20">
+            <el-form-item label="手机号">
+                <el-input v-model="queryParams.phone" placeholder="请输入" clearable  @keyup.enter.native="handleQuery" />
+            </el-form-item>
+        </el-row>
+        <el-form-item>
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+          <el-button type="primary" icon="el-icon-plus" @click="handleAdd">新增</el-button>
+  
+        </el-form-item>
+      </el-form>
+  
+      <el-table v-loading="loading" :data="tableList"  >
+        <el-table-column type="index" width="55" align="center" />
+        <el-table-column label="手机号" align="center" prop="phone" min-width="140" />
+        <el-table-column label="会员名" align="center" prop="memberName" min-width="140"/>
+        <el-table-column label="车型" align="center" prop="carName" min-width="100" />
+        <el-table-column label="科目" align="center" prop="subjects" min-width="100"/>
+        <el-table-column label="开始时间" align="center" prop="startDate" min-width="100"/>
+        <el-table-column label="结束时间" align="center" prop="endDate" min-width="100"/>
+
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template slot-scope="scope">
+            <!-- <el-button size="mini" type="text" icon="el-icon-download" @click="handleEdit(scope.row)">编辑</el-button> -->
+          </template>
+        </el-table-column>
+      </el-table>
+  
+      <!-- <pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" /> -->
+      <VipForm v-if="dialogVisible" ref="dialogForm" :dialog-visible="dialogVisible" @update="getList" />
+  
+    </div>
+  </template>
+  
+  <script>
+  import { getUserMemberList } from '@/api/vip';
+  import VipForm from './components/VipForm.vue'
+  
+  export default {
+    name: 'Vip',
+    components:{
+        VipForm
+    },
+    data() {
+      return {
+        // 遮罩层
+        loading: false,
+        // 总条数
+        total: 0,
+        tableList: [],
+        // 查询参数
+        queryParams: {
+            phone: undefined
+        },
+        dialogVisible: false,
+        dialogAddVisible: false
+      };
+    },
+    created() {
+      this.getList();
+    },
+    methods: {
+      /** 查询文件列表 */
+      getList() {
+        this.loading = true;
+        getUserMemberList(this.queryParams).then(response => {
+          this.tableList = response.data;
+          // this.total = response.total;
+          this.loading = false;
+        });
+      },
+  
+      /** 搜索按钮操作 */
+      handleQuery() {
+        this.getList();
+      },
+      /** 重置按钮操作 */
+      resetQuery() {
+        this.queryParams.question = '';
+        this.handleQuery();
+      },
+
+      handleAdd(item) {
+        this.dialogVisible = true;
+        this.$nextTick(() => {
+          this.$refs.dialogForm.init(item);
+        });
+      }
+    }
+  };
+  </script>
+  
--- a/src/views/zs/clue/ClueForm/components/MapDialog.vue
+++ b/src/views/zs/clue/ClueForm/components/MapDialog.vue
@@ -64,8 +64,9 @@ export default {
        this.dialogMap = new AMap.Map('dialogMap', {
          zoom: 12,
          resizeEnable: true,
-          center: [117.283042, 31.86119]
+          center: [121.448641, 31.2071],
        });
+
        this.dialogMap.on('click', ev => {
          this.currentPoint.lat = ev.lnglat.lat;
          this.currentPoint.lng = ev.lnglat.lng;
--- a/src/views/zs/clue/ClueForm/components/PlaceMap.vue
+++ b/src/views/zs/clue/ClueForm/components/PlaceMap.vue
@@ -76,9 +76,11 @@ export default {
      if (!this.amap) {
        this.amap = new AMap.Map('map', {
          zoom: 12,
-          center: [117.226095, 31.814372],
+          center: [121.448641, 31.2071],
          resizeEnable: true
        });
+        // this.aMap.setCity("上海")
+
        // 地图坐标点定位

        // this.getAllPlaces();
--- a/src/views/zs/clue/ClueForm/index.vue
+++ b/src/views/zs/clue/ClueForm/index.vue
@@ -76,6 +76,16 @@
                <el-input v-model="clueForm.amountReceived" placeholder="请输入订单实收" />
              </el-form-item>
            </el-col>
+            <el-col v-if="clueForm.source == '抖音直播'" :span="24">
+              <el-form-item label="意向门店" prop="intentionAccountName">
+                <el-input v-model="clueForm.intentionAccountName" placeholder="请输入" />
+              </el-form-item>
+            </el-col>
+            <el-col v-if="clueForm.source == '抖音直播'" :span="24">
+              <el-form-item label="门店地址" prop="intentionAccountAddress">
+                <el-input v-model="clueForm.intentionAccountAddress" placeholder="请输入" />
+              </el-form-item>
+            </el-col>
            <el-col :span="24">
              <el-form-item label="跟进人员" prop="followUser">
                <el-select v-model="clueForm.followUser" style="width: 100%;" multiple clearable :disabled="admin != 'true' && clueForm.clueId != undefined">
@@ -111,7 +121,7 @@
            </el-col>
            <el-col v-if="clueForm.source == '抖音直播'" :span="24">
              <el-form-item label="核销时间" prop="writeOffTime">
-                <el-date-picker v-model="clueForm.writeOffTime" style="width: 100%;" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" />
+                <el-date-picker v-model="clueForm.writeOffTime" style="width: 100%;" value-format="yyyy-MM-dd HH:mm" format="yyyy-MM-dd HH:mm" type="date" />
              </el-form-item>
            </el-col>
            <el-col :span="24">
--- a/src/views/zs/clue/columns.js
+++ b/src/views/zs/clue/columns.js
@@ -93,14 +93,14 @@ export const defaultColumns = [{
  visible: true,
  overflow: false
 },
-{
-  key: 12,
-  prop: 'offlineReceiverName',
-  label: '线下接待人员',
-  width: 140,
-  visible: true,
-  overflow: false
-},
+// {
+//   key: 12,
+//   prop: 'offlineReceiverName',
+//   label: '线下接待人员',
+//   width: 140,
+//   visible: true,
+//   overflow: false
+// },
 {
  key: 13,
  prop: 'clueMemo',
@@ -132,5 +132,21 @@ export const defaultColumns = [{
  width: 140,
  visible: true,
  overflow: true
+},
+{
+  key: 17,
+  prop: 'intentionAccountName',
+  label: '意向门店',
+  width: 140,
+  visible: true,
+  overflow: true
+},{
+  key: 18,
+  prop: 'intentionAccountAddress',
+  label: '门店地址',
+  width: 140,
+  visible: true,
+  overflow: true
 }
+
 ];
--- a/src/views/zs/clue/components/DistributeDialog.vue
+++ b/src/views/zs/clue/components/DistributeDialog.vue
@@ -0,0 +1,134 @@
+<template>
+  <div>
+    <el-dialog :title="title" :close-on-click-modal="false" append-to-body :visible.sync="visible" width="800px"
+      @close="closeDialog" style="min-height: 400px;">
+      <el-tabs v-model="activeTab">
+        <el-tab-pane label="邀约信息" name="first">
+          <el-table v-loading="loading" :data="invitationRecords" border>
+            <el-table-column label="操作时间" prop="createTime" width="140" />
+            <el-table-column label="邀约场地" prop="placeName" min-width="200" />
+            <el-table-column label="约定时间" prop="invitationTime" width="120" />
+            <el-table-column label="备注" prop="remark" min-width="200" />
+          </el-table>
+        </el-tab-pane>
+        <el-tab-pane label="分发信息" name="second">
+          <el-table v-loading="loading" :data="distributeRecords" border>
+            <el-table-column label="操作时间" prop="distributeTime" width="140" />
+            <el-table-column label="分发场地" prop="placeName" min-width="200" />
+            <!-- <el-table-column label="接待人" prop="invitationTime" min-width="120" /> -->
+            <el-table-column label="接待人" prop="coachName" min-width="120" />
+            <el-table-column label="操作" fixed="right" min-width="100">
+              <template slot-scope="scope">
+                <el-button size="mini" v-if="scope.$index == 0 && isEdit" type="text" icon="el-icon-edit"
+                  @click="handleEdit(scope.row)">修改</el-button>
+                <el-button size="mini" type="text"
+                  @click="handleFeedback(scope.row)">反馈信息</el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-tab-pane>
+      </el-tabs>
+
+      <span slot="footer" class="dialog-footer" >
+        <el-button v-jclick type="primary" :disabled="!isAdd" @click="handleAdd()">新增</el-button>
+        <el-button plain @click="(visible = false)">取消</el-button>
+      </span>
+    </el-dialog>
+    <DistributeFormDialog ref="DistributeFormDialog" @refreshDataList="getFeedbackOrder" />
+    <FeedbackDialog ref="FeedbackDialog" />
+
+  </div>
+</template>
+<script>
+import { listFeedbackOrder } from '@/api/zs/feedbackOrder';
+import { getInvitationByClue } from '@/api/zs/invitation';
+import DistributeFormDialog from './DistributeFormDialog.vue';
+import FeedbackDialog from './FeedbackDialog.vue';
+
+export default {
+  name: 'DistributeDialog',
+  components: {
+    DistributeFormDialog, FeedbackDialog
+  },
+  data() {
+    return {
+      visible: false,
+      canSubmit: true,
+      loading: false,
+      placeOptions: [],
+      coachOptions: [],
+      feedbackDetail: [],
+      activeTab: 'first',
+      invitationRecords: [],
+      clueInfo: undefined,
+      distributeRecords: [],
+      isAdd: false,
+      isEdit: true,
+      title: '分发'
+    };
+  },
+  methods: {
+    init(info = undefined) {
+      this.activeTab = 'first';
+      // this.getPlaces();
+      this.visible = true;
+      this.isAdd = false;
+      this.isEdit = true;
+      this.title = '邀约';
+      this.$nextTick(() => {
+        if (info) {
+          this.clueInfo = info;
+          if (info.feedbackStatus > 2) {
+            this.isEdit = false;
+          }
+          if (info.feedbackStatus == 1 || info.feedbackStatus == 5 || info.feedbackStatus == 6) {
+            this.isAdd = true;
+          }
+          // 查询线索的邀约情况
+          this.getInvitationByClue();
+          // 查询该线索的分发a情况
+          this.getFeedbackOrder();
+          this.title = this.title + '【' + (info.name == null ? '' : info.name) + '  ' + info.phone + '】';
+        }
+      });
+    },
+    closeDialog() {
+      this.$emit('update:dialog.batchUpdateVisible', false);
+    },
+    getInvitationByClue() {
+      getInvitationByClue({ clueId: this.clueInfo.clueId }).then(resp => {
+        if (resp.code == 200 && resp.data) {
+          this.invitationRecords = resp.data;
+        }
+      });
+    },
+    getFeedbackOrder() {
+      listFeedbackOrder({ clueId: this.clueInfo.clueId }).then(resp => {
+        if (resp.code == 200 && resp.rows && resp.rows.length > 0) {
+          this.distributeRecords = resp.rows.filter(item => item.feedbackStatus != 0);
+        }
+      });
+    },
+    handleFeedback(item) {
+      this.$nextTick(() => {
+        this.$refs.FeedbackDialog.init(item.orderId);
+      });
+    },
+    handleAdd() {
+      const item = {
+        placeId: undefined,
+        clueId: this.clueInfo.clueId,
+        coachId: undefined,
+        copyUserList: []
+      };
+      this.handleEdit(item);
+    },
+    handleEdit(item) {
+      this.$nextTick(() => {
+        this.$refs.DistributeFormDialog.init(item);
+      });
+    }
+  }
+};
+</script>
+
--- a/src/views/zs/clue/components/DistributeFormDialog.vue
+++ b/src/views/zs/clue/components/DistributeFormDialog.vue
@@ -1,10 +1,12 @@
 <template>
-  <el-dialog title="分发" :close-on-click-modal="false" append-to-body :visible.sync="visible" width="600px" @close="closeDialog">
-    <el-form ref="dialogForm" :model="dialogForm" :rules="rules" label-width="110px" :disabled="dialogForm.orderId">
+  <el-dialog title="分发" :close-on-click-modal="false" append-to-body :visible.sync="visible" width="600px"
+    @close="closeDialog" style="min-height: 400px;">
+    <el-form ref="dialogForm" :model="dialogForm" :rules="rules" label-width="110px">
      <el-row>
        <el-col :span="24">
          <el-form-item label="场地" prop="placeId">
-            <el-select v-model="dialogForm.placeId" filterable placeholder="请选择" clearable style="width: 100%;" @change="getCoaChes">
+            <el-select v-model="dialogForm.placeId" filterable placeholder="请选择" clearable style="width: 100%;"
+              @change="getCoaChes">
              <el-option v-for="dict in placeOptions" :key="dict.placeId" :label="dict.name" :value="dict.placeId" />
            </el-select>
          </el-form-item>
@@ -18,56 +20,31 @@
        </el-col>
        <el-col :span="24">
          <el-form-item label="抄送" prop="copyUserList">
-            <el-select v-model="dialogForm.copyUserList" filterable multiple placeholder="请选择" clearable style="width: 100%;">
+            <el-select v-model="dialogForm.copyUserList" filterable multiple placeholder="请选择" clearable
+              style="width: 100%;">
              <el-option v-for="dict in coachOptions" :key="dict.coachId" :label="dict.coachName" :value="dict.coachId" />
            </el-select>
          </el-form-item>
        </el-col>
-
-        <el-col :span="24">
-          <el-form-item label="跟进信息">
-            <div style="max-height: 200px; overflow-y: auto;">
-              <div v-for="item in feedbackDetail" :key="item.feedbackId">
-                <el-timeline-item :timestamp="item.updateTime == undefined ? item.createTime : item.updateTime" placement="top">
-                  <el-card>
-                    <div v-if="item.feedbackType == 1">
-                      <div>是否联系：<span style="font-size: 12px;">{{ item.isContact ? '已联系' : '未联系' }}</span></div>
-                      <div>到场时间：<span style="font-size: 12px;">{{ item.arrivalTime }}</span></div>
-                      <div>备注：<span style="font-size: 12px;" v-html="item.remark" /></div>
-                    </div>
-                    <div v-if="item.feedbackType == 2">
-                      <div>状态：
-                        <span v-if="item.arrivalStatus == 1">未到场</span>
-                        <span v-if="item.arrivalStatus == 2">到场未成交</span>
-                        <span v-if="item.arrivalStatus == 3">到场已成交</span>
-                      </div>
-                      <div>备注：<span style="font-size: 12px;" v-html="item.remark" /></div>
-                    </div>
-                  </el-card>
-                </el-timeline-item>
-              </div>
-            </div>
-          </el-form-item>
-        </el-col>
      </el-row>
    </el-form>
    <span slot="footer" class="dialog-footer" :disabled="dialogForm.orderId">
-      <el-button plain @click="(visible = false)">取消</el-button>
-      <el-button v-jclick type="primary" :disabled="!canSubmit " @click="dialogFormSubmit()">确定</el-button>
+      <el-button plain @click="closeDialog">取消</el-button>
+      <el-button v-jclick type="primary" :disabled="!canSubmit"
+        @click="dialogFormSubmit()">确定</el-button>
    </span>
  </el-dialog>
 </template>
 <script>
-import { listFeedbackOrder, addFeedbackOrder } from '@/api/zs/feedbackOrder';
-import { listFeedbackDetail } from '@/api/zs/feedbackDetail';
+import { updateFeedbackOrder, addFeedbackOrder } from '@/api/zs/feedbackOrder';
+

 import { getAllPlaces } from '@/api/sch/place';
 import { getAllCoaches } from '@/api/sch/coach';

 export default {
  name: 'DistributeFormDialog',
-
-  data () {
+  data() {
    return {
      visible: false,
      canSubmit: true,
@@ -87,76 +64,76 @@ export default {
    };
  },
  methods: {
-    init (info = undefined) {
+    init(info = undefined) {
      this.getPlaces();
      this.visible = true;
      this.$nextTick(() => {
        this.resetDialogForm();
        this.$refs['dialogForm'].resetFields();
        if (info) {
-          this.dialogForm.clueId = info;
-          // 查询该线索的分发情况
-          this.getFeedbackOrder(info);
+          this.dialogForm = { ...info };
+          if (this.dialogForm.placeId){
+            this.getCoaChes(this.dialogForm.placeId);
+          }
        }
      });
    },
-    resetDialogForm () {
+    resetDialogForm() {
      this.dialogForm = {
        placeId: undefined,
        clueId: undefined,
        coachId: undefined,
        copyUserList: []
      };
+      this.feedbackDetail = []
    },
-    closeDialog () {
+    closeDialog() {
      this.$emit('update:dialog.batchUpdateVisible', false);
-    },
-    getFeedbackOrder (clueId) {
-      listFeedbackOrder({ clueId: clueId }).then(resp => {
-        if (resp.code == 200 && resp.rows && resp.rows.length > 0) {
-          this.dialogForm = resp.rows.filter(item => item.feedbackStatus != 0)[0];
-          if (this.dialogForm != undefined && this.dialogForm.placeId != undefined) {
-            this.getCoaChes(this.dialogForm.placeId);
-          }
-
-          if (this.dialogForm.orderId) {
-            this.getFeedbackDetail(this.dialogForm.orderId);
-          }
-        }
-      });
-    },
-    getFeedbackDetail (orderId) {
-      listFeedbackDetail({ orderId: orderId }).then(resp => {
-        this.feedbackDetail = resp.rows;
-      });
+      this.visible = false;
    },
    // 表单提交
-    dialogFormSubmit () {
+    dialogFormSubmit() {
      this.$refs.dialogForm.validate((valid) => {
        if (valid) {
          this.canSubmit = false;
-          // 校验完成，调接口
-          addFeedbackOrder(this.dialogForm)
-            .then((resp) => {
-              this.canSubmit = true;
-              if (resp.code == 200) {
-                this.$message.success('分发成功');
-                this.$emit('refreshDataList');
-                this.visible = false;
-              }
-            })
-            .catch(() => {
-              this.canSubmit = true;
-            });
+          if (this.dialogForm.orderId) {
+            // 校验完成，调接口
+            updateFeedbackOrder(this.dialogForm)
+              .then((resp) => {
+                this.canSubmit = true;
+                if (resp.code == 200) {
+                  this.$message.success('分发成功');
+                  this.$emit('refreshDataList');
+                  this.visible = false;
+                }
+              })
+              .catch(() => {
+                this.canSubmit = true;
+              });
+          } else {
+            // 校验完成，调接口
+            addFeedbackOrder(this.dialogForm)
+              .then((resp) => {
+                this.canSubmit = true;
+                if (resp.code == 200) {
+                  this.$message.success('分发成功');
+                  this.$emit('refreshDataList');
+                  this.visible = false;
+                }
+              })
+              .catch(() => {
+                this.canSubmit = true;
+              });
+          }
        }
      });
    },
-    getPlaces () {
+    getPlaces() {
      getAllPlaces({ status: '0' }).then((resp) => {
        this.placeOptions = resp.data;
      });
    },
-    getCoaChes (placeId) {
+    getCoaChes(placeId) {
      console.log(placeId);
      getAllCoaches({ placeId: placeId }).then(resp => {
        if (resp.code == 200) { this.coachOptions = resp.data; }
--- a/src/views/zs/clue/components/FeedbackDialog.vue
+++ b/src/views/zs/clue/components/FeedbackDialog.vue
@@ -0,0 +1,53 @@
+<template>
+    <el-dialog title="反馈" :close-on-click-modal="false" append-to-body :visible.sync="visible" width="800px"
+        @close="closeDialog" style="min-height: 400px;">
+        <el-timeline :reverse="true">
+            <el-timeline-item v-for="(item, index) in feedbackDetail" :key="index" :timestamp="item.updateTime" placement="top">
+                <div v-if="item.feedbackType == 1">
+                    <div>是否联系：<span>{{ item.isContact ? '已联系' : '未联系' }}</span></div>
+                    <div>到场时间：<span>{{ item.arrivalTime }}</span></div>
+                    <div>备注：<span>{{ item.remark }}</span></div>
+                </div>
+                <div v-if="item.feedbackType == 2">
+                    <div>到场状态：<span v-if="item.arrivalStatus == 1">未到场</span>
+                        <span v-if="item.arrivalStatus == 2">到场未成交</span>
+                        <span v-if="item.arrivalStatus == 3">到场已成交</span>
+                    </div>
+                    <div> 备注：<span>{{ item.remark }}</span></div>
+                </div>
+            </el-timeline-item>
+        </el-timeline>
+    </el-dialog>
+</template>
+<script>
+import { listFeedbackDetail } from '@/api/zs/feedbackDetail';
+
+export default {
+    name: 'FeedbackDialog',
+    data() {
+        return {
+            visible: false,
+            feedbackDetail: [],
+        };
+    },
+    methods: {
+        init(info = undefined) {
+            this.visible = true;
+            this.$nextTick(() => {
+                this.getFeedbackDetail(info);
+            });
+        },
+        closeDialog() {
+            this.$emit('update:dialog.batchUpdateVisible', false);
+        },
+        getFeedbackDetail(orderId) {
+            listFeedbackDetail({ orderId: orderId }).then(resp => {
+                this.feedbackDetail = resp.rows;
+            });
+        }
+
+    }
+};
+</script>
+  
+  
--- a/src/views/zs/clue/components/FollowCountDialog.vue
+++ b/src/views/zs/clue/components/FollowCountDialog.vue
@@ -0,0 +1,43 @@
+<template>
+  <el-dialog title="跟进统计" :close-on-click-modal="false" append-to-body :visible.sync="visible" width="500px" min-height="500">
+    <div>
+      <el-form ref="dialogForm" :model="dialogForm" label-width="110px" >
+        <el-form-item label="今日跟进线索数" prop="name">
+          <span>{{dialogForm.total}}</span>
+        </el-form-item>
+        <el-form-item v-for="item in dialogForm.intentionCountList" :label="item.label"  >
+          <span>{{item.num}}</span>
+        </el-form-item>
+      </el-form>
+    </div>
+  </el-dialog>
+</template>
+<script>
+import { getFollowCount } from '@/api/zs/clue';
+export default {
+  name: 'FollowCountDialog',
+  data() {
+    return {
+      visible: false,
+      publicList: [],
+      dialogForm:{}
+    };
+  },
+  methods: {
+    init() {
+      this.visible = true;
+      this.getCount();
+    },
+    getCount() {
+      this.loading = true;
+      getFollowCount().then((resp) => {
+        if (resp && resp.code === 200) {
+          this.dialogForm = resp.data;
+          this.loading = false;
+        }
+      });
+    },
+  }
+};
+</script>
+
--- a/src/views/zs/clue/components/FollowInfoDialog.vue
+++ b/src/views/zs/clue/components/FollowInfoDialog.vue
@@ -0,0 +1,39 @@
+<template>
+      <el-dialog title="跟进记录" :close-on-click-modal="false" append-to-body :visible.sync="visible" width="800px">
+        <FollowRecord v-if="clueId" :clue-id="clueId" />
+       </el-dialog>
+  </template>
+  <script>
+  import FollowRecord from '../ClueForm/components/FollowRecord.vue';
+  export default {
+    name: 'FollowInfoDialog',
+    components: {
+        FollowRecord
+    },
+    data() {
+      return {
+        visible: false,
+        title: undefined,
+        clueId: undefined
+      };
+    },
+    methods: {
+      init(info = undefined) {
+        this.$nextTick(() => {
+            this.visible = true;
+          if (info) {
+            this.clueId = info;
+          }
+        });
+      }
+    }
+  };
+  </script>
+  
+  <style scoped>
+  .el-divider--vertical {
+    height: 15em !important;
+  }
+  </style>
+      
+      
--- a/src/views/zs/clue/components/InvitationDialog.vue
+++ b/src/views/zs/clue/components/InvitationDialog.vue
@@ -0,0 +1,117 @@
+<template>
+  <div>
+    <el-dialog :title="title" :close-on-click-modal="false" append-to-body :visible.sync="visible" width="800px"
+      @close="closeDialog">
+      <div>
+        <el-table v-loading="loading" :data="invitationRecords" border>
+          <el-table-column label="操作时间" prop="createTime" width="140" />
+          <el-table-column label="邀约场地" prop="placeName" width="200" />
+          <el-table-column label="约定时间" prop="invitationTime" width="120" />
+          <el-table-column label="备注" prop="remark" width="200" />
+          <el-table-column label="操作" fixed="right" width="80">
+            <template slot-scope="scope">
+              <el-button size="mini" v-if="scope.$index == 0 && isEdit" type="text" icon="el-icon-edit"
+                @click="handleEdit(scope.row)">修改</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button v-jclick type="primary" :disabled="!isAdd" @click="handleAdd()">新增</el-button>
+        <el-button plain @click="closeDialog">关闭</el-button>
+      </span>
+    </el-dialog>
+    <InvitationFormDialog ref="InvitationFormDialog" @refreshDataList="getInvitationRecord" />
+  </div>
+</template>
+<script>
+import { getInvitationByClue } from '@/api/zs/invitation';
+import InvitationFormDialog from './InvitationFormDialog.vue';
+
+export default {
+  name: 'InvitationDialog',
+  components: {
+    InvitationFormDialog
+  },
+  data() {
+    return {
+      visible: false,
+      canSubmit: true,
+      placeOptions: [],
+      isEdit: true,
+      invitationRecords: [],
+      clueId: undefined,
+      loading: false,
+      title: undefined,
+      clueInfo: undefined,
+      isAdd: false
+    };
+  },
+  methods: {
+    init(info = undefined) {
+      this.visible = true;
+      this.title = "邀约";
+      this.isAdd = false;
+      this.isEdit = true;
+      this.clueInfo = undefined;
+      this.$nextTick(() => {
+        if (info) {
+          this.clueInfo = info;
+          if (info.feedbackStatus >= 2) {
+            this.isEdit = false;
+          }
+          if (info.feedbackStatus == 0 || info.feedbackStatus == 5 || info.feedbackStatus == 6) {
+            this.isAdd = true;
+          }
+          if (info.clueId) {
+            this.clueId = info.clueId;
+            this.getInvitationRecord();
+          }
+          this.title = this.title + '【' + (info.name == null ? '' : info.name) + '  ' + info.phone + '】';
+        }
+      });
+    },
+    closeDialog() {
+      this.visible = false;
+      // this.$emit('update:dialog.batchUpdateVisible', false);
+      this.$emit('refreshDataList');
+    },
+    getInvitationRecord() {
+      getInvitationByClue({ clueId: this.clueId }).then(resp => {
+        if (resp.data) {
+          this.invitationRecords = resp.data;
+          if (this.invitationRecords && this.invitationRecords.length > 0) {
+            this.dialogForm = this.invitationRecords[0];
+          }
+        }
+      });
+    },
+    handleAdd() {
+      const invitation = {
+        invitationId: undefined,
+        clueId: this.clueInfo.clueId,
+        name: this.clueInfo.name,
+        phone: this.clueInfo.phone,
+        address: this.clueInfo.address,
+        placeId: undefined,
+        invitationTime: undefined,
+        remark: undefined
+      };
+      this.handleEdit(invitation);
+    },
+    handleEdit(item) {
+      this.$nextTick(() => {
+        this.$refs.InvitationFormDialog.init(item)
+      });
+    }
+  }
+};
+</script>
+
+<style scoped>
+.el-divider--vertical {
+  height: 15em !important;
+}
+</style>
+    
+    
--- a/src/views/zs/clue/components/InvitationFormDialog.vue
+++ b/src/views/zs/clue/components/InvitationFormDialog.vue
@@ -1,120 +1,132 @@
 <template>
-    <el-dialog title="邀约" :close-on-click-modal="false" append-to-body :visible.sync="visible" width="600px" @close="closeDialog">
-      <el-form ref="dialogForm" :model="dialogForm" :rules="rules" label-width="110px" :disabled="dialogForm.invitationId != undefined">
-        <el-form-item label="姓名" prop="name">
-          <el-input v-model="dialogForm.name" placeholder="请输入姓名" />
-        </el-form-item>
-        <el-form-item label="联系方式" prop="phone">
-          <el-input v-model="dialogForm.phone" placeholder="请输入联系方式" />
-        </el-form-item>
-        <el-form-item label="场地" prop="placeId">
-            <el-select v-model="dialogForm.placeId" filterable placeholder="请选择" clearable style="width: 100%;" @change="getCoaChes">
+  <el-dialog title="邀约" :close-on-click-modal="false" append-to-body :visible.sync="visible" width="500px"
+    @close="closeDialog">
+    <el-form ref="dialogForm" :model="dialogForm" :rules="rules" label-width="110px" :disabled="!isEdit">
+      <el-row>
+        <el-col :span="24">
+          <el-form-item label="姓名" prop="name">
+            <el-input v-model="dialogForm.name" placeholder="请输入姓名" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="联系方式" prop="phone">
+            <el-input v-model="dialogForm.phone" placeholder="请输入联系方式" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="24">
+          <el-form-item label="场地" prop="placeId">
+            <el-select v-model="dialogForm.placeId" filterable placeholder="请选择" clearable style="width: 100%;">
              <el-option v-for="dict in placeOptions" :key="dict.placeId" :label="dict.name" :value="dict.placeId" />
            </el-select>
-        </el-form-item>
-        <el-form-item label="约定时间" prop="invitationTime">
-          <el-date-picker clearable
-            v-model="dialogForm.invitationTime"
-            type="datetime"
-            value-format="yyyy-MM-dd HH:mm"
-            format="yyyy-MM-dd HH:mm"
-            placeholder="请选择约定时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="dialogForm.remark" type="textarea" placeholder="请输入" />
-        </el-form-item>
-      </el-form>
-      </el-form>
-      <span slot="footer" class="dialog-footer">
-        <el-button plain @click="(visible = false)">取消</el-button>
-        <el-button v-jclick type="primary" :disabled="!canSubmit" @click="dialogFormSubmit()">确定</el-button>
-      </span>
-    </el-dialog>
-  </template>
-    <script>
-  import { addInvitation, getInvitationByClue } from '@/api/zs/invitation';
-  import { getAllPlaces } from '@/api/sch/place';
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="约定时间" prop="invitationTime">
+            <el-date-picker clearable v-model="dialogForm.invitationTime" type="datetime" value-format="yyyy-MM-dd HH:mm"
+              format="yyyy-MM-dd HH:mm" placeholder="请选择约定时间">
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-form-item label="备注" prop="remark">
+        <el-input v-model="dialogForm.remark" type="textarea" placeholder="请输入" />
+      </el-form-item>
+    </el-form>

-  export default {
-    name: 'InvitationFormDialog',
-  
-    data() {
-      return {
-        visible: false,
-        canSubmit: true,
-        dialogForm: {
-            invitationId: undefined,
-            clueId: undefined,
-            name: undefined,
-            phone: undefined,
-            address: undefined,
-            placeId: undefined,
-            invitationTime: undefined,
-            remark: undefined
-        },
-        rules: {
-          name: { required: true, message: '姓名不能为空', trigger: 'blur'},
-          phone: { required: true, message: '姓名不能为空', trigger: 'blur'},
-          placeId: { required: true, message: '场地不能为空', trigger: 'blur'},
-          placeId: { required: true, message: '场地不能为空', trigger: 'blur'},
-          invitationTime: { required: true, message: '约定时间不能为空', trigger: 'blur'}
+    <span slot="footer" class="dialog-footer">
+      <el-button plain @click="(visible = false)">取消</el-button>
+      <el-button v-jclick type="primary" :disabled="!canSubmit || !isEdit" @click="dialogFormSubmit()">确定</el-button>
+    </span>
+  </el-dialog>
+</template>
+<script>
+import { addInvitation, updateInvitation } from '@/api/zs/invitation';
+import { getAllPlaces } from '@/api/sch/place';

-        },
-        placeOptions:[]
-      };
+export default {
+  name: 'InvitationFormDialog',
+
+  data() {
+    return {
+      visible: false,
+      canSubmit: true,
+      dialogForm: {
+        invitationId: undefined,
+        clueId: undefined,
+        name: undefined,
+        phone: undefined,
+        address: undefined,
+        placeId: undefined,
+        invitationTime: undefined,
+        remark: undefined
+      },
+      rules: {
+        name: { required: true, message: '姓名不能为空', trigger: 'blur' },
+        phone: { required: true, message: '姓名不能为空', trigger: 'blur' },
+        placeId: { required: true, message: '场地不能为空', trigger: 'blur' },
+        invitationTime: { required: true, message: '约定时间不能为空', trigger: 'blur' }
+
+      },
+      placeOptions: [],
+      isEdit: true,
+      invitationRecords: []
+    };
+  },
+  methods: {
+    init(info = undefined) {
+      this.visible = true;
+      this.getPlaces()
+      this.$nextTick(() => {
+        this.resetDialogForm();
+        this.$refs['dialogForm'].resetFields();
+        if (info) {
+          this.dialogForm = { ...info }
+        }
+      });
    },
-    methods: {
-       init(info = undefined) {
-        this.visible = true;
-        this.getPlaces()
-        this.$nextTick(() => {
-          this.resetDialogForm();
-          this.$refs['dialogForm'].resetFields();
-          if (info) {
-            this.dialogForm = {
-                invitationId: undefined,
-                clueId: info.clueId,
-                name: info.name,
-                phone: info.phone,
-                address: info.address,
-                placeId: undefined,
-                invitationTime: undefined,
-                remark: undefined
-            };
-            if(info.clueId){
-                getInvitationByClue({clueId:info.clueId}).then(resp => {
-                if(resp.data){
-                    this.dialogForm = resp.data;
-                } 
+    resetDialogForm() {
+      this.dialogForm = {
+        invitationId: undefined,
+        clueId: undefined,
+        name: undefined,
+        phone: undefined,
+        address: undefined,
+        placeId: undefined,
+        invitationTime: undefined,
+        remark: undefined
+      };
+      this.isEdit = true;
+    },
+    closeDialog() {
+      this.$emit('update:dialog.batchUpdateVisible', false);
+    },
+    handleEdit(item) {
+      this.$nextTick(() => {
+        this.$refs.InvitationDialog.init(item)
+      })
+    },
+    // 表单提交
+    dialogFormSubmit() {
+      this.$refs.dialogForm.validate((valid) => {
+        if (valid) {
+          this.canSubmit = false;
+          if (this.dialogForm.invitationId) {
+            // 校验完成，调接口
+            updateInvitation(this.dialogForm)
+              .then((resp) => {
+                this.canSubmit = true;
+                if (resp.code == 200) {
+                  this.$message.success('修改成功');
+                  this.$emit('refreshDataList');
+                  this.visible = false;
+                }
              })
-            }
-          }
-        });
-      },
-      resetDialogForm() {
-        this.dialogForm = {
-            invitationId:undefined,
-            clueId: undefined,
-            name: undefined,
-            phone: undefined,
-            address: undefined,
-            placeId: undefined,
-            invitationTime: undefined,
-            remark: undefined
-        };
-      },
-      closeDialog() {
-        this.$emit('update:dialog.batchUpdateVisible', false);
-      },
-      async getInvitationInfo(clueId){
-        l
-      },
-      // 表单提交
-      dialogFormSubmit() {
-        this.$refs.dialogForm.validate((valid) => {
-          if (valid) {
-            this.canSubmit = false;
+              .catch(() => {
+                this.canSubmit = true;
+              });
+          } else {
            // 校验完成，调接口
            addInvitation(this.dialogForm)
              .then((resp) => {
@@ -129,15 +141,22 @@
                this.canSubmit = true;
              });
          }
-        });
-      },
-      getPlaces () {
-        getAllPlaces({ status: '0' }).then((resp) => {
-            this.placeOptions = resp.data;
-        });
-      },
+        }
+      });
+    },
+    getPlaces() {
+      getAllPlaces({ status: '0' }).then((resp) => {
+        this.placeOptions = resp.data;
+      });
    }
-  };
-    </script>
+  }
+};
+</script>
+
+<style scoped>
+.el-divider--vertical {
+  height: 15em !important;
+}
+</style>
    
    
--- a/src/views/zs/clue/components/SearchForm.vue
+++ b/src/views/zs/clue/components/SearchForm.vue
@@ -7,6 +7,9 @@
      <el-form-item label="意向状态:" label-width="90px">
        <DMRadio v-model="searchForm.intentionState" :list="intentionOptions" all-text="全部" @change="$emit('search')" />
      </el-form-item>
+      <el-form-item label="反馈状态:" label-width="90px">
+        <DMRadio v-model="searchForm.feedbackStatus" :list="feedbackTagOptions" all-text="全部" @change="$emit('search')" />
+      </el-form-item>
      <el-row>
        <el-form-item label="姓名/联系方式">
          <el-input v-model="searchForm.name" placeholder="姓名/联系方式" clearable style="width: 200px" />
@@ -70,7 +73,15 @@ export default {
      ],
      intentionOptions: [],
      createDateRange: [],
-      nextDateRange: []
+      nextDateRange: [],
+      feedbackTagOptions: [
+        { value: 0, label: '待邀约' },
+        { value: 1, label: '待分发' },
+        { value: 2, label: '待跟进' },
+        { value: 3, label: '待到场' },
+        { value: 4, label: '未到场' },
+        { value: 5, label: '到场未成交' },
+        { value: 6, label: '到场已成交' }]
    };
  },
  watch: {
--- a/src/views/zs/clue/components/UploadDialog.vue
+++ b/src/views/zs/clue/components/UploadDialog.vue
@@ -63,7 +63,6 @@ export default {
    },
    /** 下载模板操作 */
    importTemplate() {
-      debugger
      this.download('zs/clue/importTemplate?ydtData=' + this.ydtData + '&dYData=' + this.dYData, {}, `clue_template_${new Date().getTime()}.xlsx`);
    },
    // 文件上传中处理
--- a/src/views/zs/clue/index.vue
+++ b/src/views/zs/clue/index.vue
@@ -1,28 +1,39 @@
 <template>
  <div class="app-container">
-    <SearchForm v-show="showSearch" ref="SearchForm" :user-options="userOptions" :source-options="sourceOptions" @search="_getTableList" />
+    <SearchForm v-show="showSearch" ref="SearchForm" :user-options="userOptions" :source-options="sourceOptions"
+      @search="_getTableList" />
    <el-row :gutter="10" class="mb8">
      <el-col :span="1.5">
-        <el-button v-hasPermi="['zs:clue:add']" icon="el-icon-plus" type="primary" @click="handleAddandUpdate(undefined)">新增</el-button>
-        <el-button v-hasPermi="['zs:clue:add']" icon="el-icon-plus" type="primary" @click="handleDYAddandUpdate(undefined)">抖音新增</el-button>
+        <el-button v-hasPermi="['zs:clue:add']" icon="el-icon-plus" type="primary"
+          @click="handleAddandUpdate(undefined)">新增</el-button>
+        <el-button v-hasPermi="['zs:clue:add']" icon="el-icon-plus" type="primary"
+          @click="handleDYAddandUpdate(undefined)">抖音新增</el-button>

-        <el-button v-hasPermi="['zs:clue:import']" icon="el-icon-upload" type="warning" @click="handleImport(false,false)">导入</el-button>
-        <el-button v-hasPermi="['zs:clue:import']" icon="el-icon-upload" type="warning" @click="handleImport(true, false)">一点通导入</el-button>
-        <el-button v-hasPermi="['zs:clue:import']" icon="el-icon-upload" type="warning" @click="handleImport(false, true)">抖音导入</el-button>
+        <el-button v-hasPermi="['zs:clue:import']" icon="el-icon-upload" type="warning"
+          @click="handleImport(false, false)">导入</el-button>
+        <!-- <el-button v-hasPermi="['zs:clue:import']" icon="el-icon-upload" type="warning" @click="handleImport(true, false)">一点通导入</el-button> -->
+        <el-button v-hasPermi="['zs:clue:import']" icon="el-icon-upload" type="warning"
+          @click="handleImport(false, true)">抖音导入</el-button>

-        <el-button v-hasPermi="['zs:clue:export']" icon="el-icon-download" type="warning" @click="handleExport">导出</el-button>
-        <el-button v-hasPermi="['zs:clue:edit']" icon="el-icon-edit" type="primary" :disabled="multiple" @click="handleBatChUpdate()">批量修改</el-button>
+        <el-button v-hasPermi="['zs:clue:export']" icon="el-icon-download" type="warning"
+          @click="handleExport">导出</el-button>
+        <el-button v-hasPermi="['zs:clue:edit']" icon="el-icon-edit" type="primary" :disabled="multiple"
+          @click="handleBatChUpdate()">批量修改</el-button>
        <el-button type="primary" @click="handlePublicClue">公海</el-button>
        <el-button type="primary" @click="handleSkill">关键话术</el-button>
+        <el-button type="primary" @click="handleFollowCount">跟进统计</el-button>

      </el-col>
      <right-toolbar :show-search.sync="showSearch" :columns="columns" @queryTable="_getTableList" />
    </el-row>
-    <el-table v-loading="loading" :data="tableList" border @selection-change="handleSelectionChange" @row-dblclick="handleRowClick" @cell-click="handleCellClick">
+    <el-table v-loading="loading" :data="tableList" border @selection-change="handleSelectionChange"
+      @row-dblclick="handleRowClick" @cell-click="handleCellClick">
      <el-table-column type="selection" width="50" align="center" />
      <template v-for="item in columns">
-        <el-table-column v-if="item.visible && item.prop != 'clueMemo'" :key="item.prop" :label="item.label" align="center" :width="item.width" :prop="item.prop" :show-overflow-tooltip="item.overflow" />
-        <el-table-column v-if="item.visible && item.prop == 'clueMemo'" :key="item.prop" :label="item.label" align="center" :width="item.width" :prop="item.prop" :show-overflow-tooltip="item.overflow" />
+        <el-table-column v-if="item.visible && item.prop != 'clueMemo'" :key="item.prop" :label="item.label"
+          align="center" :width="item.width" :prop="item.prop" :show-overflow-tooltip="item.overflow" />
+        <el-table-column v-if="item.visible && item.prop == 'clueMemo'" :key="item.prop" :label="item.label"
+          align="center" :width="item.width" :prop="item.prop" :show-overflow-tooltip="item.overflow" />
      </template>
      <el-table-column label="反馈状态" prop="feedbackStatus" sortable fixed="right" min-width="100">
        <template slot-scope="{ row }">
@@ -31,25 +42,45 @@
      </el-table-column>
      <el-table-column label="意向状态" prop="intentionState" sortable fixed="right" min-width="100">
        <template slot-scope="{ row }">
-          <el-tag effect="dark" style="border: none" :color="tagColorMap[row.intentionState]">{{ row.intentionState }}</el-tag>
+          <el-tag effect="dark" style="border: none" :color="tagColorMap[row.intentionState]">{{ row.intentionState
+          }}</el-tag>
        </template>
      </el-table-column>
      <el-table-column label="操作" fixed="right" align="left" min-width="200">
        <template slot-scope="scope">
          <!-- <el-button v-if="(admin == 'true' || scope.row.followUser2.indexOf(userId) != -1 ) && scope.row.source == '抖音直播'" v-hasPermi="['zs:clue:edit']" type="text" style="color: red;" @click.native.stop="handleDYAddandUpdate(scope.row)">编辑</el-button> -->
-          <el-button v-if="(admin == 'true' || scope.row.followUser2.indexOf(userId) != -1 )" v-hasPermi="['zs:clue:edit']" type="text" style="color: red;" @click.native.stop="handleAddandUpdate(scope.row)">编辑</el-button>
-          <el-button v-if="(admin == 'true' || scope.row.followUser2.indexOf(userId) != -1 )" v-hasPermi="['zs:clue:distribute']" type="text" @click.native.stop="handleDistribute(scope.row)">分发</el-button>
-          <el-button v-if="(admin == 'true' || scope.row.followUser2.indexOf(userId) != -1 )" v-hasPermi="['zs:clue:invitation']" type="text" @click.native.stop="handleInvitation(scope.row)">邀约</el-button>            
-          <el-button v-if="(admin == 'true' || scope.row.followUser2.indexOf(userId) != -1 ) && scope.row.state" v-hasPermi="['zs:clue:sign']" type="text" style="color: #26a69a" @click.native.stop="handleSign(scope.row)">已登记</el-button>
-          <el-button v-if="(admin == 'true' || scope.row.followUser2.indexOf(userId) != -1 ) && !scope.row.state" v-hasPermi="['zs:clue:sign']" type="text" @click.native.stop="handleSign(scope.row)">未登记</el-button>
-          <el-button v-if="(admin == 'true' || scope.row.followUser2.indexOf(userId) != -1 )" v-hasPermi="['zs:clue:remove']" type="text" @click.native.stop="handleDelete(scope.row)">删除</el-button>
-          <el-button v-if="(admin == 'true' || scope.row.followUser2.indexOf(userId) != -1 ) && !scope.row.state" v-hasPermi="['zs:clue:discard']" type="text" @click.native.stop="handleDiscard(scope.row)">释放</el-button>
+          <el-button
+            v-if="(admin == 'true' || (scope.row.followUser2 != undefined && scope.row.followUser2.indexOf(userId) != -1))"
+            v-hasPermi="['zs:clue:edit']" type="text" style="color: red;"
+            @click.native.stop="handleAddandUpdate(scope.row)">编辑</el-button>
+          <el-button v-hasPermi="['zs:clue:distribute']" type="text"
+            @click.native.stop="handleDistribute(scope.row)">分发</el-button>
+          <el-button
+            v-if="(admin == 'true' || (scope.row.followUser2 != undefined && scope.row.followUser2.indexOf(userId) != -1))"
+            v-hasPermi="['zs:clue:invitation']" type="text"
+            @click.native.stop="handleInvitation(scope.row)">邀约</el-button>
+          <el-button
+            v-if="(admin == 'true' || (scope.row.followUser2 != undefined && scope.row.followUser2.indexOf(userId) != -1)) && scope.row.state"
+            v-hasPermi="['zs:clue:sign']" type="text" style="color: #26a69a"
+            @click.native.stop="handleSign(scope.row)">已登记</el-button>
+          <el-button
+            v-if="(admin == 'true' || (scope.row.followUser2 != undefined && scope.row.followUser2.indexOf(userId) != -1)) && !scope.row.state"
+            v-hasPermi="['zs:clue:sign']" type="text" @click.native.stop="handleSign(scope.row)">未登记</el-button>
+          <el-button
+            v-if="(admin == 'true' || (scope.row.followUser2 != undefined && scope.row.followUser2.indexOf(userId) != -1))"
+            v-hasPermi="['zs:clue:remove']" type="text" @click.native.stop="handleDelete(scope.row)">删除</el-button>
+          <el-button
+            v-if="(admin == 'true' || (scope.row.followUser2 != undefined && scope.row.followUser2.indexOf(userId) != -1)) && !scope.row.state"
+            v-hasPermi="['zs:clue:discard']" type="text" @click.native.stop="handleDiscard(scope.row)">释放</el-button>
          <el-button v-if="quickSearch == 8" type="text" @click="handleViewZhuangDan(scope.row)"> 撞单信息</el-button>
+          <el-button type="text" @click="handleViewFollowInfo(scope.row)"> 跟进信息</el-button>
+
          <!-- <el-button v-if="searchForm.quickSearch == 8" type="text" > 撞单信息</el-button> -->
        </template>
      </el-table-column>
    </el-table>
-    <pagination :total="total" :page.sync="searchForm.pageNum" :limit.sync="searchForm.pageSize" :page-sizes="[10, 20, 30, 50, 100]" @pagination="_getTableList" />
+    <pagination :total="total" :page.sync="searchForm.pageNum" :limit.sync="searchForm.pageSize"
+      :page-sizes="[10, 20, 30, 50, 100]" @pagination="_getTableList" />
    <!-- 批量修改 -->
    <BatchUpdateDialog ref="batchUpdateDialogForm" :options="options" @refreshDataList="_getTableList" />
    <!-- 公海  -->
@@ -59,7 +90,7 @@
    <!-- 登记弹框 -->
    <SignFormDialog ref="signDialogForm" :clue-info="clueInfo" />
    <!-- 分发 -->
-    <DistributeFormDialog ref="distributeDialogForm" @refreshDataList="_getTableList" />
+    <DistributeDialog ref="distributeDialog" @refreshDataList="_getTableList" />
    <!-- 撞单信息 -->
    <ZhuangDanDialog ref="zhuangDanDialog" />
    <!-- 备注编辑 -->
@@ -69,7 +100,11 @@
    <!-- 关键话术 -->
    <SkillDialog ref="SkillDialog" />
    <!-- 邀约弹窗 -->
-    <InvitationFormDialog ref="InvitationDialog" @refreshDataList="_getTableList"/>
+    <InvitationDialog ref="InvitationDialog" @refreshDataList="_getTableList" />
+    <!-- 跟进统计弹窗 -->
+    <FollowCountDialog ref="FollowCountDialog" />
+    <!-- 跟进记录弹框 -->
+    <FollowInfoDialog ref="FollowInfoDialog" />
  </div>
 </template>

@@ -78,13 +113,15 @@ import SearchForm from './components/SearchForm.vue';
 import BatchUpdateDialog from './components/BatchUpdateDialog.vue';
 import PublicDialog from './components/PublicDialog.vue';
 import UploadDialog from './components/UploadDialog.vue';
-import DistributeFormDialog from './components/DistributeFormDialog.vue';
+import DistributeDialog from './components/DistributeDialog.vue';
 import SignFormDialog from '../sign/components/SignFormDialog.vue';
 import ZhuangDanDialog from './components/ZhuangDanDialog.vue';
 import MemoFormDialog from './components/MemoFormDialog.vue';
 import DYClueFormDialog from './components/DYClueFormDialog.vue';
 import SkillDialog from './components/SkillDialog.vue';
-import InvitationFormDialog from './components/InvitationFormDialog.vue';
+import InvitationDialog from './components/InvitationDialog.vue';
+import FollowCountDialog from './components/FollowCountDialog.vue';
+import FollowInfoDialog from './components/FollowInfoDialog.vue';

 import { defaultColumns } from './columns.js';
 import { getClueList, deleteClue, getClueCountBadge, discardClue, getSign, getConsultRecord } from '@/api/zs/clue';
@@ -92,10 +129,10 @@ import empApi from '@/api/system/employee';
 export default {
  name: 'Clue',
  components: {
-    SearchForm, BatchUpdateDialog, PublicDialog, UploadDialog, SignFormDialog, DistributeFormDialog, ZhuangDanDialog, MemoFormDialog,
-    DYClueFormDialog, SkillDialog,InvitationFormDialog
+    SearchForm, BatchUpdateDialog, PublicDialog, UploadDialog, SignFormDialog, DistributeDialog, ZhuangDanDialog, MemoFormDialog,
+    DYClueFormDialog, SkillDialog, InvitationDialog, FollowCountDialog, FollowInfoDialog
  },
-  beforeRouteEnter (to, from, next) {
+  beforeRouteEnter(to, from, next) {
    if (from.name == 'ClueForm') {
      next(vm => {
        vm._getTableList();
@@ -104,7 +141,7 @@ export default {
      next();
    }
  },
-  data () {
+  data() {
    return {
      admin: localStorage.getItem('admin'),
      userId: localStorage.getItem('userId'),
@@ -137,9 +174,10 @@ export default {
        0: '待邀约',
        1: '待分发',
        2: '待跟进',
-        3: '已跟进',
-        4: '已到场',
-        5: '退单'
+        3: '待到场',
+        4: '未到场',
+        5: '到场未成交',
+        6: '到场已成交'
      },
      options: undefined,
      clueInfo: undefined,
@@ -147,7 +185,7 @@ export default {
      quickSearch: 0
    };
  },
-  created () {
+  created() {
    const str = localStorage.getItem(`${this.$route.name}-table-columns`);
    this.columns = str ? JSON.parse(str) : defaultColumns;
    this._getClueCountBadge();
@@ -164,7 +202,7 @@ export default {
  },
  methods: {
    // 分页查询表格数据
-    _getTableList () {
+    _getTableList() {
      this.loading = true;
      const tempForm = this.$refs.SearchForm?.searchForm || {};
      this.quickSearch = tempForm.quickSearch;
@@ -176,36 +214,36 @@ export default {
      });
    },
    // 获取已过期线索数
-    async _getClueCountBadge () {
+    async _getClueCountBadge() {
      const resp = await getClueCountBadge();
      if (resp.code === 200) {
        this.expireCount = resp.data;
      }
    },
    // 新增或修改
-    handleAddandUpdate (info) {
+    handleAddandUpdate(info) {
      this.$router.push('/zs/clue-form/index/' + (info ? info.clueId : 0));
    },
    // 抖音新增
-    handleDYAddandUpdate (info) {
+    handleDYAddandUpdate(info) {
      this.$nextTick(() => {
        this.$refs.DYClueFormDialog.init(info);
      });
    },
-    handleSkill () {
+    handleSkill() {
      this.$nextTick(() => {
        this.$refs.SkillDialog.init();
      });
    },
    // 多选框选中数据
-    handleSelectionChange (selection) {
+    handleSelectionChange(selection) {
      console.log(selection);
      this.ids = selection.map((item) => item.clueId);
      this.single = selection.length !== 1;
      this.multiple = !selection.length;
    },
    // 释放线索操作
-    handleDiscard (item) {
+    handleDiscard(item) {
      this.$confirm('是否确认释放该条线索（“' + item.name + '/' + item.phone + '”）到公海?', '警告', {
        confirmButtonText: '确定',
        cancelButtonText: '取消',
@@ -222,7 +260,7 @@ export default {
        .catch(function () { });
    },
    // 删除
-    handleDelete (item) {
+    handleDelete(item) {
      this.$confirm('是否确认删除该条线索（“' + item.name + '/' + item.phone + '”）?', '警告', {
        confirmButtonText: '确定',
        cancelButtonText: '取消',
@@ -239,13 +277,13 @@ export default {
        .catch(function () { });
    },
    // 导入
-    handleImport (ydtData, dYData) {
+    handleImport(ydtData, dYData) {
      this.$nextTick(() => {
        this.$refs.uploadDialogForm.init({ ydtData: ydtData, dYData: dYData });
      });
    },
    /** 导出按钮操作 */
-    handleExport () {
+    handleExport() {
      this.$confirm('是否确认导出所有学员信息项?', '警告', {
        confirmButtonText: '确定',
        cancelButtonText: '取消',
@@ -256,12 +294,12 @@ export default {
      });
    },
    // 公海按钮点击时间
-    handlePublicClue () {
+    handlePublicClue() {
      this.$nextTick(() => {
        this.$refs.publicDialogForm.init();
      });
    },
-    getEmployee () {
+    getEmployee() {
      empApi.getEmployee().then((resp) => {
        if (resp.code === 200) {
          this.userOptions = resp.data;
@@ -269,7 +307,7 @@ export default {
      });
    },
    // 批量修改
-    handleBatChUpdate () {
+    handleBatChUpdate() {
      this.options = {
        userOptions: this.userOptions
      };
@@ -280,7 +318,7 @@ export default {
      });
    },
    // 登记成交
-    async handleSign (item) {
+    async handleSign(item) {
      // 根据clueId查询登记信息
      let signInfo = {};
      this.clueInfo = item;
@@ -293,21 +331,33 @@ export default {
      });
    },
    // 分发到场地
-    handleDistribute (item) {
-      this.$nextTick(() => {
-        this.$refs.distributeDialogForm.init(item.clueId);
-      });
+    handleDistribute(item) {
+      if (item.feedbackStatus == 0) {
+        this.$confirm('该学员未邀约，确定进行分发?', '警告', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then((res) => {
+          this.$nextTick(() => {
+            this.$refs.distributeDialog.init(item);
+          });
+        });
+      } else {
+        this.$nextTick(() => {
+          this.$refs.distributeDialog.init(item);
+        });
+      }
    },
    // 外呼
-    handlePhone (item) {
+    handlePhone(item) {

    },
-    handleViewZhuangDan (item) {
+    handleViewZhuangDan(item) {
      this.$nextTick(() => {
        this.$refs.zhuangDanDialog.init(item.clueId);
      });
    },
-    handleRowClick (row) {
+    handleRowClick(row) {
      if (this.quickSearch != 8) {
        // if(row.source == '抖音直播'){
        //   this.handleDYAddandUpdate(row);
@@ -316,7 +366,7 @@ export default {
        // }
      }
    },
-    handleCellClick (row, column, cell, event) {
+    handleCellClick(row, column, cell, event) {
      // 如果点击的是备注的话 开始备注编辑框
      if (column.property == 'clueMemo') {
        console.log(row, column, cell, event);
@@ -325,12 +375,23 @@ export default {
        });
      }
    },
-    //邀约
-    handleInvitation(item){
+    // 邀约
+    handleInvitation(item) {
      this.$nextTick(() => {
        this.$refs.InvitationDialog.init(item)
-      })
-
+      });
+    },
+    // 跟进统计页面
+    handleFollowCount() {
+      this.$nextTick(() => {
+        this.$refs.FollowCountDialog.init()
+      });
+    },
+    // 查看跟进记录
+    handleViewFollowInfo (item) {
+      this.$nextTick(() => {
+        this.$refs.FollowInfoDialog.init(item.clueId);
+      });
    }
  }
 };
--- a/src/views/zs/feedback/arrival.vue
+++ b/src/views/zs/feedback/arrival.vue
@@ -11,21 +11,31 @@
      <el-form-item label="地址">
        <span>{{ order.address }}</span>
      </el-form-item>
-      <el-form-item label="接待人">
+      <el-form-item label="邀约场地">
+        <span>{{ order.placeName }}</span>
+      </el-form-item>
+      <el-form-item label="邀约时间" v-if="order.invitationTime != undefined">
+        <span>{{ order.invitationTime }}</span>
+      </el-form-item>
+      <el-form-item label="邀约备注" prop="coachId" v-if="order.remark != undefined">
+        <span>{{ order.remark }}</span>
+      </el-form-item>
+      <el-form-item label="接待人" prop="coachId">
        <span>{{ order.coachName }}</span>
      </el-form-item>
+      <el-divider></el-divider>
      <el-form-item label="到场状态" prop="arrivalStatus">
-        <el-radio-group v-model="form.arrivalStatus" size="small" :disabled="type != 'JDR'">
+        <el-radio-group v-model="form.arrivalStatus" size="small" :disabled="!isEdit">
          <el-radio :label="1">未到场</el-radio>
          <el-radio :label="2">到场未成交</el-radio>
          <el-radio :label="3">到场已成交</el-radio>
        </el-radio-group>
      </el-form-item>
      <el-form-item label="备注" prop="remark">
-        <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" :disabled="type != 'JDR'" />
+        <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" :disabled="!isEdit" />
      </el-form-item>
    </el-form>
-    <div v-if="type === 'JDR'" style="text-align: center;">
+    <div v-if="isEdit" style="text-align: center;">
      <div style="text-align: center;">
        <el-button type="primary" @click="submitForm">提 交</el-button>
      </div>
@@ -45,13 +55,16 @@ export default {
      // 遮罩层
      loading: true,
      // 表单参数
-      form: {},
+      form: {
+       
+      },
      // 表单校验
      rules: {
      },
      order: {},
      orderId: undefined,
-      type: undefined
+      type: undefined,
+      isEdit: false
    };
  },
  created () {
@@ -76,6 +89,9 @@ export default {
        if (this.order.orderId) {
          this.form.orderId = this.order.orderId;
        }
+        if (this.type == this.order.coachId) {
+          this.isEdit = true;
+        }
        this.loading = false;
      });
    },
--- a/src/views/zs/feedback/follow.vue
+++ b/src/views/zs/feedback/follow.vue
@@ -11,23 +11,33 @@
      <el-form-item label="地址">
        <span>{{ order.address }}</span>
      </el-form-item>
+      <el-form-item label="邀约场地">
+        <span>{{ order.placeName }}</span>
+      </el-form-item>
+      <el-form-item label="邀约时间" v-if="order.invitationTime != undefined">
+        <span>{{ order.invitationTime }}</span>
+      </el-form-item>
+      <el-form-item label="邀约备注" prop="coachId" v-if="order.remark != undefined">
+        <span>{{ order.remark }}</span>
+      </el-form-item>
      <el-form-item label="接待人" prop="coachId">
        <span>{{ order.coachName }}</span>
      </el-form-item>
+      <el-divider></el-divider>
      <el-form-item label="是否联系" prop="isContact">
-        <el-radio-group v-model="form.isContact" size="small" :disabled="type != 'JDR'">
+        <el-radio-group v-model="form.isContact" size="small" :disabled="!isEdit">
          <el-radio :label="1">是</el-radio>
          <el-radio :label="0">否</el-radio>
        </el-radio-group>
      </el-form-item>
      <el-form-item label="到场时间" prop="arrivalTime">
-        <el-date-picker v-model="form.arrivalTime" :disabled="type != 'JDR'" clearable type="datetime" format="yyyy-MM-dd HH:mm" value-format="yyyy-MM-dd HH:mm" placeholder="请选择到场时间" />
+        <el-date-picker v-model="form.arrivalTime" :disabled="!isEdit" clearable type="datetime" format="yyyy-MM-dd HH:mm" value-format="yyyy-MM-dd HH:mm" placeholder="请选择到场时间" />
      </el-form-item>
      <el-form-item label="备注" prop="remark">
-        <el-input v-model="form.remark" :disabled="type != 'JDR'" type="textarea" placeholder="请输入内容" />
+        <el-input v-model="form.remark" :disabled="!isEdit" type="textarea" placeholder="请输入内容" />
      </el-form-item>
    </el-form>
-    <div v-if="type === 'JDR'" style="text-align: center;">
+    <div v-if="isEdit" style="text-align: center;">
      <div style="text-align: center;">
        <el-button type="primary" @click="submitForm">提 交</el-button>
      </div>
@@ -53,7 +63,8 @@ export default {
      },
      order: {},
      orderId: undefined,
-      type: undefined
+      type: undefined,
+      isEdit: false
    };
  },
  created () {
@@ -78,6 +89,9 @@ export default {
        if (this.order.orderId) {
          this.form.orderId = this.order.orderId;
        }
+        if (this.type == this.order.coachId) {
+          this.isEdit = true;
+        }
        this.loading = false;
      });
    },
--- a/src/views/zs/sign/columns.js
+++ b/src/views/zs/sign/columns.js
@@ -21,14 +21,14 @@ export const defaultColumns = [{
    visible: true,
    overflow: false
  },
-  {
-    key: 3,
-    prop: 'offlineReceiverName',
-    label: '线下接待人员',
-    width: 140,
-    visible: true,
-    overflow: false
-  },
+  // {
+  //   key: 3,
+  //   prop: 'offlineReceiverName',
+  //   label: '线下接待人员',
+  //   width: 140,
+  //   visible: true,
+  //   overflow: false
+  // },
  {
    key: 4,
    prop: 'zhuangDanName',
@@ -138,14 +138,15 @@ export const defaultColumns = [{
    visible: true,
    overflow: true
  },
-  {
-    key: 18,
-    prop: 'commission',
-    label: '佣金明细',
-    width: 140,
-    visible: true,
-    overflow: true
-  }, {
+  // {
+  //   key: 18,
+  //   prop: 'commission',
+  //   label: '佣金明细',
+  //   width: 140,
+  //   visible: true,
+  //   overflow: true
+  // },
+   {
    key: 19,
    prop: 'memo',
    label: '备注',
--- a/src/views/zs/sign/components/SignFormDialog.vue
+++ b/src/views/zs/sign/components/SignFormDialog.vue
@@ -488,7 +488,7 @@ export default {
      });
    },
    handleSubmit() {
-      this.$confirm('提交后将进入审核阶段，是否提交确认提交?', '警告', {
+      this.$confirm('提交后将进入审核结算阶段，是否提交确认提交?', '警告', {
        confirmButtonText: '确定',
        cancelButtonText: '取消',
        type: 'warning'
--- a/vue.config.js
+++ b/vue.config.js
@@ -34,8 +34,8 @@ module.exports = {
    open: true,
    proxy: {
      [process.env.VUE_APP_BASE_API + '/driver-api']: {
-        target: `http://118.31.23.45:8888/driver-api/`,
-        // target: `http://localhost:8888/driver-api/`,
+        // target: `http://118.31.23.45:8888/driver-api/`,
+        target: `http://localhost:8888/driver-api/`,
        changeOrigin: true,
        pathRewrite: {
          ['^' + process.env.VUE_APP_BASE_API + '/driver-api']: ''
@@ -43,7 +43,7 @@ module.exports = {
      },
      // detail: https://cli.vuejs.org/config/#devserver-proxy
      [process.env.VUE_APP_BASE_API]: {
-        // target: `https://xueche.ahduima.com/duima/`,
+        // target: `https://xueche.kxxc.top/duima/`,
        target: `http://localhost:8088`,
        changeOrigin: true,
        pathRewrite: {
Author	SHA1	Message	Date
zcx	205e2c7ae5	门店	2023-12-11 17:28:02 +08:00
zcx	2aabff2e90	抖音同步	2023-12-04 11:32:54 +08:00
zcx	185163d326	bug	2023-11-06 17:39:58 +08:00
zcx	052fcd60b8	数据权限	2023-10-31 17:42:08 +08:00
zcx	fc2404a5b8	接待人场地	2023-10-30 17:25:43 +08:00
qsh	72d19bfb02	数据权限	2023-10-22 17:00:56 +08:00
qsh	ac798f3f94	接待人页面	2023-10-22 16:49:00 +08:00
qsh	0ba4d3fe26	Merge branch 'caozong' of http://114.55.169.15:3000/qiushanhe/dm-manage-web into caozong	2023-10-22 14:50:05 +08:00
zcx	ed848edfd9	邀约	2023-10-19 17:39:12 +08:00
zcx	f8eda78cf7	vip	2023-10-18 17:33:26 +08:00
zcx	6b22078098	驾校二维码	2023-10-17 17:25:49 +08:00