y595705120 пре 6 дана
родитељ
комит
6a6d70cc3e

+ 2 - 2
src/assets/css/course.css

@@ -310,7 +310,7 @@
 .m-history-course {
 .m-history-course {
   position: relative;
   position: relative;
   width: 460px;
   width: 460px;
-  height: 100px;
+  height: 125px;
   border: 1px solid #ddd;
   border: 1px solid #ddd;
   margin-top: 10px;
   margin-top: 10px;
   padding: 2px;
   padding: 2px;
@@ -333,7 +333,7 @@
 }
 }
 .m-history-course .course-img img {
 .m-history-course .course-img img {
   width: 175px;
   width: 175px;
-  height: 100px;
+  height: 125px;
 }
 }
 .m-history-course .course-img .p-ico2 {
 .m-history-course .course-img .p-ico2 {
   width: 56px;
   width: 56px;

+ 1 - 1
src/containers/center/market/index.vue

@@ -79,7 +79,7 @@
 
 
               <div class="hover-block">
               <div class="hover-block">
                 <div class="mask-bg"></div>
                 <div class="mask-bg"></div>
-                <el-button @click="gotoPlay(item.course_id)" v-if="item.is_pay==1"
+                <el-button @click="gotoPlay(item)" v-if="item.is_pay==1"
                   class="ui-btn btn-blue">进入学习</el-button>
                   class="ui-btn btn-blue">进入学习</el-button>
                 <el-button @click="goPay(item)" v-else-if="item.is_pay==2 || !!item.buyImg"
                 <el-button @click="goPay(item)" v-else-if="item.is_pay==2 || !!item.buyImg"
                   class="ui-btn btn-w">补充材料</el-button>
                   class="ui-btn btn-w">补充材料</el-button>

+ 1 - 5
src/containers/center/play/components/iCourseInfo.vue

@@ -30,7 +30,7 @@
         <p style="font-size: 24px;"> 说明 </p>
         <p style="font-size: 24px;"> 说明 </p>
         <p class="mt10">岗位名称:{{tpl.name}}<strong style="color: red;">{{tpl.nd}}</strong></p>
         <p class="mt10">岗位名称:{{tpl.name}}<strong style="color: red;">{{tpl.nd}}</strong></p>
         <p class="mt10">
         <p class="mt10">
-          视频学时: <strong style="color: red;" >学满{{tpl.mediaXs/10}}就算通过</strong>
+          通过条件: <strong style="color: red;" >学满{{tpl.mediaXs/10}}学时 <span v-show="tpl.tplId>0">并考试合格</span></strong>
         </p>
         </p>
         <p class="mt10" v-if="tpl.testGroupId>0">
         <p class="mt10" v-if="tpl.testGroupId>0">
           参与练习: <strong style="color: red;"> {{finishCount}}</strong>题,满100题可得
           参与练习: <strong style="color: red;"> {{finishCount}}</strong>题,满100题可得
@@ -39,10 +39,6 @@
         <p class="mt10" v-if="tpl.examGroupId>0">
         <p class="mt10" v-if="tpl.examGroupId>0">
           报名成功: <strong style="color: red;" >80天内完成学习与考试</strong>
           报名成功: <strong style="color: red;" >80天内完成学习与考试</strong>
         </p>
         </p>
-        <p class="mt10" v-if="tpl.tplId>0">
-          学时证明: <strong style="color: red;">获得足够学时,可打印</strong>
-        </p>
-
         <div>
         <div>
           <el-button type="primary" class="mt10" style="font-size: 14px;" @click="startExam" v-if="tpl.examGroupId>0"
           <el-button type="primary" class="mt10" style="font-size: 14px;" @click="startExam" v-if="tpl.examGroupId>0"
             :disabled="info.score>=60">
             :disabled="info.score>=60">

+ 1 - 11
src/containers/center/play/index.vue

@@ -1,16 +1,6 @@
 <template>
 <template>
   <div class="m-right-block mh576">
   <div class="m-right-block mh576">
-
-
-    <ICourseInfoXsExtra v-if="tpl.isTranExam==2"
-    :extraXs="extraXs"  :info="info"
-    @updateInfo="updateInfo"
-    :tpl="tpl" @startExamTest="startExamTest" @startExam="startExam"></ICourseInfoXsExtra>
-
-    <ICourseInfoTest  v-else-if="tpl.isTranExam>0" :examList="examList" :info="info" :tpl="tpl" @printCert="printCert" @startExam="startExam"></ICourseInfoTest>
-
-
-    <ICourseInfo v-else
+    <ICourseInfo
     :info="info"
     :info="info"
      :tpl="tpl"
      :tpl="tpl"
      :extraXs="extraXs"
      :extraXs="extraXs"