From 34ad23db7ac5a1acc97e7d3b30c4e6361a4bbeb4 Mon Sep 17 00:00:00 2001
From: cast1e <rooger233@gmail.com>
Date: Tue, 2 Apr 2024 21:03:03 +0800
Subject: [PATCH] bug fixes

---
 src/App.vue                       | 14 +++++++-------
 src/components/manage/Display.vue |  5 +----
 src/components/manage/SetList.vue |  3 +--
 src/components/recite/select.vue  |  3 +--
 src/js/history.js                 |  4 ++--
 src/js/request.js                 |  8 ++++++++
 src/js/wordsets.js                |  1 +
 src/main.js                       |  4 +++-
 src/md/about.md                   | 10 ++++++++++
 9 files changed, 34 insertions(+), 18 deletions(-)
 create mode 100644 src/js/request.js

diff --git a/src/App.vue b/src/App.vue
index 4f62a4f..80c08e9 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -11,11 +11,11 @@
   <router-view style=""></router-view>
   <div class="mbonly">
     <div id="navibar">
-      <div class="navi-item"><box-icon name="home-alt-2" @click="$router.push('/')" color="var(--text-color)" size="30px"></box-icon><div>主页</div></div>
-      <div class="navi-item"><box-icon name="book-open" @click="$router.push('/select')" color="var(--text-color)" size="30px"></box-icon><div>背诵</div></div>
-      <div class="navi-item"><box-icon name="folder" @click="$router.push('/manage')" color="var(--text-color)" size="30px"></box-icon><div>浏览</div></div>
-      <div class="navi-item"><box-icon name="file" @click="$router.push('/manual')" color="var(--text-color)" size="30px"></box-icon><div>说明</div></div>
-      <div class="navi-item"><box-icon name="info-circle" @click="$router.push('/about')" color="var(--text-color)" size="30px"></box-icon><div>关于</div></div>
+      <div class="navi-item"><box-icon name="home-alt-2" @click="$router.push('/')" color="var(--text-color)" size="27px"></box-icon><div>主页</div></div>
+      <div class="navi-item"><box-icon name="book-open" @click="$router.push('/select')" color="var(--text-color)" size="27px"></box-icon><div>背诵</div></div>
+      <div class="navi-item"><box-icon name="folder" @click="$router.push('/manage')" color="var(--text-color)" size="27px"></box-icon><div>浏览</div></div>
+      <div class="navi-item"><box-icon name="file" @click="$router.push('/manual')" color="var(--text-color)" size="27px"></box-icon><div>说明</div></div>
+      <div class="navi-item"><box-icon name="info-circle" @click="$router.push('/about')" color="var(--text-color)" size="27px"></box-icon><div>关于</div></div>
     </div>
   </div>
 </template>
