Merge branch 'tmp_meeting_needs'

src/views/activeProgram/activeDetail.vue

@@ -25,7 +25,7 @@
                 <van-col span="8" v-if="vipGroup.courseType == 'VIP'">课程形式</van-col>
                 <van-col span="16" v-if="vipGroup.courseType == 'VIP'">{{ vipGroup.vipGroupCategoryNames }}&nbsp;</van-col>
                 <van-col span="8">上课模式</van-col>
-                <van-col span="16" v-if="vipGroup.giveCourseType == 'PRACTICE'">线上&nbsp;</van-col>
+                <van-col span="16" v-if="vipGroup.courseType == 'PRACTICE'">线上&nbsp;</van-col>
                 <van-col span="16" v-else>{{ vipGroup.giveTeachMode | formatTeachModel }}&nbsp;</van-col>
                 <van-col span="8">单课时时长</van-col>
                 <van-col span="16">{{ vipGroup.singleCourseTime }}分钟</van-col>

src/views/applyActive/components/theoryCourse.vue

@@ -282,7 +282,7 @@ export default {
                 onlineClassesNum: 10,
                 offlineClassesNum: 0,
                 subjectIdList: null,
-                vipGroupActivityId: 0
+                vipGroupActivityId: null
             },
             formName: {
                 vipGroupCategoryName: null,

src/views/teacher/VIP00Apply.vue

@@ -789,7 +789,7 @@ export default {
                   : null); // 报名结束时间
               tempArr.push(item);
             });
-            this.loadData.vipGroupActivity = tempArr;
+            this.loadData.vipGroupActivity = tempArr; 
             sheetForm.columns = tempArr;
             sheetForm.loading = false;
           } else {
@@ -860,7 +860,7 @@ export default {
         form.subjectIdList = value.value;
         formName.subjectListName = value.text;
         formName.subjectListIndex = index;
-        loadData.subjectListSelect = value;
+        loadData.subjectListSelect = valofflineTeacherSalaryue;
       } else if (sheetForm.currentType == "vipGroupCategory") {
         // 课程形式赋值
         if (loadData.vipGroupCategorySelect.id != value.id) {
@@ -877,7 +877,7 @@ export default {
         // this.onlineUnitPrice = Math.ceil(value.onlineClassesUnitPrice)
         form.offlineClassesUnitPrice = value.offlineClassesUnitPrice//Math.ceil(value.offlineClassesUnitPrice);
         // this.offLineUnitPrice = Math.ceil(value.offlineClassesUnitPrice)
-
+        form.offlineTeacherSalary = value.offlineTeacherSalary
         // 每课时长赋值
         form.singleClassMinutes = null;
         loadData.classTimer = [];

src/views/teacher/VIPApply.vue

@@ -1,5 +1,5 @@
 <template>
-	<!-- <van-tabs v-model="active" swipe-threshold="3" sticky class="vanTabs" @change="onChange" color="#01C1B5"> 
+	 <van-tabs v-model="active" swipe-threshold="3" sticky class="vanTabs" @change="onChange" color="#01C1B5"> 
 		<van-tab title="VIP申请" :name="1">
 			<vip-00-apply v-if="active === 1" />
 		</van-tab>
@@ -12,21 +12,21 @@
 		<van-tab title="考级乐理排课" :name="4">
 			<theory-course v-if="active === 4" />
 		</van-tab>
-	</van-tabs> -->
-	<vip-00-apply />
+	</van-tabs> 
+	<!-- <vip-00-apply /> -->
 </template>
 
 <script>
 import vip00Apply from './VIP00Apply'
-// import vip11Apply from './VIP11Apply'
-// import VipCourse from "../applyActive/components/vipCourse";
-// import TheoryCourse from "../applyActive/components/theoryCourse";
+import vip11Apply from './VIP11Apply'
+import VipCourse from "../applyActive/components/vipCourse";
+import TheoryCourse from "../applyActive/components/theoryCourse";
 export default {
 	components: {
 		vip00Apply,
-		// vip11Apply,
-		// VipCourse,
-		// TheoryCourse
+		vip11Apply,
+		VipCourse,
+		TheoryCourse
 	},
 	data() {
 		return {
@@ -42,17 +42,17 @@ export default {
 		document.title = '课程申请'
 	},
 	methods: {
-		// onChange(value) {
-		// 	if(value == 1) {
-		// 		document.title = 'VIP课程申请'
-		// 	} else if(value == 2) {
-		// 		document.title = '双十一排课'
-		// 	} else if(value == 3) {
-		// 		document.title = '考级VIP排课'
-		// 	} else if(value == 4) {
-		// 		document.title = '考级乐理排课'
-		// 	}
-		// }
+		onChange(value) {
+			if(value == 1) {
+				document.title = 'VIP课程申请'
+			} else if(value == 2) {
+				document.title = '双十一排课'
+			} else if(value == 3) {
+				document.title = '考级VIP排课'
+			} else if(value == 4) {
+				document.title = '考级乐理排课'
+			}
+		}
 	}
 }
 </script>