diff --git a/.vscode/settings.json b/.vscode/settings.json
index 4ba03f03..9e8cee6d 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -24,6 +24,7 @@
"Licence",
"loli",
"majesticons",
+ "mingcute",
"mockjs",
"moemoe",
"moemoepoint",
diff --git a/src/components/quill-editor/EditorFooter.vue b/src/components/quill-editor/EditorFooter.vue
index b0da3da4..c6c9812a 100644
--- a/src/components/quill-editor/EditorFooter.vue
+++ b/src/components/quill-editor/EditorFooter.vue
@@ -79,8 +79,9 @@ const handelClickSettings = () => {
{{ $tm('edit.help1') }}
{{ $tm('edit.help2') }}
{{ $tm('edit.help3') }}
+ {{ $tm('edit.help4') }}
- {{ $tm('edit.help4') }}
+ {{ $tm('edit.help5') }}
{{ $tm('edit.contact') }}
@@ -138,7 +139,6 @@ const handelClickSettings = () => {
ul {
display: flex;
flex-direction: column;
- border: 1px solid var(--kungalgame-blue-1);
background-color: var(--kungalgame-white);
padding: 5px;
border-radius: 5px;
diff --git a/src/components/setting-panel/KUNGalgameSettingPanel.vue b/src/components/setting-panel/KUNGalgameSettingPanel.vue
index 7e963dd5..c0b507b4 100644
--- a/src/components/setting-panel/KUNGalgameSettingPanel.vue
+++ b/src/components/setting-panel/KUNGalgameSettingPanel.vue
@@ -8,15 +8,15 @@ import Loli from './components/Loli.vue'
import Mode from './components/Mode.vue'
// 导入语言切换组件
import SwitchLanguage from './components/SwitchLanguage.vue'
+// 页面宽度调整组件
+import PageWidth from './components/PageWidth.vue'
// 引入背景设置组件
import Background from './components/Background.vue'
// 导入设置面板 store
import { useKUNGalgameSettingsStore } from '@/store/modules/settings'
-import { storeToRefs } from 'pinia'
// 使用设置面板的 store
const settingsStore = useKUNGalgameSettingsStore()
-const { showKUNGalgameMainPageWidth } = storeToRefs(settingsStore)
const emits = defineEmits(['close'])
@@ -46,24 +46,11 @@ const handelCloseSettingsPanel = () => {
-
-
-
- {{ $tm('header.settings.width') }}
- {{ showKUNGalgameMainPageWidth }}%
-
-
- 50%90%
-
-
+
+
+
+
+
@@ -128,24 +115,6 @@ const handelCloseSettingsPanel = () => {
}
}
-.page-width {
- font-size: 15px;
- display: flex;
- span {
- margin-top: 15px;
- }
-}
-/* 主页页面宽度滑动条 */
-.main {
- width: 100%;
- height: 10px;
- margin: 20px 0;
-}
-
-.width-container {
- display: flex;
- justify-content: space-between;
-}
.reset {
font-size: 15px;
cursor: pointer;
@@ -168,6 +137,7 @@ const handelCloseSettingsPanel = () => {
margin: 20px;
cursor: pointer;
}
+
@media (max-width: 1000px) {
.root {
display: none;
diff --git a/src/components/setting-panel/components/PageWidth.vue b/src/components/setting-panel/components/PageWidth.vue
new file mode 100644
index 00000000..551d782b
--- /dev/null
+++ b/src/components/setting-panel/components/PageWidth.vue
@@ -0,0 +1,86 @@
+
+
+
+
+
+
+ {{ $tm('header.settings.width') }}
+ {{ pageWidth }}%
+
+
+ 50%90%
+
+
+
+
+
diff --git a/src/components/top-bar/KUNGalgameTopBar.vue b/src/components/top-bar/KUNGalgameTopBar.vue
index e367da52..f50f057d 100644
--- a/src/components/top-bar/KUNGalgameTopBar.vue
+++ b/src/components/top-bar/KUNGalgameTopBar.vue
@@ -92,7 +92,7 @@ onBeforeRouteLeave(() => {
enter-active-class="animate__animated animate__jackInTheBox animate__faster"
leave-active-class="animate__animated animate__fadeOutRight animate__faster"
>
-
+
import('@/views/Home/KUNGalgameMainPage.vue'),
meta: {
diff --git a/src/store/modules/settings.ts b/src/store/modules/settings.ts
index 870faed4..9ab59d7e 100644
--- a/src/store/modules/settings.ts
+++ b/src/store/modules/settings.ts
@@ -11,7 +11,7 @@ interface KUNGalgameSettings {
// 网站显示语言
showKUNGalgameLanguage: string
// 主页宽度
- showKUNGalgameMainPageWidth: string
+ showKUNGalgamePageWidth: Record
// 背景图
showKUNGalgameBackground: string
// 自定义背景图
@@ -25,7 +25,16 @@ export const useKUNGalgameSettingsStore = defineStore({
state: (): KUNGalgameSettings => ({
showKUNGalgameMode: mode,
showKUNGalgameLanguage: KUNGalgameLanguage,
- showKUNGalgameMainPageWidth: '61.8',
+ showKUNGalgamePageWidth: {
+ KUN: 61.8,
+ Topic: 90,
+ Edit: 90,
+ KUNGalgame: 90,
+ Pool: 90,
+ Bylaw: 90,
+ Technique: 90,
+ ThanksList: 90,
+ },
showKUNGalgameBackground: 'none',
showKUNGalgameCustomBackground: '',
}),
diff --git a/src/views/Home/content/MainPageContent.vue b/src/views/Home/content/MainPageContent.vue
index 661e45a4..f536accc 100644
--- a/src/views/Home/content/MainPageContent.vue
+++ b/src/views/Home/content/MainPageContent.vue
@@ -7,9 +7,9 @@ import { storeToRefs } from 'pinia'
import { computed } from 'vue'
// 使用设置面板的 store
const settingsStore = useKUNGalgameSettingsStore()
-const { showKUNGalgameMainPageWidth } = storeToRefs(settingsStore)
-const width = computed(() => {
- return showKUNGalgameMainPageWidth.value + '%'
+const { showKUNGalgamePageWidth } = storeToRefs(settingsStore)
+const mainPageWidth = computed(() => {
+ return showKUNGalgamePageWidth.value.KUN + '%'
})
@@ -41,7 +41,7 @@ const width = computed(() => {
}
/* 可视内容部分宽度 */
.content-container {
- width: v-bind(width);
+ width: v-bind(mainPageWidth);
transition: all 0.2s;
height: 100%;
margin: 0 auto;
diff --git a/src/views/bylaw/Bylaw.vue b/src/views/bylaw/Bylaw.vue
index f815364c..f814639e 100644
--- a/src/views/bylaw/Bylaw.vue
+++ b/src/views/bylaw/Bylaw.vue
@@ -1,5 +1,16 @@
@@ -99,7 +110,8 @@ import KUNGalgameFooter from '@/components/KUNGalgameFooter.vue'
margin: 0 auto;
padding: 5px;
/* 固定宽高 */
- width: 70%;
+ transition: all 0.2s;
+ width: v-bind(bylawPageWidth);
max-width: 1300px;
height: 100%;
background-color: var(--kungalgame-trans-white-5);
diff --git a/src/views/edit/Edit.vue b/src/views/edit/Edit.vue
index 7f0b12d0..5974ff84 100644
--- a/src/views/edit/Edit.vue
+++ b/src/views/edit/Edit.vue
@@ -4,6 +4,17 @@ import QuillEditor from '@/components/quill-editor/QuillEditor.vue'
import Tags from './components/Tags.vue'
import Footer from './components/Footer.vue'
import KUNGalgameFooter from '@/components/KUNGalgameFooter.vue'
+
+// 导入设置面板 store
+import { useKUNGalgameSettingsStore } from '@/store/modules/settings'
+import { storeToRefs } from 'pinia'
+import { computed } from 'vue'
+// 使用设置面板的 store
+const settingsStore = useKUNGalgameSettingsStore()
+const { showKUNGalgamePageWidth } = storeToRefs(settingsStore)
+const editPageWidth = computed(() => {
+ return showKUNGalgamePageWidth.value.Edit + '%'
+})
@@ -46,7 +57,7 @@ import KUNGalgameFooter from '@/components/KUNGalgameFooter.vue'
/* 内容部分的总容器 */
.container {
transition: all 0.2s;
- width: 80%;
+ width: v-bind(editPageWidth);
max-width: 1500px;
margin: 0 auto;
/* 容器的阴影 */
diff --git a/src/views/kungalgame/KUNGalgame.vue b/src/views/kungalgame/KUNGalgame.vue
index ba3d2711..2e2fcccd 100644
--- a/src/views/kungalgame/KUNGalgame.vue
+++ b/src/views/kungalgame/KUNGalgame.vue
@@ -3,6 +3,17 @@
import KUNGalgameFooter from '@/components/KUNGalgameFooter.vue'
// 导入 Aside
import Aside from './components/Aside.vue'
+
+// 导入设置面板 store
+import { useKUNGalgameSettingsStore } from '@/store/modules/settings'
+import { storeToRefs } from 'pinia'
+import { computed } from 'vue'
+// 使用设置面板的 store
+const settingsStore = useKUNGalgameSettingsStore()
+const { showKUNGalgamePageWidth } = storeToRefs(settingsStore)
+const kungalgamePageWidth = computed(() => {
+ return showKUNGalgamePageWidth.value.KUNGalgame + '%'
+})
@@ -189,7 +200,8 @@ import Aside from './components/Aside.vue'
border-radius: 7px;
/* 固定高度 */
height: 1300px;
- width: 90%;
+ transition: all 0.2s;
+ width: v-bind(kungalgamePageWidth);
max-width: 1300px;
/* 居中 */
margin: auto;
diff --git a/src/views/pool/Pool.vue b/src/views/pool/Pool.vue
index 8300324f..04680678 100644
--- a/src/views/pool/Pool.vue
+++ b/src/views/pool/Pool.vue
@@ -5,6 +5,17 @@ import Topic from './components/Topic.vue'
import Bar from './components/Bar.vue'
import { topic } from './components/topic'
+
+// 导入设置面板 store
+import { useKUNGalgameSettingsStore } from '@/store/modules/settings'
+import { storeToRefs } from 'pinia'
+import { computed } from 'vue'
+// 使用设置面板的 store
+const settingsStore = useKUNGalgameSettingsStore()
+const { showKUNGalgamePageWidth } = storeToRefs(settingsStore)
+const poolPageWidth = computed(() => {
+ return showKUNGalgamePageWidth.value.Pool + '%'
+})
@@ -39,7 +50,8 @@ import { topic } from './components/topic'
/* 话题池容器 */
.pool-container {
/* 占页面的宽度比例 */
- width: 90%;
+ transition: all 0.2s;
+ width: v-bind(poolPageWidth);
/* 居中 */
margin: 0 auto;
display: flex;
diff --git a/src/views/technique/Technique.vue b/src/views/technique/Technique.vue
index 75a99c55..e388c090 100644
--- a/src/views/technique/Technique.vue
+++ b/src/views/technique/Technique.vue
@@ -14,6 +14,17 @@ onBeforeMount(async () => {
console.error('Error fetching topics:', error)
}
})
+
+// 导入设置面板 store
+import { useKUNGalgameSettingsStore } from '@/store/modules/settings'
+import { storeToRefs } from 'pinia'
+import { computed } from 'vue'
+// 使用设置面板的 store
+const settingsStore = useKUNGalgameSettingsStore()
+const { showKUNGalgamePageWidth } = storeToRefs(settingsStore)
+const techniquePageWidth = computed(() => {
+ return showKUNGalgamePageWidth.value.Technique + '%'
+})
@@ -47,7 +58,8 @@ onBeforeMount(async () => {
padding: 5px;
height: 1400px;
/* 占总页面的宽度 */
- width: 95%;
+ transition: all 0.2s;
+ width: v-bind(techniquePageWidth);
/* 水平垂直居中 */
margin: 0 auto;
display: flex;
diff --git a/src/views/thanks-list/ThanksList.vue b/src/views/thanks-list/ThanksList.vue
index 6ef32bc9..8559ffe9 100644
--- a/src/views/thanks-list/ThanksList.vue
+++ b/src/views/thanks-list/ThanksList.vue
@@ -1,6 +1,17 @@
@@ -97,7 +108,8 @@ import KUNGalgameFooter from '@/components/KUNGalgameFooter.vue'
}
.container {
/* 固定宽高 */
- max-width: 900px;
+ transition: all 0.2s;
+ width: v-bind(thanksListPageWidth);
height: 1300px;
/* 居中 */
margin: auto;
diff --git a/src/views/topic/KUNGalgameTopicPage.vue b/src/views/topic/KUNGalgameTopicPage.vue
index f4c13acd..89dd3b26 100644
--- a/src/views/topic/KUNGalgameTopicPage.vue
+++ b/src/views/topic/KUNGalgameTopicPage.vue
@@ -4,27 +4,38 @@