Merge pull request #455 from fuyn101/dev_shawn

刷本新增一条建议，侧栏收缩改宽点把读我改到最后，修正内容一处错误
ArkMowers · Dec 22, 2023 · 954a201 · 954a201
2 parents 15e5e9a + 70b4569
commit 954a201
Show file tree

Hide file tree

Showing 4 changed files with 66 additions and 60 deletions.
diff --git a/ui/src/App.vue b/ui/src/App.vue
@@ -27,7 +27,7 @@
               v-if="!mobile"
               bordered
               collapse-mode="width"
-              :collapsed-width="50"
+              :collapsed-width="64"
               :width="210"
               show-trigger
             >
@@ -43,12 +43,6 @@
             </n-layout-content>
             <n-layout-footer v-if="mobile">
               <n-tabs type="line" justify-content="space-evenly" size="small">
-                <n-tab name="主页" @click="$router.push('/')">
-                  <div style="display: flex; flex-direction: column; align-items: center">
-                    <n-icon size="20" style="margin-bottom: -1px" :component="BookOutline" />
-                    看我
-                  </div>
-                </n-tab>
                 <n-tab name="日志" @click="$router.push('/log')">
                   <div style="display: flex; flex-direction: column; align-items: center">
                     <n-icon size="20" style="margin-bottom: -1px" :component="BookOutline" />
@@ -110,6 +104,12 @@
                     帮助
                   </div>
                 </n-tab>
+                <n-tab name="资源" @click="$router.push('/')">
+                  <div style="display: flex; flex-direction: column; align-items: center">
+                    <n-icon size="20" style="margin-bottom: -1px" :component="Bag" />
+                    资源
+                  </div>
+                </n-tab>
               </n-tabs>
             </n-layout-footer>
           </n-layout>
@@ -134,6 +134,7 @@ import Settings from '@vicons/ionicons5/Settings'
 import HelpCircle from '@vicons/ionicons5/HelpCircle'
 import Storefront from '@vicons/ionicons5/Storefront'
 import ReaderOutline from '@vicons/ionicons5/ReaderOutline'
