合并

dist/static/css/chunk-21eba102.fc1eae64.css

@@ -1 +1,5 @@
-.newBand[data-v-78374f6c]{display:inline-block}[data-v-78374f6c] .el-input-number.is-controls-right .el-input__inner{text-align:left}.setWidth[data-v-78374f6c]{display:inline-block}.lookTitle[data-v-78374f6c]{height:40px;line-height:40px;font-weight:700;background-color:#edeef0;padding:0 20px;margin-bottom:20px}.showShop[data-v-78374f6c]{height:40px;line-height:40px;width:150px;background-color:#f5f7fa;border-color:#e4e7ed;color:#c0c4cc;cursor:not-allowed;color:#333;opacity:1;border-radius:4px;border:1px solid #dcdfe6;padding:0 15px;margin-right:10px}.shopListWrap[data-v-78374f6c]{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}
+<<<<<<< HEAD:dist/static/css/chunk-21eba102.fc1eae64.css
+.newBand[data-v-78374f6c]{display:inline-block}[data-v-78374f6c] .el-input-number.is-controls-right .el-input__inner{text-align:left}.setWidth[data-v-78374f6c]{display:inline-block}.lookTitle[data-v-78374f6c]{height:40px;line-height:40px;font-weight:700;background-color:#edeef0;padding:0 20px;margin-bottom:20px}.showShop[data-v-78374f6c]{height:40px;line-height:40px;width:150px;background-color:#f5f7fa;border-color:#e4e7ed;color:#c0c4cc;cursor:not-allowed;color:#333;opacity:1;border-radius:4px;border:1px solid #dcdfe6;padding:0 15px;margin-right:10px}.shopListWrap[data-v-78374f6c]{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}
+=======
+.newBand[data-v-6fcf95dc]{display:inline-block}[data-v-6fcf95dc] .el-input-number.is-controls-right .el-input__inner{text-align:left}.setWidth[data-v-6fcf95dc]{display:inline-block}.lookTitle[data-v-6fcf95dc]{height:40px;line-height:40px;font-weight:700;background-color:#edeef0;padding:0 20px;margin-bottom:20px}.showShop[data-v-6fcf95dc]{height:40px;line-height:40px;width:150px;background-color:#f5f7fa;border-color:#e4e7ed;color:#c0c4cc;cursor:not-allowed;color:#333;opacity:1;border-radius:4px;border:1px solid #dcdfe6;padding:0 15px;margin-right:10px}.shopListWrap[data-v-6fcf95dc]{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}
+>>>>>>> 03/12permission:dist/static/css/chunk-71b38ba0.bb27d388.css

dist/static/css/chunk-32168c97.6e5a5916.css

@@ -0,0 +1 @@
+.bannerImg[data-v-0e2497fc],.bannerImg[data-v-4a3f6e52],.bannerImg[data-v-6f9696a8],.bannerImg[data-v-51de1e78],.bannerImg[data-v-359145c4],.bannerImg[data-v-a17a2dde],.bannerImg[data-v-ac66114e],.bannerImg[data-v-c4af5972]{height:60px}

dist/static/css/chunk-6099455e.0849ad36.css

@@ -1 +0,0 @@
-.titlewrap[data-v-cfa6619a]{-webkit-box-align:center;-ms-flex-align:center;align-items:center}.titlewrap[data-v-cfa6619a],.wrap[data-v-cfa6619a]{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}.wrap div[data-v-cfa6619a]{margin-right:20px}.countWrap[data-v-cfa6619a] .el-date-editor.el-input,.countWrap[data-v-cfa6619a] .el-date-editor.el-input__inner{width:100px!important}

dist/static/css/chunk-71b38ba0.bb27d388.css

@@ -0,0 +1,5 @@
+<<<<<<< HEAD:dist/static/css/chunk-21eba102.fc1eae64.css
+.newBand[data-v-78374f6c]{display:inline-block}[data-v-78374f6c] .el-input-number.is-controls-right .el-input__inner{text-align:left}.setWidth[data-v-78374f6c]{display:inline-block}.lookTitle[data-v-78374f6c]{height:40px;line-height:40px;font-weight:700;background-color:#edeef0;padding:0 20px;margin-bottom:20px}.showShop[data-v-78374f6c]{height:40px;line-height:40px;width:150px;background-color:#f5f7fa;border-color:#e4e7ed;color:#c0c4cc;cursor:not-allowed;color:#333;opacity:1;border-radius:4px;border:1px solid #dcdfe6;padding:0 15px;margin-right:10px}.shopListWrap[data-v-78374f6c]{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}
+=======
+.newBand[data-v-6fcf95dc]{display:inline-block}[data-v-6fcf95dc] .el-input-number.is-controls-right .el-input__inner{text-align:left}.setWidth[data-v-6fcf95dc]{display:inline-block}.lookTitle[data-v-6fcf95dc]{height:40px;line-height:40px;font-weight:700;background-color:#edeef0;padding:0 20px;margin-bottom:20px}.showShop[data-v-6fcf95dc]{height:40px;line-height:40px;width:150px;background-color:#f5f7fa;border-color:#e4e7ed;color:#c0c4cc;cursor:not-allowed;color:#333;opacity:1;border-radius:4px;border:1px solid #dcdfe6;padding:0 15px;margin-right:10px}.shopListWrap[data-v-6fcf95dc]{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}
+>>>>>>> 03/12permission:dist/static/css/chunk-71b38ba0.bb27d388.css

dist/static/css/chunk-ddd54eae.dba11dd7.css

@@ -0,0 +1 @@
+.titlewrap[data-v-497bf14e]{-webkit-box-align:center;-ms-flex-align:center;align-items:center}.titlewrap[data-v-497bf14e],.wrap[data-v-497bf14e]{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}.wrap div[data-v-497bf14e]{margin-right:20px;max-width:inherit}.countWrap[data-v-497bf14e] .el-date-editor.el-input,.countWrap[data-v-497bf14e] .el-date-editor.el-input__inner{width:100px!important}

src/App.vue

@@ -142,7 +142,7 @@ input[type="number"] {
 }
 .newBand {
   min-width: 100px;
-  max-width: 130px;
+  max-width: 150px;
   padding: 0 10px;
   height: 36px;
   line-height: 36px;

src/api/buildTeam.js

@@ -2,14 +2,14 @@ import request from '@/utils/request'
 import request2 from '@/utils/request2'
 import qs from 'qs'
 let api = '/api-web'
-// 获取分部
-export function getSection (data) {
-  return request({
-    url: api + '/organization/queryPage',
-    method: 'get',
-    params: data
-  })
-}
+// // 获取分部
+// export function getSection (data) {
+//   return request({
+//     url: api + '/organization/queryPage',
+//     method: 'get',
+//     params: data
+//   })
+// }
 // 获取收费类型
 export function getType (data) {
   return request({
@@ -127,16 +127,6 @@ export function getStudentList (data) {
   })
 }
 
-// 分页查询收费类型
-export function getPayStatus (data) {
-  return request({
-    url: api + '/chargeType/queryPage',
-    method: 'get',
-    params: data
-
-  })
-}
-
 // 根据乐团id查询未分班的学生(根据多声部)
 export function getNoClassStudent (data) {
   return request({
@@ -160,7 +150,6 @@ export function createClass (data) {
     url: api + '/classGroup/create',
     method: 'post',
     data: data
-
   })
 }
 // 新增声部课班
@@ -1177,6 +1166,16 @@ export function updateCoursesExpireDate (data) {
   })
 }
 
+
+// 网管课有效期调整(不可调整已结束的)
+export function updateCoursesExpireDateOnlyNormal (data) {
+  return request({
+    url: api + '/courseSchedule/updateCoursesExpireDateOnlyNormal',
+    method: 'post',
+    data: qs.stringify(data)
+  })
+}
+
 // 新建缴费周期
 export function addMusicGroupPaymentCalender (data) {
   return request({
@@ -1559,4 +1558,11 @@ export function sendWaitRenewMessage(data) {
     data:data
   })
 }
-
+// 查询进行中乐团能否补招
+export function checkCanReg(data) {
+  return request2({
+    url: api + `/studentManage/checkCanReg`,
+    method: 'get',
+    params:data,
+  })
+}

src/api/contentManager.js

@@ -5,7 +5,7 @@ let api = '/api-cms'
 // 资讯列表分页查询
 export function newsList(data) {
     return request({
-        url: api + '/news/list',
+        url: api + '/news/queryPage',
         method: 'get',
         params: data
     })

src/components/Auth/index.md

@@ -15,4 +15,6 @@
 ```
 
 权限使用的是`localStorage`
+auths + mulit 是全部满足才通过，
+auths 只需要满足其中一个就可以
 

src/components/Auth/index.vue

@@ -71,8 +71,8 @@
 <style scoped lang="less">
   .auth {
     display: inline-block;
-    & + .auth {
-      margin-left: 10px;
-    }
+    // & + .auth {
+    //   margin-left: 10px;
+    // }
   }
 </style>