From 3fdff4e6ebb56150eb492d23160a23841734b010 Mon Sep 17 00:00:00 2001 From: lyswhut Date: Thu, 12 Mar 2020 21:12:12 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=BF=BB=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/renderer/lang/cns/store/state.json | 11 ++++++++++- src/renderer/lang/cns/view/search.json | 9 +-------- src/renderer/lang/cnt/store/state.json | 8 +++++++- src/renderer/lang/cnt/view/search.json | 9 +-------- src/renderer/lang/en/store/state.json | 10 +++++++++- src/renderer/lang/en/view/search.json | 9 +-------- src/renderer/store/getters.js | 13 +++++++++++-- src/renderer/store/modules/leaderboard.js | 6 ++++-- src/renderer/store/modules/search.js | 4 +++- src/renderer/store/modules/songList.js | 4 +++- src/renderer/utils/music/kg/leaderboard.js | 12 ++++++------ src/renderer/views/Search.vue | 5 +---- 12 files changed, 57 insertions(+), 43 deletions(-) diff --git a/src/renderer/lang/cns/store/state.json b/src/renderer/lang/cns/store/state.json index 6f4b3250..5d4d039e 100644 --- a/src/renderer/lang/cns/store/state.json +++ b/src/renderer/lang/cns/store/state.json @@ -8,5 +8,14 @@ "theme_grey": "灰常美丽", "theme_mid_autumn": "月里嫦娥", "theme_naruto": "木叶之村", - "theme_happy_new_year": "新年快乐" + "theme_happy_new_year": "新年快乐", + + "source_kw": "酷我音乐", + "source_kg": "酷狗音乐", + "source_tx": "企鹅音乐", + "source_wy": "网易音乐", + "source_mg": "咪咕音乐", + "source_bd": "百度音乐", + + "source_all": "聚合搜索" } diff --git a/src/renderer/lang/cns/view/search.json b/src/renderer/lang/cns/view/search.json index c73284ce..9ae0a0fd 100644 --- a/src/renderer/lang/cns/view/search.json +++ b/src/renderer/lang/cns/view/search.json @@ -8,12 +8,5 @@ "time": "时长", "lossless": "无损", "high_quality": "高品质", - "no_item": "搜我所想~~😉", - "source_kw": "酷我音乐", - "source_kg": "酷狗音乐", - "source_tx": "QQ音乐", - "source_wy": "网易音乐", - "source_mg": "咪咕音乐", - "source_bd": "百度音乐", - "source_all": "聚合搜索" + "no_item": "搜我所想~~😉" } diff --git a/src/renderer/lang/cnt/store/state.json b/src/renderer/lang/cnt/store/state.json index 6fdf18da..966e725e 100644 --- a/src/renderer/lang/cnt/store/state.json +++ b/src/renderer/lang/cnt/store/state.json @@ -8,5 +8,11 @@ "theme_grey": "灰常美麗", "theme_mid_autumn": "月裡嫦娥", "theme_naruto": "木葉之村", - "theme_happy_new_year": "新年快樂" + "theme_happy_new_year": "新年快樂", + "source_kw": "酷我音樂", + "source_kg": "酷狗音樂", + "source_tx": "企鵝音樂", + "source_wy": "網易音樂", + "source_mg": "咪咕音樂", + "source_bd": "百度音樂" } diff --git a/src/renderer/lang/cnt/view/search.json b/src/renderer/lang/cnt/view/search.json index 21967a86..9c2efe41 100644 --- a/src/renderer/lang/cnt/view/search.json +++ b/src/renderer/lang/cnt/view/search.json @@ -8,12 +8,5 @@ "time": "時長", "lossless": "無損", "high_quality": "高品質", - "no_item": "搜我所想~~😉", - "source_kw": "酷我音樂", - "source_kg": "酷狗音樂", - "source_tx": "QQ音樂", - "source_wy": "網易音樂", - "source_mg": "咪咕音樂", - "source_bd": "百度音樂", - "source_all": "聚合搜索" + "no_item": "搜我所想~~😉" } diff --git a/src/renderer/lang/en/store/state.json b/src/renderer/lang/en/store/state.json index 803ca062..65ba615b 100644 --- a/src/renderer/lang/en/store/state.json +++ b/src/renderer/lang/en/store/state.json @@ -8,5 +8,13 @@ "theme_grey": "Grey", "theme_mid_autumn": "Mid-Autumn", "theme_naruto": "Naruto", - "theme_happy_new_year": "New Year" + "theme_happy_new_year": "New Year", + + "source_kw": "Kuwo", + "source_kg": "Kugou", + "source_tx": "Tencent", + "source_wy": "Netease", + "source_mg": "Migu", + "source_bd": "Baidu", + "source_all": "Aggregated" } diff --git a/src/renderer/lang/en/view/search.json b/src/renderer/lang/en/view/search.json index 07a065fc..df76aa77 100644 --- a/src/renderer/lang/en/view/search.json +++ b/src/renderer/lang/en/view/search.json @@ -8,12 +8,5 @@ "time": "Interval", "lossless": "SQ", "high_quality": "HQ", - "no_item": "Search what i think~~😉", - "source_kw": "Kuwo", - "source_kg": "Kugou", - "source_tx": "Tencent", - "source_wy": "Netease", - "source_mg": "Migu", - "source_bd": "Baidu", - "source_all": "Aggregated" + "no_item": "Search what i think~~😉" } diff --git a/src/renderer/store/getters.js b/src/renderer/store/getters.js index ac3aa968..5c6b6e9e 100644 --- a/src/renderer/store/getters.js +++ b/src/renderer/store/getters.js @@ -11,14 +11,23 @@ export default { } }, source(state) { - return music.sources.find(s => s.id === state.setting.sourceId) || music.sources[0] + const source = music.sources.find(s => s.id === state.setting.sourceId) || music.sources[0] + return { id: source.id, name: window.i18n.t('store.state.source_' + source.id) } }, sources(state) { return { active: state.setting.sourceId, - list: music.sources, + list: music.sources.map(item => ({ id: item.id, name: window.i18n.t('store.state.source_' + item.id) })), } }, + sourceNames() { + const sources = {} + for (const source of music.sources) { + sources[source.id] = window.i18n.t('store.state.source_' + source.id) + } + sources.all = window.i18n.t('store.state.source_all') + return sources + }, userInfo(state) { return state.userInfo }, diff --git a/src/renderer/store/modules/leaderboard.js b/src/renderer/store/modules/leaderboard.js index 1a623131..df99c24c 100644 --- a/src/renderer/store/modules/leaderboard.js +++ b/src/renderer/store/modules/leaderboard.js @@ -19,7 +19,9 @@ const state = { // getters const getters = { - sourceInfo: () => ({ sources, sourceList }), + sourceInfo(state, getters, rootState, { sourceNames }) { + return { sources: sources.map(item => ({ id: item.id, name: sourceNames[item.id] })), sourceList } + }, list(state) { return state.list }, @@ -37,7 +39,7 @@ const actions = { getList({ state, rootState, commit }, page) { let source = rootState.setting.leaderboard.source let tabId = rootState.setting.leaderboard.tabId - let key = `${source}${tabId}${page}}` + let key = `${source}${tabId}${page}` if (state.list.length && state.key == key) return true commit('clearList') return music[source].leaderboard.getList(tabId, page).then(result => commit('setList', { result, key })) diff --git a/src/renderer/store/modules/search.js b/src/renderer/store/modules/search.js index 37d881f8..5b0d8a48 100644 --- a/src/renderer/store/modules/search.js +++ b/src/renderer/store/modules/search.js @@ -35,7 +35,9 @@ const state = { // getters const getters = { - sources: () => sources, + sources(state, getters, rootState, { sourceNames }) { + return sources.map(item => ({ id: item.id, name: sourceNames[item.id] })) + }, sourceList: state => state.sourceList || [], searchText: state => state.text, allList: state => ({ list: state.list, allPage: state.allPage, page: state.page, total: state.total, limit: state.limit, sourceMaxPage: state.sourceMaxPage }), diff --git a/src/renderer/store/modules/songList.js b/src/renderer/store/modules/songList.js index 237bcd2c..0f7af9da 100644 --- a/src/renderer/store/modules/songList.js +++ b/src/renderer/store/modules/songList.js @@ -39,7 +39,9 @@ sources.forEach(source => { // getters const getters = { - sourceInfo: () => ({ sources, sortList }), + sourceInfo(state, getters, rootState, { sourceNames }) { + return { sources: sources.map(item => ({ id: item.id, name: sourceNames[item.id] })), sortList } + }, tags: state => state.tags, isVisibleListDetail: state => state.isVisibleListDetail, selectListInfo: state => state.selectListInfo, diff --git a/src/renderer/utils/music/kg/leaderboard.js b/src/renderer/utils/music/kg/leaderboard.js index 76e4342a..cac6f726 100644 --- a/src/renderer/utils/music/kg/leaderboard.js +++ b/src/renderer/utils/music/kg/leaderboard.js @@ -5,7 +5,7 @@ export default { list: [ { id: 'kgtop500', - name: '酷狗TOP500', + name: 'TOP500', bangid: '8888', }, { @@ -53,11 +53,11 @@ export default { name: 'DJ热歌榜', bangid: '24971', }, - // { - // id: 'kghyxgb', - // name: '华语新歌榜', - // bangid: '31308', - // }, + { + id: 'kghyxgb', + name: '华语新歌榜', + bangid: '31308', + }, ], getUrl(p, id) { return `http://www2.kugou.kugou.com/yueku/v9/rank/home/${p}-${id}.html` diff --git a/src/renderer/views/Search.vue b/src/renderer/views/Search.vue index 82cde04b..47d6dd61 100644 --- a/src/renderer/views/Search.vue +++ b/src/renderer/views/Search.vue @@ -2,7 +2,7 @@ div(:class="$style.search") //- transition div(:class="$style.header") - material-tab(:class="$style.tab" :list="newSources" align="left" item-key="id" item-name="name" v-model="searchSourceId") + material-tab(:class="$style.tab" :list="sources" align="left" item-key="id" item-name="name" v-model="searchSourceId") div(v-if="listInfo.list.length" :class="$style.list") div(:class="$style.thead") table @@ -137,9 +137,6 @@ export default { isAPITemp() { return this.setting.apiSource == 'temp' }, - newSources() { - return this.sources.map(item => ({ id: item.id, name: this.$t('view.search.source_' + item.id) })) - }, }, methods: { ...mapMutations(['setSearchSource']),