Browse Source

feat: 优化页面组件逻辑,调整样式和数据加载方式

EvilDragon 3 months ago
parent
commit
59bc8ab117

+ 5 - 2
packages/app/src/components/page-helper-evo.vue

@@ -21,7 +21,7 @@ const pageSize = ref(10)
 const nomore = ref(false)
 const topRef = ref()
 const height = ref(0)
-const windowInfo = ref()
+const windowInfo = ref<UniNamespace.GetWindowInfoResult>()
 const { data, run: setData } = useRequest(
   () => props.request({ pageNo: pageNo.value, pageSize: pageSize.value, ...props.query }),
   { immediate: false },
@@ -79,7 +79,10 @@ defineExpose({
 })
 </script>
 <template>
-  <div class="flex-grow flex flex-col">
+  <div
+    class="flex-grow flex flex-col"
+    :style="{ paddingBottom: addUnit(windowInfo?.safeAreaInsets.bottom || 0) }"
+  >
     <div class="relative" :style="{ height: addUnit(height) }">
       <div
         ref="topRef"

+ 1 - 1
packages/app/src/pages/home/index.vue

@@ -102,7 +102,7 @@ const handlePlay = async (id) => {
   await updateSetIndexConfig(body)
 }
 onShow(async () => {
-  pageHelperRef.value?.refresh()
+  pageHelperRef.value?.reload()
   await Promise.all([setHotActivities(), setStudyTours()])
 })
 onLoad(async () => {

+ 5 - 1
packages/app/src/pages/mine/honors/index.vue

@@ -190,7 +190,11 @@ onMounted(async () => {
                 class="w-full px-4 box-border"
                 @click="router.push(`/pages/mine/honors/detail/index?data=${JSON.stringify(item)}`)"
               >
-                <wd-img width="100%" mode="widthFix" :src="item.badgeNotObtainedImage"></wd-img>
+                <wd-img
+                  width="100%"
+                  mode="widthFix"
+                  :src="item.quantity ? item.badgeYesObtainedImage : item.badgeNotObtainedImage"
+                ></wd-img>
                 <div
                   class="text-center text-white text-xs font-normal font-['PingFang_SC'] leading-relaxed"
                 >