1

1

dist/static/css/chunk-0e668819.7768ea34.css

@@ -1 +0,0 @@
-.vipwrap[data-v-a043b310]{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}.vipwrap .newBand[data-v-a043b310]{margin-right:20px}.resetClassForm[data-v-a043b310] .el-date-editor.el-input,.resetClassForm[data-v-a043b310] .el-date-editor.el-input__inner{width:180px!important}.countWrap[data-v-a043b310] .el-date-editor.el-input,.countWrap[data-v-a043b310] .el-date-editor.el-input__inner{width:100px!important}.maskForm[data-v-a043b310] .el-input{width:220px!important}.titlewrap[data-v-a043b310]{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}

dist/static/css/chunk-6d44028a.0c377e44.css

@@ -0,0 +1 @@
+.vipwrap[data-v-1d7dc4eb]{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}.vipwrap .newBand[data-v-1d7dc4eb]{margin-right:20px}.resetClassForm[data-v-1d7dc4eb] .el-date-editor.el-input,.resetClassForm[data-v-1d7dc4eb] .el-date-editor.el-input__inner{width:180px!important}.countWrap[data-v-1d7dc4eb] .el-date-editor.el-input,.countWrap[data-v-1d7dc4eb] .el-date-editor.el-input__inner{width:100px!important}.maskForm[data-v-1d7dc4eb] .el-input{width:220px!important}.titlewrap[data-v-1d7dc4eb]{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}

src/layout/components/Sidebar/SidebarItem.vue

@@ -128,6 +128,16 @@ export default {
       // When there is only one child router, the child router is displayed by default
 
       if (showingChildren.length === 1) {
+        let filterRouter = ['/commentManagerWrap', 'teamMananger', '/vipManager', '/accompanyManager']
+        let tempOnlyChild = this.onlyOneChild
+        // 如果包含上面几个菜单，并且只有一个
+        if(filterRouter.includes(tempOnlyChild.path) && tempOnlyChild.children.length == 1) {
+          let child = tempOnlyChild.children[0]
+          if(!this.checkPathUrl(child.path)) {
+            child.path = tempOnlyChild.path + '/' + child.path
+          }
+          this.onlyOneChild = child
+        }
         return true;
       }
 
@@ -139,6 +149,9 @@ export default {
 
       return false;
     },
+    checkPathUrl(path) {
+      return path.indexOf('/') === 0 ? true : false
+    },
     resolvePath(routePath) {
       if (isExternal(routePath)) {
         return routePath;

src/views/teamDetail/components/studentList.vue

@@ -351,7 +351,7 @@
                   scope.row.studentStatus != 'QUIT'
                 "
                 @click="quieTeamMask(scope.row)"
-                >退团</el-button
+                >退团退费</el-button
               >
               <el-button
                 type="text"
@@ -360,7 +360,7 @@
                   scope.row.studentStatus != 'QUIT'
                 "
                 @click="quieTeam(scope.row)"
-                >退团不退费</el-button
+                >退团</el-button
               >
 
               <el-button

src/views/teamDetail/teamList.vue

@@ -413,6 +413,9 @@ export default {
     if (query.organId) {
       this.topForm.orgin = query.organId;
     }
+    if (query.search) {
+      this.topForm.teamName = query.search;
+    }
     this.init();
   },
   activated() {

src/views/vipClass/vipReset.vue

@@ -18,8 +18,8 @@
            v-permission="'vipGroupManage/updateVipBaseInfo'"
            @click="addrVisible = true">修改教学点</div>
       <div class="newBand"
-           v-permission="{parent:'/vipReset',child:'employee/findEducationUsers'}"
-           @click="educationalVisible = true">课程信息</div>
+           v-permission="'vipGroupManage/updateVipBaseInfo/courseClass'"
+           @click="educationalVisible = true">课程组信息修改</div>
       <!-- <div class="newBand"
            v-permission="'vipGroupManage/update'"
            @click="expireVisible = true">有效期调整</div>  -->
@@ -99,17 +99,14 @@
           <template slot-scope="scope">
             <div>
               <el-button type="text"
-                         v-permission="{parent:'/vipReset',child:'courseSchedule/classStartDateAdjust'}"
-                         v-if="!scope.row.isSettlement"
+                         v-if="!scope.row.isSettlement && $helpers.permission('courseSchedule/classStartDateAdjust/vipReset')"
                          @click="resetClass(scope.row)">调整</el-button>
               <el-button type="text"
-                         v-permission="{parent:'/vipReset',child:'courseSchedule/batchDelete'}"
-                         v-if="!scope.row.isSettlement&&scope.row.status != 'OVER'"
+                         v-if="!scope.row.isSettlement&&scope.row.status != 'OVER' && $helpers.permission('courseSchedule/batchDelete')"
                          @click="removeClass(scope.row)">删除</el-button>
               <!--   -->
               <el-button type="text"
-                         v-permission="{parent:'/vipReset',child:'vip/cleanAttendance'}"
-                         v-if="!scope.row.isSettlement"
+                         v-if="!scope.row.isSettlement && $helpers.permission('vip/cleanAttendance')"
                          @click="clearAttend(scope.row)">清除考勤</el-button>
             </div>
           </template>