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

@@ -23,6 +23,8 @@
         </div>
       </div>
     </div>
+    <div class="courseResources-contentFather">
+      <div class="courseResources-contentBody">
       <div class="courseResources-content">
         <div>
           <div :title="'意见反馈'" class="suggestionCard" @click="handleToSuggestion">
@@ -44,50 +46,53 @@
           />
         </div>
       </div>
-    <div class="courseResources-contentTwo">
-      <div class="bannerTitle">
-        <span>专家团队</span>
-        <div />
-        <span>专家团队库50余人</span>
-      </div>
-      <div style="display: flex;width: 100%; justify-content: center">
-        <div class="expertTeam-content">
-          <div v-for="expert in expertTeamList" :key="expert.id" class="expert-card">
-            <div class="card-top">
-              <div class="expert-avatar">
-                <el-image
-                  class="img"
-                  :src="expert.avatarUrl || defaultAvatarUrl"
-                  fit="cover"
-                />
-              </div>
-              <div class="expert-info">
-                <div class="expert-name">{{ expert.name }}</div>
-                <div class="expert-position">{{ expert.position }}</div>
-              </div>
-            </div>
-            <div class="card-bottom">
-              <div v-for="honour in expert.honorList" :key="honour.id" class="expert-honor">
-                <div class="honor-dot" />
-                <div class="honor-content">{{ honour.name }}</div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-      <div class="bannerTitle">
-        <span>兼职专家库700余人</span>
-        <div />
-        <span>来自</span>
-      </div>
-      <div style="display: flex;width: 100%; justify-content: center">
-        <div class="partTimeJob-content">
-          <div v-for="item in partTimeJobExpertList" :key="item.id" class="ptjExpert">{{ item.unitName }}</div>
-          <!--        <el-button class="get-more">…</el-button>-->
-          <div class="get-more" />
-        </div>
       </div>
     </div>
+<!--    <div class="courseResources-contentTwo">-->
+<!--      <div class="bannerTitle">-->
+<!--        <span>专家团队</span>-->
+<!--        <div />-->
+<!--        <span>专家团队库50余人</span>-->
+<!--      </div>-->
+<!--      <div style="display: flex;width: 100%; justify-content: center">-->
+<!--        <div class="expertTeam-content">-->
+<!--          <div v-for="expert in expertTeamList" :key="expert.id" class="expert-card">-->
+<!--            <div class="card-top">-->
+<!--              <div class="expert-avatar">-->
+<!--                <el-image-->
+<!--                  class="img"-->
+<!--                  :src="expert.avatarUrl || defaultAvatarUrl"-->
+<!--                  fit="cover"-->
+<!--                />-->
+<!--              </div>-->
+<!--              <div class="expert-info">-->
+<!--                <div class="expert-name">{{ expert.name }}</div>-->
+<!--                <div class="expert-position">{{ expert.position }}</div>-->
+<!--              </div>-->
+<!--            </div>-->
+<!--            <div class="card-bottom">-->
+<!--              <div v-for="honour in expert.honorList" :key="honour.id" class="expert-honor">-->
+<!--                <div class="honor-dot" />-->
+<!--                <div class="honor-content">{{ honour.name }}</div>-->
+<!--              </div>-->
+<!--            </div>-->
+<!--          </div>-->
+<!--        </div>-->
+<!--      </div>-->
+<!--      <div class="bannerTitle">-->
+<!--        <span>兼职专家库700余人</span>-->
+<!--        <div />-->
+<!--        <span>来自</span>-->
+<!--      </div>-->
+<!--      <div style="display: flex;width: 100%; justify-content: center">-->
+<!--        <div class="partTimeJob-content">-->
+<!--          <div v-for="item in partTimeJobExpertList" :key="item.id" class="ptjExpert">{{ item.unitName }}</div>-->
+<!--          &lt;!&ndash;        <el-button class="get-more">…</el-button>&ndash;&gt;-->
+<!--          <div class="get-more" />-->
+<!--        </div>-->
+<!--      </div>-->
+<!--    </div>-->
+    <div class="courseResources-contentFatherTwo">
       <div class="courseResources-content">
         <div class="bannerTitle">
           <span>精品课程</span>
@@ -215,6 +220,7 @@
         </div>
       </div>
     </div>
+  </div>
 </template>
 
 <script>
@@ -571,12 +577,23 @@ export default {
 
   }
 }
-
-.courseResources-content {
-  width: 1200px;
-  margin: auto;
+.courseResources-contentBody{
   margin-top: 68px;
+}
+.courseResources-contentFather{
+  padding-bottom: 88px;
+  display: flex;
+  justify-content: center;
+  background-color: white;
+}
+.courseResources-contentFatherTwo{
+  display: flex;
+  justify-content: center;
   background-color: white;
+}
+.courseResources-content {
+  width: 1200px;
+  //margin: auto;
 
   .codeImg {
     position: fixed;
@@ -1030,7 +1047,7 @@ export default {
 .courseResources-contentTwo {
   background-image:  url("../../assets/image/kezi_bg.png");
   width: 1900px;
-  margin-top: 68px;
+  //margin-top: 68px;
   padding-bottom: 88px;
   .bannerTitle {
     max-height: 300px;

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'"         -->

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;
 }