+import Bag from '@vicons/ionicons5/Bag'
 
 function renderIcon(icon) {
   return () => h(NIcon, null, { default: () => h(icon) })
@@ -142,12 +143,7 @@ function renderIcon(icon) {
 import { RouterLink } from 'vue-router'
 const menuOptions = computed(() => [
   {
-    label: () => h(RouterLink, { to: { path: '/' } }, { default: () => '读我' }),
-    icon: renderIcon(BookOutline),
-    key: 'readme'
-  },
-  {
-    label: () => h(RouterLink, { to: { path: '/log' } }, { default: () => '运行日志' }),
+    label: () => h(RouterLink, { to: { path: '/' } }, { default: () => '运行日志' }),
     icon: renderIcon(BookOutline),
     key: 'go-to-log'
   },
@@ -195,6 +191,11 @@ const menuOptions = computed(() => [
     label: () => h(RouterLink, { to: { path: '/doc' } }, { default: () => '帮助文档' }),
     icon: renderIcon(HelpCircle),
     key: 'go-to-doc'
+  },
+  {
+    label: () => h(RouterLink, { to: { path: '/readme' } }, { default: () => '其他资源' }),
+    icon: renderIcon(Bag),
+    key: 'readme'
   }
 ])
 import { zhCN, dateZhCN, darkTheme } from 'naive-ui'

diff --git a/ui/src/components/MaaWeeklyNew.vue b/ui/src/components/MaaWeeklyNew.vue
@@ -317,7 +317,10 @@ function clear() {
       <p>建议每次更新后 点一次<b>清除当前配置以匹配最新表格</b></p>
       <p>如果觉得这个表有什么要改进的 at群管理</p>
       <p>前三行的空行用来写 一些自定义关卡</p>
-
+      <p>
+        新用法<n-tag closable>SSReopen-XX</n-tag> 如<n-tag closable>SSReopen-FC</n-tag
+        >可以刷照我以火的所有复刻本(FC-1到FC-8)
+      </p>
       <ul>
         <li>
           在第一行填入<n-tag closable class="tag-mr">HE-7</n-tag>

diff --git a/ui/src/pages/readme.vue b/ui/src/pages/readme.vue
@@ -1,11 +1,11 @@
 <template>
-  <div class="home-container">
+  <div class="home-container" style="width: auto; align-content: center">
     <!-- <h2>更新日志</h2> -->
-    <h2>资源合集</h2>
+    <h1 id="资源合集">资源合集</h1>
     <div>
-      <h3>Mower</h3>
+      <h2 id="mower">Mower</h2>
       <p>
-        介绍视频：<n-a target="_blank" href="https://www.bilibili.com/video/BV1KT411s7Ar"
+        介绍视频（过时）：<n-a target="_blank" href="https://www.bilibili.com/video/BV1KT411s7Ar"
           >BV1KT411s7Ar</n-a
         >
       </p>
@@ -16,32 +16,24 @@
           >BV1UM4y1y7bA</n-a
         >
       </p>
-      <p>自定义排班教程：</p>
+      <p>自定义排班教程（过时）：</p>
       <ul>
         <li>
-          红松 (<n-a target="_blank" href="https://www.bilibili.com/video/BV1oC4y1U7bo"
+          红松（<n-a target="_blank" href="https://www.bilibili.com/video/BV1oC4y1U7bo"
             >BV1oC4y1U7bo</n-a
-          >)
+          >）
         </li>
         <li>
-          跃跃 (<n-a target="_blank" href="https://www.bilibili.com/video/BV1Bz4y1w7mj"
+          跃跃（<n-a target="_blank" href="https://www.bilibili.com/video/BV1Bz4y1w7mj"
             >BV1Bz4y1w7mj</n-a
-          >)
+          >）
         </li>
         <li>
-          自动化 (<n-a target="_blank" href="https://www.bilibili.com/video/BV1Uw411N7WJ"
+          自动化（<n-a target="_blank" href="https://www.bilibili.com/video/BV1Uw411N7WJ"
             >BV1Uw411N7WJ</n-a
-          >)
+          >）
         </li>
       </ul>
-
-      <p>
-        （施工中）基建与 Mower 入门指南：<n-a
-          target="_blank"
-          href="https://blog.zhaozuohong.vip/categories/arknights-mower/"
-          >https://blog.zhaozuohong.vip/categories/arknights-mower/</n-a
-        >
-      </p>
       <p>
         在线文档：<n-a target="_blank" href="https://arkmowers.github.io/arknights-mower/"
           >https://arkmowers.github.io/arknights-mower/</n-a
@@ -52,6 +44,13 @@
           >https://github.com/ArkMowers/arknights-mower</n-a
         >
       </p>
+      <p>
+        Mower 教程（施工中）：<n-a
+          target="_blank"
+          href="https://blog.zhaozuohong.vip/categories/arknights-mower/"
+          >https://blog.zhaozuohong.vip/categories/arknights-mower/</n-a
+        >
+      </p>
       <p>
         从源码运行 mower：<n-a
           target="_blank"
@@ -91,19 +90,18 @@
         </li>
         <li>
           （备用）直接从
-          <n-a target="_blank" href="https://mower.zhaozuohong.vip"
+          <n-a target="_blank" href="https://mower.zhaozuohong.vip/"
             >https://mower.zhaozuohong.vip</n-a
           >
           下载
         </li>
       </ul>
     </div>
-
     <div>
-      <h3>Mower0</h3>
+      <h2 id="mower0">Mower0</h2>
       <p>
-        介绍视频：<n-a target="_blank" href="https://github.com/Bidgecfah/Mower0"
-          >https://github.com/Bidgecfah/Mower0</n-a
+        介绍视频：<n-a target="_blank" href="https://www.bilibili.com/video/BV1qu4y1k7AX"
+          >BV1qu4y1k7AX</n-a
         >
       </p>
       <p>
@@ -115,38 +113,42 @@
     </div>
 
     <div>
-      <h3>其它资源</h3>
+      <h2 id="其它资源">其它资源</h2>
       <p>
-        罗德岛物价局（材料定价）：<n-a
-          href="https://github.com/Bidgecfah/Rhodes-Island-Bureau-of-Price"
+        罗德岛物价局：<n-a
           target="_blank"
+          href="https://github.com/Bidgecfah/Rhodes-Island-Bureau-of-Price"
           >https://github.com/Bidgecfah/Rhodes-Island-Bureau-of-Price</n-a
         >
       </p>
+      <p>基建模拟器：</p>
+      <ul>
+        <li>
+          在线使用（<n-a target="_blank" href="https://infrastsim.zhaozuohong.vip/"
+            >https://infrastsim.zhaozuohong.vip</n-a
+          >）
+        </li>
+        <li>
+          项目源码（<n-a target="_blank" href="https://github.com/Funny-ppt/InfrastSim"
+            >https://github.com/Funny-ppt/InfrastSim</n-a
+          >）
+        </li>
+        <li>
+          前端源码（<n-a target="_blank" href="https://github.com/Funny-ppt/InfrastSimUI"
+            >https://github.com/Funny-ppt/InfrastSimUI</n-a
+          >）
+        </li>
+      </ul>
       <p>
-        基建模拟器：<n-a target="_blank" href="https://infrastsim.zhaozuohong.vip"
-          >https://infrastsim.zhaozuohong.vip</n-a
-        >
-        项目源码：<n-a target="_blank" href="https://github.com/Funny-ppt/InfrastSim"
-          >https://github.com/Funny-ppt/InfrastSim</n-a
-        >
-        前端源码：<n-a target="_blank" href="https://github.com/Funny-ppt/InfrastSimUI"
-          >https://github.com/Funny-ppt/InfrastSimUI</n-a
-        >
-      </p>
-      <p>
-        明日方舟工具箱（基建技能、养成规划）：<n-a
-          target="_blank"
-          href="https://arkn.lolicon.app/#/riic"
-          >https://arkn.lolicon.app/#/riic</n-a
+        明日方舟工具箱（基建技能、养成规划）：<n-a target="_blank" href="https://arkn.lolicon.app/"
+          >https://arkn.lolicon.app</n-a
         >
       </p>
       <p>Maa：<n-a target="_blank" href="https://maa.plus/">https://maa.plus/</n-a></p>
       <p>
         明日方舟定价理论（施工中）：<n-a
-          target="_blank"
           href="https://bidgecfah.gitee.io/2023/07/12/%E6%98%8E%E6%97%A5%E6%96%B9%E8%88%9F%E5%AE%9A%E4%BB%B7%E7%90%86%E8%AE%BA/"
-          >明日方舟定价理论</n-a
+          >https://bidgecfah.gitee.io/2023/07/12/%E6%98%8E%E6%97%A5%E6%96%B9%E8%88%9F%E5%AE%9A%E4%BB%B7%E7%90%86%E8%AE%BA/</n-a
         >
       </p>
     </div>

diff --git a/ui/src/routes.js b/ui/src/routes.js
@@ -3,13 +3,13 @@ export const routes = [
     path: '/',
     children: [
       {
-        path: '',
+        path: 'readme',
         component: () => import('@/pages/readme.vue'),
         meta: { title: '帮助' },
         name: 'readme'
       },
       {
-        path: 'log',
+        path: '',
         component: () => import('@/pages/Log.vue'),
         meta: { title: '日志' },
         name: 'log'