2

components/loading.uvue

@@ -6,6 +6,6 @@
 </template>
 <style lang="scss" scoped>
 .loading-image {
-  @apply w-full h-full object-cover absolute top-0 left-0 z-[100];
+  @apply w-full h-full object-cover fixed top-0 left-0 z-[100];
 }
 </style>

pages/catalog/detail.uvue

@@ -82,10 +82,17 @@ onMounted(async () => {
   }, 1000)
 })
 async function handleEnded() {
-  progress2.value++
+  if (progress.value === 2) {
+    return
+  }
+  if (progress2.value === 6) {
+    progress.value++
+  } else {
+    progress2.value++
+  }
   await updateSubjectProgress({
     courseId: course.value?.id,
-    mainProgress: 1,
+    mainProgress: progress.value,
     assistantProgress: progress2.value,
     status: 0
   })

pages/catalog/index.uvue

@@ -85,7 +85,7 @@ function handleDetail(item: SubjectCatalogResult) {
         </view>
       </scroll-view>
     </view>
-    <view class="footer">
+    <!-- <view class="footer">
       <view>
         <cl-image src="https://oss.xiaoxiongcode.com/static/home/4.png" mode="heightFix"
           class=" !h-[40px] mb-[2px] rounded-xl"></cl-image>
@@ -101,7 +101,7 @@ function handleDetail(item: SubjectCatalogResult) {
           class=" !h-[40px] mb-[2px] rounded-xl"></cl-image>
         <text class="text-[14px] text-white font-bold text-stroke-custom">学习报告</text>
       </view>
-    </view>
+    </view> -->
     <cl-popup v-model="visible" :show-header="false" direction="center" :size="600">
       <view class="p-4">
         <cl-row :gutter="0">
@@ -123,7 +123,7 @@ function handleDetail(item: SubjectCatalogResult) {
 
 <style lang="scss" scoped>
 .boxs {
-  @apply w-[100vw] h-[50vh] absolute top-1/2 left-[50vh] z-[1];
+  @apply w-[calc(100vw-52vh)] h-[50vh] absolute top-1/2 left-[50vh] z-[1];
   transform: translateY(-50%);
 }
 

pages/catalog/web-view.uvue

@@ -22,24 +22,14 @@ function handleMessage(e) {
   const prevPage = pages[pages.length - 2];
   (prevPage as any).status = "success"
 }
+function handleLoad() {
+  console.log('handleLoad')
+  isLoading.value = false
+}
 </script>
 <template>
   <Loading v-show="isLoading" />
-  <view class="w-full h-full " v-show="!isLoading">
-    <!-- <view class="video-fullscreen_title">
-      <Back />
-      <view class="control-progress">
-        <view class="before"></view>
-        <view v-for="(item, i) in menu2Items" :key="item.id"
-          class="px-0 py-3 flex items-center justify-center gap-[5px]  relative z-[1]"
-          :class="{ '!bg-[#fff] rounded-full': progress == i + 1 }">
-          <cl-image :src="item.icon" mode="heightFix" class="!h-[30px]"></cl-image>
-          <text class="text-[14px]  font-bold" :class="{ '!text-[#2BA0F3]': progress == i + 1 }">{{ item.name
-          }}</text>
-        </view>
-      </view>
-    </view> -->
-    <web-view :src="webviewSrc + '?' + Math.random()" class="w-full h-full" @message="handleMessage"></web-view>
-  </view>
+  <web-view :src="webviewSrc + '?' + Math.random()" class="w-full h-full" @message="handleMessage"
+    @load="handleLoad"></web-view>
 </template>
 <style lang="less" scoped></style>

pages/index/components/physics.uvue

@@ -92,7 +92,7 @@ function handleView(url) {
 }
 
 .content {
-  @apply absolute top-1/2 left-1/2 transform -translate-x-1/2 -translate-y-1/2 text-white w-[120vh] border-[3px] border-[#fff] border-solid rounded-[30px] px-10 py-4 h-[44vh] flex flex-row items-center justify-between gap-4;
+  @apply absolute top-1/2 left-1/2 transform -translate-x-1/2 -translate-y-1/2 text-white w-[120vh] border-[3px] border-[#fff] border-solid rounded-[30px] px-10 py-4 h-[40vh] flex flex-row items-center justify-between gap-4;
   background: linear-gradient(0deg, #C7F0FE 0%, #30B9FF 100%);
 
 }