Merge branch 'online' into wxl

dist/static/css/chunk-9534be22.e68102d4.css → dist/static/css/chunk-a6baf504.87ac0c57.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-e9cd7f4c]{font-size:14px}.btnList[data-v-e9cd7f4c]{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-e9cd7f4c]{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-2ef3692a]{font-size:14px}.btnList[data-v-2ef3692a]{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-2ef3692a]{margin-right:15px}

src/App.vue

@@ -273,4 +273,21 @@ input[type="number"] {
     background-color: #777;
   }
 }
+::-webkit-scrollbar {
+  width: 5px; /* 纵向滚动条*/
+  height: 5px; /* 横向滚动条 */
+  background-color: #fff;
+}
+
+/*定义滚动条轨道 内阴影*/
+::-webkit-scrollbar-track {
+  -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0);
+  background-color: #fff;
+}
+
+/*定义滑块 内阴影*/
+::-webkit-scrollbar-thumb {
+  -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0);
+  background-color: #d5d5d5;
+}
 </style>

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/teamDetail/components/baseInfo.vue

@@ -159,6 +159,8 @@ export default {
       }
     }
     .right {
+      height: 40vh;
+      overflow: scroll;
       ul {
         li {
           list-style: none;
@@ -167,6 +169,9 @@ export default {
           color: #aaa;
         }
       }
+      &::-webkit-scrollbar {
+        display: none;
+      }
     }
   }
   .baseBottom {

src/views/teamDetail/teamList.vue

@@ -79,6 +79,7 @@
           </el-table-column>
 
           <el-table-column prop="id"
+                           width="100"
                            align='center'
                            label="乐团编号">
           </el-table-column>
@@ -127,6 +128,7 @@
                            label="当前课时">
           </el-table-column> -->
           <el-table-column prop="createTime"
+                           width='100px'
                            align='center'
                            label="申请时间">
             <template slot-scope="scope">
@@ -136,6 +138,7 @@
             </template>
           </el-table-column>
           <el-table-column align='center'
+                           width='100px'
                            label="成团时间">
             <template slot-scope="scope">
               <div>

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"