Merge branch 'dev' into pre

70145385 · 赵茹林 · 61cf67b3 · a1d10c9a · 70145385 · 70145385
Commit 70145385 authored Sep 06, 2019 by 赵茹林
26 changed files
--- a/build/webpack.base.conf.js
+++ b/build/webpack.base.conf.js
@@ -21,15 +21,16 @@ module.exports = {
  output: {
    path: config.build.assetsRoot,
    filename: '[name].js',
-    publicPath: process.env.NODE_ENV === 'production'
+    publicPath: process.env.NODE_ENV === 'production' ? config.build.assetsPublicPath : config.dev.assetsPublicPath
-      ? config.build.assetsPublicPath
-      : config.dev.assetsPublicPath
  },
  resolve: {
    extensions: ['.js', '.vue', '.json'],
    alias: {
      'vue$': 'vue/dist/vue.esm.js',
      '@': resolve('src'),
+      '@util': resolve('src/util'),
+      '@service': resolve('src/service'),
+      '@framework': resolve('src/components/framework'),
    }
  },
  module: {

--- a/build/webpack.dev.conf.js
+++ b/build/webpack.dev.conf.js
@@ -22,6 +22,7 @@ const devWebpackConfig = merge(baseWebpackConfig, {
  // these devServer options should be customized in /config/index.js
  devServer: {
+    disableHostCheck: true,
    clientLogLevel: 'warning',
    historyApiFallback: {
      rewrites: [
@@ -34,14 +35,14 @@ const devWebpackConfig = merge(baseWebpackConfig, {
    host: HOST || config.dev.host,
    port: PORT || config.dev.port,
    open: config.dev.autoOpenBrowser,
-    overlay: config.dev.errorOverlay
+    overlay: config.dev.errorOverlay ? { warnings: false, errors: true } : false,
-      ? { warnings: false, errors: true }
-      : false,
    publicPath: config.dev.assetsPublicPath,
    proxy: config.dev.proxyTable,
    quiet: true, // necessary for FriendlyErrorsPlugin
    watchOptions: {
      poll: config.dev.poll,
+      aggregateTimeout: 500,
+      ignored : ['static', 'dist', 'dev', 'node_modules', 'src/assets'],
    }
  },
  plugins: [
@@ -84,9 +85,7 @@ module.exports = new Promise((resolve, reject) => {
        compilationSuccessInfo: {
          messages: [`Your application is running here: http://${devWebpackConfig.devServer.host}:${port}`],
        },
-        onErrors: config.dev.notifyOnErrors
+        onErrors: config.dev.notifyOnErrors ? utils.createNotifierCallback() : undefined
-        ? utils.createNotifierCallback()
-        : undefined
      }))
      resolve(devWebpackConfig)

--- a/config/index.js
+++ b/config/index.js
@@ -33,7 +33,7 @@ module.exports = {
    // Various Dev Server settings
    host: getIP(), // can be overwritten by process.env.HOST
    port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
-    autoOpenBrowser: false,
+    autoOpenBrowser: true,
    errorOverlay: true,
    notifyOnErrors: true,
    poll: false, // https://webpack.js.org/configuration/dev-server/#devserver-watchoptions-

--- a/dev/index.html
+++ b/dev/index.html
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><meta name=referrer content=never><link rel=stylesheet href=https://at.alicdn.com/t/font_746649_x1rivf5f5.css><link rel=stylesheet href=https://lib.baomitu.com/element-ui/2.11.1/theme-chalk/index.css><title>唱唱启蒙-后台</title></head><body><script src=https://lib.baomitu.com/vue/2.5.17/vue.js></script><script src=https://lib.baomitu.com/vuex/3.0.1/vuex.min.js></script><script src=https://lib.baomitu.com/axios/0.18.0/axios.min.js></script><script src=https://lib.baomitu.com/element-ui/2.11.1/index.js></script><div id=app></div><script type=text/javascript src=/static/js/manifest.4fa8c3e44c5f2cb7e588.js></script><script type=text/javascript src=/static/js/vendor.fdfa49e267f48089768a.js></script><script type=text/javascript src=/static/js/app.771316ce36eae7e98b65.js></script></body><script>let el = document.getElementsByTagName("script");
-    el.onerror = function(a,b,c){
-      console.log('error:',a,b,c);
-    };
-    // document.getElementsByTagName('script').onerror</script></html>
\ No newline at end of file
--- a/src/App.vue
+++ b/src/App.vue
@@ -283,6 +283,27 @@
      border-radius: 50%;
      height: 50px;
    }
+    .table-refresh-header {
+      display: inline-block;
+      cursor: help;
+      i {
+        color: #409eff;
+      }
+    }
+    .cell-link {
+      display: inline-block;
+      margin: 0 -6px;
+      padding: 0px 8px;
+      border-radius: 3px;
+      text-decoration: underline;
+      transition: color 240ms, background-color 240ms;
+      &:hover {
+        background-color: #cce4ff;
+        color: #007fff;
+      }
+    }
  }
  .update-time {

--- a/src/components/class/dialog.vue
+++ b/src/components/class/dialog.vue
@@ -154,6 +154,7 @@
            this.form = {
              teacher_id:'',
              max_join_num:'',
+              class_name: '',
              source:'',
              qr:""
            };

--- a/src/components/disposable/index.vue
+++ b/src/components/disposable/index.vue
@@ -19,7 +19,7 @@
          <div class="search-btn-wrapper">
            <el-button type="primary" plain @click="getList">搜索</el-button>
            <!--<el-button v-if="!$store.state.readonly" type="primary" plain @click="downLoad()">excel模板下载</el-button>-->
-            <el-button type="success" plain @click="exportTable" v-if="$store.state.export">导出</el-button>
+            <!--<el-button type="warning" plain v-if="$store.state.import">导入</el-button>-->
            <el-upload
              style="margin-left: 10px;"
              v-if="$store.state.import"
@@ -27,9 +27,11 @@
              :onSuccess="fileSuccess"
              :headers="uploadHeader"
              :data="{param_token:param_token}"
-              action="/api/admin/order/deliver/list/import">
+              accept="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,application/vnd.ms-excel"
-              <el-button type="success" plain>导入发货信息</el-button>
+              action="/api/admin/deliver/once/import">
+              <el-button type="warning" plain>导入发货信息</el-button>
            </el-upload>
+            <el-button style="margin-left: 10px;" type="success" plain @click="exportTable" v-if="$store.state.export">导出</el-button>
          </div>
        </el-form-item>
      </el-form>
@@ -80,8 +82,8 @@
            <div style="color: #67c23a;">{{scope.row.status|LogisticsStatusFil}}</div>
          </template>
          <!--<template v-if="scope.row.status == 1">-->
-            <template v-if="scope.row.express_name">{{scope.row.express_name}}：</template>
+          <template v-if="scope.row.express_name">{{scope.row.express_name}}：</template>
-            <a v-if="scope.row.express_no" :href="`https://m.baidu.com/from=1013755s/s?word=${scope.row.express_no}&sa=tb&ts=2790568&t_kt=0&ie=utf-8&rsv_t=cbe2F%252FT5T3MIzkRl%252Fg8ZUw%252FEPHZmn2wHIrB8cLvgNlEKyyDqUNPrTyDEEDjkAb8&rsv_pq=11793168499026332712&ss=110000000001&tj=1&rqlang=zh&rsv_sug4=4111&inputT=3178&oq=快递单号查询`" target="_blank">{{scope.row.express_no}}</a>
+          <a v-if="scope.row.express_no" :href="`https://m.baidu.com/from=1013755s/s?word=${scope.row.express_no}&sa=tb&ts=2790568&t_kt=0&ie=utf-8&rsv_t=cbe2F%252FT5T3MIzkRl%252Fg8ZUw%252FEPHZmn2wHIrB8cLvgNlEKyyDqUNPrTyDEEDjkAb8&rsv_pq=11793168499026332712&ss=110000000001&tj=1&rqlang=zh&rsv_sug4=4111&inputT=3178&oq=快递单号查询`" target="_blank">{{scope.row.express_no}}</a>
          <!--</template>-->
        </template>
      </el-table-column>
@@ -170,9 +172,9 @@
      editAddress(row) {
        console.log(row);
        //if (row.status == 1) {
-          this.dialogObj.express_no = row.express_no;
+        this.dialogObj.express_no = row.express_no;
-          this.dialogObj.express_name = row.express_name;
+        this.dialogObj.express_name = row.express_name;
-          this.dialogObj.status = row.status;
+        this.dialogObj.status = row.status;
        //}
        this.dialogObj.receive_address = row.receive_address;
        this.dialogObj.receive_mobile = row.receive_mobile;

--- a/src/components/framework/index.vue
+++ b/src/components/framework/index.vue
@@ -23,9 +23,9 @@
 <script>
  import headIndex from './headIndex'
  import leftMenu from './leftMenu'
-  import tab from './tab'
+  // import tab from './tab'
  export default {
-    components: {leftMenu, headIndex,tab},
+    components: {leftMenu, headIndex},
    data(){
      return {
        transitionName: 'slide-left',

--- a/src/components/framework/page.vue
+++ b/src/components/framework/page.vue
@@ -2,10 +2,11 @@
  <div class="page-div">
    <el-pagination
      :small="small"
-      @size-change="handleSizeChange"
-      :page-sizes="[5, 10, 20, 30, 40, 50, 60, 80, 100]"
      :page-size="limit"
-      :current-page.sync="nowPage"
+      :page-sizes="[5, 10, 20, 30, 40, 50, 60, 80, 100]"
+      @size-change="handleSizeChange"
+      @current-change="handleCurrentChange"
+      :current-page="nowPage"
      layout="total, sizes, prev, pager, next, jumper"
      :total="total">
    </el-pagination>
@@ -21,6 +22,9 @@
      }
    },
    props: {
+      'currentPage': {
+        required: false,
+      },
      'total': {
        required: true
      },
@@ -28,19 +32,29 @@
        default: 10
      },
      'small': {
+        required: false,
        type: Boolean,
        default: false
      }
    },
    watch: {
-      nowPage(value) {
+      currentPage(val) { // 改变这个值并不会触发 handleCurrentChange
-        this.$emit("pageChange", value);
+        if (typeof val === "number") {
-      }
+          console.log('prop currentPage!!!');
+          this.nowPage = val;
+        }
+      },
    },
    methods: {
+      // 当前页变化
+      handleCurrentChange(val) {
+        console.log('methods pageChange!!!')
+        this.$emit("pageChange", val);
+      },
+      // size变化
      handleSizeChange(val) {
+        this.nowPage = 1;
        this.$emit('sizeChange', val);
-        this.nowPage = 1
      },
    }
  }

--- a/src/components/framework/teacherDesc.vue
+++ b/src/components/framework/teacherDesc.vue
@@ -85,7 +85,7 @@
 <script>
  import {addPeriodsClassUserDescApi,getUserDescListApi,editUserReplyApi} from "../../service/api";
-  import CallBack from '@/components/callBack/index';
+  import CallBack from '@/components/userDetail/callBack';
  export default {
    name: "teacherDesc",

--- a/src/components/salesLevel/index.vue
+++ b/src/components/salesLevel/index.vue
@@ -6,10 +6,10 @@
      </div>
      <div class="subcompany-list">
        <div class="subcompany-list-content" v-if="subcompanyList.length > 0">
-          <el-form :inline="true" v-for="item in subcompanyList" class="demo-form-inline" size="mini">
+          <el-form :inline="true" :key="item.id" v-for="item in subcompanyList"  class="demo-form-inline" size="mini">
            <el-form-item label="销售层级">
              <el-select v-model="item.sale_level" @change="modifyLevel(item.id, item.sale_level)" @focus="focusOldVal(item.sale_level)" placeholder="销售层级">
-                <el-option v-for="itemSale in saleLevel" :label="itemSale.label" :value="itemSale.value"></el-option>
+                <el-option :key="itemSale.value" v-for="itemSale in saleLevel" :label="itemSale.label" :value="itemSale.value"></el-option>
              </el-select>
            </el-form-item>
            <el-form-item label="级别名称">

--- a/src/components/system/role.vue
+++ b/src/components/system/role.vue
@@ -42,13 +42,13 @@
                  <el-checkbox v-model="data.refund" v-if="data.cover ==='5-1'|| data.cover=== '5-10'|| data.cover=== '5-9'">退款</el-checkbox>
                  <el-checkbox v-model="data.refund" v-if="data.cover ==='10-1' ">类别管理</el-checkbox>
                  <el-checkbox v-model="data.promoter" v-if="data.cover ==='5-1' ">编辑推广人</el-checkbox>
-                  <el-checkbox v-model="data.refund" v-if="data.cover ==='2-3'|| data.cover=== '3-1'|| data.cover=== '3-2' ">添加观摩班用户</el-checkbox>
+                  <el-checkbox v-model="data.refund" v-if="data.cover ==='2-3'|| data.cover=== '3-1'|| data.cover=== '3-2' || data.cover=== '3-6' || data.cover=== '3-7' ">添加观摩班用户</el-checkbox>
-                  <el-checkbox v-model="data.classManage" v-if="data.cover ==='2-3'|| data.cover=== '3-1'|| data.cover=== '3-2' ">添加带班班用户</el-checkbox>
+                  <el-checkbox v-model="data.classManage" v-if="data.cover ==='2-3'|| data.cover=== '3-1'|| data.cover=== '3-2' || data.cover=== '3-6' || data.cover=== '3-7' ">添加带班班用户</el-checkbox>
-                  <el-checkbox v-model="data.classManageUnlimited" v-if="data.cover ==='2-3'|| data.cover=== '3-1'|| data.cover=== '3-2' ">添加观摩班(无限制)</el-checkbox>
+                  <el-checkbox v-model="data.classManageUnlimited" v-if="data.cover ==='2-3'|| data.cover=== '3-1'|| data.cover=== '3-2' || data.cover=== '3-6' || data.cover=== '3-7' ">添加观摩班(无限制)</el-checkbox>
-                  <el-checkbox v-model="data.classTakeUnlimited" v-if="data.cover ==='2-3'|| data.cover=== '3-1'|| data.cover=== '3-2' ">添加带班班(无限制)</el-checkbox>
+                  <el-checkbox v-model="data.classTakeUnlimited" v-if="data.cover ==='2-3'|| data.cover=== '3-1'|| data.cover=== '3-2' || data.cover=== '3-6' || data.cover=== '3-7' ">添加带班班(无限制)</el-checkbox>
                  <el-checkbox v-model="data.distribution" v-if="data.cover ==='5-9'||data.cover ==='7-9'" @change="distribution">批量分配</el-checkbox>
                  <el-checkbox v-model="data.exportFinish" v-if="data.cover === '2-3'">导出完课用户</el-checkbox>
-                  <el-checkbox v-model="data.import" v-if="data.cover ==='6-3'||data.cover ==='5-3'||data.cover ==='5-9'">导入</el-checkbox>
+                  <el-checkbox v-model="data.import" v-if="data.cover ==='6-3'||data.cover ==='5-3'||data.cover ==='5-9'||data.cover ==='6-4'">导入</el-checkbox>
                  <el-checkbox v-model="data.export" v-if="exportMenuList.indexOf(data.cover) >-1">导出</el-checkbox>
                  <el-checkbox v-model="data.readonly">只读</el-checkbox>
                  <el-checkbox v-model="data.delete">删除</el-checkbox>
@@ -88,7 +88,7 @@
        limit: 10,
        roleList: [],
        exportMenuList: [ // 导出权限
-          '2-3', '5-10', '5-2', '5-1', '5-3', '5-8', '5-9', '6-4', '3-1', '7-9', '6-3', '10-8'
+          '2-3', '5-10', '5-2', '5-1', '5-3', '5-8', '5-9', '6-4', '3-1', '3-6', '3-7', '7-9', '6-3', '10-8'
        ],
        dialog: {
          title: '新增角色',
@@ -128,9 +128,10 @@
                  j.delete = false;
                  if (this.exportMenuList.indexOf(j.cover) > -1) j.export = false;
                  if (j.cover === "5-9" || j.cover === "7-9") j.distribution = false;
-                  if (j.cover === "6-3" || j.cover === "5-3" || j.cover === "5-9") j.import = false;
+                  if (j.cover === "6-3" || j.cover === "5-3" || j.cover === "5-9"|| j.cover === "6-4") j.import = false;
-                  if (j.name === '月课订单列表' || j.name === '日课订单列表' || j.name === "来源码管理" || j.cover === "5-9" || j.cover === "2-3" || j.cover === "3-1" || j.cover === '3-2') j.refund = false;
+                  if (j.name === '月课订单列表' || j.name === '日课订单列表' || j.name === "来源码管理"
-                  if (j.cover === "2-3" || j.cover === "3-1" || j.cover === '3-2') {
+                    || j.cover === "5-9" || j.cover === "2-3" || j.cover === "3-1" || j.cover === '3-2' || j.cover === "3-6" || j.cover === "3-7") j.refund = false;
+                  if (j.cover === "2-3" || j.cover === "3-1" || j.cover === '3-2' || j.cover === "3-6" || j.cover === "3-7") {
                    j.classManageUnlimited = false;
                    j.classManage = false;
                    j.classTakeUnlimited = false;
@@ -178,9 +179,10 @@
                  j.delete = false;
                  if (this.exportMenuList.indexOf(j.cover) > -1) j.export = false;
                  if (j.cover === "5-9" || j.cover === "7-9") j.distribution = false;
-                  if (j.cover === "6-3" || j.cover === "5-3" || j.cover === "5-9") j.import = false;
+                  if (j.cover === "6-3" || j.cover === "5-3" || j.cover === "5-9"|| j.cover === "6-4") j.import = false;
-                  if (j.name === '月课订单列表' || j.name === '日课订单列表' || j.name === "来源码管理" || j.cover === "5-9" || j.cover === "2-3" || j.cover === "3-1" || j.cover === '3-2') j.refund = false;
+                  if (j.name === '月课订单列表' || j.name === '日课订单列表' || j.name === "来源码管理"
-                  if (j.cover === "2-3" || j.cover === "3-1" || j.cover === '3-2') {
+                    || j.cover === "5-9" || j.cover === "2-3" || j.cover === "3-1" || j.cover === '3-2' || j.cover === "3-6" || j.cover === "3-7") j.refund = false;
+                  if (j.cover === "2-3" || j.cover === "3-1" || j.cover === '3-2' || j.cover === "3-6" || j.cover === "3-7") {
                    j.classManageUnlimited = false;
                    j.classManage = false;
                    j.classTakeUnlimited = false;
@@ -208,15 +210,16 @@
                        x.readonly = !!i.readonly;
                        x.delete = !!i.delete;
                        if (this.exportMenuList.indexOf(i.cover) > -1) x.export = !!i.export;
-                        if (i.cover === '5-1' || i.cover === '5-10' || i.cover === "10-1" || i.cover === "5-9" || i.cover === "2-3" || i.cover === "3-1" || i.cover === '3-2') {
+                        if (i.cover === '5-1' || i.cover === '5-10' || i.cover === "10-1" || i.cover === "5-9" || i.cover === "2-3"
+                          || i.cover === "3-1" || i.cover === '3-2' || i.cover === "3-6" || i.cover === "3-7") {
                          x.refund = !!i.refund;
                        }
-                        if (i.cover === "2-3" || i.cover === "3-1" || i.cover === '3-2') {
+                        if (i.cover === "2-3" || i.cover === "3-1" || i.cover === '3-2' || i.cover === "3-6" || i.cover === "3-7") {
                          x.classManage = !!i.classManage;
                          x.classManageUnlimited = !!i.classManageUnlimited;
                          x.classTakeUnlimited = !!i.classTakeUnlimited;
                        }
-                        if (i.cover === "6-3" || i.cover === "5-3" || i.cover === "5-9") {
+                        if (i.cover === "6-3" || i.cover === "5-3" || i.cover === "5-9"|| i.cover === "6-4") {
                          x.import = !!i.import;
                        }
                        if (i.cover === "5-9" || i.cover === "7-9") {

--- a/src/components/teacher/dialog.vue
+++ b/src/components/teacher/dialog.vue
@@ -38,8 +38,7 @@
            <span v-if="type===1">{{teacherDetail.status}}</span>
            <el-form-item v-if="type !== 1">
              <el-select v-model="form.status" placeholder="请选择">
-                <el-option v-for="data in statusOption" :key="data.value" :label="data.label"
+                <el-option v-for="data in statusOption" :key="data.value" :label="data.label" :value="data.value"></el-option>
-                           :value="data.value"></el-option>
              </el-select>
            </el-form-item>
          </el-col>
@@ -47,9 +46,9 @@
          <el-col :span="8">
            <span v-if="type===1">{{teacherDetail.type}}</span>
            <el-form-item v-if="type !== 1">
-              <el-select v-model="form.type" placeholder="请选择">
+              <!--<el-select v-model="form.type" placeholder="请选择" disabled>-->
-                <el-option v-for="data in dialogObj.teacherTypeList" :key="data.type" :label="data.name"
+              <el-select v-model="form.type" placeholder="请选择" :disabled="typeList.length < 2">
-                           :value="data.type"></el-option>
+                <el-option v-for="data in typeList" :key="data.type" :label="data.name" :value="data.type"></el-option>
              </el-select>
            </el-form-item>
          </el-col>
@@ -141,6 +140,7 @@
        ],
        loading:true,
        type:0,
+        typeList: [],
        title:'',
        form:{
          name:'',
@@ -167,7 +167,7 @@
    methods:{
      sub(){
        if(this.imageList.length > 0){
-            this.form.qr = this.imageList[0].url;
+          this.form.qr = this.imageList[0].url;
        }
        let json = {
          name:this.form.name,
@@ -181,16 +181,16 @@
        switch(this.dialogObj.type){
          case 2:
            this.$refs['form'].validate((valid) => {
-                if(valid){
+              if (valid) {
-                  editTeacherApi(this.id,json).then(res=>{
+                editTeacherApi(this.id, json).then(res => {
-                    this.$message({
+                  this.$message({
-                      type: 'success',
+                    type: 'success',
-                      message: '修改成功!'
+                    message: '修改成功!'
-                    });
+                  });
-                    this.$emit("reflash");
+                  this.$emit("reflash");
-                    this.show = false;
+                  this.show = false;
-                  })
+                })
-                }
+              }
            });
            break;
          case 0:
@@ -235,41 +235,63 @@
          this.loading = false;
        })
      },
+      initType() {
+        // debugger
+        if (this.dialogObj.teacherTypeList && this.dialogObj.teacherTypeList.length) {
+          if (String(this.dialogObj.typeAdd).indexOf(',') > -1) { // 3,4
+            let typeAddArr = this.dialogObj.typeAdd.split(','), arr = [];
+            typeAddArr.forEach(val => {
+              let idx = this.dialogObj.teacherTypeList.findIndex(i => i.type == val);
+              if (idx > -1) {
+                arr.push(this.dialogObj.teacherTypeList[idx])
+              }
+            })
+            this.typeList = arr;
+          } else if (this.dialogObj.typeAdd == 0 || this.dialogObj.typeAdd == 2) {
+            let idx = this.dialogObj.teacherTypeList.findIndex(i => i.type == this.dialogObj.typeAdd);
+            if (idx > -1) {
+              this.typeList = [this.dialogObj.teacherTypeList[idx]]
+            }
+          }
+        }
+      },
      initDialog(){
-        console.log(this.dialogObj)
+        // console.log(this.dialogObj)
+        this.initType();
        switch(this.dialogObj.type){
-          case 0:
+          case 0: // 添加
-            this.title = '新增教师';
+            this.title = '新增';
            this.show = this.dialogObj.show;
            this.type = 0;
-              this.form.name = "";
+            this.form.name = "";
-              this.form.alias = "";
+            this.form.alias = "";
-              this.form.qr = "";
+            this.form.qr = "";
            this.form.squad = "";
-              this.form.type = 0;
+            this.form.type = String(this.dialogObj.typeAdd).indexOf(',')>-1 ? 3 : this.dialogObj.typeAdd;
-              this.form.status = 0;
+            this.form.status = 0;
-              this.imageList = [];
+            this.imageList = [];
-              this.loading = false;
+            this.loading = false;
-              this.uploadShow = true;
+            this.uploadShow = true;
-              this.form.media_id = '';
+            this.form.media_id = '';
            break;
-          case 1:
+          case 1: // 查看
-            this.title = '教师详情';
+            this.title = '详情';
            this.show = this.dialogObj.show;
            this.id = this.dialogObj.id;
            this.type = 1;
-            getTeacherDetailApi(this.id).then(res=>{
+            getTeacherDetailApi(this.id).then(res => {
              this.teacherDetail = res;
              this.loading = false
            });
            break;
-          case 2:
+          case 2: // 编辑
            this.title = '编辑';
            this.show = this.dialogObj.show;
            this.id = this.dialogObj.id;
            this.type = 2;
-            getTeacherDetailApi(this.id).then(res=>{
+            getTeacherDetailApi(this.id).then(res => {
              this.form.name = res.name;
              this.form.squad = res.squad;
              this.form.alias = res.alias;
@@ -277,7 +299,7 @@
              this.form.type = res.type;
              this.form.status = res.status;
              this.form.media_id = res.media_id ? res.media_id : '';
-              this.imageList = [{name:res.qr,url:res.qr}];
+              this.imageList = [{name: res.qr, url: res.qr}];
              this.uploadShow = !res.qr;
              this.loading = false;
            });
@@ -287,6 +309,10 @@
      }
    },
    watch:{
+      'dialogObj.teacherTypeList'() {
+        console.log('listUpdate'); // todo 似乎无用？
+        this.initType();
+      },
      dialogObj:{
        handler: function () {
          this.loading = true;

--- a/src/components/teacher/growth.vue
+++ b/src/components/teacher/growth.vue
--- a/src/components/teacher/index.vue
+++ b/src/components/teacher/index.vue
@@ -13,18 +13,18 @@
          <el-option label="不带班" value="1"></el-option>
        </el-select>
      </el-form-item>
-      <el-form-item label="教师类型">
+      <!--<el-form-item label="教师类型">
        <el-select v-model="searchFrom.type" style="width: 95px" placeholder="请选择" @change="getUser" clearable>
-          <!-- <el-option
+          &lt;!&ndash; <el-option
            v-for="item in dialogObj.teacherTypeList"
            :key="item.id"
            :label="item.label"
            :value="item.id">
-          </el-option> -->
+          </el-option> &ndash;&gt;
          <el-option v-for="data in dialogObj.teacherTypeList" :key="data.type" :label="data.name"
                           :value="data.type"></el-option>
        </el-select>
-      </el-form-item>
+      </el-form-item>-->
      <el-form-item label="任务日期">
        <el-date-picker
          style="width: 140px;"
@@ -37,7 +37,7 @@
      <el-form-item>
        <el-button type="primary" plain @click="getUser">搜索</el-button>
      </el-form-item>
-      <el-form-item  v-if="$store.state.orderRefund">
+      <el-form-item v-if="!$store.state.readonly">
        <el-button type="success" plain @click="add">新增教师</el-button>
      </el-form-item>
    </el-form>
@@ -151,9 +151,9 @@
        label="意向用户数">
      </el-table-column>
      <el-table-column
-              prop="performance"
+        prop="performance"
-              width="100"
+        width="100"
-              label="当月业绩">
+        label="当月业绩">
      </el-table-column>
      <el-table-column width="320" label="操作">
        <template slot-scope="scope">
@@ -187,40 +187,40 @@
      </div>
      <div>
        <div>
-        达标率：<el-progress
+          达标率：<el-progress
          style="display: inline-block;width: calc(90% - 50px)"
-        :text-inside="true"
+          :text-inside="true"
-        :stroke-width="16"
+          :stroke-width="16"
-        :color="Number(res.recall_watch_rate)===100 ? '#67C23A' : '#ff0000'"
+          :color="Number(res.recall_watch_rate)===100 ? '#67C23A' : '#ff0000'"
-        :percentage="Number(res.recall_watch_rate)?Number(res.recall_watch_rate):0">
+          :percentage="Number(res.recall_watch_rate)?Number(res.recall_watch_rate):0">
-      </el-progress>
+        </el-progress>
-        <br>
+          <br>
-        处理率：<el-progress
+          处理率：<el-progress
-        style="display: inline-block;;width: calc(90% - 50px)"
+          style="display: inline-block;;width: calc(90% - 50px)"
-        :text-inside="true"
+          :text-inside="true"
-        :stroke-width="16"
+          :stroke-width="16"
-        :color="Number(res.recall_exec_rate)===100 ? '#67C23A' : '#f00'"
+          :color="Number(res.recall_exec_rate)===100 ? '#67C23A' : '#f00'"
-        :percentage="Number(res.recall_exec_rate)?Number(res.recall_exec_rate):0">
+          :percentage="Number(res.recall_exec_rate)?Number(res.recall_exec_rate):0">
-      </el-progress>
+        </el-progress>
        </div>
      </div>
      <div>
        <div>
-        标记率：<el-progress
+          标记率：<el-progress
          style="display: inline-block;width: calc(90% - 50px)"
-        :text-inside="true"
+          :text-inside="true"
-        :stroke-width="16"
+          :stroke-width="16"
-        color="#67C23A"
+          color="#67C23A"
-        :percentage="Number(res.over_intention_rate)?Number(res.over_intention_rate):0">
+          :percentage="Number(res.over_intention_rate)?Number(res.over_intention_rate):0">
-      </el-progress>
+        </el-progress>
-        <br>
+          <br>
-        处理率：<el-progress
+          处理率：<el-progress
          style="display: inline-block;width: calc(90% - 50px)"
-        :text-inside="true"
+          :text-inside="true"
-        :stroke-width="16"
+          :stroke-width="16"
-        :color="Number(res.over_exec_rate)===100 ? '#67C23A' : '#f00'"
+          :color="Number(res.over_exec_rate)===100 ? '#67C23A' : '#f00'"
-        :percentage="Number(res.over_exec_rate)?Number(res.over_exec_rate):0">
+          :percentage="Number(res.over_exec_rate)?Number(res.over_exec_rate):0">
-      </el-progress>
+        </el-progress>
        </div>
      </div>
      <div>
@@ -289,7 +289,7 @@
  import page from '../framework/page'
  import teacherDetail from '../teacherDetail/index'
  import dialogCom from './dialog'
-  import Dialog from "../class/dialog";
+  // import Dialog from "../class/dialog";
  let teacherTypeSource = {}
  export default {
    name: "index",
@@ -334,7 +334,13 @@
          status:'0',
          task_date:nowDate,
          squad:"1",
-          type:"",
+          type:0,
+        },
+        dialogObj:{
+          typeAdd: 0, // 与searchFrom.type一致
+          type:0,
+          show:false,
+          id:''
        },
        dialogDetail:{
          show:false,
@@ -344,11 +350,6 @@
        total:0,
        nowPage:1,
        limit: 20,
-        dialogObj:{
-          type:0,
-          show:false,
-          id:''
-        },
        res:null,
        dialogDetailObj:{
          show:false,
@@ -373,7 +374,7 @@
      }
    },
    components:{
-      Dialog,
+      // Dialog,
      page,
      dialogCom,
      teacherDetail
@@ -384,7 +385,6 @@
      }
    },
    mounted(){
-      console.log(this.dialogDetail)
      // console.log(s)
      let data = localStorage.getItem("phoneNum");
      console.log(data)
@@ -596,7 +596,7 @@
    background: #cccccc;
  }
  .total-tab{
-   display: table;
+    display: table;
    background: #dfedff;
    width: 100%;
    vertical-align: middle;

--- a/src/components/teacher/userservice.vue
+++ b/src/components/teacher/userservice.vue
--- a/src/components/team/dialog.vue
+++ b/src/components/team/dialog.vue
--- a/src/components/team/hour.vue
+++ b/src/components/team/hour.vue
--- a/src/components/team/index.vue
+++ b/src/components/team/index.vue
--- a/src/components/callBack/index.vue
+++ b/src/components/callBack/index.vue
@@ -267,36 +267,37 @@
        this.callbackEdit.wechat.value = this.user.info.wx_number;
        this.callbackEdit.wechat.origin = this.user.info.wx_number;
      },
-      'callbackObj.timestamp'() {
+      'callbackObj.timestamp'() { // 时间戳变化更新数据
-        this.user.user_id = this.callbackObj.user_id;
+        this.initCallback();
-        this.getUser();
-        this.getTag();
      }
    },
    mounted() {
-      this.user.user_id = this.callbackObj.user_id;
+      this.initCallback();
-      if (!this.hasUserInfo) {
+    },
-        this.getUser();
+    methods: {
-      } else {
+      initCallback() {
-        this.user.info = this.callbackObj.info;
+        this.user.user_id = this.callbackObj.user_id;
-      }
+        if (!this.hasUserInfo) {
-      this.getTag();
+          this.getUser();
-      this.getData();
+        } else {
+          this.user.info = this.callbackObj.info;
-      if (this.callbackObj.teacher_id) {
-        let json = {
-          user_id: this.callbackObj.user_id
        }
-        getCallBackPrevApi(json).then(res => {
+        this.getTag();
-          if (res && res[0] && res[0].next_visit_at && res[0].intention) {
+        this.getData();
-            this.add.intention = res[0].intention;
-            this.add.next_visit_at = res[0].next_visit_at;
+        if (this.callbackObj.teacher_id) {
+          let json = {
+            user_id: this.callbackObj.user_id
          }
-        })
+          getCallBackPrevApi(json).then(res => {
-      }
+            if (res && res[0] && res[0].next_visit_at && res[0].intention) {
+              this.add.intention = res[0].intention;
+              this.add.next_visit_at = res[0].next_visit_at;
+            }
+          })
+        }
+      },
-    },
-    methods: {
      filterName(string, type) {
        return this[type].find(i => {
          return i.value == string

--- a/src/components/userDetail/index.vue
+++ b/src/components/userDetail/index.vue
@@ -525,7 +525,7 @@
  import {INVITETYPE, ORDERSTATUS, BUYTYPE, USERSTATUSFORMATER} from "../../util/wordbook";
  import teacherDialog from './dialog'
  import UserList from '../class/userList'
-  import CallBack from '@/components/callBack/index'
+  import CallBack from '@/components/userDetail/callBack';
  import sourceByDateDialog from '../teacherDetail/sourceByDateDialog'
  import AddressArray from "../framework/address-picker/addr";

--- a/src/main.js
+++ b/src/main.js
@@ -6,7 +6,7 @@ import router from './router'
 import store from './store'
 import element_ui from 'element-ui'
 Vue.use(element_ui);
-Vue.config.productionTip = false
+Vue.config.productionTip = false;
 /* eslint-disable no-new */
 new Vue({

--- a/src/service/api.js
+++ b/src/service/api.js
@@ -1469,3 +1469,19 @@ export const putBrokerageApi = function (id, json) {
 export const deleteBrokerageApi = function (id) {
  return Vue.prototype.$del(`${_baseUrl}api/admin/bkge/config/${id}`)
 };
+// 获取团队概况
+export const getTeamApi = function (json) {
+  return Vue.prototype.$fetch(`${_baseUrl}api/admin/teacher/teamprofile`, json)
+};
+// 获取已回访列表
+export const getVisitedApi = function (json) {
+  return Vue.prototype.$fetch(`${_baseUrl}api/admin/teacher/overvisitlist`, json)
+};
+// 获取最近开班列表
+export const getClassOpenedApi = function (json) {
+  return Vue.prototype.$fetch(`${_baseUrl}api/admin/teacher/reachstartclasslist`, json)
+};
+// 获取业绩详情
+export const getAchievementApi = function (json) {
+  return Vue.prototype.$fetch(`${_baseUrl}api/admin/teacher/teamachievement`, json)
+};
--- a/src/service/index.js
+++ b/src/service/index.js
@@ -32,8 +32,7 @@ axios.interceptors.request.use(
      config.params = config.params || {};
      let json = JSON.parse(JSON.stringify(config.params));
      // console.log(json)
-      for(let k in json)
+      for(let k in json) {
-      {
        // let reg = /^[0-9]+$/u;
        // if(reg.test(json[k])){
        //   console.log(json[k])

--- a/src/util/menuList.js
+++ b/src/util/menuList.js
@@ -115,6 +115,26 @@ export default [
          name: 'teacher',
          component: e => require(['@/components/teacher'], e),
        }
+      }, {
+        value: '增长运营列表', // 增长运营、TMK用
+        routerName: 'growth',
+        path: '/growth',
+        cover: '3-6',
+        router: {
+          path: '/growth',
+          name: 'growth',
+          component: e => require(['@/components/teacher/growth'], e),
+        }
+      }, {
+        value: '用户服务列表', // 用户服务用
+        routerName: 'userservice',
+        path: '/userservice',
+        cover: '3-7',
+        router: {
+          path: '/userservice',
+          name: 'userservice',
+          component: e => require(['@/components/teacher/userservice'], e),
+        }
      }, {
        value: '月课订单列表',
        routerName: 'monthOrder',
@@ -185,7 +205,28 @@ export default [
          name: 'brokerage',
          component: e => require(['@/components/brokerage'], e),
        }
+      }, {
+        value: '团队概况',
+        routerName: 'team',
+        path: '/team',
+        cover: '11-9',
+        router: {
+          path: '/team',
+          name: 'team',
+          component: e => require(['@/components/team'], e),
+        }
      },
+      /*{
+        value: '小时动态',
+        routerName: 'hour',
+        path: '/hour',
+        cover: '11-10',
+        router: {
+          path: '/hour',
+          name: 'hour',
+          component: e => require(['@/components/team/hour'], e),
+        }
+      },*/
    ]
  }, {
    name: '',

--- a/src/util/tipArr.js
+++ b/src/util/tipArr.js
 export const tipArr = {
-  '到课率':'浏览过一次及以上课包的人数/学员人数；不含观摩班',
+  '到课率': '浏览过一次及以上课包的人数/学员人数；不含观摩班',
-  '看课率':'（课包浏览数量*看课学员数）/（已解锁课包数*学员人数）；不含观摩班',
+  '看课率': '（课包浏览数量*看课学员数）/（已解锁课包数*学员人数）；不含观摩班',
-  '完课率':'浏览过所有课包的人数/学员人数；不含观摩班',
+  '完课率': '浏览过所有课包的人数/学员人数；不含观摩班',
-  '打卡率':'完成过一次及以上课包分享的人数/学员数；不含观摩班',
+  '打卡率': '完成过一次及以上课包分享的人数/学员数；不含观摩班',
-  '全勤打卡率':'完成过所有课包分享的人数/学员数；不含观摩班',
+  '全勤打卡率': '完成过所有课包分享的人数/学员数；不含观摩班',
-  '转化率':'晚于体验营开课时间的正式课购课学员数量/学员数；不含观摩班',
+  '转化率': '晚于体验营开课时间的正式课购课学员数量/学员数；不含观摩班',
 };
 export const tipArr2 = {
-  '订单数':'支付成功且未全额退款的订单数量（*月课、季课全勤返现完成的订单也会排除）',
+  '订单数': '支付成功且未全额退款的订单数量（*月课、季课全勤返现完成的订单也会排除）',
-  '到班数':'进入系统课程期数班级的学员数量',
+  '到班数': '进入系统课程期数班级的学员数量',
-  '到班率':'到班数/订单数',
+  '到班率': '到班数/订单数',
-  '好友数':'班主任在系统内标注用已成为微信好友的户数量，包含老师主动添加数和用户主动添加数',
+  '好友数': '班主任在系统内标注用已成为微信好友的户数量，包含老师主动添加数和用户主动添加数',
-  '到课数':'浏览过一次及以上课包的人数',
+  // '到课数':'浏览过一次及以上课包的人数',
-  '好友率':'好友数/订单数',
+  '好友率': '好友数/订单数',
-  '到课数':'浏览过一次及以上课包的人数',
+  '到课数': '浏览过一次及以上课包的人数',
-  '到课率':'到课数/订单数',
+  '到课率': '到课数/订单数',
-  '转化人数':'购买一年课、两年课且未全额退款的人数（*个别退课但未全额退款的学员包含在内）',
+  '转化人数': '购买一年课、两年课且未全额退款的人数（*个别退课但未全额退款的学员包含在内）',
-  '转化率':'转化人数/订单数',
+  '转化率': '转化人数/订单数',
-  '一年课购买人数':'购买一年课且未全额退款的人数',
+  '一年课购买人数': '购买一年课且未全额退款的人数',
-  '两年课购买人数':'购买两年课且未全额退款的人数',
+  '两年课购买人数': '购买两年课且未全额退款的人数',
-  '转化总额':'一年课和两年课的转化金额合计',
+  '转化总额': '一年课和两年课的转化金额合计',
-  '一年课转化金额':'购买一年课且未全额退款的订单实付金额（云集订单为商品金额，不扣除优惠券、抵现）',
+  '一年课转化金额': '购买一年课且未全额退款的订单实付金额（云集订单为商品金额，不扣除优惠券、抵现）',
-  '两年课转化金额':'购买两年课且未全额退款的订单实付金额（云集订单为商品金额，不扣除优惠券、抵现）',
+  '两年课转化金额': '购买两年课且未全额退款的订单实付金额（云集订单为商品金额，不扣除优惠券、抵现）',
 };
 export const tipArr3 = {
-  '到班数':'进入系统课程期数班级的学员数量',
+  '到班数': '进入系统课程期数班级的学员数量',
-  '好友数':'班主任在系统内标注用已成为微信好友的户数量，包含老师主动添加数和用户主动添加数',
+  '好友数': '班主任在系统内标注用已成为微信好友的户数量，包含老师主动添加数和用户主动添加数',
-  '到课数':'浏览过一次及以上课包的人数',
+  // '到课数':'浏览过一次及以上课包的人数',
-  '好友率':'好友数/到班数',
+  '好友率': '好友数/到班数',
-  '到课数':'浏览过一次及以上课包的人数',
+  '到课数': '浏览过一次及以上课包的人数',
-  '到课率':'到课数/到班数',
+  '到课率': '到课数/到班数',
-  '转化人数':'购买一年课、两年课且未全额退款的人数（*个别退课但未全额退款的学员包含在内）',
+  '转化人数': '购买一年课、两年课且未全额退款的人数（*个别退课但未全额退款的学员包含在内）',
-  '转化率':'转化人数/到班数',
+  '转化率': '转化人数/到班数',
-  '一年课购买人数':'购买一年课且未全额退款的人数',
+  '一年课购买人数': '购买一年课且未全额退款的人数',
-  '两年课购买人数':'购买两年课且未全额退款的人数',
+  '两年课购买人数': '购买两年课且未全额退款的人数',
-  '转化总额':'一年课和两年课的转化金额合计',
+  '转化总额': '一年课和两年课的转化金额合计',
-  '一年课转化金额':'购买一年课且未全额退款的订单实付金额（云集订单为商品金额，不扣除优惠券、抵现）',
+  '一年课转化金额': '购买一年课且未全额退款的订单实付金额（云集订单为商品金额，不扣除优惠券、抵现）',
-  '两年课转化金额':'购买两年课且未全额退款的订单实付金额（云集订单为商品金额，不扣除优惠券、抵现）',
+  '两年课转化金额': '购买两年课且未全额退款的订单实付金额（云集订单为商品金额，不扣除优惠券、抵现）',
 };
\ No newline at end of file
+export const TIP_TEAM = {
+  'reach_class_num': '近30天，进入系统课程期数班级的学员数', // 到班数
+  'reach_course_num': '近30天，浏览过1次以上课件的学员数', // 到课数
+  'wait_add_friend': '近7天，到班，但没有添加好友', // 待添加
+  'wait_visit_num': '当天待回访的学员数（标记了回访日期，回访日期=查询日，且没有回访行为）', // 待回访
+  'over_visit_num': '当天做了回访的学员数', // 已回访
+  'chat_contact_count': '当天CC在微信中发出去的信息条数（不包括群）', // 微信沟通
+  'valid_chat_contact_count': '当天CC在微信1对1沟通中有1轮以上回复的条数（CC发出一条，客户回复一条）', // 微信有效沟通
+  'valid_phone_counts': '当天接通的电话次数', // 有效通次
+  'phone_total_time': '当天接通的电话通时，格式为hms，小时分钟秒', // 有效通时
+  'lately_class_num': '当天往后推7自然日内，关联到该CC的开期的班的数量', // 未来开课
+  'month_order_num': '年、两年课的订单总和（除去全额退款的）', // 当月订单
+  'month_order_rate': '当月订单数/当月到班人数', // 当月转化
+  'order_money_count': '当月一年、两年课的业绩（减掉全额退款的）', // 当月业绩
+};