Merge branch 'tmp_meeting_needs' into test

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/activeProgram/index.vue

@@ -4,7 +4,7 @@
             <van-cell v-for="(item, index) in dataList" :key="index"
                 :title="item.activityName"
                 title-class="titleStyle"
-                :value="item.studentNum"
+                :value="item.studentNum+'人'"
                 value-class="valueStyle"
                 class="activeItem" is-link
                 @click="onDetail(item)" />

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 {
@@ -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 = [];