From ff3b85a63cf22c7542f35ecc89fa4f50c2f808e0 Mon Sep 17 00:00:00 2001 From: wanlop run Date: Thu, 22 Feb 2024 18:46:01 +0700 Subject: [PATCH] Fix --- inter/sgp/xml/menu_head.py | 8 +- inter/sgp/xml/page_catalog_group_appfast.lxml | 40 +- inter/sgp/xml/page_catalog_group_coffee.lxml | 624 +++++++++--------- inter/sgp/xml/page_catalog_group_forkid.lxml | 112 ++-- inter/sgp/xml/page_catalog_group_health.lxml | 208 +++--- inter/sgp/xml/page_catalog_group_milk.lxml | 200 +++--- inter/sgp/xml/page_catalog_group_other.lxml | 392 +++++------ .../sgp/xml/page_catalog_group_recommend.lxml | 336 +++++----- inter/sgp/xml/page_catalog_group_tea.lxml | 320 ++++----- inter/sgp/xml/page_catalog_group_whey.lxml | 136 ++-- menu/new-layout.tsv | 50 +- xml/menutab/menu_catalog_new.xml | 16 + xml/menutab/page_catalog_group_appfast.xml | 16 + xml/menutab/page_catalog_group_coffee.xml | 16 + xml/menutab/page_catalog_group_forkid.xml | 16 + xml/menutab/page_catalog_group_health.xml | 16 + xml/menutab/page_catalog_group_milk.xml | 16 + xml/menutab/page_catalog_group_oreo.xml | 16 + xml/menutab/page_catalog_group_other.xml | 16 + xml/menutab/page_catalog_group_pepsi_pro.xml | 16 + xml/menutab/page_catalog_group_pro_15THB.xml | 16 + xml/menutab/page_catalog_group_pro_melon.xml | 16 + xml/menutab/page_catalog_group_pro_mymint.xml | 16 + .../page_catalog_group_pro_pepween.xml | 16 + xml/menutab/page_catalog_group_pro_rerun.xml | 16 + xml/menutab/page_catalog_group_recommend.xml | 16 + xml/menutab/page_catalog_group_soft_serve.xml | 16 + xml/menutab/page_catalog_group_songkran.xml | 16 + xml/menutab/page_catalog_group_tea.xml | 16 + xml/menutab/page_catalog_group_whey.xml | 16 + xml/menutab/page_catalog_momday.xml | 16 + xml/page_brewing3.xml | 2 +- xml/page_drinkok.xml | 1 + xml/topview2.xml | 4 + 34 files changed, 1539 insertions(+), 1214 deletions(-) diff --git a/inter/sgp/xml/menu_head.py b/inter/sgp/xml/menu_head.py index fa73e442..ca179150 100644 --- a/inter/sgp/xml/menu_head.py +++ b/inter/sgp/xml/menu_head.py @@ -6,10 +6,10 @@ default_dir_press = 'ROOT/taobin_project/image/page_drink_press/' default_dir_disable = 'ROOT/taobin_project/image/page_drink_disable/' - new_default_dir = 'ROOT/taobin_project/inter/aus/image/page_drink_n/' - new_default_dir2 = 'ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/' - new_default_dir_press = 'ROOT/taobin_project/inter/aus/image/page_drink_press_n/' - new_default_dir_disable = 'ROOT/taobin_project/inter/aus/image/page_drink_disable_n2/' + new_default_dir = 'ROOT/taobin_project/inter/sgp/image/page_drink_n/' + new_default_dir2 = 'ROOT/taobin_project/inter/sgp/image/page_drink_picture2_n/' + new_default_dir_press = 'ROOT/taobin_project/inter/sgp/image/page_drink_press_n/' + new_default_dir_disable = 'ROOT/taobin_project/inter/sgp/image/page_drink_disable_n2/' menu_count = 0 diff --git a/inter/sgp/xml/page_catalog_group_appfast.lxml b/inter/sgp/xml/page_catalog_group_appfast.lxml index 971678c2..a95b04fd 100644 --- a/inter/sgp/xml/page_catalog_group_appfast.lxml +++ b/inter/sgp/xml/page_catalog_group_appfast.lxml @@ -653,13 +653,13 @@ Flag( 52-04-02-1018.Button,$Sum5204021018)