diff --git a/miniprogram/app.json b/miniprogram/app.json index 818c863..f0648a9 100644 --- a/miniprogram/app.json +++ b/miniprogram/app.json @@ -1,20 +1,21 @@ { "pages": [ "pages/index/index", - "pages/main/journal/index", - "pages/main/journal-search/index", - "pages/main/journal-editor/index", - "pages/main/journal-map/index", - "pages/main/journal-date/index", - "pages/main/portfolio/index", - "pages/main/travel/index", - "pages/main/travel-detail/index", - "pages/main/travel-editor/index", - "pages/main/travel-location-detail/index", - "pages/main/travel-location-map/index", - "pages/main/travel-location-editor/index", - "pages/main/about/index", - "pages/main/moment/index" + "pages/main/tabs/journal/index", + "pages/main/tabs/travel/index", + "pages/main/tabs/moment/index", + "pages/main/tabs/other/index", + "pages/main/tabs/about/index", + "pages/main/journal/search/index", + "pages/main/journal/editor/index", + "pages/main/journal/map/index", + "pages/main/journal/date/index", + "pages/main/other/portfolio/index", + "pages/main/travel/detail/index", + "pages/main/travel/editor/index", + "pages/main/travel/location-detail/index", + "pages/main/travel/location-map/index", + "pages/main/travel/location-editor/index" ], "darkmode": true, "themeLocation": "theme.json", @@ -32,31 +33,31 @@ "list": [ { "text": "归档", - "pagePath": "pages/main/journal/index", + "pagePath": "pages/main/tabs/journal/index", "iconPath": "@tabBarIconJournal", "selectedIconPath": "@tabBarIconJournalActive" }, - { - "text": "专拍", - "pagePath": "pages/main/portfolio/index", - "iconPath": "@tabBarIconPortfolio", - "selectedIconPath": "@tabBarIconPortfolioActive" - }, - { - "text": "瞬间", - "pagePath": "pages/main/moment/index", - "iconPath": "@tabBarIconMoment", - "selectedIconPath": "@tabBarIconMomentActive" - }, { "text": "出行", - "pagePath": "pages/main/travel/index", + "pagePath": "pages/main/tabs/travel/index", "iconPath": "@tabBarIconTravel", "selectedIconPath": "@tabBarIconTravelActive" }, + { + "text": "瞬间", + "pagePath": "pages/main/tabs/moment/index", + "iconPath": "@tabBarIconMoment", + "selectedIconPath": "@tabBarIconMomentActive" + }, + { + "text": "其他", + "pagePath": "pages/main/tabs/other/index", + "iconPath": "@tabBarIconOther", + "selectedIconPath": "@tabBarIconOtherActive" + }, { "text": "关于", - "pagePath": "pages/main/about/index", + "pagePath": "pages/main/tabs/about/index", "iconPath": "@tabBarIconInfo", "selectedIconPath": "@tabBarIconInfoActive" } diff --git a/miniprogram/assets/icon/dark/other.png b/miniprogram/assets/icon/dark/other.png new file mode 100644 index 0000000..5d015c7 Binary files /dev/null and b/miniprogram/assets/icon/dark/other.png differ diff --git a/miniprogram/assets/icon/dark/other_active.png b/miniprogram/assets/icon/dark/other_active.png new file mode 100644 index 0000000..0d145e9 Binary files /dev/null and b/miniprogram/assets/icon/dark/other_active.png differ diff --git a/miniprogram/assets/icon/dark/portfolio.png b/miniprogram/assets/icon/dark/portfolio.png deleted file mode 100644 index 81c6572..0000000 Binary files a/miniprogram/assets/icon/dark/portfolio.png and /dev/null differ diff --git a/miniprogram/assets/icon/dark/portfolio_active.png b/miniprogram/assets/icon/dark/portfolio_active.png deleted file mode 100644 index 6dd6e9f..0000000 Binary files a/miniprogram/assets/icon/dark/portfolio_active.png and /dev/null differ diff --git a/miniprogram/assets/icon/light/other.png b/miniprogram/assets/icon/light/other.png new file mode 100644 index 0000000..1f5c32d Binary files /dev/null and b/miniprogram/assets/icon/light/other.png differ diff --git a/miniprogram/assets/icon/light/other_active.png b/miniprogram/assets/icon/light/other_active.png new file mode 100644 index 0000000..95bcaa9 Binary files /dev/null and b/miniprogram/assets/icon/light/other_active.png differ diff --git a/miniprogram/components/background/snowflake/index.ts b/miniprogram/components/background/snowflake/index.ts index deb8927..f72e602 100644 --- a/miniprogram/components/background/snowflake/index.ts +++ b/miniprogram/components/background/snowflake/index.ts @@ -20,7 +20,7 @@ Component({ createSnowflake() { const snowflake = { x: Toolkit.random(0, this.data.docWidth), - s: Toolkit.random(16, 64), + s: Toolkit.random(16, 90), speed: Toolkit.random(14, 26) }; this.setData({ diff --git a/miniprogram/components/background/snowflake/index.wxml b/miniprogram/components/background/snowflake/index.wxml index a4f71cd..840b05d 100644 --- a/miniprogram/components/background/snowflake/index.wxml +++ b/miniprogram/components/background/snowflake/index.wxml @@ -5,6 +5,6 @@ wx:for="{{snowflakes}}" wx:key="index" style="left: {{item.x}}px; font-size: {{item.s}}rpx; animation-duration: {{item.speed}}s;" - name="snowflake" + name="plus" /> diff --git a/miniprogram/package-lock.json b/miniprogram/package-lock.json index 1cc353d..fcc6378 100644 --- a/miniprogram/package-lock.json +++ b/miniprogram/package-lock.json @@ -9,7 +9,7 @@ "version": "1.0.0", "license": "ISC", "dependencies": { - "tdesign-miniprogram": "^1.12.0" + "tdesign-miniprogram": "^1.12.2" }, "devDependencies": { "miniprogram-api-typings": "^4.1.0" @@ -22,9 +22,9 @@ "dev": true }, "node_modules/tdesign-miniprogram": { - "version": "1.12.0", - "resolved": "https://registry.npmjs.org/tdesign-miniprogram/-/tdesign-miniprogram-1.12.0.tgz", - "integrity": "sha512-Ft+B1HWMOKuOpM9+Z0mflprWrxSB/ESo6TVymjxJ6xzMgSfEcbmFaXpd0nJ+Oj/5GCljqP06ZTeWazuk1G6Ugg==" + "version": "1.12.2", + "resolved": "https://registry.npmjs.org/tdesign-miniprogram/-/tdesign-miniprogram-1.12.2.tgz", + "integrity": "sha512-ZpOdwonT26RRCK/FWbg9tR2lAJ54Hb4PAdyTWu8URWkbKOmSQhn0JCwCtWWRofKbyWCPsCn5NqljobaGh5VCMg==" } } } diff --git a/miniprogram/package.json b/miniprogram/package.json index 3e1be7b..574b936 100644 --- a/miniprogram/package.json +++ b/miniprogram/package.json @@ -10,7 +10,7 @@ "author": "", "license": "ISC", "dependencies": { - "tdesign-miniprogram": "^1.12.0" + "tdesign-miniprogram": "^1.12.2" }, "devDependencies": { "miniprogram-api-typings": "^4.1.0" diff --git a/miniprogram/pages/index/index.ts b/miniprogram/pages/index/index.ts index d68c871..7b22d4f 100644 --- a/miniprogram/pages/index/index.ts +++ b/miniprogram/pages/index/index.ts @@ -27,7 +27,7 @@ Page({ type: JournalPageType.PREVIEW }); wx.switchTab({ - url: "/pages/main/journal/index", + url: "/pages/main/tabs/journal/index", }) } catch (error: any) { if (error?.code === 40100) { diff --git a/miniprogram/pages/main/journal-date/index.json b/miniprogram/pages/main/journal/date/index.json similarity index 100% rename from miniprogram/pages/main/journal-date/index.json rename to miniprogram/pages/main/journal/date/index.json diff --git a/miniprogram/pages/main/journal-date/index.less b/miniprogram/pages/main/journal/date/index.less similarity index 91% rename from miniprogram/pages/main/journal-date/index.less rename to miniprogram/pages/main/journal/date/index.less index 5a3a6ef..eb9980c 100644 --- a/miniprogram/pages/main/journal-date/index.less +++ b/miniprogram/pages/main/journal/date/index.less @@ -1,4 +1,4 @@ -/* pages/main/journal-date/index.less */ +/* pages/main/journal/date/index.less */ .container { width: 100%; height: 100vh; diff --git a/miniprogram/pages/main/journal-date/index.ts b/miniprogram/pages/main/journal/date/index.ts similarity index 90% rename from miniprogram/pages/main/journal-date/index.ts rename to miniprogram/pages/main/journal/date/index.ts index 5cc752b..95c4199 100644 --- a/miniprogram/pages/main/journal-date/index.ts +++ b/miniprogram/pages/main/journal/date/index.ts @@ -1,7 +1,7 @@ -// pages/main/journal-date/index.ts -import { Journal, JournalPageType } from "../../../types/Journal"; -import Time from "../../../utils/Time"; -import { JournalApi } from "../../../api/JournalApi"; +// pages/main/journal/date/index.ts +import { Journal, JournalPageType } from "../../../../types/Journal"; +import Time from "../../../../utils/Time"; +import { JournalApi } from "../../../../api/JournalApi"; interface JournalDateData { // 存储每个日期的日记 id 列表 diff --git a/miniprogram/pages/main/journal-date/index.wxml b/miniprogram/pages/main/journal/date/index.wxml similarity index 79% rename from miniprogram/pages/main/journal-date/index.wxml rename to miniprogram/pages/main/journal/date/index.wxml index c988eac..c46f8d3 100644 --- a/miniprogram/pages/main/journal-date/index.wxml +++ b/miniprogram/pages/main/journal/date/index.wxml @@ -1,5 +1,5 @@ - - + + diff --git a/miniprogram/pages/main/journal-editor/index.json b/miniprogram/pages/main/journal/editor/index.json similarity index 100% rename from miniprogram/pages/main/journal-editor/index.json rename to miniprogram/pages/main/journal/editor/index.json diff --git a/miniprogram/pages/main/journal-editor/index.less b/miniprogram/pages/main/journal/editor/index.less similarity index 98% rename from miniprogram/pages/main/journal-editor/index.less rename to miniprogram/pages/main/journal/editor/index.less index e814c77..c24c5f0 100644 --- a/miniprogram/pages/main/journal-editor/index.less +++ b/miniprogram/pages/main/journal/editor/index.less @@ -1,4 +1,4 @@ -/* pages/main/journal-editor/index.wxss */ +/* pages/main/journal/editor/index.wxss */ .container { .content { diff --git a/miniprogram/pages/main/journal-editor/index.ts b/miniprogram/pages/main/journal/editor/index.ts similarity index 96% rename from miniprogram/pages/main/journal-editor/index.ts rename to miniprogram/pages/main/journal/editor/index.ts index 9123ebc..6ecfa46 100644 --- a/miniprogram/pages/main/journal-editor/index.ts +++ b/miniprogram/pages/main/journal/editor/index.ts @@ -1,13 +1,13 @@ -// pages/main/journal-editor/index.ts -import Events from "../../../utils/Events"; -import Time from "../../../utils/Time"; -import Toolkit from "../../../utils/Toolkit"; -import config from "../../../config/index"; -import { Location, MediaItem, MediaItemType, WechatMediaItem } from "../../../types/UI"; -import { JournalType } from "../../../types/Journal"; -import { MediaAttachType, PreviewImageMetadata } from "../../../types/Attachment"; -import IOSize, { Unit } from "../../../utils/IOSize"; -import { JournalApi } from "../../../api/JournalApi"; +// pages/main/journal/editor/index.ts +import Events from "../../../../utils/Events"; +import Time from "../../../../utils/Time"; +import Toolkit from "../../../../utils/Toolkit"; +import config from "../../../../config/index"; +import { Location, MediaItem, MediaItemType, WechatMediaItem } from "../../../../types/UI"; +import { JournalType } from "../../../../types/Journal"; +import { MediaAttachType, PreviewImageMetadata } from "../../../../types/Attachment"; +import IOSize, { Unit } from "../../../../utils/IOSize"; +import { JournalApi } from "../../../../api/JournalApi"; interface JournalEditorData { /** 模式：create 或 edit */ @@ -341,7 +341,7 @@ Page({ cancel() { if (this.data.mode === "create") { wx.switchTab({ - url: "/pages/main/journal/index" + url: "/pages/main/tabs/journal/index" }); } else { wx.navigateBack(); @@ -459,7 +459,7 @@ Page({ }); await Toolkit.sleep(1000); wx.switchTab({ - url: "/pages/main/journal/index" + url: "/pages/main/tabs/journal/index" }); } catch (error) { console.error("创建日记失败:", error); diff --git a/miniprogram/pages/main/journal-editor/index.wxml b/miniprogram/pages/main/journal/editor/index.wxml similarity index 99% rename from miniprogram/pages/main/journal-editor/index.wxml rename to miniprogram/pages/main/journal/editor/index.wxml index 7e05759..cce5006 100644 --- a/miniprogram/pages/main/journal-editor/index.wxml +++ b/miniprogram/pages/main/journal/editor/index.wxml @@ -1,5 +1,5 @@ - - + + 取消 - + + - + + - + diff --git a/miniprogram/pages/main/about/index.json b/miniprogram/pages/main/tabs/about/index.json similarity index 77% rename from miniprogram/pages/main/about/index.json rename to miniprogram/pages/main/tabs/about/index.json index 0be651a..5126860 100644 --- a/miniprogram/pages/main/about/index.json +++ b/miniprogram/pages/main/tabs/about/index.json @@ -4,6 +4,6 @@ "t-icon": "tdesign-miniprogram/icon/icon", "t-button": "tdesign-miniprogram/button/button", "t-navbar": "tdesign-miniprogram/navbar/navbar", - "snowflake": "../../../components/background/snowflake" + "snowflake": "/components/background/snowflake" } } \ No newline at end of file diff --git a/miniprogram/pages/main/about/index.less b/miniprogram/pages/main/tabs/about/index.less similarity index 100% rename from miniprogram/pages/main/about/index.less rename to miniprogram/pages/main/tabs/about/index.less diff --git a/miniprogram/pages/main/about/index.ts b/miniprogram/pages/main/tabs/about/index.ts similarity index 93% rename from miniprogram/pages/main/about/index.ts rename to miniprogram/pages/main/tabs/about/index.ts index b6fa09d..689a379 100644 --- a/miniprogram/pages/main/about/index.ts +++ b/miniprogram/pages/main/tabs/about/index.ts @@ -1,7 +1,7 @@ // pages/info/info.ts -import Time from "../../../utils/Time"; -import config from "../../../config/index" +import Time from "../../../../utils/Time"; +import config from "../../../../config/index" interface IAboutData { timer?: number; @@ -61,4 +61,4 @@ Page({ "url": "/pages/index/index?from=info" }) } -}) \ No newline at end of file +}) diff --git a/miniprogram/pages/main/about/index.wxml b/miniprogram/pages/main/tabs/about/index.wxml similarity index 95% rename from miniprogram/pages/main/about/index.wxml rename to miniprogram/pages/main/tabs/about/index.wxml index c43b01d..0043e6c 100644 --- a/miniprogram/pages/main/about/index.wxml +++ b/miniprogram/pages/main/tabs/about/index.wxml @@ -1,6 +1,6 @@ - + diff --git a/miniprogram/pages/main/journal/index.json b/miniprogram/pages/main/tabs/journal/index.json similarity index 100% rename from miniprogram/pages/main/journal/index.json rename to miniprogram/pages/main/tabs/journal/index.json diff --git a/miniprogram/pages/main/journal/index.less b/miniprogram/pages/main/tabs/journal/index.less similarity index 100% rename from miniprogram/pages/main/journal/index.less rename to miniprogram/pages/main/tabs/journal/index.less diff --git a/miniprogram/pages/main/journal/index.ts b/miniprogram/pages/main/tabs/journal/index.ts similarity index 89% rename from miniprogram/pages/main/journal/index.ts rename to miniprogram/pages/main/tabs/journal/index.ts index 74f591b..c3a3e1c 100644 --- a/miniprogram/pages/main/journal/index.ts +++ b/miniprogram/pages/main/tabs/journal/index.ts @@ -1,14 +1,14 @@ // pages/journal/index.ts -import Time from "../../../utils/Time"; -import config from "../../../config/index" -import Events from "../../../utils/Events"; -import Toolkit from "../../../utils/Toolkit"; -import { Journal, JournalPage, JournalPageType } from "../../../types/Journal"; -import { OrderType } from "../../../types/Model"; -import { PreviewImageMetadata } from "../../../types/Attachment"; -import { MediaItem, MediaItemType } from "../../../types/UI"; -import { JournalApi } from "../../../api/JournalApi"; +import Time from "../../../../utils/Time"; +import config from "../../../../config/index" +import Events from "../../../../utils/Events"; +import Toolkit from "../../../../utils/Toolkit"; +import { Journal, JournalPage, JournalPageType } from "../../../../types/Journal"; +import { OrderType } from "../../../../types/Model"; +import { PreviewImageMetadata } from "../../../../types/Attachment"; +import { MediaItem, MediaItemType } from "../../../../types/UI"; +import { JournalApi } from "../../../../api/JournalApi"; interface JournalData { page: JournalPage; @@ -126,22 +126,22 @@ Page({ }, toCreater() { wx.navigateTo({ - "url": "/pages/main/journal-editor/index?from=journal" + url: "/pages/main/journal/editor/index?from=journal" }) }, toSearch() { wx.navigateTo({ - url: "/pages/main/journal-search/index" + url: "/pages/main/journal/search/index" }) }, toMap() { wx.navigateTo({ - url: "/pages/main/journal-map/index" + url: "/pages/main/journal/map/index" }) }, toDate() { wx.navigateTo({ - url: "/pages/main/journal-date/index" + url: "/pages/main/journal/date/index" }) }, async fetch() { diff --git a/miniprogram/pages/main/journal/index.wxml b/miniprogram/pages/main/tabs/journal/index.wxml similarity index 97% rename from miniprogram/pages/main/journal/index.wxml rename to miniprogram/pages/main/tabs/journal/index.wxml index b3450a6..4b9134e 100644 --- a/miniprogram/pages/main/journal/index.wxml +++ b/miniprogram/pages/main/tabs/journal/index.wxml @@ -1,5 +1,5 @@ - + diff --git a/miniprogram/pages/main/moment/index.json b/miniprogram/pages/main/tabs/moment/index.json similarity index 88% rename from miniprogram/pages/main/moment/index.json rename to miniprogram/pages/main/tabs/moment/index.json index 1ee4a58..584ae0c 100644 --- a/miniprogram/pages/main/moment/index.json +++ b/miniprogram/pages/main/tabs/moment/index.json @@ -7,7 +7,7 @@ "t-button": "tdesign-miniprogram/button/button", "t-checkbox": "tdesign-miniprogram/checkbox/checkbox", "t-cell-group": "tdesign-miniprogram/cell-group/cell-group", - "journal-list": "../../../components/journal-list/index", + "journal-list": "/components/journal-list/index", "t-radio-group": "tdesign-miniprogram/radio-group/radio-group" }, "styleIsolation": "shared" diff --git a/miniprogram/pages/main/moment/index.less b/miniprogram/pages/main/tabs/moment/index.less similarity index 100% rename from miniprogram/pages/main/moment/index.less rename to miniprogram/pages/main/tabs/moment/index.less diff --git a/miniprogram/pages/main/moment/index.ts b/miniprogram/pages/main/tabs/moment/index.ts similarity index 95% rename from miniprogram/pages/main/moment/index.ts rename to miniprogram/pages/main/tabs/moment/index.ts index 3c83a91..38b1b0a 100644 --- a/miniprogram/pages/main/moment/index.ts +++ b/miniprogram/pages/main/tabs/moment/index.ts @@ -1,14 +1,14 @@ // pages/main/moment/index.ts -import config from "../../../config/index"; -import Events from "../../../utils/Events"; -import IOSize, { Unit } from "../../../utils/IOSize"; -import Time from "../../../utils/Time"; -import Toolkit from "../../../utils/Toolkit"; -import { Location, MediaItemType } from "../../../types/UI"; -import { PreviewImageMetadata } from "../../../types/Attachment"; -import { MomentApi } from "../../../api/MomentApi"; -import { JournalApi } from "../../../api/JournalApi"; -import { Network } from "../../../utils/Network"; +import config from "../../../../config/index"; +import Events from "../../../../utils/Events"; +import IOSize, { Unit } from "../../../../utils/IOSize"; +import Time from "../../../../utils/Time"; +import Toolkit from "../../../../utils/Toolkit"; +import { Location, MediaItemType } from "../../../../types/UI"; +import { PreviewImageMetadata } from "../../../../types/Attachment"; +import { MomentApi } from "../../../../api/MomentApi"; +import { JournalApi } from "../../../../api/JournalApi"; +import { Network } from "../../../../utils/Network"; type Item = { id: number; @@ -459,4 +459,4 @@ Page({ } }) } -}) \ No newline at end of file +}) diff --git a/miniprogram/pages/main/moment/index.wxml b/miniprogram/pages/main/tabs/moment/index.wxml similarity index 98% rename from miniprogram/pages/main/moment/index.wxml rename to miniprogram/pages/main/tabs/moment/index.wxml index 95ce4da..a7c5f6f 100644 --- a/miniprogram/pages/main/moment/index.wxml +++ b/miniprogram/pages/main/tabs/moment/index.wxml @@ -1,6 +1,6 @@ - + diff --git a/miniprogram/pages/main/tabs/other/index.json b/miniprogram/pages/main/tabs/other/index.json new file mode 100644 index 0000000..46fa67c --- /dev/null +++ b/miniprogram/pages/main/tabs/other/index.json @@ -0,0 +1,7 @@ +{ + "usingComponents": { + "t-navbar": "tdesign-miniprogram/navbar/navbar", + "t-cell": "tdesign-miniprogram/cell/cell", + "t-cell-group": "tdesign-miniprogram/cell-group/cell-group" + } +} diff --git a/miniprogram/pages/main/tabs/other/index.less b/miniprogram/pages/main/tabs/other/index.less new file mode 100644 index 0000000..e69de29 diff --git a/miniprogram/pages/main/tabs/other/index.ts b/miniprogram/pages/main/tabs/other/index.ts new file mode 100644 index 0000000..52b1e62 --- /dev/null +++ b/miniprogram/pages/main/tabs/other/index.ts @@ -0,0 +1,33 @@ +type NavItem = { + title: string; + icon: string; + url: string; +}; + +interface OtherData { + navList: NavItem[]; +} + +Page({ + data: { + navList: [ + { + title: "备忘录", + icon: "task-checked", + url: "/pages/main/other/portfolio/index" + }, + { + title: "专拍", + icon: "face-retouching", + url: "/pages/main/other/portfolio/index" + } + ], + }, + onNavTap(e: WechatMiniprogram.BaseEvent) { + const { url } = e.currentTarget.dataset as { url?: string }; + if (!url) { + return; + } + wx.navigateTo({ url }); + } +}); diff --git a/miniprogram/pages/main/tabs/other/index.wxml b/miniprogram/pages/main/tabs/other/index.wxml new file mode 100644 index 0000000..2639d87 --- /dev/null +++ b/miniprogram/pages/main/tabs/other/index.wxml @@ -0,0 +1,17 @@ + + + + + + + + diff --git a/miniprogram/pages/main/travel/index.json b/miniprogram/pages/main/tabs/travel/index.json similarity index 100% rename from miniprogram/pages/main/travel/index.json rename to miniprogram/pages/main/tabs/travel/index.json diff --git a/miniprogram/pages/main/travel/index.less b/miniprogram/pages/main/tabs/travel/index.less similarity index 100% rename from miniprogram/pages/main/travel/index.less rename to miniprogram/pages/main/tabs/travel/index.less diff --git a/miniprogram/pages/main/travel/index.ts b/miniprogram/pages/main/tabs/travel/index.ts similarity index 94% rename from miniprogram/pages/main/travel/index.ts rename to miniprogram/pages/main/tabs/travel/index.ts index 21ac9da..26de7a3 100644 --- a/miniprogram/pages/main/travel/index.ts +++ b/miniprogram/pages/main/tabs/travel/index.ts @@ -1,8 +1,8 @@ // pages/main/travel/index.ts -import Time from "../../../utils/Time"; -import { TravelApi } from "../../../api/TravelApi"; -import { Travel, TravelPage, TravelStatus, TravelStatusLabel, TravelStatusIcon, TransportationTypeLabel, TransportationTypeIcon } from "../../../types/Travel"; +import Time from "../../../../utils/Time"; +import { TravelApi } from "../../../../api/TravelApi"; +import { Travel, TravelPage, TravelStatus, TravelStatusLabel, TravelStatusIcon, TransportationTypeLabel, TransportationTypeIcon } from "../../../../types/Travel"; interface TravelData { /** 分页参数 */ @@ -163,14 +163,14 @@ Page({ /** 新建出行 */ toCreate() { wx.navigateTo({ - url: "/pages/main/travel-editor/index" + url: "/pages/main/travel/editor/index" }); }, /** 查看详情 */ toDetail(e: WechatMiniprogram.BaseEvent) { const { id } = e.currentTarget.dataset; wx.navigateTo({ - url: `/pages/main/travel-detail/index?id=${id}` + url: `/pages/main/travel/detail/index?id=${id}` }); }, }); diff --git a/miniprogram/pages/main/travel/index.wxml b/miniprogram/pages/main/tabs/travel/index.wxml similarity index 98% rename from miniprogram/pages/main/travel/index.wxml rename to miniprogram/pages/main/tabs/travel/index.wxml index 19dd90d..2ace7d4 100644 --- a/miniprogram/pages/main/travel/index.wxml +++ b/miniprogram/pages/main/tabs/travel/index.wxml @@ -1,6 +1,6 @@ - + diff --git a/miniprogram/pages/main/travel-detail/index.json b/miniprogram/pages/main/travel/detail/index.json similarity index 100% rename from miniprogram/pages/main/travel-detail/index.json rename to miniprogram/pages/main/travel/detail/index.json diff --git a/miniprogram/pages/main/travel-detail/index.less b/miniprogram/pages/main/travel/detail/index.less similarity index 98% rename from miniprogram/pages/main/travel-detail/index.less rename to miniprogram/pages/main/travel/detail/index.less index bf40106..19134dc 100644 --- a/miniprogram/pages/main/travel-detail/index.less +++ b/miniprogram/pages/main/travel/detail/index.less @@ -1,4 +1,4 @@ -// pages/main/travel-detail/index.less +// pages/main/travel/detail/index.less .travel-detail { width: 100vw; diff --git a/miniprogram/pages/main/travel-detail/index.ts b/miniprogram/pages/main/travel/detail/index.ts similarity index 92% rename from miniprogram/pages/main/travel-detail/index.ts rename to miniprogram/pages/main/travel/detail/index.ts index 5f37916..71178fb 100644 --- a/miniprogram/pages/main/travel-detail/index.ts +++ b/miniprogram/pages/main/travel/detail/index.ts @@ -1,10 +1,10 @@ -// pages/main/travel-detail/index.ts +// pages/main/travel/detail/index.ts -import Time from "../../../utils/Time"; -import { TravelApi } from "../../../api/TravelApi"; -import { TravelLocationApi } from "../../../api/TravelLocationApi"; -import config from "../../../config/index"; -import { Travel, TravelStatusLabel, TravelStatusIcon, TransportationTypeLabel, TravelLocation, TravelLocationTypeLabel, TravelLocationTypeIcon, TransportationTypeIcon, TravelLocationType } from "../../../types/Travel"; +import Time from "../../../../utils/Time"; +import { TravelApi } from "../../../../api/TravelApi"; +import { TravelLocationApi } from "../../../../api/TravelLocationApi"; +import config from "../../../../config/index"; +import { Travel, TravelStatusLabel, TravelStatusIcon, TransportationTypeLabel, TravelLocation, TravelLocationTypeLabel, TravelLocationTypeIcon, TransportationTypeIcon, TravelLocationType } from "../../../../types/Travel"; interface TravelLocationView extends TravelLocation { /** 预览图 */ @@ -174,7 +174,7 @@ Page({ const { travel } = this.data; if (travel && travel.id) { wx.navigateTo({ - url: `/pages/main/travel-editor/index?id=${travel.id}` + url: `/pages/main/travel/editor/index?id=${travel.id}` }); } }, @@ -184,7 +184,7 @@ Page({ const { travel } = this.data; if (travel && travel.id) { wx.navigateTo({ - url: `/pages/main/travel-location-editor/index?travelId=${travel.id}` + url: `/pages/main/travel/location-editor/index?travelId=${travel.id}` }); } }, @@ -195,7 +195,7 @@ Page({ const { travel } = this.data; if (id && travel && travel.id) { wx.navigateTo({ - url: `/pages/main/travel-location-detail/index?id=${id}&travelId=${travel.id}` + url: `/pages/main/travel/location-detail/index?id=${id}&travelId=${travel.id}` }); } }, @@ -205,7 +205,7 @@ Page({ const { travel } = this.data; if (travel && travel.id) { wx.navigateTo({ - url: `/pages/main/travel-location-map/index?travelId=${travel.id}` + url: `/pages/main/travel/location-map/index?travelId=${travel.id}` }); } }, diff --git a/miniprogram/pages/main/travel-detail/index.wxml b/miniprogram/pages/main/travel/detail/index.wxml similarity index 97% rename from miniprogram/pages/main/travel-detail/index.wxml rename to miniprogram/pages/main/travel/detail/index.wxml index f284434..04265c3 100644 --- a/miniprogram/pages/main/travel-detail/index.wxml +++ b/miniprogram/pages/main/travel/detail/index.wxml @@ -1,6 +1,6 @@ - + - + diff --git a/miniprogram/pages/main/travel-editor/index.json b/miniprogram/pages/main/travel/editor/index.json similarity index 100% rename from miniprogram/pages/main/travel-editor/index.json rename to miniprogram/pages/main/travel/editor/index.json diff --git a/miniprogram/pages/main/travel-editor/index.less b/miniprogram/pages/main/travel/editor/index.less similarity index 97% rename from miniprogram/pages/main/travel-editor/index.less rename to miniprogram/pages/main/travel/editor/index.less index 5484314..ae568cc 100644 --- a/miniprogram/pages/main/travel-editor/index.less +++ b/miniprogram/pages/main/travel/editor/index.less @@ -1,4 +1,4 @@ -// pages/main/travel-editor/index.less +// pages/main/travel/editor/index.less .travel-editor { width: 100vw; diff --git a/miniprogram/pages/main/travel-editor/index.ts b/miniprogram/pages/main/travel/editor/index.ts similarity index 97% rename from miniprogram/pages/main/travel-editor/index.ts rename to miniprogram/pages/main/travel/editor/index.ts index 1214f89..41f2dbd 100644 --- a/miniprogram/pages/main/travel-editor/index.ts +++ b/miniprogram/pages/main/travel/editor/index.ts @@ -1,8 +1,8 @@ -// pages/main/travel-editor/index.ts +// pages/main/travel/editor/index.ts -import Time from "../../../utils/Time"; -import { TravelApi } from "../../../api/TravelApi"; -import { TravelStatus, TransportationType } from "../../../types/Travel"; +import Time from "../../../../utils/Time"; +import { TravelApi } from "../../../../api/TravelApi"; +import { TravelStatus, TransportationType } from "../../../../types/Travel"; interface TravelEditorData { /** 模式：create 或 edit */ diff --git a/miniprogram/pages/main/travel-editor/index.wxml b/miniprogram/pages/main/travel/editor/index.wxml similarity index 98% rename from miniprogram/pages/main/travel-editor/index.wxml rename to miniprogram/pages/main/travel/editor/index.wxml index 27f7192..d5018d9 100644 --- a/miniprogram/pages/main/travel-editor/index.wxml +++ b/miniprogram/pages/main/travel/editor/index.wxml @@ -1,5 +1,5 @@ - - + + 取消 diff --git a/miniprogram/pages/main/travel-location-detail/index.json b/miniprogram/pages/main/travel/location-detail/index.json similarity index 100% rename from miniprogram/pages/main/travel-location-detail/index.json rename to miniprogram/pages/main/travel/location-detail/index.json diff --git a/miniprogram/pages/main/travel-location-detail/index.less b/miniprogram/pages/main/travel/location-detail/index.less similarity index 98% rename from miniprogram/pages/main/travel-location-detail/index.less rename to miniprogram/pages/main/travel/location-detail/index.less index a239772..4ddcac4 100644 --- a/miniprogram/pages/main/travel-location-detail/index.less +++ b/miniprogram/pages/main/travel/location-detail/index.less @@ -1,4 +1,4 @@ -// pages/main/travel-location-detail/index.less +// pages/main/travel/location-detail/index.less .travel-location-detail { width: 100vw; min-height: 100vh; diff --git a/miniprogram/pages/main/travel-location-detail/index.ts b/miniprogram/pages/main/travel/location-detail/index.ts similarity index 93% rename from miniprogram/pages/main/travel-location-detail/index.ts rename to miniprogram/pages/main/travel/location-detail/index.ts index 2759033..08c62ae 100644 --- a/miniprogram/pages/main/travel-location-detail/index.ts +++ b/miniprogram/pages/main/travel/location-detail/index.ts @@ -1,11 +1,11 @@ -// pages/main/travel-location-detail/index.ts +// pages/main/travel/location-detail/index.ts -import config from "../../../config/index"; -import { TravelLocationApi } from "../../../api/TravelLocationApi"; -import { TravelLocation, TravelLocationTypeIcon, TravelLocationTypeLabel } from "../../../types/Travel"; -import { MediaAttachType, PreviewImageMetadata } from "../../../types/Attachment"; -import { MapMarker, MediaItem, MediaItemType } from "../../../types/UI"; -import Toolkit from "../../../utils/Toolkit"; +import config from "../../../../config/index"; +import { TravelLocationApi } from "../../../../api/TravelLocationApi"; +import { TravelLocation, TravelLocationTypeIcon, TravelLocationTypeLabel } from "../../../../types/Travel"; +import { MediaAttachType, PreviewImageMetadata } from "../../../../types/Attachment"; +import { MapMarker, MediaItem, MediaItemType } from "../../../../types/UI"; +import Toolkit from "../../../../utils/Toolkit"; interface TravelLocationView extends TravelLocation { /** 媒体列表 */ @@ -161,7 +161,7 @@ Page({ const { location, travelId } = this.data; if (location && location.id) { wx.navigateTo({ - url: `/pages/main/travel-location-editor/index?id=${location.id}&travelId=${travelId || location.travelId || ""}` + url: `/pages/main/travel/location-editor/index?id=${location.id}&travelId=${travelId || location.travelId || ""}` }); } }, diff --git a/miniprogram/pages/main/travel-location-detail/index.wxml b/miniprogram/pages/main/travel/location-detail/index.wxml similarity index 97% rename from miniprogram/pages/main/travel-location-detail/index.wxml rename to miniprogram/pages/main/travel/location-detail/index.wxml index 3565846..2e3d78e 100644 --- a/miniprogram/pages/main/travel-location-detail/index.wxml +++ b/miniprogram/pages/main/travel/location-detail/index.wxml @@ -1,6 +1,6 @@ - + - + diff --git a/miniprogram/pages/main/travel-location-editor/index.json b/miniprogram/pages/main/travel/location-editor/index.json similarity index 100% rename from miniprogram/pages/main/travel-location-editor/index.json rename to miniprogram/pages/main/travel/location-editor/index.json diff --git a/miniprogram/pages/main/travel-location-editor/index.less b/miniprogram/pages/main/travel/location-editor/index.less similarity index 98% rename from miniprogram/pages/main/travel-location-editor/index.less rename to miniprogram/pages/main/travel/location-editor/index.less index 8784976..277d736 100644 --- a/miniprogram/pages/main/travel-location-editor/index.less +++ b/miniprogram/pages/main/travel/location-editor/index.less @@ -1,4 +1,4 @@ -// pages/main/travel-location-editor/index.less +// pages/main/travel/location-editor/index.less .travel-location-editor { width: 100vw; diff --git a/miniprogram/pages/main/travel-location-editor/index.ts b/miniprogram/pages/main/travel/location-editor/index.ts similarity index 97% rename from miniprogram/pages/main/travel-location-editor/index.ts rename to miniprogram/pages/main/travel/location-editor/index.ts index ceb354c..d4e4983 100644 --- a/miniprogram/pages/main/travel-location-editor/index.ts +++ b/miniprogram/pages/main/travel/location-editor/index.ts @@ -1,11 +1,11 @@ -// pages/main/travel-location-editor/index.ts +// pages/main/travel/location-editor/index.ts -import { Network, WechatMediaItem } from "../../../utils/Network"; -import { TravelLocationApi } from "../../../api/TravelLocationApi"; -import { TravelLocationType, TravelLocationTypeLabel } from "../../../types/Travel"; -import { MediaAttachType, PreviewImageMetadata } from "../../../types/Attachment"; -import config from "../../../config/index"; -import { MediaItem, MediaItemType } from "../../../types/UI"; +import { Network, WechatMediaItem } from "../../../../utils/Network"; +import { TravelLocationApi } from "../../../../api/TravelLocationApi"; +import { TravelLocationType, TravelLocationTypeLabel } from "../../../../types/Travel"; +import { MediaAttachType, PreviewImageMetadata } from "../../../../types/Attachment"; +import config from "../../../../config/index"; +import { MediaItem, MediaItemType } from "../../../../types/UI"; interface TravelLocationEditorData { /** 模式：create 或 edit */ diff --git a/miniprogram/pages/main/travel-location-editor/index.wxml b/miniprogram/pages/main/travel/location-editor/index.wxml similarity index 99% rename from miniprogram/pages/main/travel-location-editor/index.wxml rename to miniprogram/pages/main/travel/location-editor/index.wxml index 189a7a3..8dc9771 100644 --- a/miniprogram/pages/main/travel-location-editor/index.wxml +++ b/miniprogram/pages/main/travel/location-editor/index.wxml @@ -1,5 +1,5 @@ - - + + 取消 diff --git a/miniprogram/pages/main/travel-location-map/index.json b/miniprogram/pages/main/travel/location-map/index.json similarity index 100% rename from miniprogram/pages/main/travel-location-map/index.json rename to miniprogram/pages/main/travel/location-map/index.json diff --git a/miniprogram/pages/main/travel-location-map/index.less b/miniprogram/pages/main/travel/location-map/index.less similarity index 96% rename from miniprogram/pages/main/travel-location-map/index.less rename to miniprogram/pages/main/travel/location-map/index.less index e6b2f1c..6bb7692 100644 --- a/miniprogram/pages/main/travel-location-map/index.less +++ b/miniprogram/pages/main/travel/location-map/index.less @@ -1,4 +1,4 @@ -/* pages/main/travel-location-map/index.less */ +/* pages/main/travel/location-map/index.less */ .container { width: 100%; height: 100vh; diff --git a/miniprogram/pages/main/travel-location-map/index.ts b/miniprogram/pages/main/travel/location-map/index.ts similarity index 95% rename from miniprogram/pages/main/travel-location-map/index.ts rename to miniprogram/pages/main/travel/location-map/index.ts index 00795fe..54ddc9a 100644 --- a/miniprogram/pages/main/travel-location-map/index.ts +++ b/miniprogram/pages/main/travel/location-map/index.ts @@ -1,8 +1,8 @@ -// pages/main/travel-location-map/index.ts +// pages/main/travel/location-map/index.ts -import { TravelLocationApi } from "../../../api/TravelLocationApi"; -import { TravelLocation, TravelLocationTypeLabel } from "../../../types/Travel"; -import Toolkit from "../../../utils/Toolkit"; +import { TravelLocationApi } from "../../../../api/TravelLocationApi"; +import { TravelLocation, TravelLocationTypeLabel } from "../../../../types/Travel"; +import Toolkit from "../../../../utils/Toolkit"; interface MapMarker { id: number; diff --git a/miniprogram/pages/main/travel-location-map/index.wxml b/miniprogram/pages/main/travel/location-map/index.wxml similarity index 91% rename from miniprogram/pages/main/travel-location-map/index.wxml rename to miniprogram/pages/main/travel/location-map/index.wxml index 003b08e..47168eb 100644 --- a/miniprogram/pages/main/travel-location-map/index.wxml +++ b/miniprogram/pages/main/travel/location-map/index.wxml @@ -1,5 +1,5 @@ - - + +