bug修改

src/views/courseResources/courseDetails/index.vue

@@ -116,7 +116,6 @@
             <span v-if="courseDetails.lessonPrice === 0" style="color: #F96F21">￥0.00</span>
             {{ formatPrice(courseDetails.lessonPrice) }}
             <div v-if="courseDetails.lessonPrice !== 0 && courseDetails.lessonIsPay === 1 " class="priceLine" />
-            <span v-if="courseDetails.tryout === '1'" class="tryout_class">{{ '(试用中)' }}</span>
             <span
               v-if="userToken && $store.getters.roles[0].roleKey === 'unit_admin'
                 && courseDetails.lessonPrice !== 0 && courseDetails.tryout !== '1'"
@@ -131,7 +130,11 @@
               {{ '（未购买）' }}
             </span>
             <!--            登录&&不是免费&&没有购买，看看是不是试用-->
-            <span v-if="userToken && courseDetails.lessonPrice !== 0 && courseDetails.lessonIsPay === 0 && courseDetails.beginTrialTime" class="probationClass">(试用中)</span>
+            <span
+              v-if=" (userToken && courseDetails.lessonPrice !== 0 && courseDetails.lessonIsPay === 0 &&
+                courseDetails.beginTrialTime) || courseDetails.tryout === '1'"
+              class="probationClass"
+            >(试用中)</span>
             <!--            availableTrialTime表示剩余学习天数-->
             <span v-if="courseDetails.availableTrialTime && courseDetails.availableTrialTime > 0" class="availableTrialTime_class">还剩{{ courseDetails.availableTrialTime }}天到期</span>
             <span v-if="courseDetails.availableTrialTime && courseDetails.availableTrialTime === 0" class="availableTrialTime_class">如需继续学习，请联系管理员续期！</span>

src/views/learningCenter/components/Sidebar/index.vue

@@ -13,52 +13,52 @@
       class="user-menu"
     >
       <el-menu-item
-        index="purchased"
         v-if="roles[0].roleKey === 'unit_admin'"
+        index="purchased"
         @click.native="goPage('purchased')"
       >
         <span slot="title">已购课程</span>
       </el-menu-item>
       <el-menu-item
-        index="participants"
         v-if="roles[0].roleKey === 'unit_admin'"
+        index="participants"
         @click.native="goPage('participants')"
       >
         <span slot="title">学员管理</span>
       </el-menu-item>
       <el-menu-item
-        index="role"
         v-if="roles[0].roleKey === 'unit_admin'"
+        index="role"
         @click.native="goPage('role')"
       >
         <span slot="title">角色管理</span>
       </el-menu-item>
       <el-menu-item
-        index="group"
         v-if="roles[0].roleKey === 'unit_admin'"
+        index="group"
         @click.native="goPage('group')"
       >
         <span slot="title">小组管理</span>
       </el-menu-item>
 
       <el-menu-item
-        index="statistics"
         v-if="roles[0].roleKey === 'unit_admin'"
+        index="statistics"
         @click.native="goPage('statistics')"
       >
         <span slot="title">数据统计</span>
       </el-menu-item>
       <el-menu-item
-        index="my"
         v-if="roles[0].roleKey === 'unit_leader'"
+        index="my"
         @click.native="goPage('my')"
       >
         <!--  v-if="roles[0].roleKey === 'unit_leader'" -->
         <span slot="title">我的课程</span>
       </el-menu-item>
       <el-menu-item
-        index="myGroup"
         v-if="roles[0].roleKey === 'unit_leader'"
+        index="myGroup"
         @click.native="goPage('myGroup')"
       >
         <!--     v-if="roles[0].roleKey === 'unit_leader'"         -->
@@ -66,7 +66,7 @@
       </el-menu-item>
       <el-menu-item
         index="favorite"
-    
+
         @click.native="goPage('favorite')"
       >
         <span slot="title">我的收藏</span>

src/views/learningCenter/components/groupDialog.vue

@@ -14,13 +14,14 @@
       class="company-form"
       label-width="120px"
       label-position="top"
+      hide-required-asterisk
       :model="model"
       :rules="rules"
     >
-      <el-form-item label="小组名称" prop="name">
+      <el-form-item label="小组名称" prop="name" class="nameFormItem">
         <el-input
           v-model="model.name"
-          class="w-100"
+          class="company-formInput"
           placeholder="请输入"
         />
       </el-form-item>
@@ -29,7 +30,7 @@
           v-model="model.groupLeaderIdList"
           filterable
           multiple
-          class="w-100"
+          class="company-formInput"
           placeholder="请选择"
         >
           <el-option
@@ -200,6 +201,28 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
+.nameFormItem{
+  /deep/.el-form-item__label::after {
+    content: '*';
+    color: #FF0000;
+    margin-left: 4px;
+  }
+}
+.company-formInput{
+  width: 966px;
+}
+::v-deep .el-transfer__buttons{
+  padding: 0 15px;
+}
+::v-deep .el-checkbox{
+  display: block;
+}
+::v-deep .el-form--label-top .el-form-item__label{
+  padding: 0 0 5px 0!important;
+}
+.sub-form-box .sub-form-content{
+  margin-top: 9px!important;
+}
 /deep/.el-dialog__header{
   font-family: Source Han Sans CN, Source Han Sans CN-400;
 }