Merge branch 'LAO_MO' into online

src/permission.js

@@ -15,7 +15,8 @@ router.beforeEach(async (to, from, next) => {
   NProgress.start()
 
   // set page title
-  document.title = getPageTitle(to.meta.title)
+  // document.title = getPageTitle(to.meta.title)
+  document.title = getPageTitle()
 
   // determine whether the user has logged in
   const hasToken = getToken()

src/utils/get-page-title.js

@@ -1,8 +1,8 @@
 import defaultSettings from '@/settings'
 
-const title = defaultSettings.title || 'Vue Admin Template'
+const title = defaultSettings.title || '管乐迷后台管理系统'
 
-export default function getPageTitle(pageTitle) {
+export default function getPageTitle (pageTitle) {
   if (pageTitle) {
     return `${pageTitle} - ${title}`
   }

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

@@ -1,6 +1,7 @@
 <template>
   <div>
-    <div class="newBand" v-permission="'vipGroupManage/addVipGroupStudents'"
+    <div class="newBand"
+         v-permission="'vipGroupManage/addVipGroupStudents'"
          @click="addStudentList">新增学员</div>
     <div class="tableWrap">
       <el-table :data='tableList'
@@ -26,7 +27,7 @@
         </el-table-column>
         <el-table-column prop="courseSalary"
                          align="center"
-                         label="剩余费用"></el-table-column>
+                         label="课程余额"></el-table-column>
         <el-table-column prop="applyDate"
                          align="center"
                          label="报名时间">
@@ -69,7 +70,8 @@
                            slot="reference"
                            @click="lookFee(scope)">退学</el-button>
               </el-popover> -->
-              <el-button type="text" v-permission="'vipGroupManage/applyRefundForStudent'"
+              <el-button type="text"
+                         v-permission="'vipGroupManage/applyRefundForStudent'"
                          @click="lookFee(scope)">退学</el-button>
             </div>
           </template>
@@ -77,6 +79,7 @@
       </el-table>
     </div>
     <el-dialog title="学员列表"
+               width="70%"
                :visible.sync="maskVisible">
       <el-form :model="maskForm"
                :inline="true">
@@ -112,6 +115,8 @@
                          align="center"
                          label="手机号"
                          width="200"></el-table-column>
+        <el-table-column prop="courseSalary"
+                         label="课程余额"></el-table-column>
 
       </el-table>
       <pagination :total="rules.total"