Revert "v1.3"

This reverts commit d7be6d0bbc9ccb4a2d0943aba950ba683fbeb92a.

src/views/live-class/index.tsx

@@ -40,7 +40,7 @@ export default defineComponent({
   },
   async mounted() {
     try {
-      const res = await request.get(`${this.apiSuffix}/subject/subjectSelect?type=LIVE`)
+      const res = await request.get(`${this.apiSuffix}/subject/subjectSelect`)
       this.subjectList = res.data || []
     } catch {
       //

src/views/music/album/index.module.less

@@ -3,17 +3,3 @@
     box-shadow: 10px 10px 10px var(--box-shadow-color);
   }
 }
-.label {
-  margin-right: 8px;
-  font-size: 14px;
-  :global {
-    .van-list__loading,
-    .van-list__finished-text,
-    .van-list__error-text {
-      width: 100%;
-    }
-    .iconfont-down {
-      margin-left: 4px;
-    }
-  }
-}

src/views/music/album/index.tsx

@@ -1,5 +1,5 @@
 import { defineComponent, reactive, ref } from 'vue'
-import { Sticky, List, Popup, Icon } from 'vant'
+import { Sticky, List, Popup } from 'vant'
 import Search from '@/components/col-search'
 import request from '@/helpers/request'
 import Item from './item'
@@ -8,7 +8,6 @@ import { useRoute } from 'vue-router'
 import ColResult from '@/components/col-result'
 import styles from './index.module.less'
 import { state } from '@/state'
-import SelectSubject from '../search/select-subject'
 
 export default defineComponent({
   name: 'Album',
@@ -89,26 +88,9 @@ export default defineComponent({
       tagVisibility.value = false
     }
 
-    const onComfirmSubject = item => {
-      params.page = 1
-      params.subjectIds = item.id
-      subject.id = item.id
-      subject.name = item.name
-      data.value = null
-      FetchList()
-      subject.show = false
-    }
-
     expose({
       onSearch,
-      onComfirm,
-      onComfirmSubject
-    })
-
-    const subject = reactive({
-      show: false,
-      name: '全部',
-      id: ''
+      onComfirm
     })
 
     return () => {
@@ -131,22 +113,6 @@ export default defineComponent({
                   onSearch={onSearch}
                   onFilter={() => (tagVisibility.value = true)}
                   filterDot={!!params.albumTagIds}
-                  v-slots={{
-                    left: () => (
-                      <div
-                        class={styles.label}
-                        onClick={() => (subject.show = true)}
-                      >
-                        {subject.name}
-                        <Icon
-                          classPrefix="iconfont"
-                          name="down"
-                          size={12}
-                          color="#333"
-                        />
-                      </div>
-                    )
-                  }}
                 />
               </Sticky>
             )}
@@ -176,17 +142,6 @@ export default defineComponent({
               onCancel={() => {}}
             />
           </Popup>
-          <Popup
-            show={subject.show}
-            position="bottom"
-            round
-            closeable
-            safe-area-inset-bottom
-            onClose={() => (subject.show = false)}
-            onClosed={() => (subject.show = false)}
-          >
-            <SelectSubject isReset onComfirm={onComfirmSubject} />
-          </Popup>
         </>
       )
     }

src/views/music/list/index.module.less

@@ -3,17 +3,3 @@
     box-shadow: 10px 10px 10px var(--box-shadow-color);
   }
 }
-.label {
-  margin-right: 8px;
-  font-size: 14px;
-  :global {
-    .van-list__loading,
-    .van-list__finished-text,
-    .van-list__error-text {
-      width: 100%;
-    }
-    .iconfont-down {
-      margin-left: 4px;
-    }
-  }
-}

src/views/music/list/index.tsx

@@ -1,5 +1,5 @@
 import { defineComponent, reactive, ref } from 'vue'
-import { Sticky, List, Popup, Icon } from 'vant'
+import { Sticky, List, Popup } from 'vant'
 import Search from '@/components/col-search'
 import request from '@/helpers/request'
 import Item from './item'
@@ -9,7 +9,6 @@ import ColResult from '@/components/col-result'
 import styles from './index.module.less'
 import { getRandomKey, musicBuy } from '../music'
 import { state } from '@/state'
-import SelectSubject from '../search/select-subject'
 
 const noop = () => {}
 
@@ -105,26 +104,10 @@ export default defineComponent({
       FetchList()
       tagVisibility.value = false
     }
-    const onComfirmSubject = (item) => {
-      params.page = 1
-      params.subjectIds = item.id
-      subject.id = item.id
-      subject.name = item.name
-      data.value = null
-      FetchList()
-      subject.show = false
-    }
-
-    const subject = reactive({
-      show: false,
-      name: '全部',
-      id: ''
-    })
 
     expose({
       onSearch,
-      onComfirm,
-      onComfirmSubject
+      onComfirm
     })
 
     return () => (
@@ -145,22 +128,6 @@ export default defineComponent({
                 onSearch={onSearch}
                 onFilter={() => (tagVisibility.value = true)}
                 filterDot={!!params.musicTagIds}
-                v-slots={{
-                  left: () => (
-                    <div
-                      class={styles.label}
-                      onClick={() => (subject.show = true)}
-                    >
-                      {subject.name}
-                      <Icon
-                        classPrefix="iconfont"
-                        name="down"
-                        size={12}
-                        color="#333"
-                      />
-                    </div>
-                  )
-                }}
               />
             </Sticky>
           )}
@@ -201,19 +168,6 @@ export default defineComponent({
             defaultValue={route.query.tagids as string}
           />
         </Popup>
-
-        {/* 声部弹框 */}
-        <Popup
-            show={subject.show}
-            position="bottom"
-            round
-            closeable
-            safe-area-inset-bottom
-            onClose={() => (subject.show = false)}
-            onClosed={() => (subject.show = false)}
-          >
-            <SelectSubject isReset onComfirm={onComfirmSubject} />
-          </Popup>
       </>
     )
   }

src/views/music/list/item.tsx

@@ -51,7 +51,7 @@ export default defineComponent({
 
     const shareStatus = ref(false)
     const shareUrl = ref('')
-    // console.log(data)
+    console.log(data)
     const onShare = (evt: MouseEvent) => {
       evt.stopPropagation()
       // if (!shareStatus.value) {

src/views/music/search/header.tsx

@@ -6,7 +6,7 @@ import {
   onBeforeRouteUpdate,
   onBeforeRouteLeave
 } from 'vue-router'
-import { defineComponent, onMounted, reactive, ref, watch } from 'vue'
+import { defineComponent, onMounted, ref, watch } from 'vue'
 import mitt from 'mitt'
 import Search from '@/components/col-search'
 import { useLocalStorage } from '@vueuse/core'
@@ -14,7 +14,6 @@ import styles from './index.module.less'
 import classNames from 'classnames'
 import SelectTag from './select-tag'
 import { getRandomKey, musicBuy } from '../music'
-import SelectSubject from './select-subject'
 
 export const mitter = mitt()
 
@@ -27,19 +26,22 @@ export default defineComponent({
     localStorage.setItem('behaviorId', getRandomKey())
     const router = useRouter()
     const route = useRoute()
-    const subjectIds = ref('')
+    const loading = ref(false)
     const keyword = ref('')
     const tagids = ref('')
+    const albumRows = ref([])
+    const sheetRows = ref([])
     const tagVisibility = ref(false)
     const words = useLocalStorage<string[]>('music-search', [])
     const activeTab = ref('songe')
 
     onBeforeRouteUpdate(() => {
+      // console.log('onBeforeRouteUpdate', route.fullPath)
       if (route.path === '/music-songbook/search') {
         keyword.value = ''
         tagids.value = ''
-        subjectIds.value = ''
         activeTab.value = 'songe'
+        // console.log('onBeforeRouteUpdate')
         try {
           selectTagRef.value?.resetTags?.()
         } catch (error) {
@@ -64,29 +66,28 @@ export default defineComponent({
         words.value.length = Math.min(words.value.length, 5)
       }
       mitter.emit('search', val)
+      // const activeRef = activeTab.value === 'album' ? albumList : musicList
+      // ;(activeRef.value as any).onSearch?.(val)
+      // FetchList()
     }
 
     const onComfirm = (tags, name = '') => {
       const data = Object.values(tags).flat().filter(Boolean).join(',')
       tagids.value = data
       mitter.emit('confirm', tags)
+      // FetchList()
+      // const activeRef = activeTab.value === 'album' ? albumList : musicList
+      // ;(activeRef.value as any).onComfirm?.(tags)
       tagVisibility.value = false
     }
 
-    const onComfirmSubject = (item: any) => {
-      // console.log('onSort', item)
-      subject.name = item.name
-      subject.id = item.id
-      mitter.emit('confirmSubject', subject.id)
-      subject.show = false
-    }
-
-    onMounted(() => {})
+    // const albumList = ref(null)
+    // const musicList = ref(null)
 
-    const subject = reactive({
-      show: false,
-      name: '全部',
-      id: ''
+    onMounted(() => {
+      // const activeRef = activeTab.value === 'album' ? albumList : musicList
+      // ;(activeRef.value as any).onSearch?.('')
+      // console.log(searchInputRef.value)
     })
     return () => {
       return (
@@ -106,22 +107,6 @@ export default defineComponent({
                   })
                 }
               }}
-              v-slots={{
-                left: () => (
-                  <div
-                    class={styles.label}
-                    onClick={() => (subject.show = true)}
-                  >
-                    {subject.name}
-                    <Icon
-                      classPrefix="iconfont"
-                      name="down"
-                      size={12}
-                      color="#333"
-                    />
-                  </div>
-                )
-              }}
             />
             {route.path === '/music-songbook/search' && (
               <Tabs
@@ -174,19 +159,6 @@ export default defineComponent({
               onCancel={() => {}}
             />
           </Popup>
-
-          {/* 声部弹框 */}
-          <Popup
-            show={subject.show}
-            position="bottom"
-            round
-            closeable
-            safe-area-inset-bottom
-            onClose={() => (subject.show = false)}
-            onClosed={() => (subject.show = false)}
-          >
-            <SelectSubject isReset onComfirm={onComfirmSubject} />
-          </Popup>
         </div>
       )
     }

src/views/music/search/index.module.less

@@ -49,18 +49,4 @@
       font-size: 16px;
     }
   }
-  .label {
-    margin-right: 8px;
-    font-size: 14px;
-    :global {
-      .van-list__loading,
-      .van-list__finished-text,
-      .van-list__error-text {
-        width: 100%;
-      }
-      .iconfont-down {
-        margin-left: 4px;
-      }
-    }
-  }
 }

src/views/music/search/index.tsx

@@ -1,8 +1,17 @@
+import { Sticky, Cell, Tag, Icon, Popup, Tabs, Tab, Dialog } from 'vant'
 import { defineComponent, onMounted, onUnmounted, ref } from 'vue'
+// import Search from '@/components/col-search'
 import { useLocalStorage } from '@vueuse/core'
+// import AlbumItem from '../album/item'
 import AlbumList from '../album'
+// import MusicItem from '../list/item'
 import MusicList from '../list'
 import styles from './index.module.less'
+// import classNames from 'classnames'
+// import request from '@/helpers/request'
+import SelectTag from './select-tag'
+// import ColResult from '@/components/col-result'
+// import { orderStatus } from '@/views/order-detail/orderStatus'
 import { useRoute, useRouter } from 'vue-router'
 import { getRandomKey, musicBuy } from '../music'
 import { mitter } from './header'
@@ -11,16 +20,39 @@ export default defineComponent({
   name: 'MusicSearch',
   emits: ['confirm'],
   setup() {
+    const searchInputRef = ref()
     localStorage.setItem('behaviorId', getRandomKey())
     const route = useRoute()
     const router = useRouter()
+    const loading = ref(false)
     const keyword = ref(route.query.keyword || '')
     const tagids = ref(route.query.tagids || '')
-    const subject = ref()
+    const albumRows = ref([])
+    const sheetRows = ref([])
     const tagVisibility = ref(false)
     const words = useLocalStorage<string[]>('music-search', [])
     const activeTab = ref('songe')
 
+    const FetchList = async () => {
+      // loading.value = true
+      // try {
+      //   const res = await request.post(
+      //     '/api-student/music/sheet/albumAndSheetList',
+      //     {
+      //       data: {
+      //         albumRow: 3,
+      //         sheetRow: 10,
+      //         search: keyword.value,
+      //         musicTagIds: tagids.value
+      //       }
+      //     }
+      //   )
+      //   albumRows.value = res.data.musicAlbumList.rows
+      //   sheetRows.value = res.data.musicSheetList.rows
+      // } catch (error) {}
+      // loading.value = false
+    }
+
     const onSearch = val => {
       keyword.value = val
       const indexOf = words.value.indexOf(val)
@@ -32,23 +64,20 @@ export default defineComponent({
         words.value.length = Math.min(words.value.length, 5)
       }
       const activeRef = activeTab.value === 'album' ? albumList : musicList
+      console.log(val)
       ;(activeRef.value as any).onSearch?.(val)
+      // FetchList()
     }
 
     const onComfirm = tags => {
       const data = Object.values(tags).flat().filter(Boolean).join(',')
       tagids.value = data
+      // FetchList()
       const activeRef = activeTab.value === 'album' ? albumList : musicList
       ;(activeRef.value as any).onComfirm?.(tags)
       tagVisibility.value = false
     }
 
-    const onConfirmSubject = (id: any) => {
-      subject.value = id
-      const activeRef = activeTab.value === 'album' ? albumList : musicList
-      ;(activeRef.value as any).onComfirmSubject?.(subject)
-    }
-
     const albumList = ref(null)
     const musicList = ref(null)
 
@@ -60,14 +89,14 @@ export default defineComponent({
       mitter.on('changeTab', changeTab)
       mitter.on('search', onSearch)
       mitter.on('confirm', onComfirm)
-      mitter.on('confirmSubject', onConfirmSubject)
+      // ;(activeRef.value as any).onSearch?.('')
+      // console.log(searchInputRef.value)
     })
 
     onUnmounted(() => {
       mitter.off('changeTab', changeTab)
       mitter.off('search', onSearch)
       mitter.off('confirm', onComfirm)
-      mitter.off('confirmSubject', onConfirmSubject)
     })
 
     return () => {
@@ -79,8 +108,7 @@ export default defineComponent({
               ref={albumList}
               defauleParams={{
                 search: keyword.value,
-                tagids: tagids.value,
-                subjectIds: subject.value
+                tagids: tagids.value
               }}
             />
           ) : (
@@ -99,11 +127,21 @@ export default defineComponent({
               }}
               defauleParams={{
                 search: keyword.value,
-                tagids: tagids.value,
-                subjectIds: subject.value
+                tagids: tagids.value
               }}
             />
           )}
+          {/* <Popup
+            show={tagVisibility.value}
+            round
+            closeable
+            position="bottom"
+            style={{ height: '60%' }}
+            teleport="body"
+            onUpdate:show={val => (tagVisibility.value = val)}
+          >
+            <SelectTag onConfirm={onComfirm} onCancel={() => {}} />
+          </Popup> */}
         </div>
       )
     }

src/views/music/search/select-subject.module.less

@@ -1,79 +0,0 @@
-.filterTitle {
-  font-size: 18px;
-  font-weight: 500;
-  color: #000000;
-  line-height: 25px;
-  text-align: center;
-  padding: 20px 0;
-}
-
-.searchResult {
-  padding: 0 16px;
-  overflow: hidden;
-  margin-bottom: 20px;
-  .searchTitle {
-    font-size: 16px;
-    color: #333333;
-    line-height: 22px;
-  }
-}
-
-.radio-group {
-  display: flex;
-  margin-top: 10px;
-  margin-bottom: 20px;
-  flex-wrap: wrap;
-  .radio:first-child {
-    :global {
-      .van-radio__label {
-        margin-left: 0;
-      }
-    }
-  }
-}
-
-.radio {
-  :global {
-    .van-radio__icon {
-      display: none;
-    }
-    .van-tag--large {
-      width: 80px;
-      height: 32px;
-      font-size: 16px;
-      text-align: center;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-    }
-    .van-tag {
-      box-sizing: border-box;
-    }
-    .van-tag--default {
-      color: var(--van-tag-text-default-color);
-    }
-    .van-tag--primary {
-      background-color: var(--tag-bg-color);
-    }
-  }
-}
-
-.organ-radio {
-  :global {
-    .van-tag--large {
-      width: auto;
-      padding: 0 12px;
-      margin-bottom: 8px;
-      margin-right: 8px;
-      font-size: 14px;
-    }
-  }
-}
-
-.btn {
-  padding: 5px 14px;
-
-  & + .btn {
-    margin-left: 10px;
-  }
-}

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

@@ -1,118 +0,0 @@
-import { defineComponent } from 'vue'
-import styles from './select-subject.module.less'
-import { Tag, Button, Sticky } from 'vant'
-import { state } from '@/state'
-import request from '@/helpers/request'
-
-export default defineComponent({
-  name: 'selectSubject',
-  props: {
-    isReset: {
-      type: Boolean,
-      default: false
-    },
-    onComfirm: {
-      type: Function,
-      default: (item: any) => {}
-    }
-  },
-  data() {
-    return {
-      subject: {
-        name: '',
-        id: ''
-      },
-      subjectList: [] as any,
-      apiSuffix:
-        state.platformType === 'STUDENT' ? '/api-student' : '/api-teacher'
-    }
-  },
-  mounted() {
-    this.getList()
-  },
-  methods: {
-    async getList() {
-      const { data } = await request.get(
-        `${this.apiSuffix}/subject/subjectSelect`
-      )
-      if (Array.isArray(data)) {
-        this.subjectList = data
-      }
-    }
-  },
-  render() {
-    return (
-      <>
-        <div class={styles.filterTitle}>全部声部</div>
-        <div
-          class={styles.searchResult}
-          style={{ maxHeight: '45vh', overflowY: 'auto' }}
-        >
-          {this.subjectList.map(
-            (item: any) =>
-              item.subjects &&
-              item.subjects.length > 0 && (
-                <>
-                  <div class={styles.searchTitle}>{item.name}</div>
-                  <div
-                    class={[
-                      styles['radio-group'],
-                      styles.radio,
-                      styles['organ-radio']
-                    ]}
-                  >
-                    {item.subjects.map((subject: any) => {
-                      const isActive = subject.id === Number(this.subject.id)
-                      const type = isActive ? 'primary' : 'default'
-                      return (
-                        <Tag
-                          size="large"
-                          plain={isActive}
-                          type={type}
-                          round
-                          onClick={() => {
-                            this.subject = subject
-                          }}
-                        >
-                          {subject.name}
-                        </Tag>
-                      )
-                    })}
-                  </div>
-                </>
-              )
-          )}
-        </div>
-        <Sticky position="bottom" offsetBottom={0}>
-          <div class={['btnGroup', this.isReset ? 'btnMore' : '']}>
-            {this.isReset && (
-              <Button
-                type="primary"
-                plain
-                round
-                onClick={() => {
-                  this.subject.name = '全部'
-                  this.subject.id = ''
-                  this.onComfirm({...this.subject})
-                }}
-              >
-                重置
-              </Button>
-            )}
-
-            <Button
-              type="primary"
-              round
-              block
-              onClick={() => {
-                this.onComfirm({ ...this.subject })
-              }}
-            >
-              确认
-            </Button>
-          </div>
-        </Sticky>
-      </>
-    )
-  }
-})

src/views/video-class/index.tsx

@@ -40,7 +40,7 @@ export default defineComponent({
   },
   async mounted() {
     try {
-      const res = await request.get(`${this.apiSuffix}/subject/subjectSelect?type=VIDEO`)
+      const res = await request.get(`${this.apiSuffix}/subject/subjectSelect`)
       this.subjectList = res.data || []
     } catch {
       //