diff --git a/entry/src/main/ets/pages/Index.ets b/entry/src/main/ets/pages/Index.ets index 1b70b1035f9aca891ca8dbabed6656a7acb42c44..b2e99b706f35ee31a4c526878fdf6af9153a2734 100644 --- a/entry/src/main/ets/pages/Index.ets +++ b/entry/src/main/ets/pages/Index.ets @@ -104,6 +104,7 @@ struct Index { }) } } + .margin({ top: $r('app.float.flex_item_margin') }) .width(CommonConstants.ONE_FOURTH) }, (item: CardItem, index: number) => index + JSON.stringify(item)) } @@ -153,7 +154,7 @@ struct Index { .onClick(() => { this.classifyChangeAction(index, true); }) - }, (item: ClassifyModel, index: number) => index + item.classifyName) + }, (item: ClassifyModel, index: number) => JSON.stringify(item.classifyName)) } .height($r('app.float.top_height')) .listDirection(Axis.Horizontal) @@ -175,7 +176,7 @@ struct Index { .height(CommonConstants.FULL_PERCENT) } } - }, (item: ClassifyModel, index: number) => index + item.classifyName) + }, (item: ClassifyModel, index: number) => JSON.stringify(item.classifyName)) } .nestedScroll({ scrollForward: NestedScrollMode.PARENT_FIRST, diff --git a/entry/src/main/ets/viewmodel/ClassifyModel.ets b/entry/src/main/ets/viewmodel/ClassifyModel.ets index 93b47a02aac7c44dc5461e8828dc6acb4ba53f6c..2bbd7e09beb1e9ef684ea975f106c6a94ffc5115 100644 --- a/entry/src/main/ets/viewmodel/ClassifyModel.ets +++ b/entry/src/main/ets/viewmodel/ClassifyModel.ets @@ -17,10 +17,10 @@ import { CardItem } from './CardItem'; export class ClassifyModel { classifyId: number; - classifyName: string; + classifyName: ResourceStr; courseList: Array; - constructor(classifyId: number, classifyName: string, courseList: Array) { + constructor(classifyId: number, classifyName: ResourceStr, courseList: Array) { this.classifyId = classifyId; this.classifyName = classifyName; this.courseList = courseList; diff --git a/entry/src/main/ets/viewmodel/ClassifyViewModel.ets b/entry/src/main/ets/viewmodel/ClassifyViewModel.ets index 9ac36a3df882ac0a438d9d00ba39a06602a85a19..70e8355b0a2b577ee01368a6a5ec63b4471b65ac 100644 --- a/entry/src/main/ets/viewmodel/ClassifyViewModel.ets +++ b/entry/src/main/ets/viewmodel/ClassifyViewModel.ets @@ -19,13 +19,13 @@ import { ClassifyModel } from './ClassifyModel'; export class ClassifyViewModel { public getTopData(): Array { let data: Array = [ - new CardItem($r('app.media.ic_gallery_discover'), '值机&选座'), - new CardItem($r('app.media.ic_gallery_discover'), '自助退票'), - new CardItem($r('app.media.ic_gallery_discover'), '美食预定'), - new CardItem($r('app.media.ic_gallery_discover'), '机票兑换'), - new CardItem($r('app.media.ic_gallery_discover'), '航旅商城'), - new CardItem($r('app.media.ic_gallery_discover'), '我的行程'), - new CardItem($r('app.media.ic_gallery_discover'), '我的订单') + new CardItem($r('app.media.ic_gallery_discover'), $r('app.string.check_in')), + new CardItem($r('app.media.ic_gallery_discover'), $r('app.string.refund')), + new CardItem($r('app.media.ic_gallery_discover'), $r('app.string.food')), + new CardItem($r('app.media.ic_gallery_discover'), $r('app.string.ticket')), + new CardItem($r('app.media.ic_gallery_discover'), $r('app.string.Travel')), + new CardItem($r('app.media.ic_gallery_discover'), $r('app.string.itinerary')), + new CardItem($r('app.media.ic_gallery_discover'), $r('app.string.order')) ]; return data; } @@ -33,48 +33,48 @@ export class ClassifyViewModel { public getClassifyModelList(): Array { let classifyList: Array = []; classifyList.push( - new ClassifyModel(1, '预定行程', [ - new CardItem($r('app.media.ic_gallery_discover'), '机票预订'), - new CardItem($r('app.media.ic_gallery_discover'), '我的行程'), - new CardItem($r('app.media.ic_gallery_discover'), '我的订单'), - new CardItem($r('app.media.ic_gallery_discover'), '退改服务'), - new CardItem($r('app.media.ic_gallery_discover'), '行李购买'), - new CardItem($r('app.media.ic_gallery_discover'), '轻装出行'), - new CardItem($r('app.media.ic_gallery_discover'), '贵宾休息室'), - new CardItem($r('app.media.ic_gallery_discover'), '地面畅行'), - new CardItem($r('app.media.ic_gallery_discover'), '礼品卡'), - new CardItem($r('app.media.ic_gallery_discover'), '自助退票'), - new CardItem($r('app.media.ic_gallery_discover'), '电子发票'), - new CardItem($r('app.media.ic_gallery_discover'), '登机牌'), - new CardItem($r('app.media.ic_gallery_discover'), '行李查询'), - new CardItem($r('app.media.ic_gallery_discover'), '美食预定') + new ClassifyModel(1, $r('app.string.trip'), [ + new CardItem($r('app.media.ic_gallery_discover'), $r('app.string.reservation')), + new CardItem($r('app.media.ic_gallery_discover'), $r('app.string.itinerary')), + new CardItem($r('app.media.ic_gallery_discover'), $r('app.string.order')), + new CardItem($r('app.media.ic_gallery_discover'), $r('app.string.Retrofit')), + new CardItem($r('app.media.ic_gallery_discover'), $r('app.string.purchase')), + new CardItem($r('app.media.ic_gallery_discover'), $r('app.string.light')), + new CardItem($r('app.media.ic_gallery_discover'), $r('app.string.lounge')), + new CardItem($r('app.media.ic_gallery_discover'), $r('app.string.running')), + new CardItem($r('app.media.ic_gallery_discover'), $r('app.string.gift')), + new CardItem($r('app.media.ic_gallery_discover'), $r('app.string.fund')), + new CardItem($r('app.media.ic_gallery_discover'), $r('app.string.invoice')), + new CardItem($r('app.media.ic_gallery_discover'), $r('app.string.pass')), + new CardItem($r('app.media.ic_gallery_discover'), $r('app.string.Baggage')), + new CardItem($r('app.media.ic_gallery_discover'), $r('app.string.feed')) ]) ); classifyList.push( - new ClassifyModel(2, '旅游服务', [ - new CardItem($r('app.media.ic_gallery_discover'), '地铁出行'), - new CardItem($r('app.media.ic_gallery_discover'), '机场接送'), - new CardItem($r('app.media.ic_gallery_discover'), '中转旅游') + new ClassifyModel(2, $r('app.string.Tourism'), [ + new CardItem($r('app.media.ic_gallery_discover'), $r('app.string.Subway')), + new CardItem($r('app.media.ic_gallery_discover'), $r('app.string.transfer')), + new CardItem($r('app.media.ic_gallery_discover'), $r('app.string.tourism')) ]) ); classifyList.push( - new ClassifyModel(3, '轻松娱乐', [ - new CardItem($r('app.media.ic_gallery_discover'), '我的家庭'), - new CardItem($r('app.media.ic_gallery_discover'), '机票兑换'), - new CardItem($r('app.media.ic_gallery_discover'), '积分补登'), - new CardItem($r('app.media.ic_gallery_discover'), '积分乐园'), - new CardItem($r('app.media.ic_gallery_discover'), '积分商城'), - new CardItem($r('app.media.ic_gallery_discover'), '积分计算器') + new ClassifyModel(3, $r('app.string.entertainment'), [ + new CardItem($r('app.media.ic_gallery_discover'), $r('app.string.family')), + new CardItem($r('app.media.ic_gallery_discover'), $r('app.string.redemption')), + new CardItem($r('app.media.ic_gallery_discover'), $r('app.string.complement')), + new CardItem($r('app.media.ic_gallery_discover'), $r('app.string.paradise')), + new CardItem($r('app.media.ic_gallery_discover'), $r('app.string.Points')), + new CardItem($r('app.media.ic_gallery_discover'), $r('app.string.calculator')) ]) ); classifyList.push( - new ClassifyModel(4, '出行助手', [ - new CardItem($r('app.media.ic_gallery_discover'), '服务网点'), - new CardItem($r('app.media.ic_gallery_discover'), '企业商旅'), - new CardItem($r('app.media.ic_gallery_discover'), '出行指南'), - new CardItem($r('app.media.ic_gallery_discover'), '首次乘车指引'), - new CardItem($r('app.media.ic_gallery_discover'), '更多发现'), - new CardItem($r('app.media.ic_gallery_discover'), '绿色账户') + new ClassifyModel(4, $r('app.string.assistant'), [ + new CardItem($r('app.media.ic_gallery_discover'), $r('app.string.network')), + new CardItem($r('app.media.ic_gallery_discover'), $r('app.string.Corporate')), + new CardItem($r('app.media.ic_gallery_discover'), $r('app.string.guide')), + new CardItem($r('app.media.ic_gallery_discover'), $r('app.string.ride')), + new CardItem($r('app.media.ic_gallery_discover'), $r('app.string.more')), + new CardItem($r('app.media.ic_gallery_discover'), $r('app.string.account')) ]) ); return classifyList; diff --git a/entry/src/main/resources/base/element/float.json b/entry/src/main/resources/base/element/float.json index 3d600a331a6b088adf966f2696c3ab44744b0f0c..0806fa45cb2e4f2171db96b295973e08719c3436 100644 --- a/entry/src/main/resources/base/element/float.json +++ b/entry/src/main/resources/base/element/float.json @@ -94,7 +94,7 @@ }, { "name": "item_width", - "value": "64vp" + "value": "70vp" }, { "name": "divider_margin_top", diff --git a/entry/src/main/resources/base/element/string.json b/entry/src/main/resources/base/element/string.json index 13a7329a77721095d93cb5aba50d257feefcbad6..e21d168c5989f6fd1c2b9c71707f98d1f478964c 100644 --- a/entry/src/main/resources/base/element/string.json +++ b/entry/src/main/resources/base/element/string.json @@ -23,6 +23,158 @@ { "name": "common_font_family", "value": "HarmonyHeiTi-Medium" + }, + { + "name": "check_in", + "value": "值机&选座" + }, + { + "name": "refund", + "value": "自助退票" + }, + { + "name": "food", + "value": "美食预定" + }, + { + "name": "ticket", + "value": "机票兑换" + }, + { + "name": "Travel", + "value": "航旅商城" + }, + { + "name": "itinerary", + "value": "我的行程" + }, + { + "name": "order", + "value": "我的订单" + }, + { + "name": "reservation", + "value": "机票预订" + }, + { + "name": "Retrofit", + "value": "退改服务" + }, + { + "name": "purchase", + "value": "行李购买" + }, + { + "name": "light", + "value": "轻装出行" + }, + { + "name": "lounge", + "value": "贵宾休息室" + }, + { + "name": "running", + "value": "地面畅行" + }, + { + "name": "gift", + "value": "礼品卡" + }, + { + "name": "fund", + "value": "自助退票" + }, + { + "name": "invoice", + "value": "电子发票" + }, + { + "name": "pass", + "value": "登机牌" + }, + { + "name": "Baggage", + "value": "行李查询" + }, + { + "name": "feed", + "value": "美食预定" + }, + { + "name": "Subway", + "value": "地铁出行" + }, + { + "name": "transfer", + "value": "机场接送" + }, + { + "name": "tourism", + "value": "中转旅游" + }, + { + "name": "family", + "value": "我的家庭" + }, + { + "name": "redemption", + "value": "机票兑换" + }, + { + "name": "complement", + "value": "积分补登" + }, + { + "name": "paradise", + "value": "积分乐园" + }, + { + "name": "Points", + "value": "积分商城" + }, + { + "name": "calculator", + "value": "积分计算器" + }, + { + "name": "network", + "value": "服务网点" + }, + { + "name": "Corporate", + "value": "企业商旅" + }, + { + "name": "guide", + "value": "出行指南" + }, + { + "name": "ride", + "value": "首次乘车指引" + }, + { + "name": "more", + "value": "更多发现" + }, + { + "name": "account", + "value": "绿色账户" + }, + { + "name": "trip", + "value": "预定行程" + }, + { + "name": "Tourism", + "value": "旅游服务" + }, + { + "name": "entertainment", + "value": "轻松娱乐" + }, + { + "name": "assistant", + "value": "出行助手" } ] } \ No newline at end of file diff --git a/entry/src/main/resources/en_US/element/string.json b/entry/src/main/resources/en_US/element/string.json index 13a7329a77721095d93cb5aba50d257feefcbad6..93a16be0751615c02235066e565e9e26e42511ec 100644 --- a/entry/src/main/resources/en_US/element/string.json +++ b/entry/src/main/resources/en_US/element/string.json @@ -14,15 +14,167 @@ }, { "name": "common_service", - "value": "common service" + "value": "Common service" }, { "name": "title", - "value": "my services" + "value": "My services" }, { "name": "common_font_family", "value": "HarmonyHeiTi-Medium" + }, + { + "name": "check_in", + "value": "Check-in & Seat selection" + }, + { + "name": "refund", + "value": "Self-service refund" + }, + { + "name": "food", + "value": "Food reservation" + }, + { + "name": "ticket", + "value": "Air ticket redemption" + }, + { + "name": "Travel", + "value": "Travel mall" + }, + { + "name": "itinerary", + "value": "My itinerary" + }, + { + "name": "order", + "value": "My order" + }, + { + "name": "reservation", + "value": "Air ticket reservation" + }, + { + "name": "Retrofit", + "value": "Retrofit service" + }, + { + "name": "purchase", + "value": "Luggage purchase" + }, + { + "name": "light", + "value": "Travel light" + }, + { + "name": "lounge", + "value": "VIP lounge" + }, + { + "name": "running", + "value": "Ground running" + }, + { + "name": "gift", + "value": "Gift card" + }, + { + "name": "fund", + "value": "Self-service refund" + }, + { + "name": "invoice", + "value": "Electronic invoice" + }, + { + "name": "pass", + "value": "Boarding pass" + }, + { + "name": "Baggage", + "value": "Baggage inquiry" + }, + { + "name": "feed", + "value": "Food reservation" + }, + { + "name": "Subway", + "value": "Subway travel" + }, + { + "name": "transfer", + "value": "Airport transfer" + }, + { + "name": "tourism", + "value": "Transit tourism" + }, + { + "name": "family", + "value": "My family" + }, + { + "name": "redemption", + "value": "Air ticket redemption" + }, + { + "name": "complement", + "value": "Integral complement" + }, + { + "name": "paradise", + "value": "Integral paradise" + }, + { + "name": "Points", + "value": "Points mall" + }, + { + "name": "calculator", + "value": "Integrating calculator" + }, + { + "name": "network", + "value": "Service network" + }, + { + "name": "Corporate", + "value": "Corporate travel" + }, + { + "name": "guide", + "value": "Travel guide" + }, + { + "name": "ride", + "value": "First ride guide" + }, + { + "name": "more", + "value": "More discoveries" + }, + { + "name": "account", + "value": "Green account" + }, + { + "name": "trip", + "value": "Schedule a trip" + }, + { + "name": "Tourism", + "value": "Tourism service" + }, + { + "name": "entertainment", + "value": "Light entertain" + }, + { + "name": "assistant", + "value": "Travel assistant" } ] } \ No newline at end of file diff --git a/entry/src/main/resources/zh_CN/element/string.json b/entry/src/main/resources/zh_CN/element/string.json index 4de55b3a57016fa5941d4ce0c81958528cf56ef3..53e93c8106eff09c05688afec8c41f0dfcbf1aa1 100644 --- a/entry/src/main/resources/zh_CN/element/string.json +++ b/entry/src/main/resources/zh_CN/element/string.json @@ -23,6 +23,158 @@ { "name": "common_font_family", "value": "HarmonyHeiTi-Medium" + }, + { + "name": "check_in", + "value": "值机&选座" + }, + { + "name": "refund", + "value": "自助退票" + }, + { + "name": "food", + "value": "美食预定" + }, + { + "name": "ticket", + "value": "机票兑换" + }, + { + "name": "Travel", + "value": "航旅商城" + }, + { + "name": "itinerary", + "value": "我的行程" + }, + { + "name": "order", + "value": "我的订单" + }, + { + "name": "reservation", + "value": "机票预订" + }, + { + "name": "Retrofit", + "value": "退改服务" + }, + { + "name": "purchase", + "value": "行李购买" + }, + { + "name": "light", + "value": "轻装出行" + }, + { + "name": "lounge", + "value": "贵宾休息室" + }, + { + "name": "running", + "value": "地面畅行" + }, + { + "name": "gift", + "value": "礼品卡" + }, + { + "name": "fund", + "value": "自助退票" + }, + { + "name": "invoice", + "value": "电子发票" + }, + { + "name": "pass", + "value": "登机牌" + }, + { + "name": "Baggage", + "value": "行李查询" + }, + { + "name": "feed", + "value": "美食预定" + }, + { + "name": "Subway", + "value": "地铁出行" + }, + { + "name": "transfer", + "value": "机场接送" + }, + { + "name": "tourism", + "value": "中转旅游" + }, + { + "name": "family", + "value": "我的家庭" + }, + { + "name": "redemption", + "value": "机票兑换" + }, + { + "name": "complement", + "value": "积分补登" + }, + { + "name": "paradise", + "value": "积分乐园" + }, + { + "name": "Points", + "value": "积分商城" + }, + { + "name": "calculator", + "value": "积分计算器" + }, + { + "name": "network", + "value": "服务网点" + }, + { + "name": "Corporate", + "value": "企业商旅" + }, + { + "name": "guide", + "value": "出行指南" + }, + { + "name": "ride", + "value": "首次乘车指引" + }, + { + "name": "more", + "value": "更多发现" + }, + { + "name": "account", + "value": "绿色账户" + }, + { + "name": "trip", + "value": "预定行程" + }, + { + "name": "Tourism", + "value": "旅游服务" + }, + { + "name": "entertainment", + "value": "轻松娱乐" + }, + { + "name": "assistant", + "value": "出行助手" } ] } \ No newline at end of file