Ver 2.4

src/views/activities/NewYearView.vue → _deprecated/activities/NewYearView.vue

@@ -34,10 +34,12 @@
 
 <script setup>
 import { ref } from 'vue'
-import { sendErrorDialog, sendSuccessDialog, sendWarningDialog } from '@/utils/dialog'
-import { finishLoadingBar, startLoadingBar } from '@/utils/loadingbar'
-import { get } from '@/utils/request'
-import userData from '@/utils/stores/userData/store'
+import Message from '@/utils/dialog.js'
+import { finishLoadingBar, startLoadingBar } from '@/utils/loadingbar.js'
+import { get } from '@/utils/request.js'
+import userData from '@/utils/stores/userData/store.js'
+
+const message = new Message()
 
 const commentList = ref([])
 const formRef = ref(null)
@@ -59,7 +61,7 @@ function timestampToTime(timestamp) {
 function submitComment() {
   startLoadingBar()
   if (newYear.value.comment === '') {
-    sendErrorDialog('内容不可为空！')
+    message.warning('内容不可为空！')
     finishLoadingBar()
     return
   }

src/views/activities/PrizeView.vue → _deprecated/activities/PrizeView.vue

@@ -46,10 +46,10 @@
 
 <script setup>
 import { ref } from 'vue'
-import { sendSuccessDialog, sendWarningDialog } from '@/utils/dialog'
-import { finishLoadingBar, startLoadingBar } from '@/utils/loadingbar'
-import { get } from '@/utils/request'
-import userData from '@/utils/stores/userData/store'
+import { sendSuccessDialog, sendWarningDialog } from '@/utils/dialog.js'
+import { finishLoadingBar, startLoadingBar } from '@/utils/loadingbar.js'
+import { get } from '@/utils/request.js'
+import userData from '@/utils/stores/userData/store.js'
 import { marked } from 'marked'
 
 const prizesList = ref([

package.json

@@ -1,7 +1,7 @@
 {
   "name": "locyanfrp",
   "private": true,
-  "version": "2.3",
+  "version": "2.4",
   "type": "module",
   "scripts": {
     "dev": "vite",
@@ -10,11 +10,11 @@
     "format": "prettier --write src/"
   },
   "dependencies": {
+    "@vicons/fa": "^0.12.0",
+    "@vicons/fluent": "^0.12.0",
     "@vicons/ionicons4": "^0.12.0",
     "@vicons/ionicons5": "^0.12.0",
     "@vicons/material": "^0.12.0",
-    "@vicons/fa": "^0.12.0",
-    "@vicons/fluent": "^0.12.0",
     "axios": "^1.7.7",
     "highlight.js": "^11.10.0",
     "js-cookie": "^3.0.5",
@@ -33,6 +33,7 @@
     "vue-native-websocket": "^2.0.15",
     "vue-route": "^1.5.1",
     "vue-router": "^4.4.5",
+    "vue-turnstile": "^1.0.11",
     "vuex": "^4.1.0"
   },
   "devDependencies": {

src/App.vue

@@ -7,7 +7,7 @@
             <the-message />
             <loading-bar />
             <the-dialog />
-            <notification />
+            <the-notification />
             <n-layout v-show="loading">
               <n-el class="load-container">
                 <n-spin></n-spin>
@@ -57,7 +57,7 @@ import {
   NNotificationProvider,
   useOsTheme
 } from 'naive-ui'
-import Notification from '@components/TheNotification.vue'
+import TheNotification from '@components/TheNotification.vue'
 import TheFooter from '@components/TheFooter.vue'
 import TheHeader from '@components/TheHeader.vue'
 import UserInfo from '@components/UserInfo.vue'
@@ -73,11 +73,13 @@ import hljs from 'highlight.js/lib/core'
 import ini from 'highlight.js/lib/languages/ini'
 import nginx from 'highlight.js/lib/languages/nginx'
 import api from '@/api'
-import { sendWarningMessage } from '@/utils/message'
+import Notification from '@/utils/notification'
 import { logout } from '@/utils/profile'
 import router from '@router'
 import { useRoute, useRouter } from 'vue-router'
 
+const notification = new Notification()
+
 // 手机状态下收缩菜单栏
 const collapsed = ref(true)
 if (document.body.clientWidth >= 1000) {
@@ -121,9 +123,9 @@ vRouter.afterEach(() => {
 async function fetchUserInfo() {
   let rs
   try {
-    rs = await api.v2.user.info.root.get(userData.getters.get_username)
+    rs = await api.v2.user.info.root.get(userData.getters.get_user_id)
   } catch (e) {
-    sendWarningMessage('查询用户信息失败: ' + e + '，请重新登录后台！')
+    notification.warning('查询用户信息失败', e + '，请重新登录后台！')
   }
   if (!rs) return
   if (rs.status === 200) {
@@ -142,7 +144,7 @@ async function fetchUserInfo() {
     return true
   }
   if (rs.status === 401) {
-    sendWarningMessage('登录过期或未登录，请重新登录后台！')
+    notification.warning('授权失效', '请重新登录后台！')
     logout()
   }
   return false
@@ -151,6 +153,11 @@ async function fetchUserInfo() {
 watch(
   () => route.meta,
   (value) => {
+    if (value.noSidebar) {
+      showMainSidebar.value = false
+      showGuestSidebar.value = false
+      return
+    }
     if (value.needLogin) {
       showMainSidebar.value = true
       showGuestSidebar.value = false

src/api/base.ts

@@ -1,7 +1,7 @@
 const base = {
   api_v1_url: 'https://api.locyanfrp.cn',
-  api_v2_url: 'https://api-v2.locyanfrp.cn/api/v2',
-  // api_v2_url: 'http://localhost:18080/api/v2',
+  // api_v2_url: 'https://api-v2.locyanfrp.cn/api/v2',
+  api_v2_url: 'http://localhost:18080/api/v2',
   buildResponse: (res: any, useDataPath: boolean = true) => {
     const message =
       res.data?.message ??

src/api/index.ts

@@ -1,8 +1,6 @@
-import v1 from './v1'
 import v2 from './v2'
 
 const api = {
-  v1: v1,
   v2: v2
 }