修改

pages/curriculum/order/curriculum/index.vue

@@ -44,10 +44,7 @@
       <view
         v-if="curriculumData.image"
         :style="`height: auto !important;${
-          (cateList.length > 0 &&
-            cateList[currentCateIndex].isBuy == 0 &&
-            vip.type == '0') ||
-          vip.type != 0
+         goBuyTitle
             ? 'padding-top:80rpx'
             : ''
         }`"
@@ -74,7 +71,7 @@
       >
       </view>
 
-      <view class="containerBg1">
+      <view class="containerBg1" :style="`${curriculumData.content && curriculumData.content != ''?'padding:40rpx 0;':''}`">
         <view class="course_info_box">
           <view class="course_info">
             <view class="flexbox course_title" v-if="curriculumData.id">
@@ -106,7 +103,7 @@
 
       <view class="containerBg2">
         <view class="shiting_content">
-          <view v-for="(v, i) in cateList" style="margin-bottom: 40rpx">
+          <view v-for="(v, i) in cateList" class="catalogueList" style="margin-top: 20rpx">
             <view class="catalogueTitle chapter_title">
               <view class="top">
                 <view class="line"></view>
@@ -161,7 +158,9 @@
 
               <!--    -->
             </view> 
-            <view class="chapter_content" v-if="courseList[i].length>0">
+
+         
+            <view class="chapter_content" v-if="courseList[i]">
              
   <courseDescription
                 :isCondition="true"
@@ -207,12 +206,7 @@
 
             
             </view> 
-            
-          </view
-        ></view>
-      </view>
-
-      <view class="small_class_teaching_box">
+            <view class="small_class_teaching_box">
         <!-- <view class="small_class_teaching_top">
                     <view class="small_class_teaching_top_left">
                         <image src="@/static/icon/course_ic.png" mode="aspectFil" class="icon1"></image>
@@ -246,36 +240,33 @@
               <view class="progress_icon" style=""
                 ><u-line-progress
                   activeColor="#3AB3AE"
-                  height="18"
-                  :percentage="percentage"
+                  height="14"
+                  :percentage="v.completion"
                   :showText="false"
                 ></u-line-progress>
                 <text
-                  v-if="percentage"
+                  
                   style="
                     font-size: 28rpx;
-                    margin-left: 10rpx;
+                    margin-left: 20rpx;
                     margin-top: -2rpx;
                     font-weight: 700;
                   "
                 >
-                  {{ percentage }} %</text
+                  {{ v.completion }} %</text
                 >
               </view>
-              <image
-                src="@/static/icon/curriculum_05.png"
-                mode="aspectFil"
-                class="icon1"
-              />
-              <image
-                src="@/static/icon/curriculum_07.png"
-                mode="aspectFil"
-                class="icon2"
-              />
+             
             </view>
           </view>
         </view>
       </view>
+            
+          </view
+        ></view>
+      </view>
+
+    
       <view
         class="small_class_teaching_box related_courses_box"
         v-if="relatedCoursesList.length > 0"
@@ -1238,8 +1229,8 @@ export default {
 
 .small_class_teaching_box {
   width: 100%;
-  // margin-top: 20rpx;
-  background: #f0fbf3;
+  margin-top: 20rpx;
+  // background: #f0fbf3;
 
   .small_class_teaching_top {
     padding: 20rpx 20rpx 0 10rpx;
@@ -1295,7 +1286,10 @@ export default {
     .schedule {
       width: 100%;
       overflow: hidden;
-      padding: 20rpx 20rpx;
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      padding: 10rpx 0;
       box-sizing: border-box;
       align-items: center;
       color: #018f89;
@@ -1303,7 +1297,7 @@ export default {
       // font-family: MicrosoftYaHei;
 
       .icon_box {
-        width: 100%;
+        width:auto;
         display: flex;
         align-items: center;
         margin-bottom: 0rpx;
@@ -1317,14 +1311,16 @@ export default {
       }
 
       .progress_box {
-        width: 100%;
+        width: calc(100% - 180rpx);
         display: flex;
         align-items: center;
+        justify-content: space-between;
         position: relative;
 
         .progress_icon {
-          width: calc(100% - 240rpx);
+          width: calc(100% - 60rpx);
           display: flex;
+          align-items: center;
         }
 
         .icon1 {
@@ -1621,10 +1617,9 @@ export default {
 }
 
 .containerBg2 {
-  padding-top: 40rpx;
+  // padding-top: 40rpx;
   // margin-top: 100rpx;
-  background: linear-gradient(108deg, #e4f8eb 0%, #d1e8da 100%) !important;
-
+ 
   .shiting {
     line-height: 100rpx;
     background: linear-gradient(130deg, #4fa1fd 0%, #12f3ff 100%);
@@ -1644,7 +1639,7 @@ export default {
     text-align: center;
   }
   .shiting_content {
-    padding: 20rpx;
+    padding: 20rpx 0 0;
   }
 }
 .chapter_title {
@@ -1699,6 +1694,7 @@ export default {
 .catalogueTitle {
   justify-content: space-between;
   overflow: hidden;
+  margin-bottom: 20rpx;
   // background-image: linear-gradient(108deg, #cae9f9 0%, #e1f6fc8c 50%);
 
   // background-image: linear-gradient(180deg, #cfe0ff 0%, #fff 50%);
@@ -1766,6 +1762,7 @@ export default {
   margin-top: -4rpx;
   //   position: relative;
   z-index: 1;
+  // padding: 40rpx 0;
 
   border-radius: 30rpx 30rpx 0 0;
   // background-color: #fff;
@@ -1780,4 +1777,14 @@ export default {
   background-size: cover;
   background-repeat: no-repeat;
 }
+.catalogueList{
+  background: linear-gradient(108deg, #e4f8eb 0%, #d1e8da 100%) !important;
+  padding: 20rpx;
+  padding-bottom: 0;
+
+}
+
+.catalogueList:nth-child(1){
+  margin-top: 0 !important;
+}
 </style>