skyblued 2 年之前
父节点
当前提交
bf1b2195fa

+ 5 - 14
src/business-components/calendar/index.tsx

@@ -127,6 +127,10 @@ export default defineComponent({
       } else {
         date.type = 'disabled'
       }
+      console.log(date)
+      if(this.$route.name == 'liveCreate' && dayjs(date.date).isToday()) {
+        date.type = 'disabled'
+      }
       // 是否是节假日
       if (dateObj && this.isSkipHolidays && dateObj.holiday) {
         // date.bottomInfo = '节假日'
@@ -193,20 +197,7 @@ export default defineComponent({
       const tempDate = dayjs(this.currentDate).add(1, 'day')
       this._dayChange(tempDate.toDate())
     },
-    async onDateSelect(date: any) {
-      if (this.$route.name == 'liveCreate' && dayjs(date).isToday()) {
-        let comfirm = '' as any
-        try {
-          comfirm = await Dialog.alert({
-            title: '提示',
-            message:
-              '直播课选择当天, 售卖时间为: 现在到开课时间, 确定选择今天吗?',
-            theme: 'round-button',
-            showCancelButton: true
-          })
-        } catch (err) {}
-        if (!comfirm) return 
-      }
+    onDateSelect(date: any) {
       // 选择日历上某一个日期
       // console.log([...this.selectList])
       this.selectDays = [...this.selectList] // 初始化用户选中的值

+ 1 - 0
src/views/music/list/index.tsx

@@ -106,6 +106,7 @@ export default defineComponent({
       tagVisibility.value = false
     }
     const onComfirmSubject = (item) => {
+      // console.log(item,123)
       params.page = 1
       params.subjectIds = item.id
       subject.id = item.id

+ 1 - 1
src/views/music/search/header.tsx

@@ -77,7 +77,7 @@ export default defineComponent({
       // console.log('onSort', item)
       subject.name = item.name
       subject.id = item.id
-      mitter.emit('confirmSubject', subject.id)
+      mitter.emit('confirmSubject', subject)
       subject.show = false
     }
 

+ 4 - 3
src/views/music/search/index.tsx

@@ -43,10 +43,11 @@ export default defineComponent({
       tagVisibility.value = false
     }
 
-    const onConfirmSubject = (id: any) => {
-      subject.value = id
+    const onConfirmSubject = (item: any) => {
+      // console.log(item)
+      subject.value = item.id
       const activeRef = activeTab.value === 'album' ? albumList : musicList
-      ;(activeRef.value as any).onComfirmSubject?.(subject)
+      ;(activeRef.value as any).onComfirmSubject?.(item)
     }
 
     const albumList = ref(null)

+ 1 - 1
src/views/music/search/select-subject.tsx

@@ -33,7 +33,7 @@ export default defineComponent({
   methods: {
     async getList() {
       const { data } = await request.get(
-        `${this.apiSuffix}/subject/subjectSelect`
+        `${this.apiSuffix}/subject/subjectSelect?type=MUSIC`
       )
       if (Array.isArray(data)) {
         this.subjectList = data