408249787@qq.com před 1 týdnem
rodič
revize
13e2bb06a0
4 změnil soubory, kde provedl 35 přidání a 31 odebrání
  1. 4 4
      pages/chinese/index.uvue
  2. 11 11
      pages/english/index.uvue
  3. 5 5
      pages/math/index.uvue
  4. 15 11
      pages/mix/index.uvue

+ 4 - 4
pages/chinese/index.uvue

@@ -106,10 +106,10 @@ function debouncedOnScroll(e: any) {
           @tap="handleDetail(course)">
           <cl-image :src="course?.ossIconPath" mode="heightFix"
             class="!w-full !h-[26vh] mb-[2px] rounded-xl"></cl-image>
-          <view class="text-[4vh] font-bold absolute top-[4vh] left-0 w-full text-center"  >{{
+        <view class="text-[4vh] font-bold absolute top-[1vh] h-[24vh] flex items-center justify-center left-0 w-full text-center text-[#d78e5b]"  >{{
             course.mainTitle }}</view>
-          <text class="text-[3vh] text-[#666]">{{
-            course.assistantTitle }}</text>
+          <view class="text-[4vh] flex-1 flex items-center justify-center font-bold text-[#666]">{{
+            course.assistantTitle }}</view>
           <!-- <view>
             <Progress :progress="30" /> 
           </view> -->
@@ -155,7 +155,7 @@ function debouncedOnScroll(e: any) {
 
 <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%);
 }
 

+ 11 - 11
pages/english/index.uvue

@@ -49,13 +49,13 @@ async function handleSelect(val: SubjectCatalogResult) {
   })
 }
 function handleDetail(item: SubjectCatalogResult) {
-  if (!item.payFlag && !item.trialPlay) {
-    uni.showToast({
-      title: '请先购买',
-      icon: 'none'
-    })
-    return
-  }
+  // if (!item.payFlag && !item.trialPlay) {
+  //   uni.showToast({
+  //     title: '请先购买',
+  //     icon: 'none'
+  //   })
+  //   return
+  // }
   router.push({
     path: "/pages/english/detail",
     query: {
@@ -105,10 +105,10 @@ function debouncedOnScroll(e: any) {
           @tap="handleDetail(course)">
         <cl-image :src="course?.ossIconPath" mode="heightFix"
             class="!w-full !h-[26vh] mb-[2px] rounded-xl"></cl-image>
-          <view class="text-[4vh] font-bold absolute top-[4vh] left-0 w-full text-center"  >{{
+          <view class="text-[4vh] font-bold absolute top-[1vh] h-[24vh] flex items-center justify-center left-0 w-full text-center text-[#d78e5b]"  >{{
             course.mainTitle }}</view>
-          <text class="text-[3vh] text-[#666]">{{
-            course.assistantTitle }}</text>
+          <view class="text-[4vh] flex-1 flex items-center justify-center font-bold text-[#666]">{{
+            course.assistantTitle }}</view>
           <!-- <view>
             <Progress :progress="30" /> 
           </view> -->
@@ -154,7 +154,7 @@ function debouncedOnScroll(e: any) {
 
 <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%);
 }
 

+ 5 - 5
pages/math/index.uvue

@@ -102,14 +102,14 @@ const userInfo = computed(() => user.info.value?.userInfo)
     </view>
     <view class="boxs">
       <scroll-view class="scroll-view_H" direction="horizontal" :show-scrollbar="false" ref="cardsScrollView" @scroll="debouncedOnScroll">
-        <view class="scroll-view-item_H bg-[white]" v-for="course in catalog?.courseList || []" :class="`category-${course.catalogId}`" :key="course.id"
+        <view class="scroll-view-item_H bg-[white]" v-for="course in courseList || []" :class="`category-${course.catalogId}`" :key="course.id"
           @tap="handleDetail(course)">
          <cl-image :src="course?.ossIconPath" mode="heightFix"
             class="!w-full !h-[26vh] mb-[2px] rounded-xl"></cl-image>
-          <view class="text-[4vh] font-bold absolute top-[4vh] left-0 w-full text-center"  >{{
+          <view class="text-[4vh] font-bold absolute top-[1vh] h-[30vh] flex items-center justify-center left-0 w-full text-center text-[#bd4200]"  >{{
             course.mainTitle }}</view>
-          <text class="text-[3vh] text-[#666]">{{
-            course.assistantTitle }}</text>
+          <view class="text-[4vh] flex-1 flex items-center justify-center font-bold text-[#666]">{{
+            course.assistantTitle }}</view>
           <!-- <view>
             <Progress :progress="30" />
           </view> -->
@@ -155,7 +155,7 @@ const userInfo = computed(() => user.info.value?.userInfo)
 
 <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%);
 }
 

+ 15 - 11
pages/mix/index.uvue

@@ -18,7 +18,7 @@ const record = ref<any>()
 const userInfo = computed(() => user.info.value?.userInfo)
 const courseList = ref<SubjectCourseResult[]>()
 async function getDataList() {
-  const res = await fetchSubjectAppInfo({ id: router.query().id,delFlag: false })
+  const res = await fetchSubjectAppInfo({ id: router.query().id, delFlag: false })
   record.value = res
   dataList.value = res.catalogList || []
   catalog.value = res?.catalogList?.[0]
@@ -77,7 +77,8 @@ function handleDetail(item: SubjectCatalogResult) {
   <Loading v-show="isLoading" />
   <cl-page v-show="!isLoading">
     <Back />
-    <image mode="aspectFill" src="https://oss.xiaoxiongcode.com/static/语文/图层 4.png" alt="" class="w-full h-full object-cover" />
+    <image mode="aspectFill" src="https://oss.xiaoxiongcode.com/static/语文/图层 4.png" alt=""
+      class="w-full h-full object-cover" />
 
     <!-- 精灵图动画 -->
     <!-- <cl-image src="https://oss.xiaoxiongcode.com/static/home/3.gif" mode="heightFix"
@@ -93,19 +94,22 @@ function handleDetail(item: SubjectCatalogResult) {
       <cl-icon name="arrow-left-right-line" color="primary"></cl-icon>
     </view>
     <view class="boxs">
-      <scroll-view class="scroll-view_H" direction="horizontal" :show-scrollbar="false" ref="cardsScrollView" @scroll="debouncedOnScroll">
-        <view class="scroll-view-item_H bg-[white]" v-for="course in catalog?.courseList || []" :class="`category-${course.catalogId}`" :key="course.id"
-          @tap="handleDetail(course)">
+      <scroll-view class="scroll-view_H" direction="horizontal" :show-scrollbar="false" ref="cardsScrollView"
+        @scroll="debouncedOnScroll">
+        <view class="scroll-view-item_H bg-[white]" v-for="course in courseList || []"
+          :class="`category-${course.catalogId}`" :key="course.id" @tap="handleDetail(course)">
           <cl-image :src="course?.ossIconPath" mode="heightFix"
             class="!w-full !h-[26vh] mb-[2px] rounded-xl"></cl-image>
-          <view class="text-[4vh] font-bold absolute top-[4vh] left-0 w-full text-center"  >{{
-            course.mainTitle }}</view>
-          <text class="text-[3vh] text-[#666]">{{
-            course.assistantTitle }}</text>
+          <view
+            class="text-[4vh] font-bold absolute top-[2vh] left-0 w-full text-center text-[#000]">
+            {{
+              course.mainTitle }}</view>
+          <view class="text-[4vh] flex-1 flex items-center justify-center font-bold text-[#666]">{{
+            course.assistantTitle }}</view>
           <!-- <view>
             <Progress :progress="30" />
           </view> -->
-           <Lock v-if="userInfo?.memberLevel === 'default'" :record="course" type="vip"/>
+          <Lock v-if="userInfo?.memberLevel === 'default'" :record="course" type="vip" />
 
         </view>
       </scroll-view>
@@ -148,7 +152,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%);
 }