1120 18:37

111

src/layout/components/Navbar.vue

@@ -129,8 +129,6 @@ export default {
     // 手动加入
     this.toggleSideBar();
     this.username = this.$store.getters.name;
-    // console.log(this.$store.getters.name)
-
   },
   methods: {
     toggleSideBar () {

src/layout/components/Sidebar/SidebarItem.vue

@@ -65,7 +65,6 @@ export default {
   },
   mounted () {
     this.onlyOneChild = null
-    // console.log(this.item)
   }
   ,
   methods: {

src/layout/components/Sidebar/index.vue

@@ -49,14 +49,12 @@ export default {
       return path
     },
     showLogo () {
-      // console.log(this.$store.state.settings.sidebarLogo);
       return this.$store.state.settings.sidebarLogo
     },
     variables () {
       return variables
     },
     isCollapse () {
-      // console.log(!this.sidebar.opened)
       return false
 
     }

src/store/modules/permission.js

@@ -14,7 +14,6 @@ function generateAsyncRouter (asyncRoutes, data) {
   }
 
   data.forEach((item, index) => {
-    // console.log(item);
     item.component = asyncRoutes[item.component]
     if (item.children && item.children.length > 0) {
       generateAsyncRouter(asyncRoutes, item.children)
@@ -44,7 +43,6 @@ const mutations = {
 // 递归遍历数组
 function recursionRouter (arr) {
   if (arr.length > 0) {
-    // console.log(arr);
     let newArr = arr.map(item => {
       let obj = {};
       obj.component = item.component;

src/store/modules/user.js

@@ -38,6 +38,7 @@ const actions = {
       login({ username: username.trim(), password: password, clientId: 'system', clientSecret: 'system' }).then(response => {
         const { data } = response
         if (response.code == 200) {
+
           let token = data.authentication.token_type + ' ' + data.authentication.access_token;
           commit('SET_TOKEN', token)
           setToken(token)

src/views/businessManager/orderManager/backMoney.vue

@@ -1,6 +1,8 @@
 <template>
   <div class="m-container">
-    <h2><div class="squrt"></div>退费管理</h2>
+    <h2>
+      <div class="squrt"></div>退费管理
+    </h2>
     <div class="m-core">
       <!-- 搜索类型 -->
       <el-form :inline="true"
@@ -175,7 +177,6 @@ export default {
         if (valid) {
           this.form.status = status
           applyRefundAudit(this.form).then(res => {
-            // console.log(res)
             if (res.code == 200) {
               this.$message({
                 message: '操作成功',

src/views/businessManager/orderManager/expend.vue

@@ -1,6 +1,8 @@
 <template>
   <div class="m-container">
-    <h2><div class="squrt"></div>提现列表</h2>
+    <h2>
+      <div class="squrt"></div>提现列表
+    </h2>
     <div class="m-core">
       <!-- 搜索类型 -->
       <el-form :inline="true"
@@ -26,62 +28,84 @@
       </el-form>
       <!-- 列表 -->
       <div class="tableWrap">
-        <el-table :data='tableList' :header-cell-style="{background:'#EDEEF0',color:'#444'}">
+        <el-table :data='tableList'
+                  :header-cell-style="{background:'#EDEEF0',color:'#444'}">
           <!-- <el-table-column align='center' prop="transNo"
                           label="提现交易流水号">
           </el-table-column> -->
-          <el-table-column align='center' prop="createTime"
-                          label="申请时间">
+          <el-table-column align='center'
+                           prop="createTime"
+                           label="申请时间">
           </el-table-column>
-          <el-table-column align='center' prop="user.realName"
-                          label="学员姓名">
+          <el-table-column align='center'
+                           prop="user.realName"
+                           label="学员姓名">
           </el-table-column>
-          <el-table-column align='center' prop="amount"
-                          label="提现金额">
+          <el-table-column align='center'
+                           prop="amount"
+                           label="提现金额">
           </el-table-column>
-          <el-table-column align='center' prop="detail.balance"
-                          label="账户余额(元)">
+          <el-table-column align='center'
+                           prop="detail.balance"
+                           label="账户余额(元)">
           </el-table-column>
-          <el-table-column align='center' prop="bankCardNo" width="200"
-                          label="提现账户">
+          <el-table-column align='center'
+                           prop="bankCardNo"
+                           width="200"
+                           label="提现账户">
           </el-table-column>
           <el-table-column align='center'
-                          label="提现状态">
+                           label="提现状态">
             <template slot-scope="scope">
               {{ scope.row.status | dealStatus }}
             </template>
           </el-table-column>
           <el-table-column align='center'
-                          label="支付账号">
+                           label="支付账号">
             <template slot-scope="scope">
-              <el-input v-if="scope.row.status == 'ING'" type="text" v-model="scope.row.detail.platformAccountNo" placeholder="支付账号"></el-input>
+              <el-input v-if="scope.row.status == 'ING'"
+                        type="text"
+                        v-model="scope.row.detail.platformAccountNo"
+                        placeholder="支付账号"></el-input>
               <span v-else>{{ scope.row.detail.platformAccountNo }}</span>
             </template>
           </el-table-column>
           <el-table-column align='center'
-                          label="支付渠道">
+                           label="支付渠道">
             <template slot-scope="scope">
               <!-- <el-input type="text" v-model="scope.row.channel" placeholder="支付渠道"></el-input> -->
-              <el-select  v-if="scope.row.status == 'ING'"  v-model="scope.row.detail.transType" placeholder="请选择" style="width: 100% !important;">
-                <el-option label="微信" value="1"> </el-option>
-                <el-option label="支付宝" value="2"> </el-option>
-                <el-option label="银联" value="3"> </el-option>
+              <el-select v-if="scope.row.status == 'ING'"
+                         v-model="scope.row.detail.transType"
+                         placeholder="请选择"
+                         style="width: 100% !important;">
+                <el-option label="微信"
+                           value="1"> </el-option>
+                <el-option label="支付宝"
+                           value="2"> </el-option>
+                <el-option label="银联"
+                           value="3"> </el-option>
               </el-select>
               <span v-else>{{ getTypes(scope.row.detail.transType) }}</span>
             </template>
           </el-table-column>
           <el-table-column align='center'
-                          label="交易流水号">
+                           label="交易流水号">
             <template slot-scope="scope">
-              <el-input v-if="scope.row.status == 'ING'" type="text" v-model="scope.row.transNo" placeholder="交易流水号"></el-input>
+              <el-input v-if="scope.row.status == 'ING'"
+                        type="text"
+                        v-model="scope.row.transNo"
+                        placeholder="交易流水号"></el-input>
               <span v-else>{{ scope.row.transNo }}</span>
             </template>
           </el-table-column>
           <el-table-column align='center'
-                          label="操作">
-            <template slot-scope="scope" v-if="scope.row.status == 'ING'">
-              <el-button @click="onSure(scope.row, 'SUCCESS')" type="text">确认</el-button>
-              <el-button @click="onSure(scope.row, 'FAILED')" type="text">拒绝</el-button>
+                           label="操作">
+            <template slot-scope="scope"
+                      v-if="scope.row.status == 'ING'">
+              <el-button @click="onSure(scope.row, 'SUCCESS')"
+                         type="text">确认</el-button>
+              <el-button @click="onSure(scope.row, 'FAILED')"
+                         type="text">拒绝</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -119,7 +143,7 @@ export default {
       },
     }
   },
-  mounted() {
+  mounted () {
     getEmployeeOrgan().then(res => {
       if (res.code == 200) {
         this.organList = res.data;
@@ -134,13 +158,13 @@ export default {
       params.page = this.pageInfo.page
       studentWithdraw(params).then(res => {
         let result = res.data
-        if(res.code == 200) {
+        if (res.code == 200) {
           this.tableList = result.rows
           this.pageInfo.total = result.total
         }
       })
     },
-    getTypes(index) {
+    getTypes (index) {
       let template = {
         1: '微信',
         2: '支付宝',
@@ -148,14 +172,13 @@ export default {
       }
       return template[index]
     },
-    onSure(row, type) {
+    onSure (row, type) {
       let contentText = ''
-      if(type == 'SUCCESS') {
+      if (type == 'SUCCESS') {
         contentText = '您确定提现吗？'
-      } else if(type == 'FAILED') {
+      } else if (type == 'FAILED') {
         contentText = '您确定拒绝吗？'
       }
-      console.log(row)
       this.$confirm(contentText, '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
@@ -168,7 +191,7 @@ export default {
           status: type,
           transNo: row.transNo
         }).then(res => {
-          if(res.code == 200) {
+          if (res.code == 200) {
             this.$message({
               type: 'success',
               message: '操作成功!'
@@ -178,9 +201,9 @@ export default {
             this.$message.error(res.msg)
           }
         })
-        
+
       }).catch(() => { })
-      
+
     }
   }
 }

src/views/businessManager/shopManager/shopOperation.vue

@@ -1,65 +1,91 @@
 <template>
   <div class="m-container">
     <h2>
-      <el-page-header @back="onCancel" :content="(pageType == 'create' ? '添加' : '修改') + '商品'"></el-page-header>
+      <el-page-header @back="onCancel"
+                      :content="(pageType == 'create' ? '添加' : '修改') + '商品'"></el-page-header>
     </h2>
-    
+
     <div class="m-core">
-      <el-form :model="form" :rules="rules" ref="form" label-width="120px" style="width: 500px">
-        <el-form-item label="品牌" prop="brand">
+      <el-form :model="form"
+               :rules="rules"
+               ref="form"
+               label-width="120px"
+               style="width: 500px">
+        <el-form-item label="品牌"
+                      prop="brand">
           <el-input v-model="form.brand"></el-input>
         </el-form-item>
-        <el-form-item label="商品名称" prop="name">
-          <el-input  v-model="form.name"></el-input>
+        <el-form-item label="商品名称"
+                      prop="name">
+          <el-input v-model="form.name"></el-input>
         </el-form-item>
-        <el-form-item label="商品类型" prop="type">
+        <el-form-item label="商品类型"
+                      prop="type">
           <el-select v-model="form.type">
-              <el-option label="乐器" value="INSTRUMENT"></el-option>
-              <el-option label="辅件" value="ACCESSORIES"></el-option>
-              <el-option label="教材" value="TEACHING"></el-option>
-              <el-option label="教谱" value="STAFF"></el-option>
-              <el-option label="其它" value="OTHER"></el-option>
+            <el-option label="乐器"
+                       value="INSTRUMENT"></el-option>
+            <el-option label="辅件"
+                       value="ACCESSORIES"></el-option>
+            <el-option label="教材"
+                       value="TEACHING"></el-option>
+            <el-option label="教谱"
+                       value="STAFF"></el-option>
+            <el-option label="其它"
+                       value="OTHER"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="商品分类" prop="goodsCategoryId">
+        <el-form-item label="商品分类"
+                      prop="goodsCategoryId">
           <el-select v-model="form.goodsCategoryId">
-              <el-option
-                v-for="item in categoryList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value">
-              </el-option>
+            <el-option v-for="item in categoryList"
+                       :key="item.value"
+                       :label="item.label"
+                       :value="item.value">
+            </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="商品型号" prop="specification">
-          <el-input v-model="form.specification" ></el-input>
+        <el-form-item label="商品型号"
+                      prop="specification">
+          <el-input v-model="form.specification"></el-input>
         </el-form-item>
-        <el-form-item label="商品价格" prop="marketPrice">
-          <el-input type="number" v-model="form.marketPrice" ></el-input>
+        <el-form-item label="商品价格"
+                      prop="marketPrice">
+          <el-input type="number"
+                    v-model="form.marketPrice"></el-input>
         </el-form-item>
-        <el-form-item label="商品团购价" prop="groupPurchasePrice">
-          <el-input type="number" v-model="form.groupPurchasePrice" ></el-input>
+        <el-form-item label="商品团购价"
+                      prop="groupPurchasePrice">
+          <el-input type="number"
+                    v-model="form.groupPurchasePrice"></el-input>
         </el-form-item>
-        <el-form-item label="商品采购价" prop="discountPrice">
-          <el-input type="number" v-model="form.discountPrice" ></el-input>
+        <el-form-item label="商品采购价"
+                      prop="discountPrice">
+          <el-input type="number"
+                    v-model="form.discountPrice"></el-input>
         </el-form-item>
-        <el-form-item label="商品图片" prop="image">
-          <el-upload
-            class="avatar-uploader"
-            action="/api-web/uploadFile"
-            :headers="headers"
-            :show-file-list="false"
-            :on-success="handleAvatarSuccess"
-            :before-upload="beforeAvatarUpload">
-            <img v-if="form.image" :src="form.image" class="avatar">
-            <i v-else class="el-icon-plus avatar-uploader-icon"></i>
-        </el-upload>
+        <el-form-item label="商品图片"
+                      prop="image">
+          <el-upload class="avatar-uploader"
+                     action="/api-web/uploadFile"
+                     :headers="headers"
+                     :show-file-list="false"
+                     :on-success="handleAvatarSuccess"
+                     :before-upload="beforeAvatarUpload">
+            <img v-if="form.image"
+                 :src="form.image"
+                 class="avatar">
+            <i v-else
+               class="el-icon-plus avatar-uploader-icon"></i>
+          </el-upload>
         </el-form-item>
-        <el-form-item label="商品描述" prop="desc">
-          <el-input type="textarea" v-model="form.desc" ></el-input>
+        <el-form-item label="商品描述"
+                      prop="desc">
+          <el-input type="textarea"
+                    v-model="form.desc"></el-input>
         </el-form-item>
         <el-form-item>
-          <el-button @click="onSubmit('form')" type="primary">立即{{ pageType == "create" ? '创建' : '修改' }}</el-button>
+          <el-button @click="onSubmit('form')"
+                     type="primary">立即{{ pageType == "create" ? '创建' : '修改' }}</el-button>
           <el-button @click="onReSet('form')">重置</el-button>
         </el-form-item>
       </el-form>
@@ -70,16 +96,16 @@
 import { categoryListTree, goodsAdd, goodsUpdate, goodsSingleQuery } from '@/api/businessManager'
 import store from '@/store'
 import { getToken } from '@/utils/auth'
-let validPrice = (rule, value,callback)=>{
-    if (!value){
-        callback(new Error('请输入金额'))
-    }else  if (value < 0){
-        callback(new Error('输入金额必须大于0'))
-    }else if(value >= 100000) {
-        callback(new Error('输入金额必须小于100000'))
-    }else {
-      callback()
-    }
+let validPrice = (rule, value, callback) => {
+  if (!value) {
+    callback(new Error('请输入金额'))
+  } else if (value < 0) {
+    callback(new Error('输入金额必须大于0'))
+  } else if (value >= 100000) {
+    callback(new Error('输入金额必须小于100000'))
+  } else {
+    callback()
+  }
 }
 export default {
   data () {
@@ -114,13 +140,13 @@ export default {
       },
       rules: {
         brand: [{ required: true, message: '请输入品牌', trigger: 'blur' },
-          { min: 2, max: 30, message: '长度在 2 到 30 个字符', trigger: 'blur' }],
+        { min: 2, max: 30, message: '长度在 2 到 30 个字符', trigger: 'blur' }],
         name: [{ required: true, message: '请输入商品名称', trigger: 'blur' },
-          { min: 2, max: 30, message: '长度在 2 到 30 个字符', trigger: 'blur' }],
+        { min: 2, max: 30, message: '长度在 2 到 30 个字符', trigger: 'blur' }],
         type: [{ required: true, message: '请选择商品分类', trigger: 'change' }],
         goodsCategoryId: [{ required: true, message: '请选择商品类型', trigger: 'change' }],
         specification: [{ required: true, message: '请输入商品型号', trigger: 'blur' },
-          { min: 2, max: 30, message: '长度在 2 到 30 个字符', trigger: 'blur' }],
+        { min: 2, max: 30, message: '长度在 2 到 30 个字符', trigger: 'blur' }],
         marketPrice: [{ required: true, validator: validPrice, trigger: 'blur' }],
         groupPurchasePrice: [{ required: true, validator: validPrice, trigger: 'blur' }],
         discountPrice: [{ required: true, validator: validPrice, trigger: 'blur' }],
@@ -132,16 +158,16 @@ export default {
       }
     }
   },
-  mounted() {
+  mounted () {
     this.getList()
     this.getCatagory()
   },
   methods: {
-    onSubmit(formName) {
+    onSubmit (formName) {
       this.$refs[formName].validate((valid) => {
         if (valid) {
           if (this.pageType == 'create') {
-            if(this.form.id) { // 判断有没有Id，如果有则删除
+            if (this.form.id) { // 判断有没有Id，如果有则删除
               delete this.form.id
             }
             this.form.status = 'YES' // 默认上架
@@ -158,8 +184,8 @@ export default {
         }
       })
     },
-    messageTips(title, res) {
-      if(res.code == 200) {
+    messageTips (title, res) {
+      if (res.code == 200) {
         this.$message({
           message: title + '成功',
           type: 'success'
@@ -169,19 +195,17 @@ export default {
         this.$message.error(res.msg)
       }
     },
-    onCancel() {
+    onCancel () {
       this.$router.push('/shopManager/shopManager')
     },
-    onReSet(formName) {
+    onReSet (formName) {
       this.$refs[formName].resetFields()
     },
-    getList() {
-      if(this.pageType == 'create') return false
+    getList () {
+      if (this.pageType == 'create') return false
       goodsSingleQuery(this.$route.query.id).then(res => {
-        console.log(res)
-        if(res.code == 200) {
+        if (res.code == 200) {
           let result = res.data
-          console.log(result)
           this.form = {
             id: result.id,
             brand: result.brand,
@@ -198,13 +222,13 @@ export default {
         }
       })
     },
-    getCatagory() {
+    getCatagory () {
       categoryListTree({
         delFlag: 0,
         rows: 9999
       }).then(res => {
         let result = res.data
-        if(res.code == 200) {
+        if (res.code == 200) {
           let tempArray = []
           result.rows.forEach(row => {
             tempArray.push({
@@ -216,14 +240,14 @@ export default {
         }
       })
     },
-    handleAvatarSuccess(res, file) {
+    handleAvatarSuccess (res, file) {
       this.form.image = res.data.url
-        
+
     },
-    beforeAvatarUpload(file) {
+    beforeAvatarUpload (file) {
       const imageType = {
         'image/png': true,
-        'image/jpeg': true 
+        'image/jpeg': true
       }
       const isImage = imageType[file.type]
       const isLt2M = file.size / 1024 / 1024 < 2
@@ -244,10 +268,12 @@ export default {
   background: #14928a;
   border-color: #14928a;
   color: #fff;
-  &:hover, &:active, &:focus {
+  &:hover,
+  &:active,
+  &:focus {
     background: #14928a;
     border-color: #14928a;
-    color: #FFF;
+    color: #fff;
   }
 }
 .el-row {
@@ -268,26 +294,26 @@ export default {
   height: 40px !important;
 }
 /deep/.avatar-uploader .el-upload {
-    border: 1px dashed #d9d9d9;
-    border-radius: 6px;
-    cursor: pointer;
-    position: relative;
-    overflow: hidden;
-  }
-  .avatar-uploader .el-upload:hover {
-    border-color: #409EFF;
-  }
-  .avatar-uploader-icon {
-    font-size: 28px;
-    color: #8c939d;
-    width: 120px;
-    height: 120px;
-    line-height: 120px;
-    text-align: center;
-  }
-  .avatar {
-    width: 120px;
-    height: 120px;
-    display: block;
-  }
+  border: 1px dashed #d9d9d9;
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+}
+.avatar-uploader .el-upload:hover {
+  border-color: #409eff;
+}
+.avatar-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+  width: 120px;
+  height: 120px;
+  line-height: 120px;
+  text-align: center;
+}
+.avatar {
+  width: 120px;
+  height: 120px;
+  display: block;
+}
 </style>

src/views/categroyManager/generalSettings/errorManager.vue

@@ -2,21 +2,27 @@
   <div class='m-container'>
     <!-- <h2>错误类型管理</h2> -->
     <div class="m-core">
-      <div class='newBand' @click="openTypes('create')">添加</div>
+      <div class='newBand'
+           @click="openTypes('create')">添加</div>
       <!-- 列表 -->
       <div class="tableWrap">
-        <el-table :data='tableList' :header-cell-style="{background:'#EDEEF0',color:'#444'}">
-          <el-table-column align='center' prop="id"
+        <el-table :data='tableList'
+                  :header-cell-style="{background:'#EDEEF0',color:'#444'}">
+          <el-table-column align='center'
+                           prop="id"
                            label="编号">
           </el-table-column>
-          <el-table-column align='center' prop="name"
+          <el-table-column align='center'
+                           prop="name"
                            label="热词标签">
           </el-table-column>
           <el-table-column align='center'
                            label="操作">
             <template slot-scope="scope">
-              <el-button @click="openTypes('update', scope.row)" type="text">修改</el-button>
-              <el-button @click="onTypesDel(scope.row)" type="text">删除</el-button>
+              <el-button @click="openTypes('update', scope.row)"
+                         type="text">修改</el-button>
+              <el-button @click="onTypesDel(scope.row)"
+                         type="text">删除</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -27,17 +33,25 @@
                     @pagination="getList" />
       </div>
     </div>
-    <el-dialog :title="formTitle[formActionTitle]" :visible.sync="typeStatus"
-               @close="onFormClose('ruleForm')" width="500px">
-      <el-form :model="form" :rules="rules" ref="ruleForm">
-        <el-form-item label="热词内容" prop="name" :label-width="formLabelWidth">
-          <el-input v-model="form.name" autocomplete="off"></el-input>
+    <el-dialog :title="formTitle[formActionTitle]"
+               :visible.sync="typeStatus"
+               @close="onFormClose('ruleForm')"
+               width="500px">
+      <el-form :model="form"
+               :rules="rules"
+               ref="ruleForm">
+        <el-form-item label="热词内容"
+                      prop="name"
+                      :label-width="formLabelWidth">
+          <el-input v-model="form.name"
+                    autocomplete="off"></el-input>
         </el-form-item>
       </el-form>
       <span slot="footer"
             class="dialog-footer">
         <el-button @click="typeStatus = false">取 消</el-button>
-        <el-button type="primary" @click="onTypesSubmit('ruleForm')">确 定</el-button>
+        <el-button type="primary"
+                   @click="onTypesSubmit('ruleForm')">确 定</el-button>
       </span>
     </el-dialog>
   </div>
@@ -76,7 +90,7 @@ export default {
       }
     }
   },
-  mounted() {
+  mounted () {
     this.getList()
   },
   methods: {
@@ -84,7 +98,7 @@ export default {
       this.$refs[formName].validate((valid) => {
         if (valid) {
           if (this.formActionTitle == 'create') {
-            if(this.form.id) { // 判断有没有Id，如果有则删除
+            if (this.form.id) { // 判断有没有Id，如果有则删除
               delete this.form.id
             }
             hotWordLabelManageAdd(this.form).then(res => {
@@ -100,13 +114,13 @@ export default {
         }
       })
     },
-    onTypesDel(row) {
+    onTypesDel (row) {
       hotWordLabelManageDel(row.id).then(res => {
         this.messageTips('删除', res)
       })
     },
-    messageTips(title, res) {
-      if(res.code == 200) {
+    messageTips (title, res) {
+      if (res.code == 200) {
         this.$message({
           message: title + '成功',
           type: 'success'
@@ -117,24 +131,23 @@ export default {
         this.$message.error(res.msg)
       }
     },
-    getList () { 
+    getList () {
       hotWordLabelManage({
         rows: this.pageInfo.limit,
         page: this.pageInfo.page
       }).then(res => {
         let result = res.data
-        if(res.code == 200) {
+        if (res.code == 200) {
           this.tableList = result.rows
           this.pageInfo.total = result.total
         }
       })
     },
-    openTypes(type, row) {
+    openTypes (type, row) {
       this.typeStatus = true
       this.formActionTitle = type
       // 修改的时候赋值
       if (type == 'update') {
-        console.log(name)
         this.form = {
           id: row.id,
           name: row.name,
@@ -150,7 +163,7 @@ export default {
       }
       this.$refs[formName].resetFields()
     },
-    
+
   }
 }
 </script>
@@ -159,13 +172,15 @@ export default {
   background: #14928a;
   border-color: #14928a;
   color: #fff;
-  &:hover, &:active, &:focus {
+  &:hover,
+  &:active,
+  &:focus {
     background: #14928a;
     border-color: #14928a;
-    color: #FFF;
+    color: #fff;
   }
 }
-.el-date-editor.el-input{
+.el-date-editor.el-input {
   width: 100% !important;
 }
 .el-select {

src/views/categroyManager/generalSettings/vipParameterManager.vue

@@ -289,7 +289,6 @@ export default {
     },
     resetGroupCategory (row) {
       // 修改课程形式
-      console.log(row);
       this.vipStatus = true;
       this.vipStatusFrom.name = row.name;
 

src/views/categroyManager/insideSetting/branchActiveOperation.vue

@@ -1,54 +1,84 @@
 <template>
   <div class='m-container'>
     <h2>
-      <el-page-header @back="onCancel" :content="(pageType == 'create' ? '添加' : '修改') + '分部活动'"></el-page-header>
+      <el-page-header @back="onCancel"
+                      :content="(pageType == 'create' ? '添加' : '修改') + '分部活动'"></el-page-header>
     </h2>
     <div class="m-core">
-        <el-form :model="result" :rules="rules" ref="form" label-width="120px" >
-            <el-form-item label="活动名称" prop="name" style="width: 500px">
-                <el-input v-model="result.name"></el-input>
+      <el-form :model="result"
+               :rules="rules"
+               ref="form"
+               label-width="120px">
+        <el-form-item label="活动名称"
+                      prop="name"
+                      style="width: 500px">
+          <el-input v-model="result.name"></el-input>
+        </el-form-item>
+        <el-form-item prop="rewardMode"
+                      label="活动类型"
+                      style="width: 500px">
+          <el-radio-group v-model="result.rewardMode">
+            <el-radio label="STAIR">阶梯奖励</el-radio>
+            <el-radio label="PER">累计奖励</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item class="moreRule"
+                      style="margin-bottom: 0;">
+          <span class="min">最小值</span>
+          <span class="min">最大值</span>
+          <span class="max">奖励金额</span>
+        </el-form-item>
+        <div class="moreRule">
+          <div class="moreRuleIn"
+               v-for="(domain, index) in result.domains"
+               :key="domain.key">
+            <el-form-item :label="'梯度' + (index + 1)">
+              <el-input type="number"
+                        :disabled="domain.disabled"
+                        v-model="domain.min"></el-input>
             </el-form-item>
-            <el-form-item prop="rewardMode" label="活动类型" style="width: 500px">
-                <el-radio-group v-model="result.rewardMode">
-                    <el-radio label="STAIR">阶梯奖励</el-radio>
-                    <el-radio label="PER">累计奖励</el-radio>
-                </el-radio-group>
-            </el-form-item>
-            <el-form-item class="moreRule" style="margin-bottom: 0;">
-                <span class="min">最小值</span>
-                <span class="min">最大值</span>
-                <span class="max">奖励金额</span>
-            </el-form-item>
-            <div class="moreRule">
-                <div class="moreRuleIn" v-for="(domain, index) in result.domains" :key="domain.key">
-                    <el-form-item :label="'梯度' + (index + 1)">
-                        <el-input type="number" :disabled="domain.disabled" v-model="domain.min"></el-input>
-                    </el-form-item>
-                    <el-form-item>
-                        <el-input type="number" :disabled="domain.disabled" v-model="domain.max"></el-input>
-                    </el-form-item>
-                    <el-form-item>
-                        <el-input style="width: auto;" type="number" :disabled="domain.disabled" v-model="domain.money"></el-input>
-                        <el-button v-if="index != 0 && !domain.disabled" @click.prevent="removeDomain(result, domain)">删除</el-button>
-                    </el-form-item>
-                </div>
-                <div class="el-form-item__error" v-if="result.errorText">{{ result.errorText }}</div>
-            </div>
-            <el-form-item class="add">
-                <el-button icon="el-icon-plus" @click="addDomain(result)">新增梯度</el-button>
-            </el-form-item>
-
-            <el-form-item prop="organIdList" label="适用分部" style="width: 500px">
-                 <el-select style="width: 100% !important;" v-model="result.organIdList" multiple placeholder="请选择">
-                    <el-option v-for="item in branchList"
-                        :key="item.value" :label="item.label" :value="item.value" :disabled="item.disabled"> </el-option>
-                </el-select>
+            <el-form-item>
+              <el-input type="number"
+                        :disabled="domain.disabled"
+                        v-model="domain.max"></el-input>
             </el-form-item>
             <el-form-item>
-                <el-button @click="resetForm">重置</el-button>
-                <el-button type="primary" @click="onSubmit('form')">立即{{ pageType == "create" ? '创建' : '修改' }}</el-button>
+              <el-input style="width: auto;"
+                        type="number"
+                        :disabled="domain.disabled"
+                        v-model="domain.money"></el-input>
+              <el-button v-if="index != 0 && !domain.disabled"
+                         @click.prevent="removeDomain(result, domain)">删除</el-button>
             </el-form-item>
-        </el-form>
+          </div>
+          <div class="el-form-item__error"
+               v-if="result.errorText">{{ result.errorText }}</div>
+        </div>
+        <el-form-item class="add">
+          <el-button icon="el-icon-plus"
+                     @click="addDomain(result)">新增梯度</el-button>
+        </el-form-item>
+
+        <el-form-item prop="organIdList"
+                      label="适用分部"
+                      style="width: 500px">
+          <el-select style="width: 100% !important;"
+                     v-model="result.organIdList"
+                     multiple
+                     placeholder="请选择">
+            <el-option v-for="item in branchList"
+                       :key="item.value"
+                       :label="item.label"
+                       :value="item.value"
+                       :disabled="item.disabled"> </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-button @click="resetForm">重置</el-button>
+          <el-button type="primary"
+                     @click="onSubmit('form')">立即{{ pageType == "create" ? '创建' : '修改' }}</el-button>
+        </el-form-item>
+      </el-form>
     </div>
   </div>
 </template>
@@ -60,134 +90,133 @@ export default {
   name: 'adminManager',
   data () {
     return {
-        organId: store.getters.organ,
-        pageType: this.$route.query.type,
-        id: this.$route.query.id,
-        branchList: [],
-        useBranchId: [], // 使用的分部编号
-        result: {
-            name: null,
-            rewardMode: null,
-            organIdList: null,
-            courseScheduleType: 'VIP',
-            domains: [{
+      organId: store.getters.organ,
+      pageType: this.$route.query.type,
+      id: this.$route.query.id,
+      branchList: [],
+      useBranchId: [], // 使用的分部编号
+      result: {
+        name: null,
+        rewardMode: null,
+        organIdList: null,
+        courseScheduleType: 'VIP',
+        domains: [{
+          min: null,
+          max: null,
+          money: null,
+          disabled: false,
+          key: Date.now()
+        }],
+        errorText: null
+      },
+      rules: {
+        name: [{ required: true, message: '请输入活动名称', trigger: 'blur' }],
+        rewardMode: [{ required: true, message: '请选择活动类型', trigger: 'change' }],
+        organIdList: [{ type: 'array', required: true, message: '请选择适用分部', trigger: 'change' }]
+      }
+    }
+  },
+  mounted () {
+    this.__init()
+  },
+  methods: {
+    async __init () {
+      this.$refs.form.resetFields()
+      // 获取已经配置过的分部编号
+      let result = await queryOrganIdList()
+      let branchList = await branchQueryPage({ delFlag: 0, rows: 9999 })
+      if (result.code == 200) {
+        this.useBranchId = result.data
+      }
+      if (branchList.code == 200) {
+        branchList.data.rows.forEach(item => {
+          let tempArr = {}
+          if (this.useBranchId.indexOf(item.id) != -1) {
+            tempArr = {
+              label: item.name,
+              value: item.id,
+              disabled: true
+            }
+          } else {
+            tempArr = {
+              label: item.name,
+              value: item.id
+            }
+          }
+          this.branchList.push(tempArr)
+        })
+      }
+
+      if (this.pageType == 'update') {
+        let courseScheduleRewards = await courseScheduleRewardsQuery({ id: this.id })
+        if (courseScheduleRewards.code == 200) {
+          let data = courseScheduleRewards.data
+          let tempList = []
+          if (data.organIdList) {
+            data.organIdList.split(',').forEach(item => {
+              tempList.push(parseInt(item))
+            })
+          }
+          this.result = {
+            id: data.id,
+            name: data.name,
+            rewardMode: data.rewardMode,
+            organIdList: tempList,
+            courseScheduleType: data.courseScheduleType,
+            domains: data.rewardsRulesJson ?
+              JSON.parse(data.rewardsRulesJson) : [{
                 min: null,
                 max: null,
                 money: null,
                 disabled: false,
                 key: Date.now()
-            }],
+              }],
             errorText: null
-        },
-        rules: {
-            name: [{required: true, message: '请输入活动名称', trigger: 'blur'}],
-            rewardMode: [{ required: true, message: '请选择活动类型', trigger: 'change' }],
-            organIdList: [{ type: 'array', required: true, message: '请选择适用分部', trigger: 'change' }]
-        }
-    }
-  },
-  mounted() {
-      this.__init()
-  },
-  methods: {
-    async __init() {
-        this.$refs.form.resetFields()
-        // 获取已经配置过的分部编号
-        let result = await queryOrganIdList()
-        let branchList = await branchQueryPage({ delFlag: 0, rows: 9999 })
-        if(result.code == 200) {
-            this.useBranchId = result.data
-        }
-        if(branchList.code == 200) {
-            branchList.data.rows.forEach(item =>{
-                let tempArr = {}
-                if(this.useBranchId.indexOf(item.id) != -1) {
-                    tempArr = {
-                        label: item.name,
-                        value: item.id,
-                        disabled: true
-                    }
-                } else {
-                    tempArr = {
-                        label: item.name,
-                        value: item.id
-                    }
-                }
-                this.branchList.push(tempArr)
-            })
-        }
+          }
 
-        if(this.pageType == 'update') {
-            let courseScheduleRewards = await courseScheduleRewardsQuery({ id: this.id})
-            if(courseScheduleRewards.code == 200) {
-                let data = courseScheduleRewards.data
-                let tempList = []
-                if(data.organIdList) {
-                    data.organIdList.split(',').forEach(item => {
-                        tempList.push(parseInt(item))
-                    })
-                }
-                this.result = {
-                    id: data.id,
-                    name: data.name,
-                    rewardMode: data.rewardMode,
-                    organIdList: tempList,
-                    courseScheduleType: data.courseScheduleType,
-                    domains: data.rewardsRulesJson ? 
-                            JSON.parse(data.rewardsRulesJson) : [{
-                                min: null,
-                                max: null,
-                                money: null,
-                                disabled: false,
-                                key: Date.now()
-                            }],
-                    errorText: null
-                }
-                
-                // 修改可以取消选中
-                this.branchList.forEach(item => {
-                    if(tempList.indexOf(item.value) != -1) {
-                        item.disabled = false
-                    }
-                })
+          // 修改可以取消选中
+          this.branchList.forEach(item => {
+            if (tempList.indexOf(item.value) != -1) {
+              item.disabled = false
             }
+          })
         }
+      }
+
 
-        
     },
-    onSubmit(formName) {
-        this.$refs[formName].validate((valid) => {
-            let result = this.result
-            this.addDomain(result, true)
-            if (valid && !result.errorText) {
-                let params = {
-                    organIdList: result.organIdList.join(','),
-                    courseScheduleType: result.courseScheduleType,
-                    rewardMode: result.rewardMode,
-                    rewardsRulesJson: JSON.stringify(result.domains),
-                    name: result.name
-                }
+    onSubmit (formName) {
+      this.$refs[formName].validate((valid) => {
+        let result = this.result
+        this.addDomain(result, true)
+        if (valid && !result.errorText) {
+          let params = {
+            organIdList: result.organIdList.join(','),
+            courseScheduleType: result.courseScheduleType,
+            rewardMode: result.rewardMode,
+            rewardsRulesJson: JSON.stringify(result.domains),
+            name: result.name
+          }
+
+          if (this.pageType == 'update') {
+            params.id = result.id
+            courseScheduleRewardsUpdate(params).then(res => {
+              this.messageTips('修改', res)
+            })
+          } else if (this.pageType == 'create') {
+            // return false
+            courseScheduleRewardsAdd(params).then(res => {
+              this.messageTips('添加', res)
+            })
+          }
+        } else {
+          return false;
+        }
+      })
 
-                if(this.pageType == 'update') {
-                    params.id = result.id
-                    courseScheduleRewardsUpdate(params).then(res => {
-                    this.messageTips('修改', res)
-                    })
-                } else if(this.pageType == 'create') {
-                    console.log(params)
-                    // return false
-                    courseScheduleRewardsAdd(params).then(res => {
-                        this.messageTips('添加', res)
-                    })
-                }
-            } else {
-                return false;
-            }
-        })
-      
     },
-    messageTips(title, res) {
-      if(res.code == 200) {
+    messageTips (title, res) {
+      if (res.code == 200) {
         this.$message({
           message: title + '成功',
           type: 'success'
@@ -197,70 +226,70 @@ export default {
         this.$message.error(res.msg)
       }
     },
-    onCancel() {
+    onCancel () {
       this.$router.push('/vipClassSet/branchActive')
     },
-    resetForm() {
-        this.result = {
-            name: null,
-            rewardMode: null,
-            organIdList: [],
-            courseScheduleType: 'VIP',
-            domains: [{
-                min: null,
-                max: null,
-                money: null,
-                disabled: false,
-                key: Date.now()
-            }],
-            errorText: null
-        }
-        this.$refs.form.resetFields()
+    resetForm () {
+      this.result = {
+        name: null,
+        rewardMode: null,
+        organIdList: [],
+        courseScheduleType: 'VIP',
+        domains: [{
+          min: null,
+          max: null,
+          money: null,
+          disabled: false,
+          key: Date.now()
+        }],
+        errorText: null
+      }
+      this.$refs.form.resetFields()
     },
-    removeDomain(form, item) {
-        var index = form.domains.indexOf(item)
-        if (index !== -1) {
-            form.domains.splice(index, 1)
-            // 取消最后一个数据的禁用状态
-            form.domains[form.domains.length - 1].disabled = false
-            form.errorText = null
-        }
+    removeDomain (form, item) {
+      var index = form.domains.indexOf(item)
+      if (index !== -1) {
+        form.domains.splice(index, 1)
+        // 取消最后一个数据的禁用状态
+        form.domains[form.domains.length - 1].disabled = false
+        form.errorText = null
+      }
     },
-    addDomain(form, checked) {
-        // debugger
-        let domains = form.domains,
-            singleLength = domains.length,
-            lastDate = domains[singleLength - 1] // 获取倒数一个对象
-        if(!lastDate.min) {
-            form.errorText = '最小值不能为空'
-            return
-        }
-        if(singleLength <= 1 && parseInt(lastDate.min) < 0) {
-            form.errorText = '最小值不能小于0'
-            return
-        } else if(singleLength > 1 && parseInt(lastDate.min) <= parseInt(domains[singleLength - 2].max)) {
-            form.errorText = '最小值不能小于或等于上一个梯度的最大值'
-            return
-        }
+    addDomain (form, checked) {
+      // debugger
+      let domains = form.domains,
+        singleLength = domains.length,
+        lastDate = domains[singleLength - 1] // 获取倒数一个对象
+      if (!lastDate.min) {
+        form.errorText = '最小值不能为空'
+        return
+      }
+      if (singleLength <= 1 && parseInt(lastDate.min) < 0) {
+        form.errorText = '最小值不能小于0'
+        return
+      } else if (singleLength > 1 && parseInt(lastDate.min) <= parseInt(domains[singleLength - 2].max)) {
+        form.errorText = '最小值不能小于或等于上一个梯度的最大值'
+        return
+      }
 
-        if(!parseInt(lastDate.max)) {
-            form.errorText = '最大值不能为空'
-            return
-        } else if(parseInt(lastDate.max) <= parseInt(lastDate.min)) {
-            form.errorText = '最大值应大于该梯度的最小值'
-            return
-        }
+      if (!parseInt(lastDate.max)) {
+        form.errorText = '最大值不能为空'
+        return
+      } else if (parseInt(lastDate.max) <= parseInt(lastDate.min)) {
+        form.errorText = '最大值应大于该梯度的最小值'
+        return
+      }
 
-        form.errorText = null
-        if(!checked) {
-            lastDate.disabled = true
-            domains.push({
-                min: null,
-                max: null,
-                disabled: false,
-                key: Date.now()
-            })
-        }
+      form.errorText = null
+      if (!checked) {
+        lastDate.disabled = true
+        domains.push({
+          min: null,
+          max: null,
+          disabled: false,
+          key: Date.now()
+        })
+      }
     }
   }
 }
@@ -270,10 +299,12 @@ export default {
   background: #14928a;
   border-color: #14928a;
   color: #fff;
-  &:hover, &:active, &:focus {
+  &:hover,
+  &:active,
+  &:focus {
     background: #14928a;
     border-color: #14928a;
-    color: #FFF;
+    color: #fff;
   }
 }
 .el-row {
@@ -294,41 +325,42 @@ export default {
   height: 40px !important;
 }
 .moreRule {
-    background: #f0f0f0;
-    position: relative;
-    
-    .el-form-item__error {
-        color: #F56C6C;
-        font-size: 12px;
-        line-height: 1;
-        position: absolute;
-        left: 120px;
-        top: 100%;
-        margin-top: -21px;
-    }
+  background: #f0f0f0;
+  position: relative;
+
+  .el-form-item__error {
+    color: #f56c6c;
+    font-size: 12px;
+    line-height: 1;
+    position: absolute;
+    left: 120px;
+    top: 100%;
+    margin-top: -21px;
+  }
 }
 .add {
-    margin-bottom: 22px; 
-    background: #f0f0f0; 
-    padding-bottom: 22px;
+  margin-bottom: 22px;
+  background: #f0f0f0;
+  padding-bottom: 22px;
 }
 .moreRuleIn {
-    .el-form-item {
-        display: inline-block;
-        &:first-child {
-            /deep/.el-form-item__content {
-                margin-left: 120px !important;
-            }
-        }
-        /deep/.el-form-item__content {
-            margin-left: 0 !important;
-        }
+  .el-form-item {
+    display: inline-block;
+    &:first-child {
+      /deep/.el-form-item__content {
+        margin-left: 120px !important;
+      }
+    }
+    /deep/.el-form-item__content {
+      margin-left: 0 !important;
     }
+  }
 }
-.min, .max {
-    display: inline-block;
-    width: 180px;
-    text-align: center;
-    margin-right: 10px;
+.min,
+.max {
+  display: inline-block;
+  width: 180px;
+  text-align: center;
+  margin-right: 10px;
 }
 </style>

src/views/categroyManager/vipActiveList.vue

@@ -488,7 +488,6 @@ export default {
     },
     // 点击列表修改同步状态
     reset (row) {
-      console.log(row);
       this.activeId = row.id;
       this.dialogVisible = true;
       this.resetForm.name = row.name;
@@ -531,7 +530,6 @@ export default {
     },
     // 点击确认按钮发送修改请求
     resetRow () {
-      console.log()
       this.$refs['vipform'].validate((valid) => {
         if (valid) {
           // 验证通过

src/views/contentManager/components/activity.vue

@@ -2,17 +2,21 @@
   <div>
     <!-- 搜索标题 -->
     <div @click="openTeaching('create')"
-           class='newBand'>新建</div>
+         class='newBand'>新建</div>
     <!-- 列表 -->
     <div class="tableWrap">
-      <el-table :data='tableList' :header-cell-style="{background:'#EDEEF0',color:'#444'}">
+      <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="">
+            <img class="bannerImg"
+                 :src="scope.row.coverImage"
+                 alt="">
           </template>
         </el-table-column>
-        <el-table-column align='center' prop="title"
+        <el-table-column align='center'
+                         prop="title"
                          label="标题">
         </el-table-column>
         <el-table-column align='center'
@@ -21,26 +25,34 @@
             {{ scope.row.linkUrl + '/' + scope.row.id }}
           </template>
         </el-table-column>
-        <el-table-column align='center' prop="remark"
+        <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 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" />
+                  :page.sync="pageInfo.page"
+                  :limit.sync="pageInfo.limit"
+                  :page-sizes="pageInfo.page_size"
+                  @pagination="getList" />
     </div>
   </div>
 </template>
@@ -66,74 +78,71 @@ export default {
       }
     }
   },
-  mounted() {
+  mounted () {
     this.getList()
   },
   methods: {
-    getList() {
+    getList () {
       let params = {
         rows: this.pageInfo.limit,
         page: this.pageInfo.page,
         type: 1
       }
       newsList(params).then(res => {
-        if(res.code == 200) {
+        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 = 1
-        params.pageType = type
-        this.$router.push({
-            path: '/contentManager/contentOperation',
-            query: params
-        })
+    openTeaching (type, rows) {
+      let params = {}
+      if (type == 'update') {
+        params.id = rows.id
+      }
+      params.type = 1
+      params.pageType = type
+      this.$router.push({
+        path: '/contentManager/contentOperation',
+        query: params
+      })
     },
-    onDel(row) { // 删除
+    onDel (row) { // 删除
       this.$confirm('确定是否删除?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        console.log(true)
         newsDel({ id: row.id }).then(res => {
-          console.log(res)
-          if(res.code == 200) {
+          if (res.code == 200) {
             this.$message({
               message: '删除成功',
               type: 'success'
             })
             this.getList()
           } else {
-              this.$message.error(res.msg)
+            this.$message.error(res.msg)
           }
         })
       }).catch(() => {
-        console.log(false)
       })
-      
+
     },
-    onStop(row, status) { // 停止
+    onStop (row, status) { // 停止
       // newsUpdate
       let tempStr = ['停用', '启用']
       newsUpdate({
         id: row.id,
         status: status
       }).then(res => {
-        if(res.code == 200) {
+        if (res.code == 200) {
           this.$message({
             message: tempStr[status] + '成功',
             type: 'success'
           })
           this.getList()
         } else {
-            this.$message.error(res.msg)
+          this.$message.error(res.msg)
         }
       })
     }

src/views/contentManager/components/banner.vue

@@ -2,17 +2,21 @@
   <div>
     <!-- 搜索标题 -->
     <div @click="openTeaching('create')"
-           class='newBand'>新建</div>
+         class='newBand'>新建</div>
     <!-- 列表 -->
     <div class="tableWrap">
-      <el-table :data='tableList' :header-cell-style="{background:'#EDEEF0',color:'#444'}">
+      <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="">
+            <img class="bannerImg"
+                 :src="scope.row.coverImage"
+                 alt="">
           </template>
         </el-table-column>
-        <el-table-column align='center' prop="title"
+        <el-table-column align='center'
+                         prop="title"
                          label="标题">
         </el-table-column>
         <el-table-column align='center'
@@ -21,26 +25,34 @@
             {{ scope.row.linkUrl + '/' + scope.row.id }}
           </template>
         </el-table-column>
-        <el-table-column align='center' prop="remark"
+        <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 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" />
+                  :page.sync="pageInfo.page"
+                  :limit.sync="pageInfo.limit"
+                  :page-sizes="pageInfo.page_size"
+                  @pagination="getList" />
     </div>
   </div>
 </template>
@@ -66,71 +78,71 @@ export default {
       }
     }
   },
-  mounted() {
+  mounted () {
     this.getList()
   },
   methods: {
-    getList() {
+    getList () {
       let params = {
         rows: this.pageInfo.limit,
         page: this.pageInfo.page,
         type: 3
       }
       newsList(params).then(res => {
-        if(res.code == 200) {
+        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 = 3
-        params.pageType = type
-        this.$router.push({
-            path: '/contentManager/contentOperation',
-            query: params
-        })
+    openTeaching (type, rows) {
+      let params = {}
+      if (type == 'update') {
+        params.id = rows.id
+      }
+      params.type = 3
+      params.pageType = type
+      this.$router.push({
+        path: '/contentManager/contentOperation',
+        query: params
+      })
     },
-    onDel(row) { // 删除
+    onDel (row) { // 删除
       this.$confirm('确定是否删除?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
         newsDel({ id: row.id }).then(res => {
-          console.log(res)
-          if(res.code == 200) {
+
+          if (res.code == 200) {
             this.$message({
               message: '删除成功',
               type: 'success'
             })
             this.getList()
           } else {
-              this.$message.error(res.msg)
+            this.$message.error(res.msg)
           }
         })
       }).catch(() => { })
-      
+
     },
-    onStop(row, status) { // 停止
+    onStop (row, status) { // 停止
       // newsUpdate
       let tempStr = ['停用', '启用']
       newsUpdate({
         id: row.id,
         status: status
       }).then(res => {
-        if(res.code == 200) {
+        if (res.code == 200) {
           this.$message({
             message: tempStr[status] + '成功',
             type: 'success'
           })
           this.getList()
         } else {
-            this.$message.error(res.msg)
+          this.$message.error(res.msg)
         }
       })
     }

src/views/contentManager/components/information.vue

@@ -2,17 +2,21 @@
   <div>
     <!-- 搜索标题 -->
     <div @click="openTeaching('create')"
-           class='newBand'>新建</div>
+         class='newBand'>新建</div>
     <!-- 列表 -->
     <div class="tableWrap">
-      <el-table :data='tableList' :header-cell-style="{background:'#EDEEF0',color:'#444'}">
+      <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="">
+            <img class="bannerImg"
+                 :src="scope.row.coverImage"
+                 alt="">
           </template>
         </el-table-column>
-        <el-table-column align='center' prop="title"
+        <el-table-column align='center'
+                         prop="title"
                          label="标题">
         </el-table-column>
         <el-table-column align='center'
@@ -21,26 +25,34 @@
             {{ scope.row.linkUrl + '/' + scope.row.id }}
           </template>
         </el-table-column>
-        <el-table-column align='center' prop="remark"
+        <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 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" />
+                  :page.sync="pageInfo.page"
+                  :limit.sync="pageInfo.limit"
+                  :page-sizes="pageInfo.page_size"
+                  @pagination="getList" />
     </div>
   </div>
 </template>
@@ -66,72 +78,70 @@ export default {
       }
     }
   },
-  mounted() {
+  mounted () {
     this.getList()
   },
   methods: {
-    getList() {
+    getList () {
       let params = {
         rows: this.pageInfo.limit,
         page: this.pageInfo.page,
         type: 2
       }
       newsList(params).then(res => {
-        console.log(res)
-        if(res.code == 200) {
+        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 = 2
-        params.pageType = type
-        this.$router.push({
-            path: '/contentManager/contentOperation',
-            query: params
-        })
+    openTeaching (type, rows) {
+      let params = {}
+      if (type == 'update') {
+        params.id = rows.id
+      }
+      params.type = 2
+      params.pageType = type
+      this.$router.push({
+        path: '/contentManager/contentOperation',
+        query: params
+      })
     },
-    onDel(row) { // 删除
+    onDel (row) { // 删除
       this.$confirm('确定是否删除?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
         newsDel({ id: row.id }).then(res => {
-          console.log(res)
-          if(res.code == 200) {
+          if (res.code == 200) {
             this.$message({
               message: '删除成功',
               type: 'success'
             })
             this.getList()
           } else {
-              this.$message.error(res.msg)
+            this.$message.error(res.msg)
           }
         })
       }).catch(() => { })
-      
+
     },
-    onStop(row, status) { // 停止
+    onStop (row, status) { // 停止
       // newsUpdate
       let tempStr = ['停用', '启用']
       newsUpdate({
         id: row.id,
         status: status
       }).then(res => {
-        if(res.code == 200) {
+        if (res.code == 200) {
           this.$message({
             message: tempStr[status] + '成功',
             type: 'success'
           })
           this.getList()
         } else {
-            this.$message.error(res.msg)
+          this.$message.error(res.msg)
         }
       })
     }

src/views/login/index.vue

@@ -138,18 +138,13 @@ export default {
           this.$store
             .dispatch("user/login", this.loginForm)
             .then(() => {
-              console.log('登录成功');
               this.$nextTick(res => {
                 this.$router.push({ path: "/main/main" });
               })
-
-
-
             })
             .catch(() => {
             });
         } else {
-          console.log("登录错误");
           return false;
         }
       });

src/views/studentManager/components/studentOrder.vue

@@ -7,10 +7,19 @@
         </div>
         <div class="headItem">
           <p v-if="amountStatus">课程余额:<span>{{ dataInfo.courseBalance }}</span></p>
-          <p v-else>账户余额:<span><el-input style="width: 130px;" v-model="dataInfo.courseBalance" placeholder="账户余额"></el-input></span></p>
-          
-          <el-button v-if="amountStatus" @click="amountStatus = false" type="text">修改</el-button>
-          <el-button style="top:0;" @click="onUpdateCourse" v-else type="text">保存</el-button>
+          <p v-else>账户余额:<span>
+              <el-input style="width: 130px;"
+                        v-model="dataInfo.courseBalance"
+                        placeholder="账户余额"></el-input>
+            </span></p>
+
+          <el-button v-if="amountStatus"
+                     @click="amountStatus = false"
+                     type="text">修改</el-button>
+          <el-button style="top:0;"
+                     @click="onUpdateCourse"
+                     v-else
+                     type="text">保存</el-button>
         </div>
         <div class="headItem">
           <p>银行卡:<span>{{ dataInfo.cardNo }}</span></p>
@@ -137,25 +146,24 @@ export default {
         }
       })
     },
-    onUpdateCourse() {
-      if(!this.dataInfo.courseBalance) {
+    onUpdateCourse () {
+      if (!this.dataInfo.courseBalance) {
         this.$message.error('请输入课程余额')
         reutrn
       }
-      updateCourseBalance({ 
+      updateCourseBalance({
         userId: this.searchForm.studentId,
         decimal: this.dataInfo.courseBalance
-       }).then(res => {
-         let result = res.data
-         console.log(res)
-          if(res.code == 200) {
-            this.$message.success('保存成功')
-            this.amountStatus = true
-            this.__init()
-          } else {
-            this.$message.error(res.msg)
-          }
-       })
+      }).then(res => {
+        let result = res.data
+        if (res.code == 200) {
+          this.$message.success('保存成功')
+          this.amountStatus = true
+          this.__init()
+        } else {
+          this.$message.error(res.msg)
+        }
+      })
     },
     search () {
       this.pageInfo.page = 1;

src/views/teacherManager/teacherDetail/components/courseInfo1.vue

@@ -3,16 +3,19 @@
     <div class="tableWrap tableMargin">
       <el-table :data='teamList'
                 :header-cell-style="{background:'#EDEEF0',color:'#444'}">
-        <el-table-column label="VIP编号" prop="id">
+        <el-table-column label="VIP编号"
+                         prop="id">
         </el-table-column>
-        <el-table-column label="VIP课名称" prop="name">
+        <el-table-column label="VIP课名称"
+                         prop="name">
         </el-table-column>
         <el-table-column label="VIP课状态">
           <template slot-scope="scope">
             {{ scope.row.status | formatterStatus}}
           </template>
         </el-table-column>
-        <el-table-column label="班级人数" prop="studentNum">
+        <el-table-column label="班级人数"
+                         prop="studentNum">
         </el-table-column>
         <el-table-column label="课程单价">
           <template slot-scope="scope">
@@ -20,9 +23,10 @@
             线下：{{ scope.row.offlineClassesUnitPrice }}
           </template>
         </el-table-column>
-        <el-table-column label="活动方案" prop="vipGroupActivityName">
+        <el-table-column label="活动方案"
+                         prop="vipGroupActivityName">
         </el-table-column>
-        <el-table-column label="剩余课时">
+        <el-table-column label="当前课次">
           <template slot-scope="scope">
             <p>{{scope.row.currentClassTimes + '/' + scope.row.totalClassTimes}}</p>
           </template>
@@ -49,10 +53,10 @@
         </el-table-column>
       </el-table>
       <pagination :total="pageInfo.total"
-                :page.sync="pageInfo.page"
-                :limit.sync="pageInfo.limit"
-                :page-sizes="pageInfo.page_size"
-                @pagination="getList" />
+                  :page.sync="pageInfo.page"
+                  :limit.sync="pageInfo.limit"
+                  :page-sizes="pageInfo.page_size"
+                  @pagination="getList" />
     </div>
   </div>
 </template>
@@ -79,17 +83,17 @@ export default {
       }
     }
   },
-  mounted() {
+  mounted () {
     this.getList()
   },
   methods: {
-    getList() {
-      getVipList({ 
+    getList () {
+      getVipList({
         rows: this.pageInfo.limit,
         page: this.pageInfo.page,
         teacherId: this.teacherId
       }).then(res => {
-        if(res.code == 200) {
+        if (res.code == 200) {
           this.teamList = res.data.rows
           this.pageInfo.total = res.data.total
         }

src/views/teacherManager/teacherOperation/components/teacherOperation.vue

@@ -4,188 +4,248 @@
       <el-page-header @back="onCancel" :content="'老师' + (pageType == 'create' ? '新增' : '修改')"></el-page-header>
     </h2> -->
     <div class="infoWrap">
-        <div class="left">
-            <h4>基本信息</h4>
-            <el-form :model="topForm" :rules="rules" ref="form" >
-                <el-row>
-                    <el-col :span="12">
-                        <el-form-item label="姓名" prop="realName" :label-width="formLabelWidth">
-                            <el-input v-model="topForm.realName"></el-input>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="性别" prop="gender" :label-width="formLabelWidth">
-                            <el-select v-model="topForm.gender">
-                                <el-option label='男' :value='1'></el-option>
-                                <el-option label='女' :value='0'></el-option>
-                            </el-select>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-                <el-row>
-                    <el-col :span="12">
-                        <el-form-item label="出生日期" :label-width="formLabelWidth">
-                            <el-date-picker
-                                v-model="topForm.birthdate" type="date"
+      <div class="left">
+        <h4>基本信息</h4>
+        <el-form :model="topForm"
+                 :rules="rules"
+                 ref="form">
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="姓名"
+                            prop="realName"
+                            :label-width="formLabelWidth">
+                <el-input v-model="topForm.realName"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="性别"
+                            prop="gender"
+                            :label-width="formLabelWidth">
+                <el-select v-model="topForm.gender">
+                  <el-option label='男'
+                             :value='1'></el-option>
+                  <el-option label='女'
+                             :value='0'></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="出生日期"
+                            :label-width="formLabelWidth">
+                <el-date-picker v-model="topForm.birthdate"
+                                type="date"
                                 value-format="yyyy-MM-dd"
                                 placeholder="出生日期">
-                            </el-date-picker>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="入职日期" prop="entryDate" :label-width="formLabelWidth">
-                            <el-date-picker
-                                v-model="topForm.entryDate" type="date"
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="入职日期"
+                            prop="entryDate"
+                            :label-width="formLabelWidth">
+                <el-date-picker v-model="topForm.entryDate"
+                                type="date"
                                 value-format="yyyy-MM-dd"
                                 placeholder="入职日期">
-                            </el-date-picker>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-                <el-row>
-                    <el-col :span="12">
-                    <el-form-item label="工作类别" prop="jobNature" :label-width="formLabelWidth">
-                        <el-select v-model="topForm.jobNature" placeholder="工作类型">
-                            <el-option v-for="item in jobNature" :key="item.value" 
-                            :label="item.label" :value="item.value"></el-option>
-                        </el-select>
-                    </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                    <el-form-item label="所属分部" prop="organId" :label-width="formLabelWidth">
-                        <el-select v-model="topForm.organId"  placeholder="所属分部">
-                            <el-option v-for="item in branchList" :key="item.value" 
-                            :label="item.label" :value="item.value"></el-option>
-                        </el-select>
-                    </el-form-item>
-                    </el-col>
-                </el-row>
-                <el-row>
-                    <el-col :span="12">
-                    <el-form-item label="流动范围" :label-width="formLabelWidth">
-                        <el-select v-model="topForm.flowOrganRange" multiple placeholder="流动范围">
-                            <el-option v-for="item in branchList" :key="item.value" 
-                            :label="item.label" :value="item.value.toString()"></el-option>
-                        </el-select>
-                    </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                    <el-form-item label="人事状态" prop="isProbationPeriod" :label-width="formLabelWidth">
-                        <el-select v-model="topForm.isProbationPeriod" placeholder="人事状态">
-                            <el-option label="正式" :value="1"></el-option>
-                            <el-option label="临时" :value="0"></el-option>
-                        </el-select>
-                    </el-form-item>
-                    </el-col>
-                </el-row>
-                <el-row>
-                    <el-col :span="12">
-                    <el-form-item label="老师简介" :label-width="formLabelWidth">
-                        <el-input type='textarea'
-                                v-model="topForm.introduction"></el-input>
-                    </el-form-item>
-                    </el-col>
-                    <el-col :span="12" v-if="pageType == 'update'">
-                    <el-form-item label="教学点" :label-width="formLabelWidth">
-                        <el-input disabled v-model="teacherSchools"></el-input>
-                    </el-form-item>
-                    </el-col>
-                </el-row>
-                <h4>资料学历</h4>
-                <el-row>
-                    <el-col :span="12">
-                    <el-form-item label="手机号" prop="phone" :label-width="formLabelWidth">
-                        <el-input v-model.number="topForm.phone"></el-input>
-                    </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                    <el-form-item label="毕业学校" :label-width="formLabelWidth">
-                        <el-input v-model="topForm.graduateSchool"></el-input>
-                    </el-form-item>
-                    </el-col>
-                    
-                </el-row>
-                <el-row>
-                    <el-col :span="12">
-                    <el-form-item label="电子邮箱" :label-width="formLabelWidth">
-                        <el-input v-model="topForm.email"></el-input>
-                    </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                    <el-form-item label="最高学历" :label-width="formLabelWidth">
-                        <!-- <el-input v-model="topForm.educationBackground"></el-input> -->
-                        <el-select v-model="topForm.educationBackground" placeholder="最高学历">
-                            <el-option label="初中" value="初中"></el-option>
-                            <el-option label="高中" value="高中"></el-option>
-                            <el-option label="大专" value="大专"></el-option>
-                            <el-option label="本科" value="本科"></el-option>
-                            <el-option label="硕士" value="硕士"></el-option>
-                            <el-option label="博士" value="博士"></el-option>
-                        </el-select>
-                    </el-form-item>
-                    </el-col>
-                </el-row>
-                <el-row>
-                    <el-col :span="12">
-                    <el-form-item label="专业技能" prop="subjectIds" :label-width="formLabelWidth">
-                        <el-select multiple v-model="topForm.subjectIds" placeholder="专业技能">
-                            <el-option-group
-                            v-for="group in subjectList"
-                            :key="group.label" 
-                            :label="group.label">
-                            <el-option
-                                v-for="item in group.options"
-                                :key="item.value"
-                                :label="item.label"
-                                :value="item.value.toString()">
-                            </el-option>
-                            </el-option-group>
-                        </el-select>
-                    </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                    <el-form-item label="职称" :label-width="formLabelWidth">
-                        <el-input v-model="topForm.technicalTitles"></el-input>
-                    </el-form-item>
-                    </el-col>
-                </el-row>
-                <el-row>
-                    <el-col :span="12">
-                    <el-form-item label="证件类型" :label-width="formLabelWidth">
-                        <el-input v-model="topForm.certificateType"></el-input>
-                        <!-- <el-select v-model="topForm.certificateType" placeholder="证件类型">
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="工作类别"
+                            prop="jobNature"
+                            :label-width="formLabelWidth">
+                <el-select v-model="topForm.jobNature"
+                           placeholder="工作类型">
+                  <el-option v-for="item in jobNature"
+                             :key="item.value"
+                             :label="item.label"
+                             :value="item.value"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="所属分部"
+                            prop="organId"
+                            :label-width="formLabelWidth">
+                <el-select v-model="topForm.organId"
+                           placeholder="所属分部">
+                  <el-option v-for="item in branchList"
+                             :key="item.value"
+                             :label="item.label"
+                             :value="item.value"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="流动范围"
+                            :label-width="formLabelWidth">
+                <el-select v-model="topForm.flowOrganRange"
+                           multiple
+                           placeholder="流动范围">
+                  <el-option v-for="item in branchList"
+                             :key="item.value"
+                             :label="item.label"
+                             :value="item.value.toString()"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="人事状态"
+                            prop="isProbationPeriod"
+                            :label-width="formLabelWidth">
+                <el-select v-model="topForm.isProbationPeriod"
+                           placeholder="人事状态">
+                  <el-option label="正式"
+                             :value="1"></el-option>
+                  <el-option label="临时"
+                             :value="0"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="老师简介"
+                            :label-width="formLabelWidth">
+                <el-input type='textarea'
+                          v-model="topForm.introduction"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12"
+                    v-if="pageType == 'update'">
+              <el-form-item label="教学点"
+                            :label-width="formLabelWidth">
+                <el-input disabled
+                          v-model="teacherSchools"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <h4>资料学历</h4>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="手机号"
+                            prop="phone"
+                            :label-width="formLabelWidth">
+                <el-input v-model.number="topForm.phone"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="毕业学校"
+                            :label-width="formLabelWidth">
+                <el-input v-model="topForm.graduateSchool"></el-input>
+              </el-form-item>
+            </el-col>
+
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="电子邮箱"
+                            :label-width="formLabelWidth">
+                <el-input v-model="topForm.email"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="最高学历"
+                            :label-width="formLabelWidth">
+                <!-- <el-input v-model="topForm.educationBackground"></el-input> -->
+                <el-select v-model="topForm.educationBackground"
+                           placeholder="最高学历">
+                  <el-option label="初中"
+                             value="初中"></el-option>
+                  <el-option label="高中"
+                             value="高中"></el-option>
+                  <el-option label="大专"
+                             value="大专"></el-option>
+                  <el-option label="本科"
+                             value="本科"></el-option>
+                  <el-option label="硕士"
+                             value="硕士"></el-option>
+                  <el-option label="博士"
+                             value="博士"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="专业技能"
+                            prop="subjectIds"
+                            :label-width="formLabelWidth">
+                <el-select multiple
+                           v-model="topForm.subjectIds"
+                           placeholder="专业技能">
+                  <el-option-group v-for="group in subjectList"
+                                   :key="group.label"
+                                   :label="group.label">
+                    <el-option v-for="item in group.options"
+                               :key="item.value"
+                               :label="item.label"
+                               :value="item.value.toString()">
+                    </el-option>
+                  </el-option-group>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="职称"
+                            :label-width="formLabelWidth">
+                <el-input v-model="topForm.technicalTitles"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="证件类型"
+                            :label-width="formLabelWidth">
+                <el-input v-model="topForm.certificateType"></el-input>
+                <!-- <el-select v-model="topForm.certificateType" placeholder="证件类型">
                             <el-option label="身份证" value="身份证"></el-option>
                             <el-option label="护照" value="护照"></el-option>
                             <el-option label="港澳通行证" value="港澳通行证"></el-option>
                         </el-select> -->
-                    </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                    <el-form-item label="证件号码" :label-width="formLabelWidth">
-                        <el-input v-model="topForm.certificateNum"></el-input>
-                    </el-form-item>
-                    </el-col>
-                </el-row>
-                <el-row>
-                    <el-col :span="12">
-                    <el-form-item label="" :label-width="formLabelWidth">
-                        <!-- <el-input v-model="topForm.certificateType"></el-input> -->
-                        <el-checkbox v-model="topForm.isSupportCourseScheduleRewardsRules">适用VIP分部活动</el-checkbox>
-                    </el-form-item>
-                    </el-col>
-                </el-row>
-                <el-form-item>
-                    <el-button @click="onSubmit('form')" type="primary">立即{{ pageType == "create" ? '创建' : '修改' }}</el-button>
-                    <el-button @click="onReSet('form')">重置</el-button>
-                </el-form-item>
-            </el-form>
-        </div>
-        <div class="right">
-            <div class="teacherIcon">
-            <img v-if="topForm.avatar" key="avatar" :src="topForm.avatar" alt="">
-            <img v-else key="avatar" src="@/assets/images/base/woman.png" alt="">
-            </div>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="证件号码"
+                            :label-width="formLabelWidth">
+                <el-input v-model="topForm.certificateNum"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label=""
+                            :label-width="formLabelWidth">
+                <!-- <el-input v-model="topForm.certificateType"></el-input> -->
+                <el-checkbox v-model="topForm.isSupportCourseScheduleRewardsRules">适用VIP分部活动</el-checkbox>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-form-item>
+            <el-button @click="onSubmit('form')"
+                       type="primary">立即{{ pageType == "create" ? '创建' : '修改' }}</el-button>
+            <el-button @click="onReSet('form')">重置</el-button>
+          </el-form-item>
+        </el-form>
+      </div>
+      <div class="right">
+        <div class="teacherIcon">
+          <img v-if="topForm.avatar"
+               key="avatar"
+               :src="topForm.avatar"
+               alt="">
+          <img v-else
+               key="avatar"
+               src="@/assets/images/base/woman.png"
+               alt="">
         </div>
+      </div>
     </div>
   </div>
 </template>
@@ -196,199 +256,197 @@ import { teacherAdd, teacherUpdate, teacherGet } from '@/api/teacherManager'
 import store from '@/store'
 import { jobNature } from '@/utils/searchArray'
 import { isvalidPhone } from '@/utils/validate'
-let validPhone = (rule, value,callback)=>{
-    if (!value){
-        callback(new Error('请输入电话号码'))
-    }else  if (!isvalidPhone(value)){
-        callback(new Error('请输入正确的11位手机号码'))
-    }else {
-        callback()
-    }
+let validPhone = (rule, value, callback) => {
+  if (!value) {
+    callback(new Error('请输入电话号码'))
+  } else if (!isvalidPhone(value)) {
+    callback(new Error('请输入正确的11位手机号码'))
+  } else {
+    callback()
+  }
 }
 export default {
   name: 'adminManager',
   data () {
     return {
-        jobNature: jobNature,
+      jobNature: jobNature,
+      organId: store.getters.organ,
+      pageType: this.$route.query.type,
+      teacherId: this.$route.query.teacherId,
+      formLabelWidth: '80px',
+      branchList: [], // 分部列表
+      subjectList: [], //声部列表
+      teacherSchools: null,
+      topForm: {
+        realName: null,
+        gender: null,
+        birthdate: null,
+        entryDate: null,
+        jobNature: null,
         organId: store.getters.organ,
-        pageType: this.$route.query.type,
-        teacherId: this.$route.query.teacherId,
-        formLabelWidth: '80px',
-        branchList: [], // 分部列表
-        subjectList: [], //声部列表
-        teacherSchools: null,
-        topForm: {
-            realName: null,
-            gender: null,
-            birthdate: null,
-            entryDate: null,
-            jobNature: null,
-            organId: store.getters.organ,
-            flowOrganRange: null,
-            introduction: null,
-            phone: null,
-            avatar: null,
-            graduateSchool: null,
-            email: null,
-            educationBackground: null,
-            subjectIds: [],
-            isProbationPeriod: null,
-            technicalTitles: null,
-            certificateType: null,
-            certificateNum: null,
-            isSupportCourseScheduleRewardsRules: true
-        },
-        rules: {
-            realName: [{ required: true, message: '请输入姓名', trigger: 'blur'}, 
-            { min: 2, max: 10, message: '请输入 2 到 10 个字符', trigger: 'blur'}],
-            gender: [{ required: true, message: '请选择性别', trigger: 'change' }],
-            entryDate: [{ required: true, message: '请选择入职日期', trigger: 'change' }],
-            jobNature: [{ required: true, message: '请选择工作类别', trigger: 'change' }],
-            isProbationPeriod: [{ required: true, message: '请选择人事状态', trigger: 'change' }],
-            organId: [{ required: true, message: '请选择所属分部', trigger: 'change' }],
-            phone: [{ required: true, validator: validPhone, trigger: 'blur' }],
-            subjectIds: [{ required: true, type: 'array', message: '请选择专业技能', trigger: 'change' }]
-        }
+        flowOrganRange: null,
+        introduction: null,
+        phone: null,
+        avatar: null,
+        graduateSchool: null,
+        email: null,
+        educationBackground: null,
+        subjectIds: [],
+        isProbationPeriod: null,
+        technicalTitles: null,
+        certificateType: null,
+        certificateNum: null,
+        isSupportCourseScheduleRewardsRules: true
+      },
+      rules: {
+        realName: [{ required: true, message: '请输入姓名', trigger: 'blur' },
+        { min: 2, max: 10, message: '请输入 2 到 10 个字符', trigger: 'blur' }],
+        gender: [{ required: true, message: '请选择性别', trigger: 'change' }],
+        entryDate: [{ required: true, message: '请选择入职日期', trigger: 'change' }],
+        jobNature: [{ required: true, message: '请选择工作类别', trigger: 'change' }],
+        isProbationPeriod: [{ required: true, message: '请选择人事状态', trigger: 'change' }],
+        organId: [{ required: true, message: '请选择所属分部', trigger: 'change' }],
+        phone: [{ required: true, validator: validPhone, trigger: 'blur' }],
+        subjectIds: [{ required: true, type: 'array', message: '请选择专业技能', trigger: 'change' }]
+      }
     }
   },
-  mounted() {
-      this.__init()
+  mounted () {
+    this.__init()
   },
   methods: {
-    __init() {
-        branchQueryPage({ // 获取分部
-            delFlag: 0,
-            rows: 9999
-        }).then(res => {
-            if(res.code == 200 && res.data && res.data.rows) {
-            res.data.rows.forEach(item => {
-                this.branchList.push({
-                label: item.name,
-                value: item.id
-                })
+    __init () {
+      branchQueryPage({ // 获取分部
+        delFlag: 0,
+        rows: 9999
+      }).then(res => {
+        if (res.code == 200 && res.data && res.data.rows) {
+          res.data.rows.forEach(item => {
+            this.branchList.push({
+              label: item.name,
+              value: item.id
             })
+          })
+        }
+      })
+      subjectListTree({ // 声部
+        delFlag: 0,
+        rows: 9999
+      }).then(res => {
+        let result = res.data
+        if (res.code == 200) {
+          let tempArray = []
+          result.rows.forEach((item, index) => {
+            let subject = []
+            item.subjects.forEach(s => {
+              subject.push({
+                value: s.id,
+                label: s.name
+              })
+            })
+
+            tempArray[index] = {
+              label: item.name,
+              options: subject
             }
+          })
+          this.subjectList = tempArray
+        }
+      })
+
+      if (this.pageType == 'update') {
+        teacherGet({ teacherId: this.teacherId }).then(res => {
+          let result = res.data
+          this.topForm = {
+            realName: result.realName,
+            gender: result.gender,
+            birthdate: result.birthdate,
+            entryDate: result.entryDate,
+            jobNature: result.jobNature,
+            organId: result.organId,
+            flowOrganRange: result.flowOrganRangeId ? result.flowOrganRangeId.split(',') : null,
+            introduction: result.introduction,
+            phone: result.phone,
+            avatar: result.avatar,
+            graduateSchool: result.graduateSchool,
+            email: result.email,
+            educationBackground: result.educationBackground,
+            subjectIds: result.subjectId ? result.subjectId.split(',') : null,
+            technicalTitles: result.technicalTitles,
+            certificateType: result.certificateType,
+            certificateNum: result.certificateNum,
+            isProbationPeriod: result.isProbationPeriod,
+            isSupportCourseScheduleRewardsRules: result.isSupportCourseScheduleRewardsRules
+          }
+          this.teacherSchools = result.teacherSchools.length > 0 ? result.teacherSchools.join(',') : ''
         })
-        subjectListTree({ // 声部
-            delFlag: 0,
-            rows: 9999
-        }).then(res => {
-            let result = res.data
-            if(res.code == 200) {
-                let tempArray = []
-                result.rows.forEach((item, index) => {
-                    let subject = []
-                    item.subjects.forEach(s => {
-                        subject.push({
-                            value: s.id,
-                            label: s.name
-                        })
-                    })
-                    
-                    tempArray[index] = {
-                    label: item.name,
-                    options: subject
-                    }
-                })
-                this.subjectList = tempArray
+      }
+    },
+    onSubmit (formName) {
+      this.$refs[formName].validate(valid => {
+        if (valid) {
+          this.topForm.flowOrganRange = this.topForm.flowOrganRange.join(',')
+          this.topForm.subjectId = this.topForm.subjectIds.join(',')
+          if (this.pageType == 'update') {
+            this.topForm.id = this.teacherId
+            teacherUpdate(this.topForm).then(res => {
+              if (res.code == 200) {
+                // this.$emit('onTeacher')
+                this.$router.push('/business/teacherList')
+              }
+              this.messageTips('修改', res)
+            })
+          } else if (this.pageType == 'create') {
+            if (this.topForm.id) {
+              delete this.topForm.id
             }
-        })
-
-        if(this.pageType == 'update') {
-            teacherGet({ teacherId: this.teacherId }).then(res => {
-                let result = res.data
-                this.topForm = {
-                    realName: result.realName,
-                    gender: result.gender,
-                    birthdate: result.birthdate,
-                    entryDate: result.entryDate,
-                    jobNature: result.jobNature,
-                    organId: result.organId,
-                    flowOrganRange: result.flowOrganRangeId ? result.flowOrganRangeId.split(',') : null,
-                    introduction: result.introduction,
-                    phone: result.phone,
-                    avatar: result.avatar,
-                    graduateSchool: result.graduateSchool,
-                    email: result.email,
-                    educationBackground: result.educationBackground,
-                    subjectIds: result.subjectId ? result.subjectId.split(',') : null,
-                    technicalTitles: result.technicalTitles,
-                    certificateType: result.certificateType,
-                    certificateNum: result.certificateNum,
-                    isProbationPeriod: result.isProbationPeriod,
-                    isSupportCourseScheduleRewardsRules: result.isSupportCourseScheduleRewardsRules
-                }
-                this.teacherSchools = result.teacherSchools.length > 0 ? result.teacherSchools.join(',') : ''
+            teacherAdd(this.topForm).then(res => {
+              if (res.code == 200) {
+                this.$emit('onTeacher', res.data)
+              }
+              this.messageTips('添加', res)
             })
+          }
+        } else {
+          return false
         }
+      })
     },
-    onSubmit(formName) {
-        this.$refs[formName].validate(valid => {
-            if(valid) {
-                this.topForm.flowOrganRange = this.topForm.flowOrganRange.join(',')
-                this.topForm.subjectId = this.topForm.subjectIds.join(',')
-                if(this.pageType == 'update') {
-                    this.topForm.id = this.teacherId
-                    teacherUpdate(this.topForm).then(res => {
-                        if(res.code == 200) {
-                            // this.$emit('onTeacher')
-                            this.$router.push('/business/teacherList')
-                        }
-                        this.messageTips('修改', res)
-                    })
-                } else if(this.pageType == 'create') {
-                    if(this.topForm.id) {
-                        delete this.topForm.id
-                    }
-                    teacherAdd(this.topForm).then(res => {
-                        if(res.code == 200) {
-                            this.$emit('onTeacher', res.data)
-                        }
-                        this.messageTips('添加', res)
-                    })
-                }
-            } else {
-                return false
-            }
-        })
-    },
-    messageTips(title, res) {
-      if(res.code == 200) {
+    messageTips (title, res) {
+      if (res.code == 200) {
         this.$message({
           message: title + '成功',
           type: 'success'
         })
       } else {
-        console.log(res)
-        console.log(this.topForm)
         this.topForm.subjectIds = this.topForm.subjectIds.split(',')
         this.$message.error(res.msg)
       }
     },
-    onReSet(formName) {
-        this.topForm = {
-            realName: null,
-            gender: null,
-            birthdate: null,
-            entryDate: null,
-            jobNature: null,
-            organId: store.getters.organ,
-            flowOrganRange: null,
-            introduction: null,
-            phone: null,
-            avatar: null,
-            graduateSchool: null,
-            email: null,
-            educationBackground: null,
-            subjectIds: [],
-            technicalTitles: null,
-            certificateType: null,
-            certificateNum: null,
-            jobType: 'ADVISER'
-        }
-        this.$refs[formName].resetFields()
+    onReSet (formName) {
+      this.topForm = {
+        realName: null,
+        gender: null,
+        birthdate: null,
+        entryDate: null,
+        jobNature: null,
+        organId: store.getters.organ,
+        flowOrganRange: null,
+        introduction: null,
+        phone: null,
+        avatar: null,
+        graduateSchool: null,
+        email: null,
+        educationBackground: null,
+        subjectIds: [],
+        technicalTitles: null,
+        certificateType: null,
+        certificateNum: null,
+        jobType: 'ADVISER'
+      }
+      this.$refs[formName].resetFields()
     },
-    onCancel() {
+    onCancel () {
       this.$router.push('/business/teacherList')
     }
   }
@@ -399,14 +457,17 @@ export default {
   background: #14928a;
   border-color: #14928a;
   color: #fff;
-  &:hover, &:active, &:focus {
+  &:hover,
+  &:active,
+  &:focus {
     background: #14928a;
     border-color: #14928a;
-    color: #FFF;
+    color: #fff;
   }
 }
-/deep/.el-date-editor.el-input, /deep/.el-select  {
-    width: 100% !important;
+/deep/.el-date-editor.el-input,
+/deep/.el-select {
+  width: 100% !important;
 }
 // .el-row {
 //   margin-top: 40px;
@@ -426,35 +487,35 @@ export default {
 //   height: 40px !important;
 // }
 /deep/.el-form-item__content {
-    font-size: 14px !important;
-    margin-right: 5%;
+  font-size: 14px !important;
+  margin-right: 5%;
 }
 .infoWrap {
-    margin-top: 20px;
+  margin-top: 20px;
 
-    display: flex;
-    flex-direction: row;
-    justify-content: flex-start;
-    .left {
-      max-width: 1000px;
-      width: 100%;
-      h4 {
-        margin-bottom: 20px;
-      }
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-start;
+  .left {
+    max-width: 1000px;
+    width: 100%;
+    h4 {
+      margin-bottom: 20px;
     }
-    .right {
-      margin-left: 100px;
-      .teacherIcon {
+  }
+  .right {
+    margin-left: 100px;
+    .teacherIcon {
+      width: 150px;
+      height: 150px;
+      // border: 1px solid #444;
+      border-radius: 50%;
+      overflow: hidden;
+      img {
         width: 150px;
         height: 150px;
-        // border: 1px solid #444;
-        border-radius: 50%;
-        overflow: hidden;
-        img {
-          width: 150px;
-          height: 150px;
-        }
       }
     }
   }
+}
 </style>

src/views/teamBuild/components/teamSoundMoney.vue

@@ -692,7 +692,6 @@ export default {
                     // 
                     if (res.data.musicGroupSubjectGoodsGroups[j].type == 'INSTRUMENT') {
                       this.activeSoundList[i].zhonglei = this.activeSoundList[i].zhonglei.concat(res.data.musicGroupSubjectGoodsGroups[j].goodsIdList)
-                      console.log(this.activeSoundList[i].zhonglei)
                       this.activeSoundList[i].zhonglei = this.activeSoundList[i].zhonglei.map(item => {
                         return parseInt(item);
                       })

src/views/teamBuild/teamSeting/components/coursePlan.vue

@@ -463,7 +463,6 @@ export default {
     },
     changeMixClass (val) {
       // 根据合奏班id获取合奏班下的所有单技班
-      console.log(this.first);
       let activeVal = val;
       if (!this.first) {
         // Object.assign(this.$data, this.$options.data());
@@ -567,7 +566,6 @@ export default {
     multipleResetMix () {
       this.isMultiple = false;
       // 批量更变课程类型
-      console.log('点击批量修改')
       for (let i in this.activeList) {
         this.resetMix(this.activeList[i])
       }
@@ -577,8 +575,6 @@ export default {
       this.activeTime = row.classDate; // 选中那一行的日期
       this.startClassTimeStr = row.startClassTimeStr
       this.endClassTimeStr = row.endClassTimeStr;
-      console.log(row.classDate);
-
       // let activeTpye = this.tableActive.type;
       let startClassTime;
       let endClassTime;
@@ -597,7 +593,6 @@ export default {
 
         for (let i in this.tableList) {
           if (row.classDate == this.tableList[i].classDate && this.startClassTimeStr == this.tableList[i].startClassTimeStr && this.endClassTimeStr == this.tableList[i].endClassTimeStr) {
-            console.log('修改合奏课的类型')
             this.tableList[i].type = this.chioseType;
             startClassTime = this.tableList[i].startClassTime;
             endClassTime = this.tableList[i].endClassTime;
@@ -607,7 +602,6 @@ export default {
         }
         //
       } else if (this.chioseType.indexOf('SINGLE') != -1 || this.chioseType.indexOf('CLASSROOM') != -1) {
-        console.log(this.tableList)
         // 合奏改单技 
         for (let i in this.tableList) {
           if (row.classDate == this.tableList[i].classDate && this.startClassTimeStr == this.tableList[i].startClassTimeStr && this.endClassTimeStr == this.tableList[i].endClassTimeStr) {
@@ -745,13 +739,11 @@ export default {
     // 点击查看
     OpenSign (row) {
       this.SignList = [];
-      console.log(this.classCardList)
       for (let i in this.classCardList) {
         if (this.classCardList[i].mixid == row.mixid && this.classCardList[i].classDate == row.classDate && row.startClassTimeStr == this.classCardList[i].startClassTimeStr && row.endClassTimeStr == this.classCardList[i].endClassTimeStr) {
           this.SignList.push(this.classCardList[i])
         }
       }
-      console.log(this.SignList);
       this.openSignListVisible = true;
     },
     savecolumn (row) {

src/views/teamBuild/teamSeting/components/improvementClass.vue

@@ -280,7 +280,6 @@ export default {
         } else {
           this.$message.error('请填写必要信息')
         }
-        console.log(this.tableList);
       })
 
     },

src/views/teamBuild/teamSeting/components/lookCourse.vue

@@ -112,7 +112,6 @@ export default {
     },
     // 删除乐团所有未上课程
     removeAllCourse () {
-      console.log(111);
       deteleAllCourse({ musicGroupId: this.teamid }).then(res => {
         if (res.code == 200) {
           this.$message.success('删除成功');

src/views/teamBuild/teamSeting/components/salarySet.vue

@@ -195,7 +195,6 @@ export default {
       if (!this.isok) {
         this.$message.error('有老师未设置默认课酬,请设置后再试')
       }
-      console.log(this.searchForm.salary)
       if (this.searchForm.salary == 'TEACHER_DEFAULT' || this.searchForm.salary == 'CLASSROOM_SALARY') {
         // 组件默认课酬
         for (let i in this.defaultTableList) {

src/views/teamBuild/teamSeting/components/setClass.vue

@@ -270,7 +270,6 @@ export default {
   },
   mounted () {
     sessionStorage.setItem('setStep', 0)
-    console.log(sessionStorage.getItem('setStep'))
     getTeamRecruit({ musicGroupId: this.teamid }).then(res => {
       // 获取乐团声部集合
       if (res.code == 200) {
@@ -288,7 +287,6 @@ export default {
     })
     getTeamBaseInfo({ musicGroupId: this.teamid }).then(res => {
       if (res.code == 200) {
-        console.log(res.data.musicGroup)
         this.teacherForm.name = res.data.musicGroup.directorUserId
       }
     })
@@ -310,7 +308,6 @@ export default {
       })
     },
     handleCheckAllChange (val, index) {
-      console.log(val); // item.rows
       // 全选
       // 1.val:选项框里的所有选项
       // 2.哪一个
@@ -374,7 +371,6 @@ export default {
         this.maskList.checkList[j] = []
 
       }
-      console.log(this.maskList);
       this.soundSize = val.length;
       getNoClassStudent({
         musicGroupId: this.teamid,
@@ -508,7 +504,6 @@ export default {
           }).catch(res => {
             this.teacherVisible = false;
             this.teacherForm.name = '';
-            console.log('验证失败')
           })
         }
 

src/views/teamBuild/teamSeting/components/setImprovement.vue

@@ -1,10 +1,12 @@
 <template>
   <div class="m-container">
     <h2>
-      <el-page-header @back="onCancel" content="基础技能班报名详情"></el-page-header>
+      <el-page-header @back="onCancel"
+                      content="基础技能班报名详情"></el-page-header>
       <!-- <div class='squrt'></div>  -->
       <!-- <span @click="onCreateQRCode" style="font-size: 16px; padding-left: 20px; font-weight: 400;cursor: pointer; ">查看报名连接</span> -->
-      <span @click="onApply" style="font-size: 16px; padding-left: 20px; font-weight: 400;cursor: pointer;">开启报名</span>
+      <span @click="onApply"
+            style="font-size: 16px; padding-left: 20px; font-weight: 400;cursor: pointer;">开启报名</span>
     </h2>
     <div class='m-core'>
       <div class="tableWrap">
@@ -38,12 +40,14 @@
     <el-dialog title="报名二维码"
                :visible.sync="qrcodeStatus"
                width="300px">
-      <div class="left-code" style="display: flex; flex-direction: column; align-items: center;">
+      <div class="left-code"
+           style="display: flex; flex-direction: column; align-items: center;">
         <h2>小班课报名连接</h2>
         <div id="qrcode"
              class="qrcode code"
              ref="qrCodeUrl"></div>
-        <p class="code-url" style="width: 220px"
+        <p class="code-url"
+           style="width: 220px"
            v-if="codeUrl">{{ codeUrl }}</p>
       </div>
     </el-dialog>
@@ -158,23 +162,22 @@ export default {
     })
   },
   methods: {
-    onApply() {
+    onApply () {
       this.$confirm('您确定开启报名吗?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          pushMessage({ musicGroupId: this.teamid }).then(res => {
-            let result = res.data
-            console.log(res)
-            if(res.code == 200) {
-              this.$message.success('报名成功')
-            } else {
-              this.$message.error(res.msg)
-            }
-          })
-        }).catch(() => { })
-      
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        pushMessage({ musicGroupId: this.teamid }).then(res => {
+          let result = res.data
+          if (res.code == 200) {
+            this.$message.success('报名成功')
+          } else {
+            this.$message.error(res.msg)
+          }
+        })
+      }).catch(() => { })
+
     },
     // onCreateQRCode () { // 生成报名二维码
     //   this.qrcodeStatus = true
@@ -241,7 +244,6 @@ export default {
     },
     // 删除学生
     removeStudent (scope) {
-      console.log(scope.row.userId);
       removeStudents({ classGroupId: this.activeClass, userId: scope.row.userId }).then(res => {
         if (res.code == 200) {
           this.$message.success('恭喜你删除成功');
@@ -255,11 +257,10 @@ export default {
       })
 
     },
-    onCancel() {
+    onCancel () {
       this.$router.push('/business/teamDetail')
     },
     resetClass (row) {
-      console.log(this.activeClass, row.userId)
       this.activeStudent = row.userId;
       this.resetVisible = true;
     },

src/views/teamBuild/teamSeting/index.vue

@@ -3,7 +3,8 @@
     <div class="topWrap">
       <h2>
         <!-- <div class="squrt"></div> -->
-        <el-page-header @back="goBack" :content="name">
+        <el-page-header @back="goBack"
+                        :content="name">
         </el-page-header>
       </h2>
       <div class="stepbox">
@@ -142,10 +143,9 @@ export default {
   },
   methods: {
     gotoNav (val) {
-      console.log(val)
       this.activeIndex = val;
     },
-    goBack() {
+    goBack () {
       this.$router.push('/business/teamDetail')
     }
   },

src/views/teamDetail/components/courseList.vue

@@ -290,15 +290,6 @@ export default {
       })
     },
     resetClass (row) {
-      /**
-       * 
-       *  date: '',
-        startTime: '',
-        endTime: '',
-        id: ''
-       * 
-       */
-      console.log(row);
       this.maskForm.teacher = parseInt(row.masterTeacherId);
       this.maskForm.assistant = []
       for (let i in row.teachingTeachers) {

src/views/teamDetail/components/resetClass.vue

@@ -176,6 +176,11 @@
                                align='center'
                                width="55"
                                label="性别">
+                <template slot-scope="scope">
+                  <div>
+                    {{ scope.row.gender | sex }}
+                  </div>
+                </template>
               </el-table-column>
               <el-table-column prop="subjectName"
                                align='center'
@@ -203,6 +208,11 @@
                                align='center'
                                width="55"
                                label="性别">
+                <template slot-scope="scope">
+                  <div>
+                    {{ scope.row.gender | sex }}
+                  </div>
+                </template>
               </el-table-column>
               <el-table-column prop="subjectName"
                                align='center'
@@ -513,7 +523,6 @@ export default {
     },
     // 选择学生的方法修改
     SelectionStudent (val) {
-      console.log(val)
       this.chioseStudent = val;
 
     },
@@ -531,7 +540,6 @@ export default {
       // 去重
       this.activeListStudent = this.objArrayRemoval(this.activeListStudent, 'userId');
       // 将其填入选中的学生
-      console.log(this.activeListStudent)
     },
     // 删除班级
     removeClass (scope) {
@@ -556,7 +564,6 @@ export default {
       this.studentVisible = true;
       this.activeClass = row.id
       this.isSearch = false;
-      console.log(row);
       // 根据单机班id 查询单技班内的所有学生
       getClassAllStudent({ classGroupId: row.id }).then(res => {
         if (res.code == 200) {

src/views/teamDetail/components/salaryList.vue

@@ -218,7 +218,6 @@ export default {
       })
     },
     setCourseInfo (row) {
-      console.log(row)
       getTeacherSalary({ courseScheduleId: row.courseScheduleId }).then(res => {
         if (res.code == 200) {
           this.dialogTableVisible = true;
@@ -232,7 +231,6 @@ export default {
     resetTeacher (row) {
       this.innerVisible = true;
       this.activeTeacher = row;
-      console.log(row)
     },
     resetSalary () {
       // console.log(this.activeTeacher);

src/views/teamDetail/components/studentSignin.vue

@@ -1,7 +1,8 @@
 <template>
   <div class="m-container">
     <h2>
-      <el-page-header @back="onCancel" content="学生点名总览"></el-page-header>
+      <el-page-header @back="onCancel"
+                      content="学生点名总览"></el-page-header>
       <!-- <div class="term">第一学期</div>
       <div class="term active">第二学期</div> -->
     </h2>
@@ -69,7 +70,7 @@ export default {
     this.getList()
   },
   methods: {
-    onCancel() {
+    onCancel () {
       // history.go(-1)
       let params = this.$route.query
       this.$router.push({
@@ -84,7 +85,7 @@ export default {
     },
     getList () {
       // console.log(111);
-      getStudentRecord({ search: 1 }).then(res => {
+      getStudentRecord({ search: this.teamid }).then(res => {
         if (res.code == 200) {
           this.tableList = res.data.rows;
           this.rules.total = res.data.total;

src/views/teamDetail/teamList.vue

@@ -1,6 +1,8 @@
 <template>
   <div class="m-container">
-    <h2><div class="squrt"></div>乐团列表</h2>
+    <h2>
+      <div class="squrt"></div>乐团列表
+    </h2>
     <div class="m-core">
       <div class="btnList">
         <div class='newBand'
@@ -101,7 +103,7 @@
                            align='center'
                            label="教学主管">
           </el-table-column>
-          <el-table-column prop="improventClassesNum"
+          <el-table-column prop="groupMemberNum"
                            align='center'
                            label="成团人数">
           </el-table-column>
@@ -265,7 +267,6 @@ export default {
     },
     resetTeaming (row) {
       // 修改进行中的乐团
-      console.log(row.id)
       this.$router.push({ path: '/business/resetTeaming', query: { type: 'resetTeam', id: row.id } })
     },
     setSearchList (obj) {
@@ -371,13 +372,11 @@ export default {
         }
         case 'APPLY': {
           // 报名中
-          console.log('报名中')
           this.$router.push({ path: `/business/signupList`, query: { status: row.status, id: row.id, name: row.name } })
           break;
         }
         case 'PAY': {
           // 缴费中
-          console.log('缴费中')
           this.$router.push({ path: `/business/signupList`, query: { status: row.status, id: row.id, name: row.name } })
           break;
         }
@@ -390,12 +389,10 @@ export default {
           // 进行中
           // 调到乐团详情 teamDetails
           this.$router.push({ path: `/business/teamDetails`, query: { status: row.status, id: row.id, name: row.name } })
-          console.log('进行中')
           break
         }
         case 'CANCELED': {
           // 取消
-          console.log('取消')
           break
         }
         case 'PAUSE': {

src/views/vipClass/vipDetail/components/vipBaseInfo.vue

@@ -168,7 +168,6 @@ export default {
       })
     },
     leaveSchool (scope) {
-      console.log(scope.row)
       let studentId = scope.row.id;
       let vipGroupId = this.id;
       leaveSchool({ studentId, vipGroupId }).then(res => {

src/views/vipClass/vipList.vue

@@ -1,6 +1,7 @@
 <template>
   <div class="m-container">
-    <h2><div class="squrt"></div>VIP课列表
+    <h2>
+      <div class="squrt"></div>VIP课列表
     </h2>
     <div class="newBand"
          @click='gotoBuildVip'>新建vip课</div>
@@ -98,7 +99,7 @@
                            label="活动方案">
           </el-table-column>
           <el-table-column align='center'
-                           label="剩余课时">
+                           label="当前课次">
             <template slot-scope="scope">
               <div>
                 <p>{{scope.row.currentClassTimes + '/' + scope.row.totalClassTimes}}</p>
@@ -273,7 +274,6 @@ export default {
     },
     // 修改vip
     resetVip (id) {
-      console.log(id);
       this.$router.push({ path: '/business/vipReset', query: { id } })
     }
 

vue.config.js

@@ -20,8 +20,8 @@ const name = defaultSettings.title || '大雅后台管理系统' // page title
 // let target = 'http://192.168.3.27:8000' // 箭河
 // let target = 'http://192.168.3.28:8000' //邹璇
 // let target = 'http://192.168.3.8:8000' //勇哥
-let target = 'http://47.99.212.176:8000' // 测试服
-// let target = 'http://192.168.3.48:8000' // 乔
+// let target = 'http://47.99.212.176:8000' // 测试服
+let target = 'http://192.168.3.48:8000' // 乔
 // All configuration item explanations can be find in https://cli.vuejs.org/config/
 module.exports = {
   /**