lex-xin 3 gadi atpakaļ
vecāks
revīzija
031412a467

+ 56 - 58
src/views/activeProgram/activeDetail.vue

@@ -17,64 +17,62 @@
             <van-col span="14">{{ vipGroup.payToBalance ? '是' : '否' }}</van-col>
         </van-row>
 
-        <template v-if="vipGroup.courseType == 'VIP' && vipDetail.vipNum || vipGroup.courseType == 'PRACTICE' && vipDetail.practiceNum">
-            <h2 class="van-block__title">付费课程</h2>
-            <div class="active-row">
-                <van-row>
-                    <van-col span="8">课程类型</van-col>
-                    <van-col span="16">{{ vipGroup.courseType | coursesType }}&nbsp;</van-col>
-                    <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">{{ vipGroup.teachMode | formatTeachModel }}&nbsp;</van-col>
-                    <van-col span="8">单课时时长</van-col>
-                    <van-col span="16">{{ vipGroup.singleCourseTime }}分钟</van-col>
-                    <van-col span="8">课时数</van-col>
-                    <van-col span="16">{{ vipGroup.avgCourseNum }}&nbsp;</van-col>
-                </van-row>
-                <van-cell is-link class="teaching">
-                    <template #title>
-                        剩余 <span style="color: #01C1B5">
-                            {{vipGroup.courseType == 'VIP' ? vipDetail.vipNum : null}}
-                            {{vipGroup.courseType == 'PRACTICE' ? vipDetail.practiceNum : null}}
-                        </span> 名学员未排课
-                    </template>
-                    <template #default>
-                        <span style="color: #01C1B5" @click="onProgram('pay')">立即排课</span>
-                    </template>
-                </van-cell>
-            </div>
-        </template>
+        <h2 class="van-block__title">付费课程</h2>
+        <div class="active-row">
+            <van-row>
+                <van-col span="8">课程类型</van-col>
+                <van-col span="16">{{ vipGroup.courseType | coursesType }}&nbsp;</van-col>
+                <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">{{ vipGroup.teachMode | formatTeachModel }}&nbsp;</van-col>
+                <van-col span="8">单课时时长</van-col>
+                <van-col span="16">{{ vipGroup.singleCourseTime }}分钟</van-col>
+                <van-col span="8">课时数</van-col>
+                <van-col span="16">{{ vipGroup.avgCourseNum }}&nbsp;</van-col>
+            </van-row>
+            <van-cell is-link class="teaching" :clickable="false">
+                <template #title>
+                    剩余 <span style="color: #01C1B5">
+                        {{vipGroup.courseType == 'VIP' ? vipDetail.vipNum : null}}
+                        {{vipGroup.courseType == 'PRACTICE' ? vipDetail.practiceNum : null}}
+                    </span> 名学员未排课
+                </template>
+                <template #default>
+                    <span  v-if="vipGroup.courseType == 'VIP' && vipDetail.vipNum || vipGroup.courseType == 'PRACTICE' && vipDetail.practiceNum" style="color: #01C1B5" @click="onProgram('pay')">立即排课</span>
+                    <span v-else style="color: #c0c0c0">立即排课</span>
+                </template>
+            </van-cell>
+        </div>
 
         <!-- 赠送课程类型,只有VIP和网管课的时候才有赠送课程 -->
