diff --git a/package.json b/package.json index ad775f31..b8605cea 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "sub-store-front-end", - "version": "2.14.303", + "version": "2.14.304", "private": true, "scripts": { "dev": "vite --host", diff --git a/src/locales/en.ts b/src/locales/en.ts index 91107738..a60bf05f 100644 --- a/src/locales/en.ts +++ b/src/locales/en.ts @@ -287,6 +287,7 @@ export default { }, subscriptions: { label: "Select included subscriptions", + empty: 'Please create a subscription first, then use the collection feature', }, content: { label: "Content", diff --git a/src/locales/zh.ts b/src/locales/zh.ts index bf715fe5..c2169944 100644 --- a/src/locales/zh.ts +++ b/src/locales/zh.ts @@ -307,6 +307,7 @@ export default { }, subscriptions: { label: '手动选择的订阅', + empty: '请先创建单条订阅, 再使用组合订阅功能', }, content: { label: '内容', diff --git a/src/views/File.vue b/src/views/File.vue index 4ee58903..44889266 100644 --- a/src/views/File.vue +++ b/src/views/File.vue @@ -18,12 +18,11 @@ }" :style="{ cursor: 'pointer', - left: '16px', + left: '15px', bottom: `${ bottomSafeArea + 48 + - 36 + - (!isMobile() ? (appearanceSetting.isSimpleMode ? 44 : 48) : 0) + (!isMobile() ? (appearanceSetting.isSimpleMode ? 50 : 48) : 0) }px`, }" > diff --git a/src/views/Sub.vue b/src/views/Sub.vue index 7aad52d8..269d5e38 100644 --- a/src/views/Sub.vue +++ b/src/views/Sub.vue @@ -71,12 +71,11 @@ }" :style="{ cursor: 'pointer', - left: '16px', + left: '15px', bottom: `${ bottomSafeArea + 48 + - 36 + - (!isMobile() ? (appearanceSetting.isSimpleMode ? 44 : 48) : 0) + (!isMobile() ? (appearanceSetting.isSimpleMode ? 50 : 48) : 0) }px`, }" > diff --git a/src/views/SubEditor.vue b/src/views/SubEditor.vue index e1a7a459..da8241d5 100644 --- a/src/views/SubEditor.vue +++ b/src/views/SubEditor.vue @@ -544,7 +544,7 @@ const padding = bottomSafeArea.value + "px"; } }; const selectedSubs = computed(() => { - if(!Array.isArray(form.subscriptions) || form.subscriptions.length === 0) return '' + if(!Array.isArray(form.subscriptions) || form.subscriptions.length === 0) return `: ${t(`editorPage.subConfig.basic.subscriptions.empty`)}` return `: ${form.subscriptions.map((name) => { const sub = subsStore.getOneSub(name); return sub?.displayName || sub?.["display-name"] || sub.name; diff --git a/src/views/Sync.vue b/src/views/Sync.vue index fbdc0d7f..4980726b 100644 --- a/src/views/Sync.vue +++ b/src/views/Sync.vue @@ -17,12 +17,11 @@ }" :style="{ cursor: 'pointer', - left: '16px', + left: '15px', bottom: `${ bottomSafeArea + 48 + - 36 + - (!isMobile() ? (appearanceSetting.isSimpleMode ? 44 : 48) : 0) + (!isMobile() ? (appearanceSetting.isSimpleMode ? 50 : 48) : 0) }px`, }" > diff --git a/src/views/share/Share.vue b/src/views/share/Share.vue index 8c635623..a40e280d 100644 --- a/src/views/share/Share.vue +++ b/src/views/share/Share.vue @@ -19,8 +19,7 @@ bottom: `${ bottomSafeArea + 48 + - 36 + - (!isMobile() ? (appearanceSetting.isSimpleMode ? 44 : 48) : 0) + (!isMobile() ? (appearanceSetting.isSimpleMode ? 50 : 48) : 0) }px`, }" >