Merge branch 'LAO_MO' into online

src/views/login/index.vue

@@ -299,8 +299,8 @@ $light_gray: #eee;
 
   .login-form {
     position: relative;
-    width: 26%;
-    max-width: 100%;
+    width: 500px;
+    max-width: 90%;
     padding: 0px 35px;
     margin: 12% auto 0;
     overflow: hidden;

src/views/teamBuild/teamSeting/index.vue

@@ -7,7 +7,8 @@
                         :content="name">
         </el-page-header>
       </h2>
-      <!-- <div class="stepbox">
+      <div class="stepbox"
+           v-if="isOld">
         <span class='stepspan'
               @click="activeIndex=0">
           <div class="step1 sptep"
@@ -41,15 +42,16 @@
                class="
                arrow">
         </span>
-      </div> -->
+      </div>
     </div>
- <classSeting :teamid='id'
-                     :isSetSalary='isSetSalary'
-                     @gotoNav='gotoNav' />
+
     <!-- 下面显示的内容 -->
-    <!-- <div class="stepcontent">
+    <div class="stepcontent"
+         v-if="isOld">
       <div v-if='activeIndex==0'>
-       
+        <classSeting :teamid='id'
+                     :isSetSalary='isSetSalary'
+                     @gotoNav='gotoNav' />
       </div>
       <div v-if='activeIndex==1'>
         <teacherSeting :teamid='id'
@@ -72,7 +74,11 @@
         <salarySet :teamid='id'
                    :isSetSalary='isSetSalary' />
       </div>
-    </div> -->
+    </div>
+    <classSeting v-if="!isOld"
+                 :teamid='id'
+                 :isSetSalary='isSetSalary'
+                 @gotoNav='gotoNav' />
   </div>
 </template>
 <script>
@@ -82,7 +88,7 @@ import coursePlan from '@/views/teamBuild/teamSeting/components/coursePlan'
 import salarySet from '@/views/teamBuild/teamSeting/components/salarySet'
 import improvement from '@/views/teamBuild/teamSeting/components/improvementClass'
 import lookCourse from '@/views/teamBuild/teamSeting/components/lookCourse'
-import { getTeamBaseInfo, checkSetSalary } from '@/api/buildTeam'
+import { getTeamBaseInfo, checkSetSalary, getCourseSchedule } from '@/api/buildTeam'
 export default {
   name: 'teamSeting',
   components: {
@@ -105,11 +111,12 @@ export default {
       name: '',
       isSetSalary: false,
       Fsearch: null,
-      Frules: null
+      Frules: null,
+      isOld: false
     }
   },
   created () {
-    this.init()
+
   },
   activated () {
     this.init()
@@ -121,6 +128,7 @@ export default {
 
   mounted () {
     // 根据乐团id 获取乐团信息
+    this.init()
   },
   methods: {
     init () {
@@ -142,12 +150,24 @@ export default {
           sessionStorage.setItem('createTeamOrgnId', res.data.musicGroup.organId)
         }
       })
+
       // 获取是否设置课酬
       checkSetSalary({ musicGroupId: this.id }).then(res => {
         if (res.code == 200) {
           this.isSetSalary = res.data;
         }
       })
+
+      // 查询有没有课
+      getCourseSchedule({ musicGroupId: this.id }).then(res => {
+        if (res.code == 200) {
+          if (res.data && res.data.rows.length > 0) {
+            this.isOld = true
+          } else {
+            this.isOld = false
+          }
+        }
+      })
     },
     gotoNav (val) {
       this.activeIndex = val;