refactor(family): 统一默认家庭封面图片变量名并优化欢迎页用户年龄计算
将默认家庭封面图片的导入变量名从defaultFamilyCover改为defaultFamilyCoverSvg以避免命名冲突 在欢迎页添加onMounted钩子模拟获取用户信息并计算年龄
Showing
3 changed files
with
29 additions
and
9 deletions
| 1 | <!-- | 1 | <!-- |
| 2 | * @Date: 2025-08-27 17:44:53 | 2 | * @Date: 2025-08-27 17:44:53 |
| 3 | * @LastEditors: hookehuyr hookehuyr@gmail.com | 3 | * @LastEditors: hookehuyr hookehuyr@gmail.com |
| 4 | - * @LastEditTime: 2025-09-02 11:36:49 | 4 | + * @LastEditTime: 2025-09-02 11:51:18 |
| 5 | * @FilePath: /lls_program/src/pages/CreateFamily/index.vue | 5 | * @FilePath: /lls_program/src/pages/CreateFamily/index.vue |
| 6 | * @Description: 文件描述 | 6 | * @Description: 文件描述 |
| 7 | --> | 7 | --> |
| ... | @@ -177,7 +177,7 @@ import Taro from '@tarojs/taro'; | ... | @@ -177,7 +177,7 @@ import Taro from '@tarojs/taro'; |
| 177 | import { Edit, Tips, Photograph, Right } from '@nutui/icons-vue-taro'; | 177 | import { Edit, Tips, Photograph, Right } from '@nutui/icons-vue-taro'; |
| 178 | // import AppHeader from '../../components/AppHeader.vue'; | 178 | // import AppHeader from '../../components/AppHeader.vue'; |
| 179 | import BASE_URL from '@/utils/config'; | 179 | import BASE_URL from '@/utils/config'; |
| 180 | -import defaultFamilyCover from '@/assets/images/default-family-cover.png'; | 180 | +import defaultFamilyCoverSvg from '@/assets/images/default-family-cover.png'; |
| 181 | 181 | ||
| 182 | const familyName = ref(''); | 182 | const familyName = ref(''); |
| 183 | const familyIntro = ref(''); | 183 | const familyIntro = ref(''); |
| ... | @@ -214,7 +214,7 @@ const districtColumns = ref([ | ... | @@ -214,7 +214,7 @@ const districtColumns = ref([ |
| 214 | const familyAvatar = ref(''); | 214 | const familyAvatar = ref(''); |
| 215 | const focusedIndex = ref(-1); | 215 | const focusedIndex = ref(-1); |
| 216 | const inputRefs = ref([]); | 216 | const inputRefs = ref([]); |
| 217 | -const defaultFamilyCover = ref(defaultFamilyCover); | 217 | +const defaultFamilyCover = ref(defaultFamilyCoverSvg); |
| 218 | 218 | ||
| 219 | const isFormValid = computed(() => { | 219 | const isFormValid = computed(() => { |
| 220 | return ( | 220 | return ( | ... | ... |
| 1 | <!-- | 1 | <!-- |
| 2 | * @Date: 2025-08-27 17:44:53 | 2 | * @Date: 2025-08-27 17:44:53 |
| 3 | * @LastEditors: hookehuyr hookehuyr@gmail.com | 3 | * @LastEditors: hookehuyr hookehuyr@gmail.com |
| 4 | - * @LastEditTime: 2025-09-02 11:38:50 | 4 | + * @LastEditTime: 2025-09-02 11:51:36 |
| 5 | * @FilePath: /lls_program/src/pages/EditFamily/index.vue | 5 | * @FilePath: /lls_program/src/pages/EditFamily/index.vue |
| 6 | * @Description: 文件描述 | 6 | * @Description: 文件描述 |
| 7 | --> | 7 | --> |
| ... | @@ -173,7 +173,7 @@ import Taro from '@tarojs/taro'; | ... | @@ -173,7 +173,7 @@ import Taro from '@tarojs/taro'; |
| 173 | import { Edit, Tips, Photograph, Right } from '@nutui/icons-vue-taro'; | 173 | import { Edit, Tips, Photograph, Right } from '@nutui/icons-vue-taro'; |
| 174 | // import AppHeader from '../../components/AppHeader.vue'; | 174 | // import AppHeader from '../../components/AppHeader.vue'; |
| 175 | import BASE_URL from '@/utils/config'; | 175 | import BASE_URL from '@/utils/config'; |
| 176 | -import defaultFamilyCover from '@/assets/images/default-family-cover.png'; | 176 | +import defaultFamilyCoverSvg from '@/assets/images/default-family-cover.png'; |
| 177 | 177 | ||
| 178 | const familyName = ref(''); | 178 | const familyName = ref(''); |
| 179 | const familyIntro = ref(''); | 179 | const familyIntro = ref(''); |
| ... | @@ -209,7 +209,7 @@ const districtColumns = ref([ | ... | @@ -209,7 +209,7 @@ const districtColumns = ref([ |
| 209 | ]); | 209 | ]); |
| 210 | const familyAvatar = ref(''); | 210 | const familyAvatar = ref(''); |
| 211 | const focusedIndex = ref(-1); | 211 | const focusedIndex = ref(-1); |
| 212 | -const defaultFamilyCover = ref(defaultFamilyCover); | 212 | +const defaultFamilyCover = ref(defaultFamilyCoverSvg); |
| 213 | 213 | ||
| 214 | // 图片预览相关 | 214 | // 图片预览相关 |
| 215 | const previewVisible = ref(false); | 215 | const previewVisible = ref(false); | ... | ... |
| 1 | <!-- | 1 | <!-- |
| 2 | * @Date: 2025-08-27 17:43:45 | 2 | * @Date: 2025-08-27 17:43:45 |
| 3 | * @LastEditors: hookehuyr hookehuyr@gmail.com | 3 | * @LastEditors: hookehuyr hookehuyr@gmail.com |
| 4 | - * @LastEditTime: 2025-08-28 22:47:16 | 4 | + * @LastEditTime: 2025-09-02 11:52:57 |
| 5 | * @FilePath: /lls_program/src/pages/Welcome/index.vue | 5 | * @FilePath: /lls_program/src/pages/Welcome/index.vue |
| 6 | * @Description: 文件描述 | 6 | * @Description: 文件描述 |
| 7 | --> | 7 | --> |
| ... | @@ -75,19 +75,39 @@ | ... | @@ -75,19 +75,39 @@ |
| 75 | </template> | 75 | </template> |
| 76 | 76 | ||
| 77 | <script setup> | 77 | <script setup> |
| 78 | -import { ref, computed } from 'vue'; | 78 | +import { ref, computed, onMounted } from 'vue'; |
| 79 | import Taro from '@tarojs/taro'; | 79 | import Taro from '@tarojs/taro'; |
| 80 | import BottomNav from '../../components/BottomNav.vue'; // 假设BottomNav组件已转换 | 80 | import BottomNav from '../../components/BottomNav.vue'; // 假设BottomNav组件已转换 |
| 81 | import welcomeHomeImg from '../../assets/images/welcome_home.png'; | 81 | import welcomeHomeImg from '../../assets/images/welcome_home.png'; |
| 82 | 82 | ||
| 83 | // TODO: 等待真实接口获取用户年龄 | 83 | // TODO: 等待真实接口获取用户年龄 |
| 84 | -const userAge = ref(65); // or 55 to test the other case | 84 | +const userAge = ref(null); |
| 85 | +const userInfo = ref({ | ||
| 86 | + age: null, | ||
| 87 | + name: null, | ||
| 88 | + phone: null, | ||
| 89 | +}); | ||
| 85 | const canCreateFamily = computed(() => userAge.value >= 60); | 90 | const canCreateFamily = computed(() => userAge.value >= 60); |
| 86 | 91 | ||
| 87 | const navigateTo = (url) => { | 92 | const navigateTo = (url) => { |
| 88 | Taro.navigateTo({ url }); | 93 | Taro.navigateTo({ url }); |
| 89 | }; | 94 | }; |
| 90 | 95 | ||
| 96 | +onMounted(() => { | ||
| 97 | + // 模拟获取用户的个人信息 | ||
| 98 | + const userInfo = { | ||
| 99 | + age: '1890-01-01', | ||
| 100 | + name: '张三', | ||
| 101 | + phone: '13800000000', | ||
| 102 | + }; | ||
| 103 | + | ||
| 104 | + userInfo.value = userInfo; | ||
| 105 | + // userInfo.age 是年月日的形式需要转成年龄 | ||
| 106 | + userInfo.value.age = new Date().getFullYear() - new Date(userInfo.value.age).getFullYear(); | ||
| 107 | + userAge.value = userInfo.value.age; | ||
| 108 | + console.warn(userAge.value); | ||
| 109 | +}); | ||
| 110 | + | ||
| 91 | const handleNavigate = (url) => { | 111 | const handleNavigate = (url) => { |
| 92 | // TODO: 模拟检查个人信息是否完善 | 112 | // TODO: 模拟检查个人信息是否完善 |
| 93 | const hasProfile = true; // 假设未完善 | 113 | const hasProfile = true; // 假设未完善 | ... | ... |
-
Please register or login to post a comment