2

src/components/course/mateitem.vue

@@ -11,6 +11,7 @@
             <span v-if="subItem.TimeStr==='下午'" class="commonTimeStr blueTime">{{subItem.TimeStr}}</span>
             <span v-if="subItem.TimeStr==='晚上'" class="commonTimeStr orangeTime">{{subItem.TimeStr}}</span>
             <span v-if="subItem.ClassType==2">试听课</span>
+            <span v-if="subItem.ClassType==3">预约课</span>
             <span style="color:red;margin:0 5px;">{{subItem.TeacherName}}</span>
             <span>[{{subItem.RoomName}}]</span>
           </div>

src/pages/studyAbroad/subscribe.vue

@@ -160,7 +160,7 @@
                 :key="__index"
                 class="my-event justify-center ellipsis courseItem"
                 :class="badgeClasses(__item, 'body', _item.TeacherId)"
-                style="overflow:hidden"
+                style="overflow:hidden;border:1px solid #999"
                 :style="
                   badgeStyles(
                     __item,
@@ -191,7 +191,7 @@
                         <span class="detailLabel">教室：</span
                         >{{ __item.RoomName }}
                       </div>
-                      <div class="flex no-wrap">
+                      <div class="flex no-wrap" v-if="__item.ClassType !== 2">
                         <span class="detailLabel">进度：</span
                         ><span
                           >{{ __item.Ranks }}/{{ __item.TotalPlanNum }}</span
@@ -222,13 +222,14 @@
                         >
                       </div>
 
-                      <div class="flex no-wrap">
+                      <div class="flex no-wrap" v-if="__item.ClassType !== 2">
                         <span class="detailLabel">进度：</span
                         ><span
                           >{{ __item.Ranks }}/{{ __item.TotalPlanNum }}</span
                         >
+                        <span class="q-ml-sm">{{__item.CourseGradeName}}</span>
                       </div>
-                      <div class="flex no-wrap">
+                      <div class="flex no-wrap" v-if="__item.ClassType !== 2">
                         <span class="detailLabel">学员：</span
                         ><span>{{
                           __item.GuestList.map(e => e.GuestName).toString()
@@ -258,11 +259,10 @@
                         <span class="">最小成班人数：</span
                         ><span>{{ __item.ScrollMinNum }}</span>
                       </div>
-                      <div class="flex no-wrap" v-if="__item.ClassType == 3">
+                      <!-- <div class="flex no-wrap" v-if="__item.ClassType == 3">
                         <span class="">最大成班人数：</span
                         ><span>{{ __item.ScrollMaxNum }}</span>
-                      </div>
-                      <div></div>
+                      </div> -->
                     </div>
                   </div>
                   <div style="position:relative">
@@ -287,9 +287,10 @@
                       <span class="detailLabel">时间：</span
                       ><span>{{ __item.StartTime }}-{{ __item.EndTime }}</span>
                     </div>
-                    <div class="flex no-wrap">
+                    <div class="flex no-wrap" v-if="__item.ClassType !== 2">
                       <span class="detailLabel">进度</span
                       ><span>{{ __item.Ranks }}/{{ __item.TotalPlanNum }}</span>
+                      <span class="q-ml-sm">{{__item.CourseGradeName}}</span>
                     </div>
                     <div class="flex no-wrap">
                       <span class="detailLabel">
@@ -300,7 +301,7 @@
                       >
                     </div>
 
-                    <div class="flex no-wrap">
+                    <div class="flex no-wrap" v-if="__item.ClassType !== 2">
                       <span class="detailLabel">学员：</span
                       ><span>{{
                         __item.GuestList.map(e => e.GuestName).toString()
@@ -326,11 +327,10 @@
                       <span class="">最小成班人数：</span
                       ><span>{{ __item.ScrollMinNum }}</span>
                     </div>
-                    <div class="flex no-wrap" v-if="__item.ClassType == 3">
+                    <!-- <div class="flex no-wrap" v-if="__item.ClassType == 3">
                       <span class="">最大成班人数：</span
                       ><span>{{ __item.ScrollMaxNum }}</span>
-                    </div>
-                    <div></div>
+                    </div> -->
                   </div>
                 </el-popover>
               </div>