Merge branch 'team' into dev

a1d10c9a · 赵茹林 · ce34616e · d6538bc6 · a1d10c9a · a1d10c9a
Commit a1d10c9a authored Sep 06, 2019 by 赵茹林
19 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/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/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
--- 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
@@ -205,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': '当月一年、两年课的业绩（减掉全额退款的）', // 当月业绩
+};