소스 검색

修改细节问题

快乐的梦鱼 1 개월 전
부모
커밋
07d9f1b642

+ 5 - 3
src/common/components/parts/Box2LineImageRightShadow.vue

@@ -1,16 +1,17 @@
 <template>
-  <FlexRow 
+  <Touchable 
     :style="{ 
       height: 'calc(100% - 20rpx)',
       width: 'calc(100% - 10rpx)',
     }"
     :flexGrow="1" 
     overflow="hidden"
+    direction="row"
     justify="space-between"
     :padding="[20,10]"
     @click="$emit('click')"
   >
-    <FlexRow width="100%" :gap="10">
+    <FlexRow width="100%" :gap="20">
       <Image 
         :width="wideImage ? 250 : 150"
         :height="150"
@@ -35,7 +36,7 @@
       </FlexCol>
     </FlexRow>
     <Text color="primary-second-text" fontConfig="caption">{{ right }}</Text>
-  </FlexRow>
+  </Touchable>
 </template>
 
 <script setup lang="ts">
@@ -46,6 +47,7 @@ import FlexCol from '@/components/layout/FlexCol.vue';
 import FlexRow from '@/components/layout/FlexRow.vue';
 import Image from '@/components/basic/Image.vue';
 import Text from '@/components/basic/Text.vue';
+import Touchable from '@/components/feedback/Touchable.vue';
 
 defineProps({
   title: String,

+ 2 - 2
src/common/components/parts/Box2LineLargeImageUserShadow.vue

@@ -7,20 +7,20 @@
     :radius="20"
     overflow="hidden"
     position="relative"
+    backgroundColor="white"
     :innerClass="[
       'grid4-item',
       classNames,
     ]"
     :innerStyle="{ 
       height: 'calc(100% - 20rpx)',
-      width: fixSize ? undefined : 'calc(100% - 10rpx)',
+      width: fixSize ? undefined : 'calc(100% - 40rpx)',
     }"
     direction="column"
     @click="$emit('click')"
   >
     <Image 
       v-if="image" 
-      :width="100" 
       :height="300" 
       :radius="20"
       :src="image" 

+ 1 - 1
src/components/basic/Cell.vue

@@ -304,7 +304,7 @@ const style = computed(() => {
   }
 
   //内边距样式的强制设置
-  configPadding(styleObj, theme.theme, props.padding);
+  configPadding(styleObj, theme.theme.value, props.padding);
 
   //边框设置
   if (props.topBorder)

+ 3 - 4
src/components/theme/ThemeDefine.ts

@@ -308,12 +308,11 @@ export function configTheme(
 ) {
   let defaultTheme = ObjectUtils.clone(DefaultTheme);
   let defaultDarkTheme = ObjectUtils.clone(DefaultDarkTheme);
-  const [theme, darkTheme] = cb?.(defaultTheme, defaultDarkTheme) ?? [defaultTheme, defaultDarkTheme];
-  const currentSystemDark = ref(uni.getSystemInfoSync().theme === 'dark');
-
-  console.log(uni.getSystemInfoSync());
   
+  const [theme, darkTheme] = cb?.(defaultTheme, defaultDarkTheme) ?? [defaultTheme, defaultDarkTheme];
+  const currentSystemDark = ref(autoMatchSystemDark !== false && uni.getSystemInfoSync().theme === 'dark');
   const currentTheme = shallowRef(currentSystemDark.value ? darkTheme : theme);
+
   provide(ThemeKey, currentTheme);
 
   if (autoMatchSystemDark !== false) {

+ 3 - 1
src/pages/home/village/details.vue

@@ -96,9 +96,10 @@
           v-for="(tag, index) in tagsDataRecommend"
           :key="index"
         >
+          <Height :height="20" />
           <SubTitle :title="tag.title" showMore @moreClicked="tag.goList()" />
           <SimplePageContentLoader :loader="tag.loader" >
-            <FlexCol>
+            <FlexCol :gap="20">
               <Box2LineLargeImageUserShadow 
                 v-for="(item, i) in tag.loader.content.value"
                 :key="i"
@@ -140,6 +141,7 @@ import Text from '@/components/basic/Text.vue';
 import FlexRow from '@/components/layout/FlexRow.vue';
 import Cell from '@/components/basic/Cell.vue';
 import Touchable from '@/components/feedback/Touchable.vue';
+import Height from '@/components/layout/space/Height.vue';
 
 const EmptyImage = 'https://mncdn.wenlvti.net/app_static/minnan/EmptyImage.png';