Merge branch 'master' of http://git.dayaedu.com/molingzhide/dy-admin-manager

dist/static/css/chunk-c53f7e5a.a7dcb92a.css → dist/static/css/chunk-1c788fa0.2395694b.css

@@ -1 +1 @@
-.pagination-container[data-v-31cb099a]{background:#fff;padding:32px 16px;width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-31cb099a]{display:none}.select[data-v-4e8285df]{font-size:14px}.btnList[data-v-4e8285df]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.btnList div[data-v-4e8285df]{margin-right:15px}
+.pagination-container[data-v-31cb099a]{background:#fff;padding:32px 16px;width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-31cb099a]{display:none}.select[data-v-55f79260]{font-size:14px}.btnList[data-v-55f79260]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.btnList div[data-v-55f79260]{margin-right:15px}

dist/static/css/chunk-2593e7a8.c821ceeb.css

@@ -0,0 +1 @@
+.el-button--primary[data-v-5ccf6581],.el-button--primary[data-v-5ccf6581]:active,.el-button--primary[data-v-5ccf6581]:focus,.el-button--primary[data-v-5ccf6581]:hover{background:#14928a;border-color:#14928a;color:#fff}[data-v-5ccf6581] .el-date-editor.el-input,[data-v-5ccf6581] .el-select{width:100%!important}[data-v-5ccf6581] .el-form-item__content{font-size:14px!important;margin-right:5%}.infoWrap[data-v-5ccf6581]{margin-top:20px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.infoWrap .left[data-v-5ccf6581]{max-width:1000px;width:100%}.infoWrap .left h4[data-v-5ccf6581]{margin-bottom:20px}.infoWrap .right[data-v-5ccf6581]{margin-left:100px}.infoWrap .right .teacherIcon[data-v-5ccf6581]{width:150px;height:150px;border-radius:50%;overflow:hidden}.infoWrap .right .teacherIcon img[data-v-5ccf6581]{width:150px;height:150px}.salarySet h3[data-v-147b9010]{margin-top:10px;margin-bottom:10px;font-size:14px;color:#444;font-weight:400}.salarySet .tableList .left[data-v-147b9010],.salarySet .tableList .right[data-v-147b9010]{float:left}.salarySet .tableList .left[data-v-147b9010]{width:70%;margin-right:2%}.salarySet .tableList .right[data-v-147b9010]{width:56%;margin-left:2%}[data-v-147b9010] .el-table__body tr td:nth-child(3){border-right:1px solid #ebeef5}[data-v-147b9010] .el-input-group__append{background-color:#f5f7fa;color:#909399;vertical-align:middle;display:table-cell;position:relative;border:1px solid #dcdfe6;border-left:0}

dist/static/css/chunk-7ec1e8ed.7df003bc.css

@@ -1 +0,0 @@
-.el-button--primary[data-v-3e8c41e7],.el-button--primary[data-v-3e8c41e7]:active,.el-button--primary[data-v-3e8c41e7]:focus,.el-button--primary[data-v-3e8c41e7]:hover{background:#14928a;border-color:#14928a;color:#fff}[data-v-3e8c41e7] .el-date-editor.el-input,[data-v-3e8c41e7] .el-select{width:100%!important}[data-v-3e8c41e7] .el-form-item__content{font-size:14px!important;margin-right:5%}.infoWrap[data-v-3e8c41e7]{margin-top:20px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.infoWrap .left[data-v-3e8c41e7]{max-width:1000px;width:100%}.infoWrap .left h4[data-v-3e8c41e7]{margin-bottom:20px}.infoWrap .right[data-v-3e8c41e7]{margin-left:100px}.infoWrap .right .teacherIcon[data-v-3e8c41e7]{width:150px;height:150px;border-radius:50%;overflow:hidden}.infoWrap .right .teacherIcon img[data-v-3e8c41e7]{width:150px;height:150px}.salarySet h3[data-v-90ce9dec]{margin-top:10px;margin-bottom:10px;font-size:14px;color:#444;font-weight:400}.salarySet .tableList .left[data-v-90ce9dec],.salarySet .tableList .right[data-v-90ce9dec]{float:left}.salarySet .tableList .left[data-v-90ce9dec]{width:70%;margin-right:2%}.salarySet .tableList .right[data-v-90ce9dec]{width:56%;margin-left:2%}[data-v-90ce9dec] .el-table__body tr td:nth-child(3){border-right:1px solid #ebeef5}[data-v-90ce9dec] .el-input-group__append{background-color:#f5f7fa;color:#909399;vertical-align:middle;display:table-cell;position:relative;border:1px solid #dcdfe6;border-left:0}

public/index.html

@@ -1,17 +1,22 @@
 <!DOCTYPE html>
 <html>
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
-    <link rel="icon" href="<%= BASE_URL %>favicon.ico">
-    <title><%= webpackConfig.name %></title>
-  </head>
-  <body>
-    <noscript>
-      <strong>We're sorry but <%= webpackConfig.name %> doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
-    </noscript>
-    <div id="app"></div>
-    <!-- built files will be auto injected -->
-  </body>
-</html>
+
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+  <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
+  <link rel="icon" href="<%= BASE_URL %>favicon1.ico">
+  <!-- <link rel="shortcut icon" href="<%= BASE_URL %>favicon1.ico" type="image/x-icon" /> -->
+  <title><%= webpackConfig.name %></title>
+</head>
+
+<body>
+  <noscript>
+    <strong>We're sorry but <%= webpackConfig.name %> doesn't work properly without JavaScript enabled. Please enable it
+      to continue.</strong>
+  </noscript>
+  <div id="app"></div>
+  <!-- built files will be auto injected -->
+</body>
+
+</html>

src/components/SvgIcon/index.vue

@@ -1,6 +1,12 @@
 <template>
-  <div v-if="isExternal" :style="styleExternalIcon" class="svg-external-icon svg-icon" v-on="$listeners" />
-  <svg v-else :class="svgClass" aria-hidden="true" v-on="$listeners">
+  <div v-if="isExternal"
+       :style="styleExternalIcon"
+       class="svg-external-icon svg-icon"
+       v-on="$listeners" />
+  <svg v-else
+       :class="svgClass"
+       aria-hidden="true"
+       v-on="$listeners">
     <use :xlink:href="iconName" />
   </svg>
 </template>
@@ -22,20 +28,20 @@ export default {
     }
   },
   computed: {
-    isExternal() {
+    isExternal () {
       return isExternal(this.iconClass)
     },
-    iconName() {
+    iconName () {
       return `#icon-${this.iconClass}`
     },
-    svgClass() {
+    svgClass () {
       if (this.className) {
         return 'svg-icon ' + this.className
       } else {
         return 'svg-icon'
       }
     },
-    styleExternalIcon() {
+    styleExternalIcon () {
       return {
         mask: `url(${this.iconClass}) no-repeat 50% 50%`,
         '-webkit-mask': `url(${this.iconClass}) no-repeat 50% 50%`
@@ -56,7 +62,7 @@ export default {
 
 .svg-external-icon {
   background-color: currentColor;
-  mask-size: cover!important;
+  mask-size: cover !important;
   display: inline-block;
 }
 </style>

src/layout/components/Sidebar/Logo.vue

@@ -49,7 +49,7 @@ export default {
     width: 100%;
 
     & .sidebar-logo {
-      width: 132px;
+      width: 111px;
       // height: 210px;
       vertical-align: middle;
     }

src/views/buildVip/index.vue

@@ -512,7 +512,7 @@ export default {
     })
     // 获取所有老师的接口  根据声部id获取老师
     // 获取课程类型的接口
-    vipGroupCategory({ organId: this.$store.getters.organ }).then(res => {
+    vipGroupCategory().then(res => {
       if (res.code == 200) {
         this.courseTypeList = res.data;
       }

src/views/categroyManager/insideSetting/branchManager.vue

@@ -1,8 +1,11 @@
 <template>
   <div class='m-container'>
-    <h2><div class="squrt"></div>合作单位</h2>
+    <h2>
+      <div class="squrt"></div>合作单位
+    </h2>
     <div class="m-core">
-      <div @click="openTeaching('create')" class='newBand'>新建</div>
+      <div @click="openTeaching('create')"
+           class='newBand'>新建</div>
       <!-- 搜索类型 -->
       <!-- <el-form :inline="true"
                class="searchForm"
@@ -30,20 +33,26 @@
       </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' prop='linkman'
+          <el-table-column align='center'
+                           prop='linkman'
                            label="联系人">
           </el-table-column>
-          <el-table-column align='center' prop='job'
+          <el-table-column align='center'
+                           prop='job'
                            label="职位">
           </el-table-column>
-          <el-table-column align='center' prop='mobileNo'
+          <el-table-column align='center'
+                           prop='mobileNo'
                            label="手机号">
           </el-table-column>
           <!-- <el-table-column align='center' prop='ownershipType'
@@ -53,10 +62,13 @@
             </template>
           </el-table-column> -->
           <el-table-column align='center'
-                           label="操作" width='100'>
+                           label="操作"
+                           width='100'>
             <template slot-scope="scope">
-              <el-button @click="openTeaching('update', scope.row)" type="text">修改</el-button>
-              <el-button @click="onDelete(scope.row)" type="text">删除</el-button>
+              <el-button @click="openTeaching('update', scope.row)"
+                         type="text">修改</el-button>
+              <el-button @click="onDelete(scope.row)"
+                         type="text">删除</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -68,19 +80,36 @@
       </div>
     </div>
 
-    <el-dialog :title="formTitle[formActionTitle]" :visible.sync="teachingStatus" @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="teachingStatus"
+               @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-item label="联系人" prop="linkman" :label-width="formLabelWidth">
-          <el-input v-model="form.linkman" autocomplete="off"></el-input>
+        <el-form-item label="联系人"
+                      prop="linkman"
+                      :label-width="formLabelWidth">
+          <el-input v-model="form.linkman"
+                    autocomplete="off"></el-input>
         </el-form-item>
-        <el-form-item label="职位" prop="job" :label-width="formLabelWidth">
-          <el-input v-model="form.job" autocomplete="off"></el-input>
+        <el-form-item label="职位"
+                      prop="job"
+                      :label-width="formLabelWidth">
+          <el-input v-model="form.job"
+                    autocomplete="off"></el-input>
         </el-form-item>
-        <el-form-item label="手机号" prop="mobileNo" :label-width="formLabelWidth">
-          <el-input v-model="form.mobileNo" autocomplete="off"></el-input>
+        <el-form-item label="手机号"
+                      prop="mobileNo"
+                      :label-width="formLabelWidth">
+          <el-input v-model="form.mobileNo"
+                    autocomplete="off"></el-input>
         </el-form-item>
         <!-- <el-form-item label="权属类型" prop="ownershipType" :label-width="formLabelWidth">
           <el-select v-model="form.ownershipType">
@@ -90,9 +119,11 @@
           </el-select>
         </el-form-item> -->
       </el-form>
-      <span slot="footer" class="dialog-footer">
+      <span slot="footer"
+            class="dialog-footer">
         <el-button @click="teachingStatus = false">取 消</el-button>
-        <el-button type="primary" @click="onTeachingSubmit('ruleForm')">确 定</el-button>
+        <el-button type="primary"
+                   @click="onTeachingSubmit('ruleForm')">确 定</el-button>
       </span>
     </el-dialog>
   </div>
@@ -102,14 +133,14 @@ import pagination from '@/components/Pagination/index'
 import { cooperationOrganAdd, cooperationOrganUpdate, cooperationOrganDel, queryPage } from '@/api/systemManage'
 import store from '@/store'
 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 {
   components: { pagination },
@@ -140,32 +171,32 @@ export default {
         name: null, // 教学点名称
         linkman: null, // 来源
         job: null,  // 费用
-        mobileNo: null, 
+        mobileNo: null,
         // ownershipType: null,
         organId: store.getters.organ
       },
       rules: {
         name: [{ required: true, message: '请输入教学点名称', trigger: 'blur' }],
-        linkman: [{required: true, message: '请输入联系人', trigger: 'blur'}],
-        job: [{ required: true, message: '请输入职位', trigger: 'blur'}],
-        mobileNo: [{required: true, validator: validPhone, trigger: 'blur'}],
+        linkman: [{ required: true, message: '请输入联系人', trigger: 'blur' }],
+        job: [{ required: true, message: '请输入职位', trigger: 'blur' }],
+        mobileNo: [{ required: true, validator: validPhone, trigger: 'blur' }],
         // ownershipType: [{ required: true, message: '请选择权属类型', trigger: 'change' }]
       },
-      
+
     }
   },
-  mounted() {
+  mounted () {
     this.getList() // 获取列表数据
   },
   methods: {
-    onDelete(rows) {
+    onDelete (rows) {
       this.$confirm('您确定删除合作单位?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
         cooperationOrganDel(rows.id).then(res => {
-          if(res.code == 200) {
+          if (res.code == 200) {
             this.$message.success('删除成功')
             this.teachingStatus = false
             this.getList()
@@ -174,14 +205,14 @@ export default {
           }
         })
       }).catch(() => { });
-      
+
     },
-    onTeachingSubmit(formName) { // 添加数据
+    onTeachingSubmit (formName) { // 添加数据
       this.$refs[formName].validate((valid) => {
         if (valid) {
-          if(this.formActionTitle == 'create') {
+          if (this.formActionTitle == 'create') {
             cooperationOrganAdd(this.form).then(res => {
-              if(res.code == 200) {
+              if (res.code == 200) {
                 this.$message.success('修改成功')
                 this.teachingStatus = false
                 this.getList()
@@ -189,10 +220,10 @@ export default {
                 this.$message.error(res.msg)
               }
             })
-          } else if(this.formActionTitle == 'update') {
+          } else if (this.formActionTitle == 'update') {
             cooperationOrganUpdate(this.form).then(res => {
               // console.log(res)
-              if(res.code == 200) {
+              if (res.code == 200) {
                 this.$message.success('修改成功')
                 this.teachingStatus = false
                 this.getList()
@@ -206,19 +237,19 @@ export default {
         }
       })
     },
-    getList() {
+    getList () {
       queryPage({
-        organId: this.form.organId,
+        search: this.form.organId,
         rows: this.pageInfo.limit,
         page: this.pageInfo.page
       }).then(res => {
-        if(res.code == 200 && res.data) {
+        if (res.code == 200 && res.data) {
           this.tableList = res.data.rows
           this.pageInfo.total = res.data.total
         }
       })
     },
-    openTeaching(type, rows) {
+    openTeaching (type, rows) {
       // 重置数据
       this.form = {
         id: null,
@@ -232,19 +263,19 @@ export default {
       this.teachingStatus = true
       this.formActionTitle = type
       // 修改的时候赋值
-      if(type == 'update') {
+      if (type == 'update') {
         this.form = {
           id: rows.id,
           name: rows.name, // 教学点名称
           linkman: rows.linkman, // 来源
           job: rows.job,  // 费用
-          mobileNo: rows.mobileNo ? rows.mobileNo : null, 
+          mobileNo: rows.mobileNo ? rows.mobileNo : null,
           ownershipType: rows.ownershipType,
           organId: store.getters.organ
         }
       }
     },
-    onFormClose(formName) { // 关闭弹窗重置验证
+    onFormClose (formName) { // 关闭弹窗重置验证
       this.$refs[formName].clearValidate()
     }
   }
@@ -255,10 +286,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-vue-search-box-container {

src/views/categroyManager/vipActiveList.vue

@@ -333,9 +333,9 @@ export default {
     this.getList();
     // 首先获取课程形式
     // 获取分部id
-    let organId = this.$store.getters.organ;
+    // let organId = this.$store.getters.organ;
     // console.log(organId)
-    vipGroupCategory({ organId }).then(res => {
+    vipGroupCategory().then(res => {
       // console.log(res);
       if (res.code == 200) {
         this.courseStatusList = res.data;

src/views/login/index.vue

@@ -23,7 +23,7 @@
                   name="username"
                   type="text"
                   tabindex="1"
-                  auto-complete="on" />
+                  auto-complete="off" />
       </el-form-item>
 
       <el-form-item prop="password"
@@ -39,15 +39,15 @@
                   placeholder="请输入密码"
                   name="password"
                   tabindex="2"
-                  auto-complete="on"
+                  auto-complete="off"
                   @keyup.enter.native="handleLogin" />
         <span class="show-pwd"
               @click="showPwd">
           <svg-icon :icon-class="passwordType === 'password' ? 'eye' : 'eye-open'" />
         </span>
       </el-form-item>
-
       <div class="loginBtn"
+           :class="!loginForm.username || !loginForm.password?'disabled':''"
            style="width:100%;margin-bottom:30px;"
            @click="handleLogin">登录</div>
       <div class='remberBox'
@@ -156,11 +156,14 @@ export default {
 };
 </script>
 
-<style lang="scss">
+<style lang="scss" rel="stylesheet/scss">
+.login-input {
+  background-color: #fff;
+}
 /* 修复input 背景不协调 和光标变色 */
 /* Detail see https://github.com/PanJiaChen/vue-element-admin/pull/927 */
 .loginBtn {
-  background-color: #777 !important;
+  background-color: rgb(19, 129, 122);
   text-align: center;
   width: 100%;
   height: 51px;
@@ -170,6 +173,9 @@ export default {
   cursor: pointer;
   margin-bottom: 10px !important;
 }
+.loginBtn.disabled {
+  background-color: #777;
+}
 ::-webkit-input-placeholder {
   /* WebKit browsers */
   color: #444;
@@ -223,9 +229,17 @@ export default {
     }
   }
 }
-$bg: #283443;
-$light_gray: #fff;
-$cursor: #fff;
+$bg: #fff;
+$light_gray: #000;
+$cursor: #000;
+@supports (-webkit-mask: none) and (not (cater-color: $cursor)) {
+  .login-container .el-input input {
+    color: $cursor;
+    &::first-line {
+      color: $light_gray;
+    }
+  }
+}
 
 @supports (-webkit-mask: none) and (not (cater-color: $cursor)) {
   .login-container .el-input input {
@@ -267,8 +281,8 @@ $cursor: #fff;
 </style>
 
 <style lang="scss" scoped>
-$bg: #2d3a4b;
-$dark_gray: #889aa4;
+$bg: #fff;
+$dark_gray: #000;
 $light_gray: #eee;
 
 .login-container {
@@ -317,9 +331,9 @@ $light_gray: #eee;
     display: flex;
     flex-direction: column;
     align-items: center;
-    padding: 30px 0;
+    padding: 90px 0;
     img {
-      width: 30%;
+      width: 48%;
     }
     .title {
       font-size: 26px;

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

@@ -12,58 +12,86 @@
           </el-table-column>
           <el-table-column label="默认课酬-主教">
             <template slot-scope="scope">
-              <el-input type="number" v-model="scope.row.mainTeacher30MinSalary" placeholder="请输入课酬">
-                <template slot="append" v-if="scope.row.courseScheduleType == 'HIGH'">元/45分钟</template>
-                <template slot="append" v-else-if="scope.row.courseScheduleType == 'CLASSROOM'">元/40分钟</template>
-                <template slot="append" v-else>元/30分钟</template>
+              <el-input type="number"
+                        v-model="scope.row.mainTeacher30MinSalary"
+                        placeholder="请输入课酬">
+                <template slot="append"
+                          v-if="scope.row.courseScheduleType == 'HIGH'">元/45分钟</template>
+                <template slot="append"
+                          v-else-if="scope.row.courseScheduleType == 'CLASSROOM'">元/40分钟</template>
+                <template slot="append"
+                          v-else>元/30分钟</template>
               </el-input>
             </template>
           </el-table-column>
           <el-table-column label="默认课酬-助教">
             <template slot-scope="scope">
-              <el-input type="number" v-model="scope.row.assistantTeacher30MinSalary" placeholder="请输入课酬">
-                <template slot="append" v-if="scope.row.courseScheduleType == 'HIGH'">元/45分钟</template>
-                <template slot="append" v-else-if="scope.row.courseScheduleType == 'CLASSROOM'">元/40分钟</template>
-                <template slot="append" v-else>元/30分钟</template>
+              <el-input type="number"
+                        v-model="scope.row.assistantTeacher30MinSalary"
+                        placeholder="请输入课酬">
+                <template slot="append"
+                          v-if="scope.row.courseScheduleType == 'HIGH'">元/45分钟</template>
+                <template slot="append"
+                          v-else-if="scope.row.courseScheduleType == 'CLASSROOM'">元/40分钟</template>
+                <template slot="append"
+                          v-else>元/30分钟</template>
               </el-input>
             </template>
           </el-table-column>
           <el-table-column label="3.0课酬-主教">
             <template slot-scope="scope">
-              <el-input type="number" :disabled="scope.row.courseScheduleType == 'CLASSROOM'" v-model="scope.row.mainTeacher90MinSalary" placeholder="请输入课酬">
-                <template slot="append" v-if="scope.row.courseScheduleType == 'HIGH'">元/45分钟</template>
-                <template slot="append" v-else-if="scope.row.courseScheduleType == 'CLASSROOM'">元/40分钟</template>
-                <template slot="append" v-else>元/90分钟</template>
+              <el-input type="number"
+                        :disabled="scope.row.courseScheduleType == 'CLASSROOM'"
+                        v-model="scope.row.mainTeacher90MinSalary"
+                        placeholder="请输入课酬">
+                <template slot="append"
+                          v-if="scope.row.courseScheduleType == 'HIGH'">元/45分钟</template>
+                <template slot="append"
+                          v-else-if="scope.row.courseScheduleType == 'CLASSROOM'">元/40分钟</template>
+                <template slot="append"
+                          v-else>元/90分钟</template>
                 <!-- <template slot="append">元/{{ (scope.row.courseScheduleType == 'HIGH' || scope.row.courseScheduleType == 'CLASSROOM') ? 45 : 90 }}分钟</template> -->
               </el-input>
             </template>
           </el-table-column>
           <el-table-column label="3.0课酬-助教">
             <template slot-scope="scope">
-              <el-input type="number" :disabled="scope.row.courseScheduleType == 'CLASSROOM'" v-model="scope.row.assistantTeacher90MinSalary" placeholder="请输入课酬">
-                <template slot="append" v-if="scope.row.courseScheduleType == 'HIGH'">元/45分钟</template>
-                <template slot="append" v-else-if="scope.row.courseScheduleType == 'CLASSROOM'">元/40分钟</template>
-                <template slot="append" v-else>元/90分钟</template>
+              <el-input type="number"
+                        :disabled="scope.row.courseScheduleType == 'CLASSROOM'"
+                        v-model="scope.row.assistantTeacher90MinSalary"
+                        placeholder="请输入课酬">
+                <template slot="append"
+                          v-if="scope.row.courseScheduleType == 'HIGH'">元/45分钟</template>
+                <template slot="append"
+                          v-else-if="scope.row.courseScheduleType == 'CLASSROOM'">元/40分钟</template>
+                <template slot="append"
+                          v-else>元/90分钟</template>
                 <!-- <template slot="append">元/{{ (scope.row.courseScheduleType == 'HIGH' || scope.row.courseScheduleType == 'CLASSROOM') ? 45 : 90 }}分钟</template> -->
               </el-input>
             </template>
           </el-table-column>
         </el-table>
 
-        <el-table :data='vipTable' style="width: 70%; margin-top: 15px;"
+        <el-table :data='vipTable'
+                  style="width: 70%; margin-top: 15px;"
                   :header-cell-style="{background:'#EDEEF0',color:'#444'}">
-          <el-table-column label="VIP课课酬参考值" prop="vipGroupCategoryName">
+          <el-table-column label="VIP课课酬参考值"
+                           prop="vipGroupCategoryName">
           </el-table-column>
           <el-table-column label="线上课">
             <template slot-scope="scope">
-              <el-input type="number" v-model="scope.row.onlineClassesSalary" placeholder="请输入内容">
+              <el-input type="number"
+                        v-model="scope.row.onlineClassesSalary"
+                        placeholder="请输入内容">
                 <template slot="append">元/45分钟</template>
               </el-input>
             </template>
           </el-table-column>
           <el-table-column label="线下课">
             <template slot-scope="scope">
-              <el-input type="number" v-model="scope.row.offlineClassesSalary" placeholder="请输入内容">
+              <el-input type="number"
+                        v-model="scope.row.offlineClassesSalary"
+                        placeholder="请输入内容">
                 <template slot="append">元/45分钟</template>
               </el-input>
             </template>
@@ -71,8 +99,10 @@
           </el-table-column>
         </el-table>
 
-        <div style="padding-top: 10px;" v-permission="pageType == 'create' ? {child: 'teacherDefaultMusicGroupSalary/batchUpset', parent: 'teacherAdd/batchUpset'} : {child: 'teacherDefaultMusicGroupSalary/batchUpset', parent: 'teacherUpdate/batchUpset'}">
-          <el-button @click="onSave()" type="primary">保存</el-button>
+        <div style="padding-top: 10px;"
+             v-permission="pageType == 'create' ? {child: 'teacherDefaultMusicGroupSalary/batchUpset', parent: 'teacherAdd/batchUpset'} : {child: 'teacherDefaultMusicGroupSalary/batchUpset', parent: 'teacherUpdate/batchUpset'}">
+          <el-button @click="onSave()"
+                     type="primary">保存</el-button>
         </div>
       </div>
     </div>
@@ -95,35 +125,35 @@ export default {
         mainTeacher30MinSalary: 0,
         mainTeacher90MinSalary: 0,
         userId: this.teacherId,
-      },{
+      }, {
         assistantTeacher30MinSalary: 0,
         assistantTeacher90MinSalary: 0,
         courseScheduleType: "MIX",
         mainTeacher30MinSalary: 0,
         mainTeacher90MinSalary: 0,
         userId: this.teacherId
-      },{
+      }, {
         assistantTeacher30MinSalary: 0,
         assistantTeacher90MinSalary: 0,
         courseScheduleType: "COMPREHENSIVE",
         mainTeacher30MinSalary: 0,
         mainTeacher90MinSalary: 0,
         userId: this.teacherId
-      },{
+      }, {
         assistantTeacher30MinSalary: 0,
         assistantTeacher90MinSalary: 0,
         courseScheduleType: "TRAINING_SINGLE",
         mainTeacher30MinSalary: 0,
         mainTeacher90MinSalary: 0,
         userId: this.teacherId
-      },{
+      }, {
         assistantTeacher30MinSalary: 0,
         assistantTeacher90MinSalary: 0,
         courseScheduleType: "TRAINING_MIX",
         mainTeacher30MinSalary: 0,
         mainTeacher90MinSalary: 0,
         userId: this.teacherId
-      },{
+      }, {
         assistantTeacher30MinSalary: 0,
         assistantTeacher90MinSalary: 0,
         courseScheduleType: "HIGH",
@@ -144,13 +174,13 @@ export default {
       vipList: []
     }
   },
-  mounted() {
+  mounted () {
     this.__init()
   },
   methods: {
-    __init() {
+    __init () {
       // 获取课程形态 设置vip课酬
-      vipGroupCategory({ organId: this.$store.getters.organ }).then(res => {
+      vipGroupCategory().then(res => {
         if (res.code == 200 && res.data.length > 0) {
           let vipData = []
           res.data.forEach(item => {
@@ -168,7 +198,7 @@ export default {
             page: 1,
             search: this.teacherId
           }).then(res => {
-            if(res.code == 200) {
+            if (res.code == 200) {
               let rows = res.data.rows
               this.vipListCompare(vipData, rows)
             }
@@ -182,7 +212,7 @@ export default {
         teacherId: this.teacherId,
         // settlementType: 'FIXED_SALARY'
       }).then(res => {
-        if(res.code == 200) {
+        if (res.code == 200) {
           // this.teamTable = res.data.rows
           let rows = res.data.rows
           this.teacherSalaryMoney(rows)
@@ -190,15 +220,15 @@ export default {
       })
 
     },
-    vipListCompare(vipData, rows) { // vip 做对比
-      if(!rows) { // 判断是否有数据
+    vipListCompare (vipData, rows) { // vip 做对比
+      if (!rows) { // 判断是否有数据
         this.vipTable = vipData
         return
       }
       let result = []
       vipData.forEach(item => {
         rows.forEach(c => {
-          if(item.vipGroupCategoryId == c.vipGroupCategoryId) {
+          if (item.vipGroupCategoryId == c.vipGroupCategoryId) {
             item.checked = true
             result.push({
               vipGroupCategoryId: c.vipGroupCategoryId,
@@ -210,9 +240,9 @@ export default {
           }
         })
       })
-      if(result.length > 0) {
+      if (result.length > 0) {
         vipData.forEach(item => {
-          if(!item.checked) {
+          if (!item.checked) {
             result.push(item)
           }
         })
@@ -222,14 +252,14 @@ export default {
       this.vipTable = result
     },
 
-    teacherSalaryMoney(rows) {
+    teacherSalaryMoney (rows) {
       // 判断是否有数据
-      if(!rows || rows.length <= 0) return
+      if (!rows || rows.length <= 0) return
       let teamTable = this.teamTable
       let result = []
       teamTable.forEach(item => {
         rows.forEach(c => {
-          if(item.courseScheduleType == c.courseScheduleType) {
+          if (item.courseScheduleType == c.courseScheduleType) {
             item.checked = true
             result.push({
               mainTeacher30MinSalary: c.mainTeacher30MinSalary,
@@ -242,9 +272,9 @@ export default {
           }
         })
       })
-      if(result.length > 0) {
+      if (result.length > 0) {
         teamTable.forEach(item => {
-          if(!item.checked) {
+          if (!item.checked) {
             result.push(item)
           }
         })
@@ -253,35 +283,35 @@ export default {
       }
       this.teamTable = result
     },
-    onSave() {
+    onSave () {
       let teamTable = this.teamTable
       let checkStatus = true
       teamTable.forEach(item => {
-        if(item.assistantTeacher30MinSalary < 0 || item.assistantTeacher90MinSalary < 0 
+        if (item.assistantTeacher30MinSalary < 0 || item.assistantTeacher90MinSalary < 0
           || item.mainTeacher30MinSalary < 0 || item.mainTeacher90MinSalary < 0) {
           this.$message('输入课酬不能为负数')
           checkStatus = false
-        } 
+        }
       })
       this.vipTable.forEach(item => {
-          if(item.offlineClassesSalary < 0 && item.onlineClassesSalary < 0) {
-            this.$message('输入课酬不能为负数')
-            checkStatus = false
-          }
-        })
+        if (item.offlineClassesSalary < 0 && item.onlineClassesSalary < 0) {
+          this.$message('输入课酬不能为负数')
+          checkStatus = false
+        }
+      })
       // 判断输入的值是否正确
-      if(!checkStatus) return false
+      if (!checkStatus) return false
       teacherSalaryBatchUpset(teamTable).then(res => {
-        if(res.code == 200) {
-          
+        if (res.code == 200) {
+
           // 判断输入的值是否正确
           // if(!checkStatus) return false
           vipGroupSalarySet(this.vipTable).then(res => {
-            if(res.code == 200) {
+            if (res.code == 200) {
               this.$message.success('保存成功')
 
               // if(this.$route.query.type == 'create') {
-                this.$router.push('/business/teacherList')
+              this.$router.push('/business/teacherList')
               // }
             }
           })
@@ -301,7 +331,8 @@ export default {
     font-weight: normal;
   }
   .tableList {
-    .left, .right {
+    .left,
+    .right {
       float: left;
     }
     .left {
@@ -318,17 +349,17 @@ export default {
 /deep/.el-table__body {
   tr {
     td:nth-child(3) {
-      border-right: 1px solid #EBEEF5;
+      border-right: 1px solid #ebeef5;
     }
   }
 }
 /deep/.el-input-group__append {
-    background-color: #F5F7FA;
-    color: #909399;
-    vertical-align: middle;
-    display: table-cell;
-    position: relative;
-    border: 1px solid #DCDFE6;
-    border-left: 0;
+  background-color: #f5f7fa;
+  color: #909399;
+  vertical-align: middle;
+  display: table-cell;
+  position: relative;
+  border: 1px solid #dcdfe6;
+  border-left: 0;
 }
 </style>

src/views/teamBuild/components/teamBaseInfo.vue

@@ -552,13 +552,13 @@ export default {
 
     }).catch()
     // 2.获取收费类型选项卡
-    getType({ 'rows': 1000, organId: this.organId }).then(res => {
+    getType({ 'rows': 1000 }).then(res => {
       if (res.code == 200) {
         this.typeList = res.data.rows;
       }
     })
     // 3.获取合作单位选项卡
-    getCooperation({ 'rows': 1000, organId: this.organId }).then(res => {
+    getCooperation({ 'rows': 1000, search: this.organId }).then(res => {
       if (res.code == 200) {
         this.cooperationList = res.data.rows;
       }

src/views/teamBuild/components/teamSoundMoney.vue

@@ -673,13 +673,13 @@ export default {
         for (let key in this.soundList) {
           this.$set(this.soundLists, key, [])
         }
-        // 新建团带默认的数据
+        // 新建团带默认的数据   this.topfor.section
         if (this.teamStatus == 'newTeam') {
-          getDefaultSubject({ chargeTypeId: type }).then(res => {
+          getDefaultSubject({ chargeTypeId: type, organId: this.topfor.section, number: 1 }).then(res => {
             if (res.code == 200) {
               this.activeSoundList = res.data.map(item => {
                 this.soundLists[0].push(item.id)
-                let obj = { 'id': item.id, 'sound': item.name, 'jihua': 0, 'yuji': 0, 'zhonglei': [], 'fangshi': '', 'fangshiprice': 1500, 'jiaopu': '', 'type': 1, 'typeVisible': false, 'provideVisible': false, 'markVisible': false, 'goodsList': [], 'markList': [{ 'name': '', 'goods': [], 'price': '' }], 'markChioseList': [] }
+                let obj = { 'id': item.id, 'sound': item.name, 'jihua': 0, 'yuji': item.fee, 'zhonglei': [], 'fangshi': '', 'fangshiprice': 1500, 'jiaopu': '', 'type': 1, 'typeVisible': false, 'provideVisible': false, 'markVisible': false, 'goodsList': [], 'markList': [{ 'name': '', 'goods': [], 'price': '' }], 'markChioseList': [] }
                 return obj;
               })
               // 并且把所有soundLists 里面

src/views/teamBuild/teamSeting/index.vue

@@ -139,7 +139,7 @@ export default {
       }
     })
     // 获取是否设置课酬
-    checkSetSalary().then(res => {
+    checkSetSalary({ musicGroupId: this.id }).then(res => {
       if (res.code == 200) {
         this.isSetSalary = res.data;
       }

vue.config.js

@@ -36,6 +36,16 @@ module.exports = {
   assetsDir: 'static',
   lintOnSave: false,
   productionSourceMap: false,
+  // 以下是pwa配置
+  pwa: {
+    iconPaths: {
+      favicon32: 'favicon1.ico',
+      favicon16: 'favicon1.ico',
+      appleTouchIcon: 'favicon1.ico',
+      maskIcon: 'favicon1.ico',
+      msTileImage: 'favicon1.ico'
+    }
+  },
   devServer: {
     // port: port,
     open: true,