diff --git a/WonderQ-MiniAPP/src/app.css b/WonderQ-MiniAPP/src/app.css index bf247f2..fd9e750 100644 --- a/WonderQ-MiniAPP/src/app.css +++ b/WonderQ-MiniAPP/src/app.css @@ -68,10 +68,6 @@ button::after { } } -.safe-bottom { - padding-bottom: calc(64px + env(safe-area-inset-bottom)); -} - .top-safe { padding-top: env(safe-area-inset-top); } @@ -119,7 +115,10 @@ button::after { } .tap-feedback { - transition: opacity 140ms ease, background-color 140ms ease, border-color 140ms ease; + transition: + opacity 140ms ease, + background-color 140ms ease, + border-color 140ms ease; } .tap-feedback:active { diff --git a/WonderQ-MiniAPP/src/components/AppShell.vue b/WonderQ-MiniAPP/src/components/AppShell.vue deleted file mode 100644 index 14a340b..0000000 --- a/WonderQ-MiniAPP/src/components/AppShell.vue +++ /dev/null @@ -1,7 +0,0 @@ - diff --git a/WonderQ-MiniAPP/src/components/BottomNav.vue b/WonderQ-MiniAPP/src/components/BottomNav.vue deleted file mode 100644 index 4e877c8..0000000 --- a/WonderQ-MiniAPP/src/components/BottomNav.vue +++ /dev/null @@ -1,105 +0,0 @@ - - - - - diff --git a/WonderQ-MiniAPP/src/content.ts b/WonderQ-MiniAPP/src/content.ts index 8cee46e..a7038da 100644 --- a/WonderQ-MiniAPP/src/content.ts +++ b/WonderQ-MiniAPP/src/content.ts @@ -1,4 +1,16 @@ -const guizhouAsset = (name: string) => `/assets/guizhou/${name}.jpg`; +const remoteGuizhouAssets: Record = { + "jiaxiu-tower": + "https://dimg04.c-ctrip.com/images/1me6m12000rntioi4FFB2.jpg?proc=source%2Ftripcommunity", + "xijiang-miao-village": + "https://p6.itc.cn/q_70/images03/20200918/df728d2b79d943da869333e2ea2c92c8.jpeg", + wanfenglin: + "https://wanfenglin-guanwang.oss-cn-chengdu.aliyuncs.com/uploads/20240718/23ea4291a9570b94a1f8df9a012c18ec.jpg", + "huangguoshu-waterfall": + "https://news.cgtn.com/news/2023-07-02/Picturesque-landscapes-draw-tourists-to-Guizhou--1l6RJMNVStq/img/f0d32df3426e4b70bf7a8b00a3404ef9/f0d32df3426e4b70bf7a8b00a3404ef9.jpeg", +}; + +const guizhouAsset = (name: string) => + remoteGuizhouAssets[name] ?? `/assets/guizhou/${name}.jpg`; export const heroSlides = [ { diff --git a/WonderQ-MiniAPP/src/generated-products.json b/WonderQ-MiniAPP/src/generated-products.json index d7f6767..8b2956f 100644 --- a/WonderQ-MiniAPP/src/generated-products.json +++ b/WonderQ-MiniAPP/src/generated-products.json @@ -7,7 +7,7 @@ "经典人文打卡", "小包团" ], - "image": "/assets/guizhou/huangguoshu-waterfall.jpg", + "image": "https://news.cgtn.com/news/2023-07-02/Picturesque-landscapes-draw-tourists-to-Guizhou--1l6RJMNVStq/img/f0d32df3426e4b70bf7a8b00a3404ef9/f0d32df3426e4b70bf7a8b00a3404ef9.jpeg", "summary": "贵州首游代表线路,串联瀑布、绿宝石河谷、苗寨夜景和梵净山云海。", "destinationName": "黄果树" }, @@ -19,7 +19,7 @@ "经典人文打卡", "贵阳安顺" ], - "image": "/assets/guizhou/jiaxiu-tower.jpg", + "image": "https://dimg04.c-ctrip.com/images/1me6m12000rntioi4FFB2.jpg?proc=source%2Ftripcommunity", "summary": "适合周末或短假,从城市地标、古镇风味一路延展到黄果树瀑布。", "destinationName": "贵阳" }, @@ -43,7 +43,7 @@ "经典人文打卡", "非遗体验" ], - "image": "/assets/guizhou/xijiang-miao-village.jpg", + "image": "https://p6.itc.cn/q_70/images03/20200918/df728d2b79d943da869333e2ea2c92c8.jpeg", "summary": "深入苗寨街巷、古城夜色和非遗手作,保留小团讲解与拍摄节奏。", "destinationName": "西江苗寨" }, @@ -67,7 +67,7 @@ "经典人文打卡", "黔西南" ], - "image": "/assets/guizhou/wanfenglin.jpg", + "image": "https://wanfenglin-guanwang.oss-cn-chengdu.aliyuncs.com/uploads/20240718/23ea4291a9570b94a1f8df9a012c18ec.jpg", "summary": "在峰林、峡谷和布依村寨之间切换,适合摄影、亲友小团和慢旅行。", "destinationName": "万峰林" }, @@ -115,7 +115,7 @@ "极限山野户外野咖", "漂流" ], - "image": "/assets/guizhou/shuichunhe-rafting.jpg", + "image": "https://dimg04.c-ctrip.com/images/0EQ5712000ca7t504EC0E_W_640_10000.jpg?proc=autoorient", "summary": "适合夏季出行,围绕河谷、森林、漂流和轻徒步设计每日节奏。", "destinationName": "荔波小七孔" }, @@ -127,7 +127,7 @@ "极限山野户外野咖", "山野咖啡" ], - "image": "/assets/guizhou/wanfenglin.jpg", + "image": "https://wanfenglin-guanwang.oss-cn-chengdu.aliyuncs.com/uploads/20240718/23ea4291a9570b94a1f8df9a012c18ec.jpg", "summary": "在峰林公路、峡谷观景和山野咖啡之间安排松弛感十足的小团体验。", "destinationName": "万峰林" }, @@ -163,7 +163,7 @@ "极限山野户外野咖", "峡谷徒步" ], - "image": "/assets/guizhou/huangguoshu-waterfall.jpg", + "image": "https://news.cgtn.com/news/2023-07-02/Picturesque-landscapes-draw-tourists-to-Guizhou--1l6RJMNVStq/img/f0d32df3426e4b70bf7a8b00a3404ef9/f0d32df3426e4b70bf7a8b00a3404ef9.jpeg", "summary": "把黄果树瀑布、坝陵河桥梁景观和峡谷轻徒步做成短假小包团。", "destinationName": "黄果树" }, diff --git a/WonderQ-MiniAPP/src/lib/data.ts b/WonderQ-MiniAPP/src/lib/data.ts index 94016e2..423b212 100644 --- a/WonderQ-MiniAPP/src/lib/data.ts +++ b/WonderQ-MiniAPP/src/lib/data.ts @@ -176,7 +176,7 @@ const campaignDisplayDefaults = [ }, { campaignType: "山野野咖特惠", - image: "/assets/guizhou/shuichunhe-rafting.jpg", + image: "https://dimg04.c-ctrip.com/images/0EQ5712000ca7t504EC0E_W_640_10000.jpg?proc=autoorient", description: "溶洞、漂流、峰林骑行、山野咖啡,把轻户外和松弛感放进同一程。", priceText: "¥1.16万起/人", tags: ["山野野咖", "轻户外"], @@ -184,7 +184,7 @@ const campaignDisplayDefaults = [ }, { campaignType: "综合混搭特惠", - image: "/assets/guizhou/xijiang-miao-village.jpg", + image: "https://p6.itc.cn/q_70/images03/20200918/df728d2b79d943da869333e2ea2c92c8.jpeg", description: "非遗村寨、自然轻探险和精品住宿同程安排,适合想兼顾打卡与松弛的同行人。", priceText: "¥1.39万起/人", tags: ["人文混搭", "精品住宿"], @@ -216,7 +216,7 @@ export function normalizeApiCampaign(campaign: PublicCampaign): CampaignCard { } const fallbackDestinationHero: DestinationHero = { - image: "/assets/guizhou/huangguoshu-waterfall.jpg", + image: "https://news.cgtn.com/news/2023-07-02/Picturesque-landscapes-draw-tourists-to-Guizhou--1l6RJMNVStq/img/f0d32df3426e4b70bf7a8b00a3404ef9/f0d32df3426e4b70bf7a8b00a3404ef9.jpeg", kicker: "贵州小包团目的地", title: "山水、苗寨、古城与野咖同程安排", }; diff --git a/WonderQ-MiniAPP/src/manifest.json b/WonderQ-MiniAPP/src/manifest.json index abee13a..0f724c3 100644 --- a/WonderQ-MiniAPP/src/manifest.json +++ b/WonderQ-MiniAPP/src/manifest.json @@ -20,7 +20,7 @@ } }, "mp-weixin": { - "appid": "wx5e79df5996572539", + "appid": "wx72c9792d304525b7", "setting": { "urlCheck": false, "es6": true, diff --git a/WonderQ-MiniAPP/src/pages.json b/WonderQ-MiniAPP/src/pages.json index 1745d97..f2c9cce 100644 --- a/WonderQ-MiniAPP/src/pages.json +++ b/WonderQ-MiniAPP/src/pages.json @@ -10,15 +10,13 @@ { "path": "pages/play/index", "style": { - "navigationBarTitleText": "玩法", - "navigationStyle": "custom" + "navigationBarTitleText": "玩法" } }, { "path": "pages/concierge/index", "style": { - "navigationBarTitleText": "管家", - "navigationStyle": "custom" + "navigationBarTitleText": "管家" } }, { @@ -52,5 +50,37 @@ "rpxCalcMaxDeviceWidth": 430, "rpxCalcBaseDeviceWidth": 430, "rpxCalcIncludeWidth": 750 + }, + "tabBar": { + "color": "#9a9590", + "selectedColor": "#a45a3d", + "backgroundColor": "#fffdf9", + "borderStyle": "black", + "list": [ + { + "pagePath": "pages/home/index", + "iconPath": "static/tabbar/house-normal.png", + "selectedIconPath": "static/tabbar/house-active.png", + "text": "首页" + }, + { + "pagePath": "pages/play/index", + "iconPath": "static/tabbar/list-normal.png", + "selectedIconPath": "static/tabbar/list-active.png", + "text": "玩法" + }, + { + "pagePath": "pages/concierge/index", + "iconPath": "static/tabbar/headphones-normal.png", + "selectedIconPath": "static/tabbar/headphones-active.png", + "text": "管家" + }, + { + "pagePath": "pages/mine/index", + "iconPath": "static/tabbar/user-round-normal.png", + "selectedIconPath": "static/tabbar/user-round-active.png", + "text": "我的" + } + ] } } diff --git a/WonderQ-MiniAPP/src/pages/concierge/index.vue b/WonderQ-MiniAPP/src/pages/concierge/index.vue index 182f555..a3ad70d 100644 --- a/WonderQ-MiniAPP/src/pages/concierge/index.vue +++ b/WonderQ-MiniAPP/src/pages/concierge/index.vue @@ -1,20 +1,20 @@ diff --git a/WonderQ-MiniAPP/src/pages/mine/components/MineMember.vue b/WonderQ-MiniAPP/src/pages/mine/components/MineMember.vue new file mode 100644 index 0000000..f4cefd7 --- /dev/null +++ b/WonderQ-MiniAPP/src/pages/mine/components/MineMember.vue @@ -0,0 +1,108 @@ + + + diff --git a/WonderQ-MiniAPP/src/pages/mine/index.vue b/WonderQ-MiniAPP/src/pages/mine/index.vue index 5969b73..4d9796b 100644 --- a/WonderQ-MiniAPP/src/pages/mine/index.vue +++ b/WonderQ-MiniAPP/src/pages/mine/index.vue @@ -1,98 +1,32 @@ diff --git a/WonderQ-MiniAPP/src/pages/play/components/PlayCategorySidebar.vue b/WonderQ-MiniAPP/src/pages/play/components/PlayCategorySidebar.vue index fcf5b2d..4a3c7d6 100644 --- a/WonderQ-MiniAPP/src/pages/play/components/PlayCategorySidebar.vue +++ b/WonderQ-MiniAPP/src/pages/play/components/PlayCategorySidebar.vue @@ -1,6 +1,6 @@ - - diff --git a/WonderQ-MiniAPP/src/pages/play/components/playData.ts b/WonderQ-MiniAPP/src/pages/play/components/playData.ts index 9d2fd8f..52d90f9 100644 --- a/WonderQ-MiniAPP/src/pages/play/components/playData.ts +++ b/WonderQ-MiniAPP/src/pages/play/components/playData.ts @@ -13,6 +13,39 @@ export type PlayCategory = { routes: PlayRoute[]; }; +const routeImageByAsset: Record = { + "libo-xiaoqikong": "https://p0.51img.ca/i/669740a019b94.jpeg", + "xijiang-miao-village": + "https://p6.itc.cn/q_70/images03/20200918/df728d2b79d943da869333e2ea2c92c8.jpeg", + "wumeng-grassland": + "https://p2.cri.cn/M00/89/21/rBABC2aHnWeACxj5AAAAAAAAAAA159.1000x566.jpg", + "miao-costume": + "https://i.pinimg.com/736x/d5/86/5d/d5865d0b2765dfb6713787aede09f086.jpg", + wanfenglin: + "https://wanfenglin-guanwang.oss-cn-chengdu.aliyuncs.com/uploads/20240718/23ea4291a9570b94a1f8df9a012c18ec.jpg", + "jiabang-terrace": + "https://news.cgtn.com/news/2023-08-28/Spectacular-rice-terraces-in-Guizhou-1mDHGG4vtHq/img/9ff1dc49c6304b35bdb83bc1f7f8df93/9ff1dc49c6304b35bdb83bc1f7f8df93.jpeg", + "mountain-resort": + "https://images.unsplash.com/photo-1501785888041-af3ef285b470?auto=format&fit=crop&fm=jpg&q=80&w=1200&h=800", + "jianhe-hot-spring": "https://www.gz007.net/images/upload/jianhewenquan2.jpg", + "libo-water-forest": "https://p0.51img.ca/i/669740a019b94.jpeg", + "gorge-paddle": + "https://q9.itc.cn/q_70/images03/20250810/b62f5afc191a4947a66e6b32721b0235.jpeg", + "shuichunhe-rafting": + "https://dimg04.c-ctrip.com/images/0EQ5712000ca7t504EC0E_W_640_10000.jpg?proc=autoorient", + "miao-dragon-boat": + "https://news.cgtn.com/news/2023-07-13/Miao-people-celebrate-Canoe-Dragon-Boat-Festival-1lpanidzxu0/img/61b7100caa8a441aacb3780cfa3eeb69/61b7100caa8a441aacb3780cfa3eeb69.jpeg", + "huangguoshu-waterfall": + "https://news.cgtn.com/news/2023-07-02/Picturesque-landscapes-draw-tourists-to-Guizhou--1l6RJMNVStq/img/f0d32df3426e4b70bf7a8b00a3404ef9/f0d32df3426e4b70bf7a8b00a3404ef9.jpeg", + "zhenyuan-ancient-town": + "https://news.cgtn.com/news/2023-06-23/Zhenyuan-ancient-town-a-must-see-in-Guizhou-1kRXUSXOP1m/img/6aead33b391640589740a7672c66a685/6aead33b391640589740a7672c66a685.jpeg", + "zhijin-cave": "https://www.zurnal24.si/media/img/5e/d5/9526a56dba168aa136f3.jpeg", +}; + +const resolveRouteImage = (image: string) => + routeImageByAsset[image] ?? + (image.startsWith("http") ? image : `/assets/guizhou/${image}.jpg`); + const route = ( id: string, title: string, @@ -24,7 +57,7 @@ const route = ( id, title, subtitle, - image: `/public/assets/guizhou/${image}.jpg`, + image: resolveRouteImage(image), routeCount, searchKeyword, }); diff --git a/WonderQ-MiniAPP/src/pages/play/index.vue b/WonderQ-MiniAPP/src/pages/play/index.vue index 04c533e..949e2c2 100644 --- a/WonderQ-MiniAPP/src/pages/play/index.vue +++ b/WonderQ-MiniAPP/src/pages/play/index.vue @@ -1,33 +1,30 @@