Преглед на файлове

🎨 优化首页细节

快乐的梦鱼 преди 1 ден
родител
ревизия
fac88c1372

+ 3 - 3
src/api/inhert/VillageInfoApi.ts

@@ -54,7 +54,7 @@ export class CommonInfoModel extends DataModel<CommonInfoModel> {
         };
       return undefined;
     };
-    this._afterSolveServer = () => {
+    this._afterSolveServer = (data) => {
       if (this.province && this.city && this.district) {
         this.cityAddress = [this.province as string, this.city as string, this.district as string];
       }
@@ -63,8 +63,8 @@ export class CommonInfoModel extends DataModel<CommonInfoModel> {
       if (this.longitude && this.latitude) {
         this.lonlat = [this.longitude as number, this.latitude as number];
       }
-      if (this.avatar)
-        this.villageVolunteerAvatar = this.avatar as string;
+      if (data.avatar)
+        this.villageVolunteerAvatar = data.avatar as string;
     };
     this._afterSolveClient = (data) => {
       if (this.cityAddress) {

+ 2 - 2
src/components/display/Avatar.vue

@@ -8,8 +8,8 @@
     @click="$emit('click')"
   >
     <image 
-      v-if="url || defaultAvatar || src" 
-      :src="url || defaultAvatar || src"
+      v-if="url || src || defaultAvatar" 
+      :src="url || src || defaultAvatar"
       :style="{
         width: themeContext.resolveThemeSize(size),
         height: themeContext.resolveThemeSize(size),

+ 2 - 2
src/components/feedback/BubbleBox.vue

@@ -20,7 +20,7 @@
           :radius="radius"
           :gap="10"
           :padding="10"
-          :zIndex="1001"
+          :zIndex="181"
           :margin="selectObjectByType(position, 'left', {
             top: [arrowWidth,0],
             bottom: [arrowWidth,0],
@@ -80,12 +80,12 @@ import { computed, ref } from 'vue';
 import { propGetThemeVar, useTheme } from '../theme/ThemeDefine';
 import { selectObjectByType, selectStyleType } from '../theme/ThemeTools';
 import type { FlexProps } from '../layout/FlexView.vue';
-import type { TextProps } from '../basic/Text.vue';
 import Icon, { type IconProps } from '../basic/Icon.vue';
 import FlexView from '../layout/FlexView.vue';
 import Text from '../basic/Text.vue';
 import Touchable from './Touchable.vue';
 import SimpleTransition from '../anim/SimpleTransition.vue';
+import type { TextProps } from '../basic/Text';
 
 export interface BubbleBoxItem {
   text: string,

+ 2 - 1
src/components/feedback/BubbleTip.vue

@@ -17,11 +17,12 @@
 </template>
 
 <script setup lang="ts">
-import Text, { type TextProps } from '../basic/Text.vue';
+import Text from '../basic/Text.vue';
 import BubbleBox, { type BubbleBoxProps } from './BubbleBox.vue';
 import FlexRow from '../layout/FlexRow.vue';
 import IconButton, { type IconButtonProps } from '../basic/IconButton.vue';
 import { onMounted, ref, watch } from 'vue';
+import type { TextProps } from '../basic/Text';
 
 export interface BubbleTiProps extends Partial<BubbleBoxProps> {
   show?: boolean;

+ 2 - 1
src/pages/home/discover/details.vue

@@ -85,7 +85,7 @@
             </ImageBlock3>
             <Touchable align="center" gap="gap.md" @click.stop="handleGoUserDetails">
               <Avatar
-                :src="loader.content.value.villageVolunteerAvatar"
+                :url="loader.content.value.villageVolunteerAvatar"
                 defaultAvatar="https://xy.wenlvti.net/app_static/images/village/PlaceholderVolunteerNew.png"
                 size="50"
                 radius="radius.md"
@@ -176,6 +176,7 @@ const emptyContent = computed(() =>
 const loader = useSimpleDataLoader(async () => {
   const res = await VillageInfoApi.getInfoForDiscover(querys.value.id);
   uni.setNavigationBarTitle({ title: res.title });
+  console.log('加载信息', res);
   return res;
 });
 const recommendListLoader = useSimpleDataLoader(async () => {

+ 2 - 0
src/pages/home/village/components/VillageGallery.vue

@@ -2,6 +2,8 @@
   <FlexCol>
     <swiper
       class="village-gallery-swiper"
+      autoplay
+      :interval="10000"
       :indicator-dots="pageCount > 1"
       indicator-color="rgba(0,0,0,0.2)"
       indicator-active-color="#e19579"

+ 2 - 2
src/pages/index.vue

@@ -15,7 +15,7 @@
         backgroundColor="transparent"
         textColor="whweixinite"
         align="left"
-        :zIndex="2000"
+        :zIndex="200"
       />
       <HomeIndex v-show="tabIndex === 0" @goVillage="tabIndex = 1" @goDig="tabIndex = 2" />
       <VillageIndex v-if="tabIndex === 1" showSwitch ref="villageIndex" @goHome="tabIndex=0" />
@@ -27,7 +27,7 @@
         fixed
         xbarSpace
         :innerStyle="{
-          zIndex: 2001,
+          zIndex: 201,
           backgroundColor: '#ffead8',
         }"
       >