@@ -184,7 +184,7 @@ html.bgimged .card {
 <style scoped>
 @media screen and (max-width: 500px) {
   #navibar {
-    height: 70px;
+    height: 55px;
     border-top: solid 1px var(--bd-color);
     display: flex;
     flex-direction: row;
@@ -198,7 +198,7 @@ html.bgimged .card {
 
   .navi-item {
     height: 100%;
-    font-size: 13px;
+    font-size: 11px;
     display: flex;
     flex-direction: column;
     align-items: center;
diff --git a/src/components/manage/Display.vue b/src/components/manage/Display.vue
index ab8e8dc..0943c4b 100644
--- a/src/components/manage/Display.vue
+++ b/src/components/manage/Display.vue
@@ -19,9 +19,6 @@
 </template>
 
 <script>
-
-import axios from 'axios';
-
 export default {
     name: "NoteEditor",
     data() {
@@ -34,7 +31,7 @@ export default {
         this.book = this.$route.query.book;
         this.id = this.$route.query.id;
         if (this.set && this.book && this.id) {
-            axios.get("./wordset/detail", {
+            this.$axios.get("wordset/detail", {
                 params:{
                     set: this.set, book: this.book, id: this.id
                 }
diff --git a/src/components/manage/SetList.vue b/src/components/manage/SetList.vue
index 56409c7..43e96d6 100644
--- a/src/components/manage/SetList.vue
+++ b/src/components/manage/SetList.vue
@@ -88,7 +88,6 @@
 
 <script>
 import { ElNotification, ElMessage, ElMessageBox } from 'element-plus';
-import axios from 'axios';
 
 export default {
     name: "SetList",
@@ -186,7 +185,7 @@ export default {
                 this.view(first_set);
             }, 0);
         }
-        axios.get("/wordset/list").then(
+        this.$axios.get("wordset/list").then(
             (res) => {
                 this.online_wordsets = res.data;
             }
diff --git a/src/components/recite/select.vue b/src/components/recite/select.vue
index d4b79e1..28526ed 100644
--- a/src/components/recite/select.vue
+++ b/src/components/recite/select.vue
@@ -83,7 +83,6 @@
 </template>
 
 <script>
-import axios from 'axios';
 import { ElMessage } from 'element-plus';
 
 export default {
@@ -161,7 +160,7 @@ export default {
             }
         }
         document.addEventListener('keyup', this.key_listener);
-        axios.get("/wordset/list").then((res, err) => {
+        this.$axios.get("wordset/list").then((res, err) => {
             if (err) {
                 ElMessage({
                     message: "在线词库加载失败",
diff --git a/src/js/history.js b/src/js/history.js
index cda6594..674e43e 100644
--- a/src/js/history.js
+++ b/src/js/history.js
@@ -1,4 +1,4 @@
-import axios from 'axios'
+import axios from './request.js'
 const limit = 10;
 export default class _history {
     constructor() {
@@ -81,7 +81,7 @@ export default class _history {
             else return this.handle_err("单词本不存在",err);
         }
         for (let i of history.onlinesets) {
-            let res = await axios.get("/wordset/detail", {
+            let res = await axios.get("wordset/detail", {
                 params: i
             })
             if (res.status != 200) {
diff --git a/src/js/request.js b/src/js/request.js
new file mode 100644
index 0000000..43c05e5
--- /dev/null
+++ b/src/js/request.js
@@ -0,0 +1,8 @@
+import axios from 'axios'
+
+const instance = axios.create({
+    baseURL:"./",
+    timeout:6000,
+})
+
+export default instance;
\ No newline at end of file
diff --git a/src/js/wordsets.js b/src/js/wordsets.js
index ca63dd3..7a58bcf 100644
--- a/src/js/wordsets.js
+++ b/src/js/wordsets.js
@@ -1,5 +1,6 @@
 import uuid from 'node-uuid';
 
+
 export default class _wordset {
     constructor() {
         this.sets = {};
diff --git a/src/main.js b/src/main.js
index 7e4fbbc..b1a79dd 100644
--- a/src/main.js
+++ b/src/main.js
@@ -1,4 +1,4 @@
-import { createApp } from 'vue'
+import {createApp} from 'vue'
 import App from './App.vue'
 import { createStore } from 'vuex'
 import ElementPlus from 'element-plus'
@@ -6,6 +6,7 @@ import 'element-plus/dist/index.css'
 import 'element-plus/theme-chalk/dark/css-vars.css'
 import 'boxicons'
 import router from './router.js'
+import axios from './js/request.js'
 
 const app = createApp(App);
 const store = createStore({
@@ -15,4 +16,5 @@ const store = createStore({
 app.use(store);
 app.use(ElementPlus);
 app.use(router);
+app.config.globalProperties.$axios = axios;
 app.mount('#app');
\ No newline at end of file
diff --git a/src/md/about.md b/src/md/about.md
index f07d0d7..05e8820 100644
--- a/src/md/about.md
+++ b/src/md/about.md
@@ -42,6 +42,16 @@ wordIn 的前端代码已经开源 [Git Repository](https://git.zjueva.net/cast1
    - （已修复）查看之前的单词时溢出的错误
    - （解决中）手机端适配问题
 
+#### Patch 1
+
+- 增加了移动端底部导航栏
+- 修复了无法随机顺序问题
+
+#### Patch 2
+
+- 封装网络请求
+- 其他源码优化
+
 ### 1.0  
 
 #### 1.0 及之前的版本汇总