Merge pull request #92 from Tianci-King/master

fix(lostAndFound):修复失物招领首页和详情页字体间距过大；修复成绩查询页面变量显示 undefined
zjutjh · Nov 22, 2023 · 8bb77b5 · 8bb77b5
2 parents f491473 + 3d53d1a
commit 8bb77b5
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 8 deletions.
diff --git a/src/components/FixedQuickView/LostfoundQuickView/index.scss b/src/components/FixedQuickView/LostfoundQuickView/index.scss
@@ -1,6 +1,7 @@
 @import "@/style/theme";
 
 .text {
+  padding-left: 10%;
   margin-left: 6.5em;
   text-indent: -4.3em;
   font-weight: normal;

diff --git a/src/components/FixedQuickView/LostfoundQuickView/index.vue b/src/components/FixedQuickView/LostfoundQuickView/index.vue
@@ -4,9 +4,12 @@
       <view class="title">失物寻物</view>
     </view>
     <view v-if="randomContent" class="content flex-column ">
-      <text v-show="randomContent?.item_name" class="text" style="padding-left: 10%"> 物品名称  {{ randomContent?.item_name }}</text>
-      <text v-show="randomContent?.lost_or_found_place" class="text" style="padding-left: 10%"> 拾得地点  {{ randomContent?.lost_or_found_place }}</text>
-      <text v-show="randomContent?.lost_or_found_time" class="text" style="padding-left: 10%"> 拾得时间  {{ randomContent?.lost_or_found_time }}</text>
+        <text v-show="!randomContent?.type && randomContent?.item_name" class="text"> 物品名称  {{ randomContent?.item_name }}</text>
+        <text v-show="!randomContent?.type && randomContent?.lost_or_found_place" class="text" style="margin-top: -10px;"> 遗失地点  {{ randomContent?.lost_or_found_place }}</text>
+        <text v-show="!randomContent?.type && randomContent?.lost_or_found_time" class="text" style="margin-top: -10px;"> 遗失时间  {{ randomContent?.lost_or_found_time }}</text>
+        <text v-show="randomContent?.type && randomContent?.item_name" class="text"> 物品名称  {{ randomContent?.item_name }}</text>
+        <text v-show="randomContent?.type && randomContent?.lost_or_found_place" class="text" style="margin-top: -10px;"> 拾得地点  {{ randomContent?.lost_or_found_place }}</text>
+        <text v-show="randomContent?.type && randomContent?.lost_or_found_time" class="text" style="margin-top: -10px;"> 拾得时间  {{ randomContent?.lost_or_found_time }}</text>
     </view>
     <view v-else :class="['content', 'empty']">
       <text class="campus">{{ defaultCampus }} </text>

diff --git a/src/constants/updateInfo.ts b/src/constants/updateInfo.ts
@@ -17,13 +17,14 @@ type UpdateInfoType = {
 }
 
 export const updateInfo: UpdateInfoType = {
-  version: "2.5.0",
+  version: "2.5.6",
   title: "微精弘更新公告",
-  content: `微精弘小程序2.5.0更新 [失物招领] ，注册绑定一卡通以体验！
+  content: `微精弘小程序2.5.6更新 [失物招领] ，注册绑定一卡通以体验！
   > 更新内容
   1. 实验室上线切换主题色功能
   2. 微精弘 x “For You”工程 联合上线失物招领
   3. 校园资讯功能优化
+  4. 修复了一些已知的bug
   `,
   actions: {
     cancel: { label: "取消" },

diff --git a/src/pages/lostfound/PreviewCard/index.module.scss b/src/pages/lostfound/PreviewCard/index.module.scss
@@ -47,6 +47,7 @@
 
     .text {
       margin-left: 6.5em;
+      margin-top: -20px;
       text-indent: -6em;
       font-weight: normal;
     }

diff --git a/src/pages/lostfound/index.scss b/src/pages/lostfound/index.scss
@@ -41,6 +41,7 @@
   background-color: var(--wjh-color-primary-light);
 
   .scroll-view {
+    margin-top: -10px;
     font-size: 0.9em;
     display: flex;
     overflow-x: auto;

diff --git a/src/pages/score/index.vue b/src/pages/score/index.vue
@@ -176,10 +176,19 @@ const relativeTermInfo = computed(() => {
   const charEnum = ["一", "二", "三", "四", "五", "六", "日"];
   let char = charEnum[0];
   if (serviceStore.user.info?.studentID) {
-    char = charEnum[
-      parseInt(selectTerm.value?.year) -
+    //解决2023 年以后的学生 id 是 302023 开头的问题
+    if(serviceStore.user.info.studentID.slice(0,2) === "30"){
+      char = charEnum[
+        parseInt(selectTerm.value?.year) -
+      parseInt(serviceStore.user.info.studentID.slice(2, 6))
+      ];
+    }
+    else {
+      char = charEnum[
+        parseInt(selectTerm.value?.year) -
       parseInt(serviceStore.user.info.studentID.slice(0, 4))
-    ];
+      ];
+    }
   }
   return `大${char}${selectTerm.value?.term}学期`;
 });