diff --git a/image/collectiing_mmr/text_31.png b/image/collectiing_mmr/text_31.png index 08b6359d..c9498113 100644 Binary files a/image/collectiing_mmr/text_31.png and b/image/collectiing_mmr/text_31.png differ diff --git a/image/collectiing_mmr/text_34.png b/image/collectiing_mmr/text_34.png index fb63d6d7..ae250aa2 100644 Binary files a/image/collectiing_mmr/text_34.png and b/image/collectiing_mmr/text_34.png differ diff --git a/image/collectiing_mmr/text_35.png b/image/collectiing_mmr/text_35.png index 44ca83e8..c3f974b1 100644 Binary files a/image/collectiing_mmr/text_35.png and b/image/collectiing_mmr/text_35.png differ diff --git a/image/collectiing_mmr/text_37.png b/image/collectiing_mmr/text_37.png index 0c38b536..f77428c7 100644 Binary files a/image/collectiing_mmr/text_37.png and b/image/collectiing_mmr/text_37.png differ diff --git a/image/collectiing_mmr/text_39.png b/image/collectiing_mmr/text_39.png index 3e6ea73e..d1854937 100644 Binary files a/image/collectiing_mmr/text_39.png and b/image/collectiing_mmr/text_39.png differ diff --git a/image/collectiing_mmr/text_40.png b/image/collectiing_mmr/text_40.png index 6cb474c4..8231e954 100644 Binary files a/image/collectiing_mmr/text_40.png and b/image/collectiing_mmr/text_40.png differ diff --git a/image/collectiing_mmr/text_41.png b/image/collectiing_mmr/text_41.png index 8d20c9a1..8e8c9816 100644 Binary files a/image/collectiing_mmr/text_41.png and b/image/collectiing_mmr/text_41.png differ diff --git a/image/collectiing_mmr/text_43_2.png b/image/collectiing_mmr/text_43_2.png index 5f4902e7..1d47ed0c 100644 Binary files a/image/collectiing_mmr/text_43_2.png and b/image/collectiing_mmr/text_43_2.png differ diff --git a/image/collectiing_mmr/text_46.png b/image/collectiing_mmr/text_46.png index 2591d2d8..4004913c 100644 Binary files a/image/collectiing_mmr/text_46.png and b/image/collectiing_mmr/text_46.png differ diff --git a/xml/menutab/page_catalog.xml b/xml/menutab/page_catalog.xml index 54873193..05d45119 100644 --- a/xml/menutab/page_catalog.xml +++ b/xml/menutab/page_catalog.xml @@ -8,6 +8,12 @@ OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml" OpenInst 0 "/mnt/sdcard/coffeevending/taobin_project/xml/page_main_blank.xml" + + If InternationalEnable = 1 Then + If CountryName = "Thailand" Then + Open "ROOT/taobin_project/inter/tha/xml/multi/page_catalog.lxml" + EndIf + EndIf SAVELOG "======================================= catalog multi instance ================================" ; On open diff --git a/xml/page_catalog3.xml b/xml/page_catalog3.xml index 2bdf280e..1d26db96 100644 --- a/xml/page_catalog3.xml +++ b/xml/page_catalog3.xml @@ -258,14 +258,13 @@ EndIf EndIf - If EnableMultiInstance = "true" Then - If InternationalEnable = 1 Then - If CountryName = "Thailand" Then - Open "ROOT/taobin_project/inter/tha/xml/page_catalog.lxml" - EndIf + If InternationalEnable = 1 Then + If CountryName = "Thailand" Then + Open "ROOT/taobin_project/inter/tha/xml/multi/page_catalog.lxml" EndIf EndIf + Var Price5Active = 0