Merge branch 'master' into permission_small

dist/static/css/chunk-06232610.4af8a1ea.css

@@ -1 +0,0 @@
-.m-container .m-wrap[data-v-22955bb9]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;width:100%}.m-container .m-wrap .newBand[data-v-22955bb9]{margin:0 5px 0 50px}.m-container .m-wrap .el-tooltip.micon[data-v-22955bb9]{width:20px;height:20px;position:relative;top:12px}[data-v-22955bb9] .el-input__icon.el-icon-date{height:40px!important}

dist/static/css/chunk-0e8e579a.6663f0cb.css

@@ -1 +0,0 @@
-.m-container[data-v-0469c7e5]{min-width:100%}.el-input[data-v-0469c7e5]{width:400px}[data-v-0469c7e5] .ql-editor{min-height:300px}.el-button--primary[data-v-0469c7e5],.el-button--primary[data-v-0469c7e5]:active,.el-button--primary[data-v-0469c7e5]:focus,.el-button--primary[data-v-0469c7e5]:hover{background:#14928a;border-color:#14928a;color:#fff}.el-row[data-v-0469c7e5]{margin-top:40px}.el-col[data-v-0469c7e5]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;margin-bottom:20px;-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end;margin-right:50%}.el-input-group[data-v-0469c7e5]{width:200px;margin:0 20px}[data-v-0469c7e5] .el-tree-node__content{height:40px!important}[data-v-0469c7e5] .avatar-uploader .el-upload{border:1px dashed #d9d9d9;border-radius:6px;cursor:pointer;position:relative;overflow:hidden}.avatar-uploader .el-upload[data-v-0469c7e5]:hover{border-color:#409eff}.avatar-uploader-icon[data-v-0469c7e5]{font-size:28px;color:#8c939d;width:120px;height:120px;line-height:120px;text-align:center}.avatar[data-v-0469c7e5]{width:120px;height:120px;display:block}.ivu-upload[data-v-0469c7e5]{display:none}

dist/static/css/chunk-e4409656.abac7ce0.css → dist/static/css/chunk-4d82cebc.94f9183c.css

@@ -1 +1 @@
-.pagination-container[data-v-31cb099a]{background:#fff;padding:32px 16px;width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-31cb099a]{display:none}.bannerImg[data-v-1339b45c],.bannerImg[data-v-a3aa8ac0],.bannerImg[data-v-ac080a66],.bannerImg[data-v-ae44f08a]{height:60px}
+.pagination-container[data-v-31cb099a]{background:#fff;padding:32px 16px;width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-31cb099a]{display:none}.bannerImg[data-v-673db3aa],.bannerImg[data-v-1339b45c],.bannerImg[data-v-a3aa8ac0],.bannerImg[data-v-ac080a66],.bannerImg[data-v-ae44f08a]{height:60px}

dist/static/css/chunk-51b367e4.5997a02e.css

@@ -0,0 +1 @@
+.m-container .m-wrap[data-v-c1fd1100]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;width:100%}.m-container .m-wrap .newBand[data-v-c1fd1100]{margin:0 5px 0 50px}.m-container .m-wrap .el-tooltip.micon[data-v-c1fd1100]{width:20px;height:20px;position:relative;top:12px}[data-v-c1fd1100] .el-input__icon.el-icon-date{height:40px!important}

dist/static/css/chunk-5c114bcd.71fe6da2.css

@@ -0,0 +1 @@
+.m-container[data-v-70c10581]{min-width:100%}.el-input[data-v-70c10581]{width:400px}[data-v-70c10581] .ql-editor{min-height:300px}.el-button--primary[data-v-70c10581],.el-button--primary[data-v-70c10581]:active,.el-button--primary[data-v-70c10581]:focus,.el-button--primary[data-v-70c10581]:hover{background:#14928a;border-color:#14928a;color:#fff}.el-row[data-v-70c10581]{margin-top:40px}.el-col[data-v-70c10581]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;margin-bottom:20px;-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end;margin-right:50%}.el-input-group[data-v-70c10581]{width:200px;margin:0 20px}[data-v-70c10581] .el-tree-node__content{height:40px!important}[data-v-70c10581] .avatar-uploader .el-upload{border:1px dashed #d9d9d9;border-radius:6px;cursor:pointer;position:relative;overflow:hidden}.avatar-uploader .el-upload[data-v-70c10581]:hover{border-color:#409eff}.avatar-uploader-icon[data-v-70c10581]{font-size:28px;color:#8c939d;width:120px;height:120px;line-height:120px;text-align:center}.avatar[data-v-70c10581]{width:120px;height:120px;display:block}.ivu-upload[data-v-70c10581]{display:none}

dist/static/css/chunk-71d62e3f.63219895.css → dist/static/css/chunk-78297145.61e8e48a.css

@@ -1 +1 @@
-.pagination-container[data-v-31cb099a]{background:#fff;padding:32px 16px;width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-31cb099a]{display:none}.vipwrap[data-v-b93c37b8]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.vipwrap .newBand[data-v-b93c37b8]{margin-right:20px}.resetClassForm[data-v-b93c37b8] .el-date-editor.el-input,.resetClassForm[data-v-b93c37b8] .el-date-editor.el-input__inner{width:180px!important}[data-v-b93c37b8] .el-date-editor.el-input,[data-v-b93c37b8] .el-date-editor.el-input__inner{width:100px!important}
+.pagination-container[data-v-31cb099a]{background:#fff;padding:32px 16px;width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-31cb099a]{display:none}.vipwrap[data-v-7211b2c3]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.vipwrap .newBand[data-v-7211b2c3]{margin-right:20px}.resetClassForm[data-v-7211b2c3] .el-date-editor.el-input,.resetClassForm[data-v-7211b2c3] .el-date-editor.el-input__inner{width:180px!important}[data-v-7211b2c3] .el-date-editor.el-input,[data-v-7211b2c3] .el-date-editor.el-input__inner{width:100px!important}

src/utils/searchArray.js

@@ -51,8 +51,7 @@ const orderStatus = [
   { value: "SMALL_CLASS_TO_BUY", label: "VIP购买" },
   { value: "SPORADIC", label: "零星收费" },
   { value: "LUCK", label: "福袋活动" },
-  { value: "PRACTICE", label: "网管课" },
-  { value: "PRACTICE_GROUP_BUY", label: "付费网管课" }, 
+  { value: "PRACTICE_GROUP_BUY", label: "网管课" }, 
   
 ]
 

src/views/contentManager/components/flashPage.vue

@@ -0,0 +1,154 @@
+<template>
+  <div>
+    <!-- 搜索标题 -->
+    <div @click="openTeaching('create')"
+         class='newBand'>新建</div>
+    <!-- 列表 -->
+    <div class="tableWrap">
+      <el-table :data='tableList'
+                :header-cell-style="{background:'#EDEEF0',color:'#444'}">
+        <el-table-column align='center'
+                         label="轮播图">
+          <template slot-scope="scope">
+            <img class="bannerImg"
+                 :src="scope.row.coverImage"
+                 alt="">
+          </template>
+        </el-table-column>
+        <el-table-column align='center'
+                         prop="title"
+                         label="标题">
+        </el-table-column>
+        <el-table-column align='center'
+                         label="跳转连接">
+          <template slot-scope="scope">
+            {{ scope.row.linkUrl + '/' + scope.row.id }}
+          </template>
+        </el-table-column>
+        <el-table-column align='center'
+                         prop="remark"
+                         label="是否使用">
+          <template slot-scope="scope">
+            {{ scope.row.status == 1 ? '是' : '否' }}
+          </template>
+        </el-table-column>
+        <el-table-column align='center'
+                         label="操作">
+          <template slot-scope="scope">
+            <el-button @click="openTeaching('update', scope.row)"
+                       type="text">修改</el-button>
+            <el-button v-if="scope.row.status == 1"
+                       @click="onStop(scope.row, 0)"
+                       type="text">停用</el-button>
+            <el-button v-else
+                       @click="onStop(scope.row, 1)"
+                       type="text">启用</el-button>
+            <el-button @click="onDel(scope.row)"
+                       type="text">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <pagination :total="pageInfo.total"
+                  :page.sync="pageInfo.page"
+                  :limit.sync="pageInfo.limit"
+                  :page-sizes="pageInfo.page_size"
+                  @pagination="getList" />
+    </div>
+  </div>
+</template>
+<script>
+import { newsList, newsUpdate, newsDel } from '@/api/contentManager'
+import pagination from '@/components/Pagination/index'
+import store from '@/store'
+export default {
+  name: 'banner',
+  components: {
+    pagination
+  },
+  data () {
+    return {
+      tableList: [],
+      organId: null,
+      teacherId: this.$route.query.teacherId,
+      pageInfo: {
+        // 分页规则
+        limit: 10, // 限制显示条数
+        page: 1, // 当前页
+        total: 1, // 总条数
+        page_size: [10, 20, 40, 50] // 选择限制显示条数
+      }
+    }
+  },
+  activated () {
+    this.getList()
+  },
+  mounted () {
+    this.getList()
+  },
+  methods: {
+    getList () {
+      let params = {
+        rows: this.pageInfo.limit,
+        page: this.pageInfo.page,
+        type: 5
+      }
+      newsList(params).then(res => {
+        if (res.code == 200) {
+          this.tableList = res.data.rows
+          this.pageInfo.total = res.data.total
+        }
+      })
+    },
+    openTeaching (type, rows) {
+      let params = {}
+      if (type == 'update') {
+        params.id = rows.id
+      }
+      params.type = 5
+      params.pageType = type
+      this.$router.push({
+        path: '/contentManager/contentOperation',
+        query: params
+      })
+    },
+    onDel (row) { // 删除
+      this.$confirm('确定是否删除?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        newsDel({ id: row.id }).then(res => {
+
+          if (res.code == 200) {
+            this.$message.success('删除成功')
+            this.getList()
+          } else {
+            this.$message.error(res.msg)
+          }
+        })
+      }).catch(() => { })
+
+    },
+    onStop (row, status) { // 停止
+      // newsUpdate
+      let tempStr = ['停用', '启用']
+      newsUpdate({
+        id: row.id,
+        status: status
+      }).then(res => {
+        if (res.code == 200) {
+          this.$message.success(tempStr[status] + '成功')
+          this.getList()
+        } else {
+          this.$message.error(res.msg)
+        }
+      })
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.bannerImg {
+  height: 60px;
+}
+</style>

src/views/contentManager/contentOperation.vue

@@ -341,7 +341,8 @@ export default {
         1: "精彩活动",
         2: "热门资讯",
         3: "活动列表",
-        4: "专项训练"
+        4: "专项训练",
+        5:'闪页管理'
       }
       return tempTitle[type]
     },
@@ -350,7 +351,8 @@ export default {
         3: 0,
         1: 1,
         2: 2,
-        4: 3
+        4: 3,
+        5:4
       }
       return tempTitle[type]
     },

src/views/contentManager/index.vue

@@ -23,6 +23,10 @@
                      name="3">
           <training v-if="activeStatus[3]" />
         </el-tab-pane>
+        <el-tab-pane label="闪页管理"
+                     name="4">
+          <flashPage v-if="activeStatus[4]" />
+        </el-tab-pane>
       </el-tabs>
     </div>
   </div>
@@ -32,13 +36,14 @@ import banner from './components/banner'
 import activity from './components/activity'
 import information from './components/information'
 import training from './components/training'
+import flashPage from './components/flashPage'
 export default {
-  components: { banner, activity, information, training },
+  components: { banner, activity, information, training,flashPage },
   name: 'contentManager',
   data () {
     return {
       activeName: "0",
-      activeStatus: [true, false, false, false]
+      activeStatus: [true, false, false, false,false]
     }
   },
   created () {

src/views/editionManager/editionList.vue

@@ -4,8 +4,19 @@
       <div class="squrt"></div>版本控制
     </h2>
     <div class="m-core">
-      <!--  v-permission="'cooperationOrgan/add'" -->
-      <div class="newBand" @click="createEdi">新建</div>
+       <!--   -->
+      <div class="newBand" @click="createEdi" v-permission="'appVersionInfo/add'">新建</div>
+      <el-form :inline="true" :model="searchForm">
+        <el-form-item label="客户端">
+          <el-select clearable v-model="searchForm.search">
+            <el-option v-for="(item,index) in sectionList" :key='index' :value="item.value" :label="item.label"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item >
+          <el-button type="danger" @click="search">搜索</el-button>
+        </el-form-item>
+      </el-form>
+     
       <div class="tableWrap">
         <el-table :data="tableList" :header-cell-style="{background:'#EDEEF0',color:'#444'}">
           <el-table-column align="center" prop="id" label="编号"></el-table-column>
@@ -30,7 +41,7 @@
           <el-table-column align="center" label="操作">
             <template slot-scope="scope">
               <div>
-                <el-button type="text"@click="resetEdit(scope.row)">修改</el-button>
+                <el-button v-permission="'appVersionInfo/update'" type="text"@click="resetEdit(scope.row)">修改</el-button>
               </div>
             </template>
           </el-table-column>
@@ -44,7 +55,8 @@
         />
       </div>
     </div>
-    <el-dialog title="版本修改" width="400px" :visible.sync="sectionVisible" :before-close="reserForm">
+    <!-- v-if="sectionVisible" -->
+    <el-dialog title="版本修改" width="400px" :visible.sync="sectionVisible" :before-close="resetForm" >
       <el-form
         :model="sectionForm"
         ref="sectionForm"
@@ -52,14 +64,15 @@
         label-position="right"
         label-width="80px"
         :inline="true"
+        v-if="sectionVisible"
       >
-      <el-form-item label="客户端" prop="platform" >
+      <el-form-item label="客户端" prop="platform"  v-if="isNew">
         <el-select v-model="sectionForm.platform" clearable>
           <el-option v-for="(item,index) in sectionList" :key="index" :label="item.label" :value="item.value"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="版本号" prop="version" v-if="isNew">
-        <el-input v-model.trim="sectionForm.version" type="number"  @mousewheel.native.prevent></el-input>
+        <el-input v-model.trim="sectionForm.version"   @mousewheel.native.prevent></el-input>
       </el-form-item>
       <el-form-item label="强制更新" prop="isForceUpdate">
         <el-select clearable v-model="sectionForm.isForceUpdate">
@@ -106,6 +119,9 @@ export default {
         total: 0, // 总条数
         page_size: [10, 20, 40, 50] // 选择限制显示条数
       },
+      searchForm:{
+        search:null
+      },
       sectionList: [{value:'ios-teacher',label:'苹果-老师端'},
       {value:'ios-student',label:'苹果-学生端'},{value:'ios-education',label:'苹果-教务端'},{value:'android-teacher',label:'安卓-老师端'},
       {value:'android-student',label:'安卓-学生端'},{value:'android-education',label:'安卓-教务端'}],
@@ -141,11 +157,16 @@ export default {
     this.init();
   },
   methods: {
+    search(){
+      this.rules.page = 1;
+      this.getList()
+    },
     init() {
       this.getList();
     },
     getList() {
-      appVersionInfo().then(res => {
+      this.searchForm.search?this.searchForm.search:this.searchForm.search = null;
+      appVersionInfo({search:this.searchForm.search}).then(res => {
         if (res.code == 200) {
           this.tableList = res.data.rows;
           this.rules.total = res.data.total;
@@ -173,8 +194,7 @@ export default {
     },
     resetEdit(row){
        this.isNew = false;
-      //  console.log(row)
-       this.sectionForm =   row;
+       this.sectionForm =row;
        this.sectionVisible = true;
     },
     resetEdition(){
@@ -188,7 +208,7 @@ export default {
         }
       })
     },
-    reserForm(){
+    resetForm(){
       this.sectionForm = {
         platform:'',
         version:'',
@@ -197,6 +217,7 @@ export default {
         status:'',
         id:''
       }
+    // console.log(this.sectionForm.status)
     this.$refs.sectionForm.resetFields();
     this.sectionVisible = false;
     }

src/views/reportForm/index.vue

@@ -5,7 +5,7 @@
     </h2>
     <div class="m-core">
       <div class="m-wrap">
-        <el-date-picker v-model="mouth" type="month" placeholder="选择月"></el-date-picker>
+        <el-date-picker v-model="mouth" type="month" placeholder="选择月" value-format="yyyy-MM-dd"></el-date-picker>
 
         <div class="newBand" @click="exportSalar" v-permission="'export/teacherSalary'">导出课酬</div>
         <el-tooltip placement="top" popper-class="mTooltip">
@@ -50,7 +50,7 @@ export default {
         url,
         responseType: 'blob'
       }
-      this.$confirm('您确定导出发放清单', '提示', {
+      this.$confirm('您确定导出课酬', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'

src/views/vipClass/vipReset.vue

@@ -39,6 +39,11 @@
             <div>{{ scope.row.status | coursesStatus }}</div>
           </template>
         </el-table-column>
+         <el-table-column label="是否点名" align="center">
+          <template slot-scope="scope">
+            <div>{{scope.row.isCallNames?'已点名':'未点名'}}</div>
+          </template>
+        </el-table-column>
         <el-table-column label="结算状态" align="center">
           <template slot-scope="scope">
             <div>{{scope.row.isSettlement?'已结算':'未结算'}}</div>
@@ -58,7 +63,7 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column label="操作">
+        <el-table-column label="操作" width="180" align="center">
           <template slot-scope="scope">
             <div>
               <el-button
@@ -70,9 +75,16 @@
               <el-button
                 type="text"
                 v-permission="'courseSchedule/bathDelete'"
-                v-if="scope.row.status != 'OVER'"
+                 v-if="!scope.row.isSettlement"
                 @click="removeClass(scope.row)"
               >删除</el-button>
+              <!--   -->
+                  <el-button
+                type="text"
+                 v-permission="'vip/cleanAttendance'"
+                v-if="!scope.row.isSettlement"
+               @click="clearAttend(scope.row)"
+              >清除考勤</el-button>
             </div>
           </template>
         </el-table-column>
@@ -327,7 +339,7 @@
   </div>
 </template>
 <script>
-import { resetCourse } from "@/api/buildTeam";
+import { resetCourse,  cleanAttendance } from "@/api/buildTeam";
 // import { getSchool } from '@/api/systemManage'
 import pagination from "@/components/Pagination/index";
 import {
@@ -720,6 +732,27 @@ export default {
           this.getList();
         }
       });
+    },
+      // 清除考勤
+    clearAttend(row) {
+      this.$confirm("是否清除考勤记录?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          cleanAttendance({ courseScheduleIds: row.id }).then(
+            res => {
+              if (res.code == 200) {
+                this.$message.success("清除成功");
+                this.getList();
+              } else {
+                this.$message.error(res.msg);
+              }
+            }
+          );
+        })
+        .catch(() => {});
     }
   },
   watch: {