Home Explore Help
Register Sign In
mabaoyi
/
factoryDirector
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

冲突

zhaogongxue 5 months ago
parent
3d2b8dd2c4
commit
e06867b929
4 changed files with 10 additions and 9 deletions
Split View Show Diff Stats
  1. 1 1
      dist/index.html
  2. 1 0
      src/components/anchorPoint/index.vue
  3. 7 6
      src/view/Home/product.vue
  4. 1 2
      src/view/video/course.vue

+ 1 - 1
dist/index.html
View File 

@@ -9,7 +9,7 @@
 
     />

     <meta name="viewport" content="width=device-width, initial-scale=1.0" />

     <title>云厂长</title>

-    <script type="module" crossorigin src="./assets/index-BusSrDIS.js"></script>
 
+    <script type="module" crossorigin src="./assets/index-_cB-BSHh.js"></script>
 
     <link rel="stylesheet" crossorigin href="./assets/index-CNV4glNT.css">
 
   </head>

   <body>

+ 1 - 0
src/components/anchorPoint/index.vue
View File 

@@ -79,6 +79,7 @@ onMounted(() => {
 
   right: 100px;
 
   bottom: 100px;
 
   z-index: 1000;
 
+  border-radius: 32px 32px;
 
   .advice-1 {
 
     border-radius: 32px 32px 0 0;
 
     padding-top: 10px;

+ 7 - 6
src/view/Home/product.vue
View File 

@@ -106,6 +106,7 @@ import banner from "../../components/Banne/index.vue";
 
 import bottom from "../../components/Layout/bottom.vue";
 
 // import application from "../../components/Application .vue";
 
 // import corporat from "../../components/corporation.vue";
 
+import corporation from "../../components/corporation.vue";
 
 import advanta from "../../components/advantage/index.vue";
 
 import * as productApi from "../../api/login";
 
 import * as configApi from "../../api/config";
 
@@ -126,7 +127,7 @@ const updateScrollDistance = () => {
 
 };
 
 let advantage = ref("");
 
 let application = ref("");
 
-let corporation = ref("");
 
+// let corporation = ref("");
 
 let corporat = ref("");
 
 
 function handleScroll(event) {
 
@@ -141,11 +142,11 @@ function handleScroll(event) {
 
       return import("../../components/Application .vue");
 
     });
 
   }
 
-  if (event.target.scrollTop > 2400 && corporation.value == "") {
 
-    corporation.value = defineAsyncComponent(() => {
 
-      return import("../../components/corporation.vue");
 
-    });
 
-  }
 
+  // if (event.target.scrollTop > 2400 && corporation.value == "") {
 
+  //   corporation.value = defineAsyncComponent(() => {
 
+  //     return import("../../components/corporation.vue");
 
+  //   });
 
+  // }
 
   if (event.target.scrollTop > 400 && corporat.value == "") {
 
     corporat.value = defineAsyncComponent(() => {
 
       return import("../../components/corporation.vue");

+ 1 - 2
src/view/video/course.vue
View File 

@@ -392,8 +392,7 @@ const videoinfo = (child) => {
 
     query: {
 
       id: child.video_id || child.id,
 
       time: child.study_record == null ? 0 : child.study_record.duration,
 
-      is_complete:
 
-        child.is_complete == null ? 1 : child.study_record.is_complete,
 
+      is_complete:child.study_record == null ? 1 : child.study_record.is_complete,
 
     },
 
   });
 
 };