lex 2 лет назад
Родитель
Сommit
cdd74a66ff

+ 30 - 4
src/school/orchestra/compontent/information.tsx

@@ -26,6 +26,9 @@ import { useRoute, useRouter } from 'vue-router'
 import { CountUp } from 'countup.js'
 import { CountUp } from 'countup.js'
 import OEmpty from '@/components/o-empty'
 import OEmpty from '@/components/o-empty'
 import dayjs from 'dayjs'
 import dayjs from 'dayjs'
+import isSameOrBefore from 'dayjs/plugin/isSameOrBefore'
+import isSameOrAfter from 'dayjs/plugin/isSameOrAfter'
+dayjs.extend(isSameOrBefore, isSameOrAfter)
 import { promisefiyPostMessage, postMessage } from '@/helpers/native-message'
 import { promisefiyPostMessage, postMessage } from '@/helpers/native-message'
 import html2canvas from 'html2canvas'
 import html2canvas from 'html2canvas'
 
 
@@ -42,6 +45,7 @@ export default defineComponent({
     const endTime = computed(() => props.termTimes.end)
     const endTime = computed(() => props.termTimes.end)
     const route = useRoute()
     const route = useRoute()
     const router = useRouter()
     const router = useRouter()
+
     const state = reactive({
     const state = reactive({
       timeShow: false,
       timeShow: false,
       currentData: [dayjs().year() + ''],
       currentData: [dayjs().year() + ''],
@@ -200,10 +204,32 @@ export default defineComponent({
       })
       })
     }
     }
 
 
-    onMounted(() => {
-      getDetails()
-      getStatistics()
-      getList()
+    onMounted(async () => {
+      const sysStartTime = dayjs(dayjs().year() + startTime.value).format('YYYY-MM-DD HH:mm:ss')
+      const sysEndTime = dayjs(dayjs().year() + endTime.value).format('YYYY-MM-DD HH:mm:ss')
+      const nowTime = dayjs().format('YYYY-MM-DD')
+      const before = dayjs(nowTime).isSameOrBefore(dayjs(sysStartTime))
+      const after = dayjs(nowTime).isSameOrBefore(dayjs(sysEndTime))
+      const year = dayjs().year()
+      if (before) {
+        state.currentData = [year - 1 + '']
+        state.params.startTime = dayjs(year - 1 + startTime.value).format('YYYY-MM-DD HH:mm:ss')
+        state.params.endTime = dayjs(dayjs().year() + endTime.value)
+          .subtract(1, 'day')
+          .format('YYYY-MM-DD HH:mm:ss')
+      } else if (after) {
+        state.params.startTime = dayjs(dayjs().year() + startTime.value).format(
+          'YYYY-MM-DD HH:mm:ss'
+        )
+        state.params.endTime = dayjs(dayjs().year() + endTime.value)
+          .add(1, 'year')
+          .subtract(1, 'day')
+          .format('YYYY-MM-DD HH:mm:ss')
+      }
+
+      await getDetails()
+      await getStatistics()
+      await getList()
     })
     })
 
 
     return () => (
     return () => (

+ 27 - 2
src/school/orchestra/compontent/plan.tsx

@@ -1,6 +1,9 @@
 import OEmpty from '@/components/o-empty'
 import OEmpty from '@/components/o-empty'
 import request from '@/helpers/request'
 import request from '@/helpers/request'
 import dayjs from 'dayjs'
 import dayjs from 'dayjs'
+import isSameOrBefore from 'dayjs/plugin/isSameOrBefore'
+import isSameOrAfter from 'dayjs/plugin/isSameOrAfter'
+dayjs.extend(isSameOrBefore, isSameOrAfter)
 import { Cell, DatePicker, Icon, Image, List, Popover, Popup } from 'vant'
 import { Cell, DatePicker, Icon, Image, List, Popover, Popup } from 'vant'
 import { computed, defineComponent, onMounted, reactive } from 'vue'
 import { computed, defineComponent, onMounted, reactive } from 'vue'
 import { useRoute } from 'vue-router'
 import { useRoute } from 'vue-router'
@@ -146,8 +149,30 @@ export default defineComponent({
       getList()
       getList()
     }
     }
 
 
-    onMounted(() => {
-      getList()
+    onMounted(async () => {
+      const sysStartTime = dayjs(dayjs().year() + startTime.value).format('YYYY-MM-DD HH:mm:ss')
+      const sysEndTime = dayjs(dayjs().year() + endTime.value).format('YYYY-MM-DD HH:mm:ss')
+      const nowTime = dayjs().format('YYYY-MM-DD')
+      const before = dayjs(nowTime).isSameOrBefore(dayjs(sysStartTime))
+      const after = dayjs(nowTime).isSameOrBefore(dayjs(sysEndTime))
+      const year = dayjs().year()
+      if (before) {
+        state.currentData = [year - 1 + '']
+        state.params.startTime = dayjs(year - 1 + startTime.value).format('YYYY-MM-DD HH:mm:ss')
+        state.params.endTime = dayjs(dayjs().year() + endTime.value)
+          .subtract(1, 'day')
+          .format('YYYY-MM-DD HH:mm:ss')
+      } else if (after) {
+        state.params.startTime = dayjs(dayjs().year() + startTime.value).format(
+          'YYYY-MM-DD HH:mm:ss'
+        )
+        state.params.endTime = dayjs(dayjs().year() + endTime.value)
+          .add(1, 'year')
+          .subtract(1, 'day')
+          .format('YYYY-MM-DD HH:mm:ss')
+      }
+
+      await getList()
     })
     })
     return () => (
     return () => (
       <div
       <div

BIN
src/student/download/images/wx_bg.png


BIN
src/student/member-center/images/member-1.png


BIN
src/student/member-center/images/member-2.png


BIN
src/student/music-group/pre-apply/images/member_bao-1.png


BIN
src/student/music-group/pre-apply/images/member_bao-2.png