From 965743be3884bc31894abbebff3b0337ff0b455a Mon Sep 17 00:00:00 2001 From: Timi Date: Wed, 28 Jan 2026 14:11:54 +0800 Subject: [PATCH] refactor pages struct --- miniprogram/app.json | 59 +++++++++--------- miniprogram/assets/icon/dark/other.png | Bin 0 -> 1373 bytes miniprogram/assets/icon/dark/other_active.png | Bin 0 -> 1449 bytes miniprogram/assets/icon/dark/portfolio.png | Bin 1386 -> 0 bytes .../assets/icon/dark/portfolio_active.png | Bin 1648 -> 0 bytes miniprogram/assets/icon/light/other.png | Bin 0 -> 1251 bytes .../assets/icon/light/other_active.png | Bin 0 -> 1446 bytes .../components/background/snowflake/index.ts | 2 +- .../background/snowflake/index.wxml | 2 +- miniprogram/package-lock.json | 8 +-- miniprogram/package.json | 2 +- miniprogram/pages/index/index.ts | 2 +- .../{journal-date => journal/date}/index.json | 0 .../{journal-date => journal/date}/index.less | 2 +- .../{journal-date => journal/date}/index.ts | 8 +-- .../{journal-date => journal/date}/index.wxml | 4 +- .../editor}/index.json | 0 .../editor}/index.less | 2 +- .../editor}/index.ts | 24 +++---- .../editor}/index.wxml | 4 +- .../{journal-map => journal/map}/index.json | 0 .../{journal-map => journal/map}/index.less | 2 +- .../{journal-map => journal/map}/index.ts | 14 ++--- .../{journal-map => journal/map}/index.wxml | 4 +- .../search}/index.json | 0 .../search}/index.less | 0 .../search}/index.ts | 6 +- .../search}/index.wxml | 2 +- .../main/{ => other}/portfolio/index.json | 0 .../main/{ => other}/portfolio/index.less | 2 +- .../pages/main/{ => other}/portfolio/index.ts | 20 +++--- .../main/{ => other}/portfolio/index.wxml | 4 +- .../pages/main/{ => tabs}/about/index.json | 2 +- .../pages/main/{ => tabs}/about/index.less | 0 .../pages/main/{ => tabs}/about/index.ts | 6 +- .../pages/main/{ => tabs}/about/index.wxml | 2 +- .../pages/main/{ => tabs}/journal/index.json | 0 .../pages/main/{ => tabs}/journal/index.less | 0 .../pages/main/{ => tabs}/journal/index.ts | 26 ++++---- .../pages/main/{ => tabs}/journal/index.wxml | 2 +- .../pages/main/{ => tabs}/moment/index.json | 2 +- .../pages/main/{ => tabs}/moment/index.less | 0 .../pages/main/{ => tabs}/moment/index.ts | 22 +++---- .../pages/main/{ => tabs}/moment/index.wxml | 2 +- miniprogram/pages/main/tabs/other/index.json | 7 +++ miniprogram/pages/main/tabs/other/index.less | 0 miniprogram/pages/main/tabs/other/index.ts | 33 ++++++++++ miniprogram/pages/main/tabs/other/index.wxml | 17 +++++ .../pages/main/{ => tabs}/travel/index.json | 0 .../pages/main/{ => tabs}/travel/index.less | 0 .../pages/main/{ => tabs}/travel/index.ts | 10 +-- .../pages/main/{ => tabs}/travel/index.wxml | 2 +- .../detail}/index.json | 0 .../detail}/index.less | 2 +- .../{travel-detail => travel/detail}/index.ts | 20 +++--- .../detail}/index.wxml | 4 +- .../editor}/index.json | 0 .../editor}/index.less | 2 +- .../{travel-editor => travel/editor}/index.ts | 8 +-- .../editor}/index.wxml | 4 +- .../location-detail}/index.json | 0 .../location-detail}/index.less | 2 +- .../location-detail}/index.ts | 16 ++--- .../location-detail}/index.wxml | 4 +- .../location-editor}/index.json | 0 .../location-editor}/index.less | 2 +- .../location-editor}/index.ts | 14 ++--- .../location-editor}/index.wxml | 4 +- .../location-map}/index.json | 0 .../location-map}/index.less | 2 +- .../location-map}/index.ts | 8 +-- .../location-map}/index.wxml | 4 +- miniprogram/theme.json | 8 +-- 73 files changed, 234 insertions(+), 176 deletions(-) create mode 100644 miniprogram/assets/icon/dark/other.png create mode 100644 miniprogram/assets/icon/dark/other_active.png delete mode 100644 miniprogram/assets/icon/dark/portfolio.png delete mode 100644 miniprogram/assets/icon/dark/portfolio_active.png create mode 100644 miniprogram/assets/icon/light/other.png create mode 100644 miniprogram/assets/icon/light/other_active.png rename miniprogram/pages/main/{journal-date => journal/date}/index.json (100%) rename miniprogram/pages/main/{journal-date => journal/date}/index.less (91%) rename miniprogram/pages/main/{journal-date => journal/date}/index.ts (90%) rename miniprogram/pages/main/{journal-date => journal/date}/index.wxml (79%) rename miniprogram/pages/main/{journal-editor => journal/editor}/index.json (100%) rename miniprogram/pages/main/{journal-editor => journal/editor}/index.less (98%) rename miniprogram/pages/main/{journal-editor => journal/editor}/index.ts (96%) rename miniprogram/pages/main/{journal-editor => journal/editor}/index.wxml (99%) rename miniprogram/pages/main/{journal-map => journal/map}/index.json (100%) rename miniprogram/pages/main/{journal-map => journal/map}/index.less (97%) rename miniprogram/pages/main/{journal-map => journal/map}/index.ts (93%) rename miniprogram/pages/main/{journal-map => journal/map}/index.wxml (93%) rename miniprogram/pages/main/{journal-search => journal/search}/index.json (100%) rename miniprogram/pages/main/{journal-search => journal/search}/index.less (100%) rename miniprogram/pages/main/{journal-search => journal/search}/index.ts (67%) rename miniprogram/pages/main/{journal-search => journal/search}/index.wxml (78%) rename miniprogram/pages/main/{ => other}/portfolio/index.json (100%) rename miniprogram/pages/main/{ => other}/portfolio/index.less (95%) rename miniprogram/pages/main/{ => other}/portfolio/index.ts (88%) rename miniprogram/pages/main/{ => other}/portfolio/index.wxml (89%) rename miniprogram/pages/main/{ => tabs}/about/index.json (77%) rename miniprogram/pages/main/{ => tabs}/about/index.less (100%) rename miniprogram/pages/main/{ => tabs}/about/index.ts (93%) rename miniprogram/pages/main/{ => tabs}/about/index.wxml (95%) rename miniprogram/pages/main/{ => tabs}/journal/index.json (100%) rename miniprogram/pages/main/{ => tabs}/journal/index.less (100%) rename miniprogram/pages/main/{ => tabs}/journal/index.ts (89%) rename miniprogram/pages/main/{ => tabs}/journal/index.wxml (97%) rename miniprogram/pages/main/{ => tabs}/moment/index.json (88%) rename miniprogram/pages/main/{ => tabs}/moment/index.less (100%) rename miniprogram/pages/main/{ => tabs}/moment/index.ts (95%) rename miniprogram/pages/main/{ => tabs}/moment/index.wxml (98%) create mode 100644 miniprogram/pages/main/tabs/other/index.json create mode 100644 miniprogram/pages/main/tabs/other/index.less create mode 100644 miniprogram/pages/main/tabs/other/index.ts create mode 100644 miniprogram/pages/main/tabs/other/index.wxml rename miniprogram/pages/main/{ => tabs}/travel/index.json (100%) rename miniprogram/pages/main/{ => tabs}/travel/index.less (100%) rename miniprogram/pages/main/{ => tabs}/travel/index.ts (94%) rename miniprogram/pages/main/{ => tabs}/travel/index.wxml (98%) rename miniprogram/pages/main/{travel-detail => travel/detail}/index.json (100%) rename miniprogram/pages/main/{travel-detail => travel/detail}/index.less (98%) rename miniprogram/pages/main/{travel-detail => travel/detail}/index.ts (92%) rename miniprogram/pages/main/{travel-detail => travel/detail}/index.wxml (97%) rename miniprogram/pages/main/{travel-editor => travel/editor}/index.json (100%) rename miniprogram/pages/main/{travel-editor => travel/editor}/index.less (97%) rename miniprogram/pages/main/{travel-editor => travel/editor}/index.ts (97%) rename miniprogram/pages/main/{travel-editor => travel/editor}/index.wxml (98%) rename miniprogram/pages/main/{travel-location-detail => travel/location-detail}/index.json (100%) rename miniprogram/pages/main/{travel-location-detail => travel/location-detail}/index.less (98%) rename miniprogram/pages/main/{travel-location-detail => travel/location-detail}/index.ts (93%) rename miniprogram/pages/main/{travel-location-detail => travel/location-detail}/index.wxml (97%) rename miniprogram/pages/main/{travel-location-editor => travel/location-editor}/index.json (100%) rename miniprogram/pages/main/{travel-location-editor => travel/location-editor}/index.less (98%) rename miniprogram/pages/main/{travel-location-editor => travel/location-editor}/index.ts (97%) rename miniprogram/pages/main/{travel-location-editor => travel/location-editor}/index.wxml (99%) rename miniprogram/pages/main/{travel-location-map => travel/location-map}/index.json (100%) rename miniprogram/pages/main/{travel-location-map => travel/location-map}/index.less (96%) rename miniprogram/pages/main/{travel-location-map => travel/location-map}/index.ts (95%) rename miniprogram/pages/main/{travel-location-map => travel/location-map}/index.wxml (91%) 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 0000000000000000000000000000000000000000..5d015c7eab24fd202b4859f19331d65e240036f6 GIT binary patch literal 1373 zcmV-j1)}L}(N(r2pYC3r6kGP2L;P(f z5D+&bJRAaIKy)DBpdunMAUY6mQ1NOa@$vETt>nD}vxSNm2~n^B_MrT$4hwBRmlS*k|P*C2KkXM;!uKe4|Xw`%@L7RKAnY z*&cGWBLes!J2N~THYfVTH(;Wp`NG_=1!8XdEOWsl`hLhbB2U>Y{nXi)B=^eiB%dVT zk|;YRV1AZ9raH%`irT?75HZYCYBtvDzpBCcl*PWgX`1e*X?jTVQ~4jsH_0bN*8vsC zIy@x+5|!kq!qP!6L=3r?0d7(dDoV{+Ru_AkoA?_Y#W7N zQeU&S=O;r##0fdaI%T7T`#M0{9|W3K1%PVAI%om1xpBU4sbWLWzFMYZ)Mb z$)M*o)9U4z!2&jscQw3hQx#%vI8vTqGU$Biz=sB`allg5L{8c9%ZMkxw*7yR5Z91Q z(?kTWRc$VNH4rzGDkunu1vsr$0kM@-p1pfP;#N#DM5Pz(GYsq8CI5J+E3tM54p+ z2gHErK)^voL}Ea6AmE^)Hxl_!obRCB#KDJy-b1_DgD%uA&1^k;+ZU z)0V8O%b;F}UCLie;}(c~_2GJlY5Kxe?NHmBF1QaAbOeB7J+U2l~0<$ZLcL@=&@-HvD!(ZQb z$Ist)PoH0Q&aLDG^ZPhH@f?kLuc$;Oj6!tI!2@@6&MjfHB85N*53o*7Ai=s5TCOw+h&T^>)C`8j6iX+39^<1#QMQ&vR|@qMP<$oXNp#` z5c&KHDp)f5g5&62f|Roqf}0`Lg5G~@ zq?3b)=Eax)3ohj-yoic08U@;~$B4|gGG7yeZE_F;-v!OO439PU(TrbeJtu?zq>_V( z%GFJ4<>X(v*K(HdIs3jKipX1q&T_X%6p@BDp2hXelh%?{B%&g305273RP>Uh_B*+( zq#*hSei$Ju>5UGVzce6LWp}D31<}_alREmwdQF+JG~NQj8`q(!0I@^$j!EcPCij|J zZs2Bxoy?VNauD(VHmuNH=1utQ#m%Z;>c`#!(t~(uT5nByCC97Kn3>?mC_@bnOoYd+ z{p29>0gnNP#@{kTj#>xfwSplwH06S2wzxG8lY>}!&nDf7MpVAhn^yUvH;BT=@S@iL z=|iDz;+3Xsr*%)>Zl~lv-mF^Bop44P`6|nqmIU=%Nrmw zmQjc^w13;B9_F_2UplaP5)@vE*4SpSHPZ-=c5!mv@4JN9g@jq*h!L>*vKqubG7;&c5Ha4s58n^iE@6|#1mOz@LYDA{Wo*WH zjzWY0ze9P%b_pAG7=CbNz9sx&87zxs_SzJPy%*bw3xQi8mbg^YAUAu}^oLqe4#h&` zV8j}O5o#9YZFlBU(;sS~m?)635TSpEHE~IUsBi-fqCr$3pdew9Xb=?$C`ec&8bk#G z3KABH22p{4f`mn)K~x~1AYqZH1yMogLrYjBD%^g9Xb=?$C`ec&8bk#G3KFrAm}AcO zq-hFu5KVum1)nC(e^~8jOcgh?s}vT=N0jC2Z7T)&{=(Q9g}Aq|;`@1l|qA;cDLZtU*-ZYY+{h z0s#dHi$sH{KtMs_e*gdg|Nq1)6iNU900v1!K~w_(Jg{8f$)gW?00000NkvXXu0mjf DHrS<) literal 0 HcmV?d00001 diff --git a/miniprogram/assets/icon/dark/portfolio.png b/miniprogram/assets/icon/dark/portfolio.png deleted file mode 100644 index 81c6572f32aed6fa4ccc1907c34981bb8571a5aa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1386 zcmV-w1(o`VP)B?Q7_c)N9DeLUSx#ZJ4M zAn6$p-E8a+03x@vdqI|f2=mBBbpQypKvsuH<~6dA?~kh{7GlnPBB9b$(;pIHno*+p zy@qG1kI&-#mC>orXnRCyOjCPSglWz+s2qr|r~%8FafR@_LTG+E9ZF;#vdN z*{HS}To7gP@5Ucn#ur3c8p~{Kwu~=`etkN1!p4x^f~d9{egh5cy?01&LF_R7_#6>P z=N%%%UGB{FUBbV{`UE3t3nH=CToI-NVv8!|*Ge(}B{Vp7@)^Z`C+dtq&a9~KMIS_N ztaGC|sWf{}lF{Fu#@v`YOVztm9}4+&{k?~b5~T6q@g^DgAd1EXg3%TH*7mOvI4}5y zv)gDW63S~xNgHEMEV^hI=aUW@#GY8bv$Rtu$>7Sw0=oV?7myF4cIs3=j6;i@x|R%L zGLeE7-$z>7=z};^3*&rJA%iOu_eo0|eGtE#I+c!uskZ-IkyHPY3}Q|!K)v6ME%K(t z)Z9LJMJ`cIa!a#bLf2MUx-mNb$3!1J^Ff7UY#9e}b;wpG4n>ZLU#@?`{%mTo%-{j# z{}?n*{bN_lnRvsFf+~EJNyx@FF+;|}vDxD4zQAb@L_VawtE4hPa`nc4z{to8?n@tF zDTycrB3QtEg+QfXt;V_Z9&lDQ4lc}cMeyi;wijZ{9Mw4DHp9jZP?BoKqgY>E4n$(k z`bt6DzS>B5t*LvTOwamU^u-mk$g{)pEcK4Me+vnZv#z~huIJY;%m%U$twHvQk!Ky-G?+hA*H7%YFNWh~J*EYqkmN^~~=v z9h^)fmj9JSKB;TAHP$Ogd(rZ|a+3sL--ElgarWeAt*+u3@|lJ2SHESS1JQyUS%>Wb zAmo&m?avr$lMB&;=0C+aOQHW8c_^Soc9%(7iF*Vo% z#g~0qG1Y`5(Fgiz6a9CR53XlC4wW!v$gc=n z?YwHXjj-?eiJ1G`n|Z)=Ikpk{&;UMex7)&}Z{d4MX-qrviS6MAl(_*(Bk$pp1kZAj zSzDhyRA4B_48ta37{;p47_wWXb^5rUT)2+%bYolI;2*LY%VGYEryCO<&w;q#BUAF} s#@|H^*ulCW?iV3&q3Y75OE07U0nAEc*_z&>ApigX07*qoM6N<$g1U~JEdT%j diff --git a/miniprogram/assets/icon/dark/portfolio_active.png b/miniprogram/assets/icon/dark/portfolio_active.png deleted file mode 100644 index 6dd6e9fc5a93fe9ae960462ee36dfdd853cfd7bd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1648 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 literal 0 HcmV?d00001 diff --git a/miniprogram/assets/icon/light/other_active.png b/miniprogram/assets/icon/light/other_active.png new file mode 100644 index 0000000000000000000000000000000000000000..95bcaa96da4e1603078af86b2e3627e1664dd6c1 GIT binary patch literal 1446 zcmV;X1zGxuP)4gwNH}tB&H`x(usX20W|i!ul0MCx*Jwz4 zKNn^Q#2XPI$R#Y7iJK2EQo;cxOlm~tb;&~@x`hAh5513FmY#P}$4nkFk#EjUvdvDi zhV83N3YxUHoEq%v)NEfGKbr#a0g{>qx#@fLK@QUGvV;dckJ8#zG{#Ez~p(a?^Htpj5K)a+d_--~pHy-x~zbl7N{< z0NzXFKziq+!B~i+VoP3h&oAEt0pa&eu_l<Ga-Wxn0eNV5iv=2!_bYAGS1Kn}&olXuCBt6m-$WI^St9RZTOcG+t z3p3$>!Dn@E17jlz(jU1)yfHb5=w5tZZP>tbzBMOGfz@B}HFHcDj&|wfAfkKm<^POJ z*$dC2BJ@Uq_R~2$^SR8YNbi^&M6d3GZe9B4nqhR~$40M`(SK6OK}6%4uC=PEp0rDo0}({Eh$e#L!JSi8`5g%IZEv}xU8fgx(B}RAuAd5 z4w=8TAl7B~swM@|wIGwm`>u_eGGlAK1^73vM^gb}kLn9XVPFX!HMOdNo8=EO7qZDg z#Q$5rK`*jy!e=jTR`XJS?JXcZi07{L+@)8-rHc#im=odVD18A=O!()WaB>j&fX9SG z>u(u6M{R&{THX{Jx^lrXJKS2Q$w91Z&o15aMl`-Pn%3!}5AecUKU3#_w124yCkc_B z(e=jIDgA~(9pFvq&XjYKmSxpR1`kO>WNXm4f{kRjHaDdY7|noC$6q}lPYw?}h}Vq; z6A)ZFxSAOWVj=R`ga7>~PSgz5n7H$SkH&hrb9m&TUa@0cy-Sxt!lU;g&k?Qh(?`ve z$3ncU$t%Xd8%xY5cGpH&Bf{j@4*r)8J3!lTR-9`m1Mq|%$h8`Y*pi0Gb`m7JUEQ@y z#(Cxz=K0PCZ#%&5(T#3--tjzUDXB4KttJHGca*SS$T;evsQBH1Iq1x)uVF4J#n9gvB%-Rch~zR}$t)+?NiL3G46cmW-p<(b#o)17yY)0&#}? z>tuB>w}t!Cf!&j!@Jh7CF@vocM{u-r4d?y7Nr-(&2(~X?BktWm)POalVGxJNM8q4! z2v|c&4dM`)h?WBG>8fW6eP?O4Wa@81qt&+gQ!42 zLBc%IASw`0kT6fwf~cVLt|iP96>h&lG>8fW6eP?O4Wa@81<s2`_wund+p z>Lwu&DZ+13mN1qzTH*R4(=AaSmcg>>V*3vv5c_jlY(wD9Kx|s{3IT(t0No%OL 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 @@ - - + +