下个节日

package.json

@@ -1,6 +1,23 @@
 {
   "name": "blog",
-  "version": "0.0.0",
+  "version": "0.0.1",
+  "description": "blog",
+  "author": "youzi",
+  "license": "MIT",
+  "private": true,
+  "main": "dist/index.cjs.js",
+  "module": "dist/index.esm.js",
+  "unpkg": "dist/index.umd.js",
+  "types": "dist/index.d.ts",
+  "files": [
+    "dist"
+  ],
+  "publishConfig": {
+    "access": "public"
+  },
+  "keywords": [
+    "blog"
+  ],
   "scripts": {
     "dev": "vite",
     "build": "vite build",
@@ -11,24 +28,26 @@
     "@wangeditor/editor": "^5.1.23",
     "@wangeditor/editor-for-vue": "^5.1.12",
     "aplayer": "^1.10.1",
-    "axios": "^1.4.0",
+    "axios": "^1.7.7",
+    "browserslist": "^4.24.2",
     "chinese-workday": "^1.10.0",
     "colorofchina": "^1.0.6",
     "gsap": "^3.12.2",
     "less": "^4.1.3",
-    "naive-ui": "^2.38.1",
+    "naive-ui": "^2.40.1",
     "nprogress": "^0.2.0",
-    "pinia": "^2.0.17",
-    "qs": "^6.11.2",
+    "pinia": "^2.2.4",
+    "qs": "^6.13.0",
     "qweather-icons": "^1.3.3",
-    "rapidoc": "^9.3.4",
-    "unplugin-auto-import": "^0.15.2",
-    "unplugin-vue-components": "^0.24.1",
+    "rapidoc": "^9.3.8",
+    "unplugin-auto-import": "^0.18.3",
+    "unplugin-vue-components": "^0.27.4",
+    "update-browserslist-db": "^1.1.1",
     "vfonts": "^0.0.3",
-    "vite-svg-loader": "^4.0.0",
-    "vue": "^3.2.37",
-    "vue-cookies": "^1.8.3",
-    "vue-router": "^4.1.3",
+    "vite-svg-loader": "^5.1.0",
+    "vue": "^3.5.12",
+    "vue-cookies": "^1.8.4",
+    "vue-router": "^4.4.5",
     "vue-wechat-title": "^2.0.7"
   },
   "devDependencies": {

src/api/wea/index.js

@@ -23,6 +23,14 @@ export function getNextHoliday() {
   });
 }
 
+//getTodayHoliday
+export function getTodayHoliday() {
+  return request({
+    url: '/wea/todayHoliday',
+    method: 'get'
+  });
+}
+
 //iswork
 export function iswork() {
   return request({

src/views/console/gallery/index.vue

@@ -313,5 +313,6 @@ onMounted(() => {
   overflow: hidden;
   box-shadow: @ps;
   border: 1px solid #dddddd;
+  margin-bottom: 20px;
 }
 </style>

src/views/home/side.vue

@@ -8,8 +8,11 @@
         <div class="date text-right mb-2">
           {{ date }}
         </div>
-        <div class="holi text-center">
-          <!-- 还有 {{ holi.holiday.rest }} 天就是 <span class="text-pp-300 text-lg">{{ holi.holiday.name }}</span> 了 -->
+        <div class="holi text-center" v-if="holi.isHoliday">
+          今天就是 <span class="text-pp-300 text-lg">{{ holi.data.hname }}</span> 啦
+        </div>
+        <div class="holi text-center" v-else>
+          还有 <span class="text-[#409eff] text-lg">{{ holi.subdate }}</span> 天就是 <span class="text-pp-300 text-lg">{{ holi.data.hname }}</span> 了
         </div>
       </div>
       <div class="right h-[150px]">
@@ -97,6 +100,12 @@ const date = ref(formatTime(new Date(), 'YYYY 年 MM 月 DD 日'))
 const date1 = ref(formatTime(new Date(), 'YYYY-MM-DD'))
 const isw = ref(true)
 isw.value = ww.isWorkday(date1)
+
+const holi = await $http.wea.getTodayHoliday()
+console.log("*************",holi);
+
+
+
 const baidu = await $http.news.listBaiduNews()
 const jqImg = ref('#')
 const jq = await $http.wea.getJq()
@@ -106,8 +115,8 @@ jqImg.value = 'https://www.hxyouzi.com/img/jieqi/' + jNum + '.jpg'
 const isBaidu = ref(false);
 
 
-const holi = await $http.wea.getNextHoliday()
-console.log(555555555555555555,holi);
+// const holi = await $http.wea.getNextHoliday()
+// console.log(555555555555,holi);
 
 
 

vite.config.js

@@ -35,6 +35,9 @@ export default defineConfig({
     },
   },
   base: "/blog/",
+  server:{
+    host:'0.0.0.0'
+  },
   css: {
     preprocessorOptions: {
       less: {