刘洋 1 год назад
Родитель
Сommit
3a783f7fba

+ 2 - 2
src/assets/styles/main.css

@@ -18,7 +18,7 @@
   padding-bottom: calc(var(--van-tabbar-height) + env(safe-area-inset-bottom)) !important;
 }
 .page {
-  padding-bottom: env(safe-area-inset-bottom) !important;
+  padding-bottom: calc(env(safe-area-inset-bottom) + 16px) !important;
 }
 .page,
 .tab-page {
@@ -34,7 +34,7 @@
 }
 .page .sub-page,
 .tab-page .sub-page {
-  padding-bottom: env(safe-area-inset-bottom) !important;
+  padding-bottom: calc(env(safe-area-inset-bottom) + 16px) !important;
   position: fixed;
   left: 0;
   top: 0;

+ 2 - 2
src/assets/styles/main.less

@@ -23,7 +23,7 @@
   ) !important;
 }
 .page {
-  padding-bottom: env(safe-area-inset-bottom) !important;
+  padding-bottom: calc(env(safe-area-inset-bottom) + 16px) !important;
 }
 .page,
 .tab-page {
@@ -37,7 +37,7 @@
   flex-direction: column;
   justify-content: flex-start;
   .sub-page {
-    padding-bottom: env(safe-area-inset-bottom) !important;
+    padding-bottom: calc(env(safe-area-inset-bottom) + 16px) !important;
     position: fixed;
     left: 0;
     top: 0;

+ 22 - 9
src/pages/admissionCard.vue

@@ -11,18 +11,18 @@
           <img :src="appStore.globalConfig.fileUrlPrefix + info.photoPath" />
         </div>
         <div class="media-right info-rows">
-          <div><span class="label">姓名:</span>{{ info.studentName }}</div>
-          <div><span class="label">性别:</span>{{ info.gender }}</div>
-          <div>
-            <span class="label">身份证号:</span>{{ info.identityNumber }}
+          <div class="base-info">
+            <div><span class="label">姓名:</span>{{ info.studentName }}</div>
+            <div><span class="label">性别:</span>{{ info.gender }}</div>
           </div>
           <div>
-            <span class="label">考点名称:</span>{{ info.examSiteName }}
+            <span class="label">身份证号:</span>{{ info.identityNumber }}
           </div>
         </div>
       </div>
-      <div class="py-20 d-flex flex-v justify-content-between info-rows">
-        <div>
+      <div class="pt-14 pb-20 d-flex flex-v justify-content-between info-rows">
+        <div><span class="label">考点名称:</span>{{ info.examSiteName }}</div>
+        <div class="mt-12">
           <span class="label">考试时间:</span>
           {{ $filters.dateFormat(info.timePeriodStart, "yyyy年MM月dd日") }}
           (星期{{ getWeek(info.timePeriodStart) }})
@@ -187,14 +187,27 @@ function getWeek(time) {
         flex: 1;
         display: flex;
         flex-direction: column;
-        justify-content: space-between;
+        justify-content: space-around;
+        padding: 8px 0;
+        .base-info {
+          & > div {
+            width: 50%;
+            float: left;
+          }
+          &:after {
+            content: "";
+            display: block;
+            clear: both;
+          }
+        }
       }
     }
     .info-rows {
       color: #262626;
       .label {
         color: #8c8c8c;
-        margin-right: 6px;
+        display: block;
+        margin-bottom: 3px;
       }
     }
   }

+ 0 - 1
src/pages/examGuidance.vue

@@ -27,7 +27,6 @@ _getRoomGuide();
 </script>
 <style lang="less" scoped>
 .exam-guidance {
-  background: #fff;
   background: #fff;
   .title {
     font-weight: bold;

+ 11 - 0
src/pages/login.vue

@@ -25,6 +25,7 @@
             clearable
             label-width="0px"
             :rules="[{ required: true, message: '请输入学号' }]"
+            @update:model-value="accountChange"
           />
           <van-field
             v-model="password"
@@ -36,6 +37,7 @@
             @click-right-icon="passwordShow = !passwordShow"
             label-width="0px"
             :rules="[{ required: true, message: '请输入证件号后六位' }]"
+            @update:model-value="passwordChange"
           />
           <div style="margin: 16px">
             <van-button block type="success" native-type="submit">
@@ -98,6 +100,15 @@ const exit = () => {
   //   window.close();
   // }
 };
+
+const accountChange = (val) => {
+  val = val || "";
+  account.value = val.trim();
+};
+const passwordChange = (val) => {
+  val = val || "";
+  password.value = val.trim();
+};
 </script>
 <style lang="less" scoped>
 .login {

+ 19 - 0
src/pages/tab-pages/mine.vue

@@ -22,13 +22,22 @@
     <van-button plain block type="success" class="mt-16" @click="logout"
       >退出登录</van-button
     >
+    <div class="hid" @click="countAdd"></div>
   </div>
 </template>
 <script name="Mine" setup>
 import { computed, ref } from "vue";
 import { useUserStore } from "@/store";
 import { useRouter } from "vue-router";
+import vconsole from "vconsole";
 
+const count = ref(0);
+function countAdd() {
+  count.value = count.value + 1;
+  if (count.value == 20) {
+    new vconsole();
+  }
+}
 const router = useRouter();
 const userStore = useUserStore();
 userStore.requestStuInfo();
@@ -51,6 +60,16 @@ function logout() {
 </script>
 <style lang="less" scoped>
 .mine {
+  position: relative;
+  .hid {
+    background: transparent;
+    width: 30px;
+    height: 30px;
+    right: 0;
+    bottom: calc(var(--van-tabbar-height) + env(safe-area-inset-bottom) + 10px);
+    position: absolute;
+    z-index: 1;
+  }
   .cell-group2 {
     margin-top: 16px !important;
   }

+ 2 - 2
vite.config.js

@@ -26,8 +26,8 @@ export default defineConfig(({ mode }) => {
       cors: true,
       proxy: {
         "/api": {
-          target: "http://192.168.10.41:8080",
-          // target: "http://apply.qmth.com.cn",
+          // target: "http://192.168.10.41:8080",
+          target: "http://apply.qmth.com.cn",
           changeOrigin: true,
           // rewrite: (path) => path.replace(new RegExp(`^${envConfig.proxy}`), ''),
         },