diff --git a/.env.development b/.env.development index cd2649f..cf3d429 100644 --- a/.env.development +++ b/.env.development @@ -2,6 +2,6 @@ ENV = 'development' VITE_APP_ENV = 'development' -VITE_APP_BASE_URL = 'http://127.0.0.1:7777' -# VITE_APP_BASE_URL = 'https://www.hxyouzi.com' +# VITE_APP_BASE_URL = 'http://127.0.0.1:7777' +VITE_APP_BASE_URL = 'https://www.hxyouzi.com' diff --git a/src/views/home/side.vue b/src/views/home/side.vue index 250977a..ec36407 100644 --- a/src/views/home/side.vue +++ b/src/views/home/side.vue @@ -17,7 +17,7 @@
- +
@@ -90,7 +90,6 @@ import offwork from '@/assets/offwork.webp'; import onwork from '@/assets/onwork.webp'; import hot from "@/icon/hot.svg"; import { formatTime } from '@/util/index.js'; -import ww from 'chinese-workday'; import { onMounted, ref } from 'vue'; @@ -98,18 +97,17 @@ import { onMounted, ref } from 'vue'; const jqs = ['立春', '雨水', '惊蛰', '春分', '清明', '谷雨', '立夏', '小满', '芒种', '夏至', '小暑', '大暑', '立秋', '处暑', '白露', '秋分', '寒露', '霜降', '立冬', '小雪', '大雪', '冬至', '小寒', '大寒'] const time = ref(formatTime(new Date(), 'hh:mm:ss')) 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 jqImg = ref('#') const jq = await $http.wea.getJq() +console.log("*************",jq); const j = jq.data.solarTerms.slice(0, 2) const jNum = jqs.indexOf(j) + 1 jqImg.value = 'https://www.hxyouzi.com/img/jieqi/' + jNum + '.jpg'