diff --git a/app/components/tags/DishLabel.vue b/app/components/tags/DishLabel.vue new file mode 100644 index 0000000..9d8aa47 --- /dev/null +++ b/app/components/tags/DishLabel.vue @@ -0,0 +1,25 @@ + + + + + {{ dishLabel }} + + + + + + diff --git a/app/pages/help.vue b/app/pages/help.vue index a95e0b8..491a206 100644 --- a/app/pages/help.vue +++ b/app/pages/help.vue @@ -140,7 +140,6 @@ - diff --git a/app/pages/recipes/history.vue b/app/pages/recipes/history.vue index 7843933..7396666 100644 --- a/app/pages/recipes/history.vue +++ b/app/pages/recipes/history.vue @@ -1,4 +1,5 @@ - - - - 清空记录 - + + + + + + + 历史记录 - - - - {{ dayjs(history.time).format('YYYY-MM-DD HH:mm:ss') }} - - - - - + + + + + + + + + + + + + + + + + + {{ dayjs(history.time).format('YYYY-MM-DD HH:mm:ss') }} + + + + + + + + 删除 + + + + + + + diff --git a/app/pages/settings.vue b/app/pages/settings.vue index 8dbd1c8..6fc542f 100644 --- a/app/pages/settings.vue +++ b/app/pages/settings.vue @@ -39,9 +39,6 @@ definePageMeta({ 离开网页后保留选中数据 - - 更多设置,敬请期待 - diff --git a/app/pages/tabs/my/index.vue b/app/pages/tabs/my/index.vue index 61cd593..ccec03d 100644 --- a/app/pages/tabs/my/index.vue +++ b/app/pages/tabs/my/index.vue @@ -16,20 +16,20 @@ definePageMeta({ - + --> + diff --git a/ios/App/Podfile b/ios/App/Podfile index 1660f90..b083b49 100644 --- a/ios/App/Podfile +++ b/ios/App/Podfile @@ -15,6 +15,7 @@ def capacitor_pods pod 'CapacitorHaptics', :path => '../../node_modules/.pnpm/@capacitor+haptics@7.0.2_@capacitor+core@7.4.3/node_modules/@capacitor/haptics' pod 'CapacitorKeyboard', :path => '../../node_modules/.pnpm/@capacitor+keyboard@7.0.3_@capacitor+core@7.4.3/node_modules/@capacitor/keyboard' pod 'CapacitorStatusBar', :path => '../../node_modules/.pnpm/@capacitor+status-bar@7.0.3_@capacitor+core@7.4.3/node_modules/@capacitor/status-bar' + pod 'CapacitorDialog', :path => '../../node_modules/.pnpm/@capacitor+dialog@7.0.2_@capacitor+core@7.4.3/node_modules/@capacitor/dialog' end target 'App' do diff --git a/ios/App/Podfile.lock b/ios/App/Podfile.lock index 9af8c5f..ded2796 100644 --- a/ios/App/Podfile.lock +++ b/ios/App/Podfile.lock @@ -4,6 +4,8 @@ PODS: - CapacitorApp (7.1.0): - Capacitor - CapacitorCordova (7.4.3) + - CapacitorDialog (7.0.2): + - Capacitor - CapacitorHaptics (7.0.2): - Capacitor - CapacitorKeyboard (7.0.3): @@ -15,6 +17,7 @@ DEPENDENCIES: - "Capacitor (from `../../node_modules/.pnpm/@capacitor+ios@7.4.3_@capacitor+core@7.4.3/node_modules/@capacitor/ios`)" - "CapacitorApp (from `../../node_modules/.pnpm/@capacitor+app@7.1.0_@capacitor+core@7.4.3/node_modules/@capacitor/app`)" - "CapacitorCordova (from `../../node_modules/.pnpm/@capacitor+ios@7.4.3_@capacitor+core@7.4.3/node_modules/@capacitor/ios`)" + - "CapacitorDialog (from `../../node_modules/.pnpm/@capacitor+dialog@7.0.2_@capacitor+core@7.4.3/node_modules/@capacitor/dialog`)" - "CapacitorHaptics (from `../../node_modules/.pnpm/@capacitor+haptics@7.0.2_@capacitor+core@7.4.3/node_modules/@capacitor/haptics`)" - "CapacitorKeyboard (from `../../node_modules/.pnpm/@capacitor+keyboard@7.0.3_@capacitor+core@7.4.3/node_modules/@capacitor/keyboard`)" - "CapacitorStatusBar (from `../../node_modules/.pnpm/@capacitor+status-bar@7.0.3_@capacitor+core@7.4.3/node_modules/@capacitor/status-bar`)" @@ -26,6 +29,8 @@ EXTERNAL SOURCES: :path: "../../node_modules/.pnpm/@capacitor+app@7.1.0_@capacitor+core@7.4.3/node_modules/@capacitor/app" CapacitorCordova: :path: "../../node_modules/.pnpm/@capacitor+ios@7.4.3_@capacitor+core@7.4.3/node_modules/@capacitor/ios" + CapacitorDialog: + :path: "../../node_modules/.pnpm/@capacitor+dialog@7.0.2_@capacitor+core@7.4.3/node_modules/@capacitor/dialog" CapacitorHaptics: :path: "../../node_modules/.pnpm/@capacitor+haptics@7.0.2_@capacitor+core@7.4.3/node_modules/@capacitor/haptics" CapacitorKeyboard: @@ -37,10 +42,11 @@ SPEC CHECKSUMS: Capacitor: 28d6c01026a9a3f7156529498ec1f389a2a28dbc CapacitorApp: 26587c2ce485d88ddb39adb21cac64f8e481afe3 CapacitorCordova: 435121e81a2df4d0034f0fb11fcefab5104cfdb5 + CapacitorDialog: 5bf72a94b747fb339df6f64ef60812e5e4630ad2 CapacitorHaptics: b3fb2869e72c4466e18ce9ccbeb60a3d8723b3d4 CapacitorKeyboard: 62f36104f26d53d8b3a2a43f2a69fe714f1777d5 CapacitorStatusBar: 0659ddc7b1713764a05831463d215b177a15d054 -PODFILE CHECKSUM: 8bd0d9c820121f1afdd77c0f07183ee4bdcccf29 +PODFILE CHECKSUM: c0ad7487807bc389ebb7e4f95a97f324cfdda550 COCOAPODS: 1.16.2 diff --git a/package.json b/package.json index 7b5768b..586cb4c 100644 --- a/package.json +++ b/package.json @@ -42,6 +42,7 @@ "devDependencies": { "@antfu/eslint-config": "^5.4.1", "@capacitor/cli": "7.4.3", + "@capacitor/dialog": "^7.0.2", "@headlessui/vue": "^1.7.23", "@iconify-json/carbon": "^1.2.13", "@iconify-json/fe": "^1.2.4", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 9237713..13c0c1a 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -43,6 +43,9 @@ importers: '@capacitor/cli': specifier: 7.4.3 version: 7.4.3 + '@capacitor/dialog': + specifier: ^7.0.2 + version: 7.0.2(@capacitor/core@7.4.3) '@headlessui/vue': specifier: ^1.7.23 version: 1.7.23(vue@3.5.22(typescript@5.9.3)) @@ -855,6 +858,11 @@ packages: '@capacitor/core@7.4.3': resolution: {integrity: sha512-wCWr8fQ9Wxn0466vPg7nMn0tivbNVjNy1yL4GvDSIZuZx7UpU2HeVGNe9QjN/quEd+YLRFeKEBLBw619VqUiNg==} + '@capacitor/dialog@7.0.2': + resolution: {integrity: sha512-2lRMKEdBV/2LMCwHbC5a03jiU4tdlIN4hXAqmQMxnaa7CAVLfk/vEE+vxA5mpnI/pzoXF/QDQEUXJUd10hbcKA==} + peerDependencies: + '@capacitor/core': '>=7.0.0' + '@capacitor/haptics@7.0.2': resolution: {integrity: sha512-vqfeEM6s2zMgLjpITCTUIy7P/hadq/Gr5E/RClFgMJPB41Y5FsqOKD+j85/uwh8N2cf/aWaPeXUmjnTzJbEB2g==} peerDependencies: @@ -8387,6 +8395,10 @@ snapshots: dependencies: tslib: 2.8.1 + '@capacitor/dialog@7.0.2(@capacitor/core@7.4.3)': + dependencies: + '@capacitor/core': 7.4.3 + '@capacitor/haptics@7.0.2(@capacitor/core@7.4.3)': dependencies: '@capacitor/core': 7.4.3