-        <template v-if="vipGroup.giveCourseType == 'VIP' && vipDetail.giveVipNum || vipGroup.giveCourseType == 'PRACTICE' && vipDetail.givePracticeNum">
-            <h2 class="van-block__title">赠送课程</h2>
-            <div class="active-row">
-                <van-row>
-                    <van-col span="8">课程类型</van-col>
-                    <van-col span="16">{{ vipGroup.giveCourseType | coursesType }}&nbsp;</van-col>
-                    <van-col span="8" v-if="vipGroup.giveCourseType == 'VIP'">课程形式</van-col>
-                    <van-col span="16" v-if="vipGroup.giveCourseType == 'VIP'">{{ vipGroup.giveCategoryName }}&nbsp;</van-col>
-                    <van-col span="8">上课模式</van-col>
-                    <van-col span="16">{{ vipGroup.giveTeachMode | formatTeachModel }}&nbsp;</van-col>
-                    <van-col span="8">单课时时长</van-col>
-                    <van-col span="16">{{ vipGroup.giveSingleCourseTime }}分钟</van-col>
-                    <van-col span="8">课时数</van-col>
-                    <van-col span="16">{{ vipGroup.giveCourseNum }}课时</van-col>
-                </van-row>
-                <van-cell is-link class="teaching">
-                    <template #title>
-                        剩余 <span style="color: #01C1B5">
-                            {{vipGroup.giveCourseType == 'VIP' ? vipDetail.giveVipNum : null}}
-                            {{vipGroup.giveCourseType == 'PRACTICE' ? vipDetail.givePracticeNum : null}}
-                        </span> 名学员未排课
-                    </template>
-                    <template #default>
-                        <span style="color: #01C1B5" @click="onProgram('give')">立即排课</span>
-                    </template>
-                </van-cell>
-            </div>
-        </template>
+        <h2 class="van-block__title">赠送课程</h2>
+        <div class="active-row">
+            <van-row>
+                <van-col span="8">课程类型</van-col>
+                <van-col span="16">{{ vipGroup.giveCourseType | coursesType }}&nbsp;</van-col>
+                <van-col span="8" v-if="vipGroup.giveCourseType == 'VIP'">课程形式</van-col>
+                <van-col span="16" v-if="vipGroup.giveCourseType == 'VIP'">{{ vipGroup.giveCategoryName }}&nbsp;</van-col>
+                <van-col span="8">上课模式</van-col>
+                <van-col span="16">{{ vipGroup.giveTeachMode | formatTeachModel }}&nbsp;</van-col>
+                <van-col span="8">单课时时长</van-col>
+                <van-col span="16">{{ vipGroup.giveSingleCourseTime }}分钟</van-col>
+                <van-col span="8">课时数</van-col>
+                <van-col span="16">{{ vipGroup.giveCourseNum }}课时</van-col>
+            </van-row>
+            <van-cell is-link class="teaching" :clickable="false">
+                <template #title>
+                    剩余 <span style="color: #01C1B5">
+                        {{vipGroup.giveCourseType == 'VIP' ? vipDetail.giveVipNum : null}}
+                        {{vipGroup.giveCourseType == 'PRACTICE' ? vipDetail.givePracticeNum : null}}
+                    </span> 名学员未排课
+                </template>
+                <template #default>
+                    <span v-if="vipGroup.giveCourseType == 'VIP' && vipDetail.giveVipNum || vipGroup.giveCourseType == 'PRACTICE' && vipDetail.givePracticeNum" style="color: #01C1B5" @click="onProgram('give')">立即排课</span>
+                    <span v-else style="color: #c0c0c0">立即排课</span>
+                </template>
+            </van-cell>
+        </div>
 
         <m-empty v-if="!vipDetail.giveVipNum && !vipDetail.givePracticeNum && !vipDetail.vipNum && !vipDetail.practiceNum" msg="暂无排课内容" />
     </div>
@@ -196,8 +194,8 @@ export default {
         font-weight: 500;
     }
     .teaching {
-        margin-top: 1px;
-        padding: .2rem 0 0;
+        margin-top: .2rem;
+        padding: 0;
         font-size: .16rem;
         color: #1A1A1A;
     }

+ 4 - 4
src/views/activeProgram/modal/studentList.vue

@@ -111,10 +111,10 @@ export default {
     },
     methods: {
         // 搜索
-        onSearch() {
-            this.dataList = [];
-            this.getStudent();
-        },
+        // onSearch() {
+        //     this.dataList = [];
+        //     this.getStudent();
+        // },
         async getStudent() {
             let params = this.params;
             try {

+ 4 - 3
src/views/teacher/VIP00Apply.vue

@@ -902,10 +902,10 @@ export default {
 
         // 换活动之后单价重置
         form.onlineClassesUnitPrice = Math.ceil(
-          loadData.vipGroupCategorySelect.onlineClassesUnitPrice
+          loadData.vipGroupCategorySelect.onlineClassesUnitPrice || 0
         );
         form.offlineClassesUnitPrice = Math.ceil(
-          loadData.vipGroupCategorySelect.offlineClassesUnitPrice
+          loadData.vipGroupCategorySelect.offlineClassesUnitPrice || 0
         );
 
         form.singleClassMinutes = value.singleCourseTime
@@ -1530,7 +1530,8 @@ export default {
         }
       }
 
-      if(form.offlineClassesNums + form.onlineClassesNums <= 0) {
+      // 判断课时总数
+      if(form.totalClassTime <= 0) {
         this.$toast('请输入线上/线下课次数')
         return false;
       }