Browse Source

修复bug

purui 2 months ago
parent
commit
f41598c9de

+ 10 - 5
packages/app/src/pages-sub/home/activity/detail/index.vue

@@ -128,11 +128,16 @@ const infos = computed(() => [
   {
   {
     icon: user,
     icon: user,
     title: `${activityTypes.value[type.value]}名额`,
     title: `${activityTypes.value[type.value]}名额`,
-    content: [
-      places.value === '不限制'
-        ? `不限制`
-        : `${places.value}人/剩余${status.value === 'closed' || status.value === 'overdue' ? 0 : data.value.surplus}人`,
-    ],
+    // content: [
+    //   places.value === '不限制'
+    //     ? `不限制`
+    //     : `${places.value}人/剩余${status.value === 'closed' || status.value === 'overdue' ? 0 : data.value.surplus}人`,
+    // ],
+	content: [
+	  places.value === '不限制'
+	    ? `不限制`
+	    : `${places.value}人/剩余${data.value.surplus}人`,
+	],
     visable: true,
     visable: true,
   },
   },
   {
   {

+ 22 - 7
packages/app/src/pages-sub/home/classmates/index.vue

@@ -10,18 +10,23 @@
 import { NetImages } from '../../../core/libs/net-images'
 import { NetImages } from '../../../core/libs/net-images'
 import { getContents } from '../../../core/libs/requests'
 import { getContents } from '../../../core/libs/requests'
 import ClassItem from '../components/class-item.vue'
 import ClassItem from '../components/class-item.vue'
+import PageHelper from '@/components/page-helper.vue'
 
 
-const { data: classmates, run: setClassmates } = useRequest(
-  () => getContents({ contentType: '1', contentCategory: '101' }),
-  { initialData: { list: [] } },
-)
+// const { data: classmates, run: setClassmates } = useRequest(
+//   () => getContents({ contentType: '1', contentCategory: '101' }),
+//   { initialData: { list: [] } },
+// )
+const query = computed(() => ({
+  contentType: "1",
+  contentCategory: "101",
+}))
 onMounted(async () => {
 onMounted(async () => {
-  await setClassmates()
+  // await setClassmates()
 })
 })
 </script>
 </script>
 <template>
 <template>
   <view class="p-3.5 flex flex-col gap-6">
   <view class="p-3.5 flex flex-col gap-6">
-    <template v-for="it of classmates.list" :key="it.id">
+    <!-- <template v-for="it of classmates.list" :key="it.id">
       <ClassItem :options="it"></ClassItem>
       <ClassItem :options="it"></ClassItem>
     </template>
     </template>
     <wd-status-tip
     <wd-status-tip
@@ -31,6 +36,16 @@ onMounted(async () => {
     ></wd-status-tip>
     ></wd-status-tip>
     <template v-if="classmates.list?.length">
     <template v-if="classmates.list?.length">
       <wd-loadmore custom-class="loadmore" state="finished" />
       <wd-loadmore custom-class="loadmore" state="finished" />
-    </template>
+    </template> -->
+	<PageHelper
+	  v-slot="{ source }"
+	  class="flex-grow flex flex-col"
+	  :request="getContents"
+	  :query="query"
+	>
+		<template v-for="(it, i) in source.list" :key="i">
+		  <ClassItem :options="it"></ClassItem>
+		</template>
+	</PageHelper>
   </view>
   </view>
 </template>
 </template>

+ 1 - 1
packages/app/src/pages-sub/home/components/class-item.vue

@@ -23,7 +23,7 @@ const router = useRouter()
 </script>
 </script>
 <template>
 <template>
   <view
   <view
-    class="relative h-43 flex items-end"
+    class="relative h-43 flex items-end mb-[15px]"
     :class="[customClass]"
     :class="[customClass]"
     @click="router.push(`/pages-sub/home/classmates-detail/index?id=${options.id}`)"
     @click="router.push(`/pages-sub/home/classmates-detail/index?id=${options.id}`)"
   >
   >

+ 1 - 1
packages/app/src/pages-sub/home/components/elegant-info-card.vue

@@ -23,7 +23,7 @@ const router = useRouter()
 </script>
 </script>
 <template>
 <template>
   <view
   <view
-    class="relative h-43 flex items-end"
+    class="relative h-43 flex items-end mb-[15px]"
     :class="[customClass]"
     :class="[customClass]"
     @click="router.push(`/pages-sub/home/classmates-detail/index?id=${options.id}`)"
     @click="router.push(`/pages-sub/home/classmates-detail/index?id=${options.id}`)"
   >
   >

+ 1 - 1
packages/app/src/pages-sub/home/offline-activity/list/index.vue

@@ -40,7 +40,7 @@ onShareTimeline(() => ({
     <PageHelper
     <PageHelper
       v-if="tabs.length"
       v-if="tabs.length"
       :request="getActivities"
       :request="getActivities"
-      :query="{ activityType: tabs[tab].value, showStatus: 1 }"
+      :query="{ activityType: tabs[tab].value, showStatus: 1,pageSize:1000 }"
       class="flex flex-col flex-grow"
       class="flex flex-col flex-grow"
     >
     >
       <template #default="{ source }">
       <template #default="{ source }">

+ 29 - 13
packages/app/src/pages-sub/home/spread/design-awards/index.vue

@@ -14,17 +14,23 @@ import { getBanners, getContents } from '../../../../core/libs/requests'
 import { NetImages } from '../../../../core/libs/net-images'
 import { NetImages } from '../../../../core/libs/net-images'
 import { BannerMode } from '../../../../core/libs/models'
 import { BannerMode } from '../../../../core/libs/models'
 import Banner from '../../components/banner.vue'
 import Banner from '../../components/banner.vue'
+import PageHelper from '@/components/page-helper.vue'
 
 
-const { data, run: setData } = useRequest(
-  () =>
-    getContents({
-      contentType: '3',
-      contentCategory: '301',
-    }),
-  {
-    initialData: { list: [] },
-  },
-)
+
+// const { data, run: setData } = useRequest(
+//   () =>
+//     getContents({
+//       contentType: '3',
+//       contentCategory: '301',
+//     }),
+//   {
+//     initialData: { list: [] },
+//   },
+// )
+const query = computed(() => ({
+  contentType: "3",
+  contentCategory: "301",
+}))
 const { data: banners, run: setBanners } = useRequest(
 const { data: banners, run: setBanners } = useRequest(
   () => getBanners({ mode: BannerMode.DesignAwards }),
   () => getBanners({ mode: BannerMode.DesignAwards }),
   { initialData: [] },
   { initialData: [] },
@@ -39,7 +45,7 @@ function onChange(e) {
   console.log(e)
   console.log(e)
 }
 }
 onMounted(async () => {
 onMounted(async () => {
-  await setData()
+  // await setData()
   await setBanners()
   await setBanners()
 })
 })
 </script>
 </script>
@@ -59,14 +65,24 @@ onMounted(async () => {
     ></wd-swiper> -->
     ></wd-swiper> -->
     <Banner :mode="BannerMode.DesignAwards"></Banner>
     <Banner :mode="BannerMode.DesignAwards"></Banner>
     <SectionHeading title="筑巢奖"></SectionHeading>
     <SectionHeading title="筑巢奖"></SectionHeading>
-    <template v-for="(it, i) in data.list" :key="i">
+	<PageHelper
+	  v-slot="{ source }"
+	  class="flex-grow flex flex-col"
+	  :request="getContents"
+	  :query="query"
+	>
+		<template v-for="(it, i) in source.list" :key="i">
+		  <ElegantInfoCard :options="it"></ElegantInfoCard>
+		</template>
+	</PageHelper>
+    <!-- <template v-for="(it, i) in data.list" :key="i">
       <ElegantInfoCard :options="it"></ElegantInfoCard>
       <ElegantInfoCard :options="it"></ElegantInfoCard>
     </template>
     </template>
     <wd-status-tip
     <wd-status-tip
       v-if="!data.list?.length"
       v-if="!data.list?.length"
       :image="NetImages.NotContent"
       :image="NetImages.NotContent"
       tip="暂无内容"
       tip="暂无内容"
-    ></wd-status-tip>
+    ></wd-status-tip> -->
   </view>
   </view>
 </template>
 </template>
 
 

+ 1 - 1
packages/app/src/pages-sub/mine/honors/detail/collection.vue

@@ -61,7 +61,7 @@ onLoad(async (query: Record<string | 'id' | 'badgeId', string>) => {
 </script>
 </script>
 <template>
 <template>
   <div
   <div
-    class="flex-grow bg-[#100f18] backdrop-blur-2xl flex flex-col items-center justify-between py-32 gap-4 relative"
+    class="flex-grow bg-[#100f18] backdrop-blur-2xl flex flex-col items-center justify-between py-32 gap-4 relative overflow-hidden"
   >
   >
     <div class="absolute top-[-60px] left-0 right-0 rotate-[-50deg]">
     <div class="absolute top-[-60px] left-0 right-0 rotate-[-50deg]">
       <wd-img
       <wd-img