Merge branch 'masterpiece' of ssh://forthrd.ddns.net:2222/1TBHDD/ikong/taobin_project into masterpiece

2025-04-22 10:41:30 +07:00 · 2025-04-22 10:41:30 +07:00 · db1be33ec9
commit db1be33ec9
parent e3d09a817b 9801cfb321
146 changed files with 2696 additions and 160 deletions
--- a/image/collectiing_en/img_popup11-GBR.png
+++ b/image/collectiing_en/img_popup11-GBR.png
--- a/image/collectiing_en/img_popup15-GBR.png
+++ b/image/collectiing_en/img_popup15-GBR.png
--- a/image/display_point_en/text5-GBR.png
+++ b/image/display_point_en/text5-GBR.png
--- a/image/page_drink_disable_n2/bn_BananaOreo_smoothie.png
+++ b/image/page_drink_disable_n2/bn_BananaOreo_smoothie.png
--- a/image/page_drink_disable_n2/bn_CaramelOreo_smoothie.png
+++ b/image/page_drink_disable_n2/bn_CaramelOreo_smoothie.png
--- a/image/page_drink_disable_n2/bn_Caramel_Espresso_Oreo_smoothie.png
+++ b/image/page_drink_disable_n2/bn_Caramel_Espresso_Oreo_smoothie.png
--- a/image/page_drink_disable_n2/bn_Caramel_GreenTea_Oreo_smoothie.png
+++ b/image/page_drink_disable_n2/bn_Caramel_GreenTea_Oreo_smoothie.png
--- a/image/page_drink_disable_n2/bn_Caramel_ThaiTea_Oreo_smoothie.png
+++ b/image/page_drink_disable_n2/bn_Caramel_ThaiTea_Oreo_smoothie.png
--- a/image/page_drink_disable_n2/bn_ChocoOreo_smoothie.png
+++ b/image/page_drink_disable_n2/bn_ChocoOreo_smoothie.png
--- a/image/page_drink_disable_n2/bn_Coconut_Milk_Cocoa_Smoothie.png
+++ b/image/page_drink_disable_n2/bn_Coconut_Milk_Cocoa_Smoothie.png
--- a/image/page_drink_disable_n2/bn_Coconut_Milk_Coffee_Smoothie.png
+++ b/image/page_drink_disable_n2/bn_Coconut_Milk_Coffee_Smoothie.png
--- a/image/page_drink_disable_n2/bn_Coconut_Milk_Matcha_Smoothie.png
+++ b/image/page_drink_disable_n2/bn_Coconut_Milk_Matcha_Smoothie.png
--- a/image/page_drink_disable_n2/bn_Coconut_Milk_Smoothie.png
+++ b/image/page_drink_disable_n2/bn_Coconut_Milk_Smoothie.png
--- a/image/page_drink_disable_n2/bn_Coconut_Milk_Strawberry_Smoothie.png
+++ b/image/page_drink_disable_n2/bn_Coconut_Milk_Strawberry_Smoothie.png
--- a/image/page_drink_disable_n2/bn_Coconut_Oreo_smoothie.png
+++ b/image/page_drink_disable_n2/bn_Coconut_Oreo_smoothie.png
--- a/image/page_drink_disable_n2/bn_Ginger_milk_Oreo_smoothie.png
+++ b/image/page_drink_disable_n2/bn_Ginger_milk_Oreo_smoothie.png
--- a/image/page_drink_disable_n2/bn_HojichaOreo_smoothie.png
+++ b/image/page_drink_disable_n2/bn_HojichaOreo_smoothie.png
--- a/image/page_drink_disable_n2/bn_Iced_chrysanthemum_milk.png
+++ b/image/page_drink_disable_n2/bn_Iced_chrysanthemum_milk.png
--- a/image/page_drink_disable_n2/bn_Iced_chrysanthemum_tea.png
+++ b/image/page_drink_disable_n2/bn_Iced_chrysanthemum_tea.png
--- a/image/page_drink_disable_n2/bn_Iced_taiwan_milk_tea.png
+++ b/image/page_drink_disable_n2/bn_Iced_taiwan_milk_tea.png
--- a/image/page_drink_disable_n2/bn_Iced_taiwan_milk_tea_cocoa.png
+++ b/image/page_drink_disable_n2/bn_Iced_taiwan_milk_tea_cocoa.png
--- a/image/page_drink_disable_n2/bn_Iced_taiwanese_Tea_Cafe_Latte.png
+++ b/image/page_drink_disable_n2/bn_Iced_taiwanese_Tea_Cafe_Latte.png
--- a/image/page_drink_disable_n2/bn_Matcha_Latte_Premium.png
+++ b/image/page_drink_disable_n2/bn_Matcha_Latte_Premium.png
--- a/image/page_drink_disable_n2/bn_Matcha_Latte_X3.png
+++ b/image/page_drink_disable_n2/bn_Matcha_Latte_X3.png
--- a/image/page_drink_disable_n2/bn_MelonOreo_smoothie.png
+++ b/image/page_drink_disable_n2/bn_MelonOreo_smoothie.png
--- a/image/page_drink_disable_n2/bn_Mint_Oreo_smoothie.png
+++ b/image/page_drink_disable_n2/bn_Mint_Oreo_smoothie.png
--- a/image/page_drink_disable_n2/bn_PEPSI_Coaco_Oreo_smoothie.png
+++ b/image/page_drink_disable_n2/bn_PEPSI_Coaco_Oreo_smoothie.png
--- a/image/page_drink_disable_n2/bn_PEPSI_Oreo_smoothie.png
+++ b/image/page_drink_disable_n2/bn_PEPSI_Oreo_smoothie.png
--- a/image/page_drink_disable_n2/bn_PinkOreo_smoothie.png
+++ b/image/page_drink_disable_n2/bn_PinkOreo_smoothie.png
--- a/image/page_drink_disable_n2/bn_StrawberrOreo_smoothie.png
+++ b/image/page_drink_disable_n2/bn_StrawberrOreo_smoothie.png
--- a/image/page_drink_disable_n2/bn_Yuzu_Milk_Oreo_Volcano.png
+++ b/image/page_drink_disable_n2/bn_Yuzu_Milk_Oreo_Volcano.png
--- a/image/page_drink_disable_n2/bn_iced_Fruit_Punch_Lime_Sala_jemila.png
+++ b/image/page_drink_disable_n2/bn_iced_Fruit_Punch_Lime_Sala_jemila.png
--- a/image/page_drink_disable_n2/bn_iced_Oliang.png
+++ b/image/page_drink_disable_n2/bn_iced_Oliang.png
--- a/image/page_drink_disable_n2/bn_iced_fruit_punch_Ume_Jemila.png
+++ b/image/page_drink_disable_n2/bn_iced_fruit_punch_Ume_Jemila.png
--- a/image/page_drink_disable_n2/bn_iced_fruit_punch_Yuzu_Jemila.png
+++ b/image/page_drink_disable_n2/bn_iced_fruit_punch_Yuzu_Jemila.png
--- a/image/page_drink_disable_n2/bn_jasmine_Oreo_smoothie.png
+++ b/image/page_drink_disable_n2/bn_jasmine_Oreo_smoothie.png
--- a/image/page_drink_disable_n2/bn_smoothie_oreo.png
+++ b/image/page_drink_disable_n2/bn_smoothie_oreo.png
--- a/image/page_drink_disable_n2/bn_super_oreo_volcano.png
+++ b/image/page_drink_disable_n2/bn_super_oreo_volcano.png
--- a/image/page_drink_n/bn_BananaOreo_smoothie.png
+++ b/image/page_drink_n/bn_BananaOreo_smoothie.png
--- a/image/page_drink_n/bn_CaramelOreo_smoothie.png
+++ b/image/page_drink_n/bn_CaramelOreo_smoothie.png
--- a/image/page_drink_n/bn_Caramel_Espresso_Oreo_smoothie.png
+++ b/image/page_drink_n/bn_Caramel_Espresso_Oreo_smoothie.png
--- a/image/page_drink_n/bn_Caramel_GreenTea_Oreo_smoothie.png
+++ b/image/page_drink_n/bn_Caramel_GreenTea_Oreo_smoothie.png
--- a/image/page_drink_n/bn_Caramel_ThaiTea_Oreo_smoothie.png
+++ b/image/page_drink_n/bn_Caramel_ThaiTea_Oreo_smoothie.png
--- a/image/page_drink_n/bn_ChocoOreo_smoothie.png
+++ b/image/page_drink_n/bn_ChocoOreo_smoothie.png
--- a/image/page_drink_n/bn_Coconut_Milk_Cocoa_Smoothie.png
+++ b/image/page_drink_n/bn_Coconut_Milk_Cocoa_Smoothie.png
--- a/image/page_drink_n/bn_Coconut_Milk_Coffee_Smoothie.png
+++ b/image/page_drink_n/bn_Coconut_Milk_Coffee_Smoothie.png
--- a/image/page_drink_n/bn_Coconut_Milk_Matcha_Smoothie.png
+++ b/image/page_drink_n/bn_Coconut_Milk_Matcha_Smoothie.png
--- a/image/page_drink_n/bn_Coconut_Milk_Smoothie.png
+++ b/image/page_drink_n/bn_Coconut_Milk_Smoothie.png
--- a/image/page_drink_n/bn_Coconut_Milk_Strawberry_Smoothie.png
+++ b/image/page_drink_n/bn_Coconut_Milk_Strawberry_Smoothie.png
--- a/image/page_drink_n/bn_Coconut_Oreo_smoothie.png
+++ b/image/page_drink_n/bn_Coconut_Oreo_smoothie.png
--- a/image/page_drink_n/bn_Ginger_milk_Oreo_smoothie.png
+++ b/image/page_drink_n/bn_Ginger_milk_Oreo_smoothie.png
--- a/image/page_drink_n/bn_HojichaOreo_smoothie.png
+++ b/image/page_drink_n/bn_HojichaOreo_smoothie.png
--- a/image/page_drink_n/bn_Iced_chrysanthemum_milk.png
+++ b/image/page_drink_n/bn_Iced_chrysanthemum_milk.png
--- a/image/page_drink_n/bn_Iced_chrysanthemum_tea.png
+++ b/image/page_drink_n/bn_Iced_chrysanthemum_tea.png
--- a/image/page_drink_n/bn_Iced_taiwan_milk_tea.png
+++ b/image/page_drink_n/bn_Iced_taiwan_milk_tea.png
--- a/image/page_drink_n/bn_Iced_taiwan_milk_tea_cocoa.png
+++ b/image/page_drink_n/bn_Iced_taiwan_milk_tea_cocoa.png
--- a/image/page_drink_n/bn_Iced_taiwanese_Tea_Cafe_Latte.png
+++ b/image/page_drink_n/bn_Iced_taiwanese_Tea_Cafe_Latte.png
--- a/image/page_drink_n/bn_Matcha_Latte_Premium.png
+++ b/image/page_drink_n/bn_Matcha_Latte_Premium.png
--- a/image/page_drink_n/bn_Matcha_Latte_X3.png
+++ b/image/page_drink_n/bn_Matcha_Latte_X3.png
--- a/image/page_drink_n/bn_MelonOreo_smoothie.png
+++ b/image/page_drink_n/bn_MelonOreo_smoothie.png
--- a/image/page_drink_n/bn_Mint_Oreo_smoothie.png
+++ b/image/page_drink_n/bn_Mint_Oreo_smoothie.png
--- a/image/page_drink_n/bn_PEPSI_Coaco_Oreo_smoothie.png
+++ b/image/page_drink_n/bn_PEPSI_Coaco_Oreo_smoothie.png
--- a/image/page_drink_n/bn_PEPSI_Oreo_smoothie.png
+++ b/image/page_drink_n/bn_PEPSI_Oreo_smoothie.png
--- a/image/page_drink_n/bn_PinkOreo_smoothie.png
+++ b/image/page_drink_n/bn_PinkOreo_smoothie.png
--- a/image/page_drink_n/bn_StrawberrOreo_smoothie.png
+++ b/image/page_drink_n/bn_StrawberrOreo_smoothie.png
--- a/image/page_drink_n/bn_Yuzu
+++ b/image/page_drink_n/bn_Yuzu
--- a/image/page_drink_n/bn_iced_Fruit_Punch_Lime_Sala_jemila.png
+++ b/image/page_drink_n/bn_iced_Fruit_Punch_Lime_Sala_jemila.png
--- a/image/page_drink_n/bn_iced_Oliang.png
+++ b/image/page_drink_n/bn_iced_Oliang.png
--- a/image/page_drink_n/bn_iced_fruit_punch_Ume_Jemila.png
+++ b/image/page_drink_n/bn_iced_fruit_punch_Ume_Jemila.png
--- a/image/page_drink_n/bn_iced_fruit_punch_Yuzu_Jemila.png
+++ b/image/page_drink_n/bn_iced_fruit_punch_Yuzu_Jemila.png
--- a/image/page_drink_n/bn_jasmine_Oreo_smoothie.png
+++ b/image/page_drink_n/bn_jasmine_Oreo_smoothie.png
--- a/image/page_drink_n/bn_smoothie_oreo.png
+++ b/image/page_drink_n/bn_smoothie_oreo.png
--- a/image/page_drink_n/bn_super_oreo_volcano.png
+++ b/image/page_drink_n/bn_super_oreo_volcano.png
--- a/image/page_drink_picture2_n/bn_BananaOreo_smoothie.png
+++ b/image/page_drink_picture2_n/bn_BananaOreo_smoothie.png
--- a/image/page_drink_picture2_n/bn_CaramelOreo_smoothie_oreo.png
+++ b/image/page_drink_picture2_n/bn_CaramelOreo_smoothie_oreo.png
--- a/image/page_drink_picture2_n/bn_Caramel_Espresso_Oreo_smoothie_weekday_discount.png
+++ b/image/page_drink_picture2_n/bn_Caramel_Espresso_Oreo_smoothie_weekday_discount.png
--- a/image/page_drink_picture2_n/bn_Caramel_GreenTea_Oreo_smoothie_weekday_discount.png
+++ b/image/page_drink_picture2_n/bn_Caramel_GreenTea_Oreo_smoothie_weekday_discount.png
--- a/image/page_drink_picture2_n/bn_Caramel_ThaiTea_Oreo_smoothie_weekday_discount.png
+++ b/image/page_drink_picture2_n/bn_Caramel_ThaiTea_Oreo_smoothie_weekday_discount.png
--- a/image/page_drink_picture2_n/bn_ChocoOreo_smoothie_oreo.png
+++ b/image/page_drink_picture2_n/bn_ChocoOreo_smoothie_oreo.png
--- a/image/page_drink_picture2_n/bn_Coconut_Milk_Cocoa_Smoothie.png
+++ b/image/page_drink_picture2_n/bn_Coconut_Milk_Cocoa_Smoothie.png
--- a/image/page_drink_picture2_n/bn_Coconut_Milk_Coffee_Smoothie.png
+++ b/image/page_drink_picture2_n/bn_Coconut_Milk_Coffee_Smoothie.png
--- a/image/page_drink_picture2_n/bn_Coconut_Milk_Matcha_Smoothie.png
+++ b/image/page_drink_picture2_n/bn_Coconut_Milk_Matcha_Smoothie.png
--- a/image/page_drink_picture2_n/bn_Coconut_Milk_Smoothie.png
+++ b/image/page_drink_picture2_n/bn_Coconut_Milk_Smoothie.png
--- a/image/page_drink_picture2_n/bn_Coconut_Milk_Strawberry_Smoothie.png
+++ b/image/page_drink_picture2_n/bn_Coconut_Milk_Strawberry_Smoothie.png
--- a/image/page_drink_picture2_n/bn_Coconut_Oreo_smoothie.png
+++ b/image/page_drink_picture2_n/bn_Coconut_Oreo_smoothie.png
--- a/image/page_drink_picture2_n/bn_Ginger_milk_Oreo_smoothie.png
+++ b/image/page_drink_picture2_n/bn_Ginger_milk_Oreo_smoothie.png
--- a/image/page_drink_picture2_n/bn_HojichaOreo_smoothie_oreo.png
+++ b/image/page_drink_picture2_n/bn_HojichaOreo_smoothie_oreo.png
--- a/image/page_drink_picture2_n/bn_Iced_chrysanthemum_milk.png
+++ b/image/page_drink_picture2_n/bn_Iced_chrysanthemum_milk.png
--- a/image/page_drink_picture2_n/bn_Iced_chrysanthemum_tea.png
+++ b/image/page_drink_picture2_n/bn_Iced_chrysanthemum_tea.png
--- a/image/page_drink_picture2_n/bn_Iced_taiwan_milk_tea.png
+++ b/image/page_drink_picture2_n/bn_Iced_taiwan_milk_tea.png
--- a/image/page_drink_picture2_n/bn_Iced_taiwan_milk_tea_cocoa.png
+++ b/image/page_drink_picture2_n/bn_Iced_taiwan_milk_tea_cocoa.png
--- a/image/page_drink_picture2_n/bn_Iced_taiwanese_Tea_Cafe_Latte.png
+++ b/image/page_drink_picture2_n/bn_Iced_taiwanese_Tea_Cafe_Latte.png
--- a/image/page_drink_picture2_n/bn_MelonOreo_smoothie_oreo.png
+++ b/image/page_drink_picture2_n/bn_MelonOreo_smoothie_oreo.png
--- a/image/page_drink_picture2_n/bn_Mint_Oreo_smoothie_oreo.png
+++ b/image/page_drink_picture2_n/bn_Mint_Oreo_smoothie_oreo.png
--- a/image/page_drink_picture2_n/bn_PinkOreo_smoothie.png
+++ b/image/page_drink_picture2_n/bn_PinkOreo_smoothie.png
--- a/image/page_drink_picture2_n/bn_StrawberrOreo_smoothie.png
+++ b/image/page_drink_picture2_n/bn_StrawberrOreo_smoothie.png
--- a/image/page_drink_picture2_n/bn_YUZU_Oreo_smoothie_oreo.png
+++ b/image/page_drink_picture2_n/bn_YUZU_Oreo_smoothie_oreo.png
--- a/image/page_drink_picture2_n/bn_iced_Fruit_Punch_Lime_Sala_jemila.png
+++ b/image/page_drink_picture2_n/bn_iced_Fruit_Punch_Lime_Sala_jemila.png
--- a/image/page_drink_picture2_n/bn_iced_Oliang.png
+++ b/image/page_drink_picture2_n/bn_iced_Oliang.png
--- a/image/page_drink_picture2_n/bn_iced_fruit_punch_Ume_Jemila.png
+++ b/image/page_drink_picture2_n/bn_iced_fruit_punch_Ume_Jemila.png
--- a/Show more
+++ b/Show more