Browse Source

feat(home): 优化时间格式处理,增加安全访问操作;调整页面布局

EvilDragon 3 months ago
parent
commit
f1df30e372

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

@@ -311,7 +311,7 @@ onLoad(async (query: { id: string; type: 'activity' | 'studyTour' }) => {
           <div class="flex flex-col gap-6">
             <div class="text-white text-base font-normal font-['PingFang_SC'] leading-normal">
               <!-- 6月26日 第一天 -->
-              {{ dayjs(it.travelTime).format('MM月DD日') }}
+              {{ dayjs(it?.travelTime).format('MM月DD日') }}
               <span class="ml-1">{{ `第${i + 1}天` }}</span>
             </div>
             <div class="flex gap-2">

+ 2 - 2
packages/app/src/pages/home/components/schedule-card.vue

@@ -12,7 +12,7 @@ const data = ref()
 const dates = computed(() => {
   const a = props.items.at(0)?.studyTravelDOList
   // 使用radash将studyTravelDOList 中的travelTime字段按天分组
-  const b = group(a, (it) => dayjs(it.travelTime).format('YYYY-MM-DD'))
+  const b = group(a, (it) => dayjs(it?.travelTime).format('YYYY-MM-DD'))
   console.log(b)
   return b
 })
@@ -30,7 +30,7 @@ onMounted(() => {
 })
 </script>
 <template>
-  <view class="flex flex-col items-center" :class="[customClass]">
+  <view class="flex flex-col items-center aspect-[1.28/1]" :class="[customClass]">
     <SectionHeading title="我的游学日程" custom-class="w-full"></SectionHeading>
     <div
       class="w-full my-3.5 text-[#acacac] text-sm font-normal font-['PingFang_SC'] leading-normal"

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

@@ -64,11 +64,13 @@ const handleLike = async (options) => {
   pageHelperRef.value?.refresh()
 }
 onShow(async () => {
-  await setStudyTours()
   pageHelperRef.value?.refresh()
+  // await setStudyTours()
+  // setStudyTours()
 })
 onLoad(async () => {
   await setIndexConfigsData()
+  await setStudyTours()
   swiperData.value = indexConfigsData.value.list.map((it) => ({
     data: it,
   }))

+ 3 - 3
packages/app/src/pages/home/schedule/index.vue

@@ -44,7 +44,7 @@ onMounted(() => {
           </div>
           <template
             v-for="(date, index) in group(it.studyTravelDOList, (it) =>
-              dayjs(it.travelTime).format('YYYY-MM-DD'),
+              dayjs(it?.travelTime).format('YYYY-MM-DD'),
             )"
             :key="index"
           >
@@ -67,7 +67,7 @@ onMounted(() => {
                   // Object.keys(
                   //   group(it.studyTravelDOList, (it) => dayjs(it.travelTime).format('YYYY-MM-DD')),
                   // )
-                  dayjs(date.at(i).travelTime).format('MM月DD日')
+                  dayjs(date.at(i)?.travelTime).format('MM月DD日')
                 }}
               </div>
             </view>
@@ -84,7 +84,7 @@ onMounted(() => {
                   <div
                     class="text-black/90 text-base font-normal font-['PingFang_SC'] leading-normal mr-5"
                   >
-                    {{ dayjs(item.travelTime).format('HH:mm') }}
+                    {{ dayjs(item?.travelTime).format('HH:mm') }}
                   </div>
                   <div
                     class="text-black/90 text-base font-normal font-['PingFang_SC'] leading-normal"

+ 11 - 1
packages/app/src/pages/login/index.vue

@@ -37,7 +37,17 @@ const getTestCode = async ({ detail }) => {
 const handleTestLogin = async () => {
   // console.log('');
   const { data } = await testLogin({ mobile: mobile.value, password: 'aaa123456' })
-  console.log(data)
+  setUserInfo({
+    token: data.accessToken,
+    userId: data.userId,
+    accessToken: data.accessToken,
+    refreshToken: data.refreshToken,
+    expiresTime: data.expiresTime,
+    openid: data.openid,
+  })
+  uni.switchTab({
+    url: '/pages/mine/index',
+  })
 }
 onLoad(async (query: { type?: 'test' }) => {
   if (query.type) {