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

dist/static/css/chunk-0686e72e.0485204a.css → dist/static/css/chunk-12d1c276.14b08d39.css

@@ -1 +1 @@
-.m-core[data-v-57b31322]{margin-top:30px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-ms-flex-pack:distribute;justify-content:space-around}.m-core .el-input[data-v-57b31322]{width:180px}.m-core h4[data-v-57b31322]{font-size:16px;background-color:#ccc;color:#fff;text-align:center;width:100%;height:40px;line-height:40px;margin-bottom:20px}.m-core .center[data-v-57b31322],.m-core .right[data-v-57b31322],.m-core .vipLeft[data-v-57b31322]{width:400px}.planList[data-v-57b31322]{padding:0 25px}.planList .planTop[data-v-57b31322]{height:40px;line-height:40px;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:justify;-ms-flex-pack:justify;justify-content:space-between;border-bottom:1px solid #ccc;margin-top:20px}.planList .planTop>p[data-v-57b31322]{font-size:14px}.planList .planCore .row[data-v-57b31322]{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:justify;-ms-flex-pack:justify;justify-content:space-between;-ms-flex-wrap:nowrap;flex-wrap:nowrap;height:40px;line-height:40px;font-size:14px;text-align:center}.planList .planCore .row div[data-v-57b31322]{width:87px}.okBtn[data-v-57b31322]{width:120px;height:40px;line-height:40px;text-align:center;color:#fff;border-radius:4px;margin-right:20px;cursor:pointer;background-color:#f97215;float:right}
+.m-core[data-v-69da3f96]{margin-top:30px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-ms-flex-pack:distribute;justify-content:space-around}.m-core .el-input[data-v-69da3f96]{width:180px}.m-core h4[data-v-69da3f96]{font-size:16px;background-color:#ccc;color:#fff;text-align:center;width:100%;height:40px;line-height:40px;margin-bottom:20px}.m-core .center[data-v-69da3f96],.m-core .right[data-v-69da3f96],.m-core .vipLeft[data-v-69da3f96]{width:400px}.planList[data-v-69da3f96]{padding:0 25px}.planList .planTop[data-v-69da3f96]{height:40px;line-height:40px;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:justify;-ms-flex-pack:justify;justify-content:space-between;border-bottom:1px solid #ccc;margin-top:20px}.planList .planTop>p[data-v-69da3f96]{font-size:14px}.planList .planCore .row[data-v-69da3f96]{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:justify;-ms-flex-pack:justify;justify-content:space-between;-ms-flex-wrap:nowrap;flex-wrap:nowrap;height:40px;line-height:40px;font-size:14px;text-align:center}.planList .planCore .row div[data-v-69da3f96]{width:87px}.okBtn[data-v-69da3f96]{width:120px;height:40px;line-height:40px;text-align:center;color:#fff;border-radius:4px;margin-right:20px;cursor:pointer;background-color:#f97215;float:right}

src/views/buildVip/index.vue

@@ -645,8 +645,8 @@ export default {
     chioseActive (val) {
       this.rightForm.offlineCourse = '';
       this.rightForm.onlineCourse = '';
-      this.rightForm.onlinePrice = '';
-      this.rightForm.offlinePrice = '';
+      // this.rightForm.onlinePrice = '';
+      // this.rightForm.offlinePrice = '';
       this.lookList = []
       this.timeTable = []
       this.attribute1 = '';

src/views/businessManager/orderManager/income.vue

@@ -100,8 +100,10 @@
                            label="实付金额">
           </el-table-column>
           <el-table-column align='center'
-                           prop="user.username"
                            label="学员姓名">
+            <template slot-scope="scope">
+              {{ scope.row.user.username }}<span v-if="scope.row.user.username && scope.row.user.phone">/</span>{{ scope.row.user.phone }}
+            </template>
           </el-table-column>
           <el-table-column align='center'
                            prop="paymentChannel"

src/views/businessManager/orderManager/incomeOne.vue

@@ -104,8 +104,10 @@
                            label="实付金额">
           </el-table-column>
           <el-table-column align='center'
-                           prop="user.username"
                            label="学员姓名">
+            <template slot-scope="scope">
+              {{ scope.row.user.username }}<span v-if="scope.row.user.username && scope.row.user.phone">/</span>{{ scope.row.user.phone }}
+            </template>
           </el-table-column>
           <el-table-column align='center'
                            prop="paymentChannel"

src/views/businessManager/orderManager/incomeTwo.vue

@@ -104,8 +104,10 @@
                            label="实付金额">
           </el-table-column>
           <el-table-column align='center'
-                           prop="user.username"
                            label="学员姓名">
+            <template slot-scope="scope">
+              {{ scope.row.user.username }}<span v-if="scope.row.user.username && scope.row.user.phone">/</span>{{ scope.row.user.phone }}
+            </template>
           </el-table-column>
           <el-table-column align='center'
                            prop="paymentChannel"

src/views/teamDetail/components/studentList.vue

@@ -17,9 +17,9 @@
         <div class="newStudent"
              style="margin-bottom:10px;"
              @click="addStudentVisible = true">新增学员</div>
-        <!-- <div class="newStudent"
+        <div class="newStudent"
              style="margin-bottom:10px;"
-             @click="onCreateQRCode">报名连接</div> -->
+             @click="onCreateQRCode">报名连接</div>
         <div class="newStudent"
              @click='gotoSignin'>点名总览</div>
       </div>
@@ -355,10 +355,10 @@
             </el-date-picker>
           </el-col>
         </el-form-item>
-        <el-form-item label="声部费用"
+        <el-form-item label="课程费用"
                       prop="courseFee">
           <el-input v-model="maskForm.courseFee"
-                    placeholder="请输入声部费用"></el-input>
+                    placeholder="续费金额"></el-input>
         </el-form-item>
         <br>
         <el-form-item label="单技班">
@@ -404,13 +404,13 @@
           </el-select>
         </el-form-item>
 
-        <el-divider>订单信息</el-divider>
+        <el-divider>首缴订单信息</el-divider>
         <el-form-item label="课程费用"
                       prop="temporaryCourseFee">
           <el-input type='number'
                     @mousewheel.native.prevent
                     v-model="maskForm.temporaryCourseFee"
-                    placeholder="本次课程费用"></el-input>
+                    placeholder="首缴课程金额"></el-input>
         </el-form-item>
 
         <el-form-item label="乐器"

src/views/teamDetail/teamCourseList.vue

@@ -39,20 +39,7 @@
                     clearable
                     filterable
                     placeholder="课程类型">
-            <el-option label="基础技能课"
-                      value="HIGH"></el-option>
-            <el-option label="综合课"
-                      value="COMPREHENSIVE"></el-option>
-            <el-option label="课堂课"
-                      value="CLASSROOM"></el-option>
-            <el-option label="合奏课"
-                      value="MIX"></el-option>
-            <el-option label="集训合奏课"
-                      value="TRAINING_MIX"></el-option>
-            <el-option label="集训单技课"
-                      value="TRAINING_SINGLE"></el-option>
-            <el-option label="单技课"
-                      value="SINGLE"></el-option>
+            <el-option v-for="(item, index) in courseType" :key="index" :value="item.value" :label="item.label"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item>
@@ -183,6 +170,7 @@
 <script>
 import pagination from '@/components/Pagination/index'
 import { getTeacher, getMusicGroupAllClass, superFindCourseSchedules, getEmployeeOrgan } from '@/api/buildTeam'
+import { courseType } from '@/utils/searchArray'
 let nowTime = new Date()
 nowTime = nowTime.getFullYear() + '-' + (nowTime.getMonth() + 1) + '-' + nowTime.getDate()
 export default {
@@ -190,6 +178,7 @@ export default {
     return {
       timerVisible: false,
       courseVisible: false,
+      courseType: courseType,
       searchForm: {
         organIdList: null,
         courseStatus: null,