Merge branch 'master' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project

This commit is contained in:
miggaze 2022-04-04 17:44:27 +07:00
commit 25ad3df945
155 changed files with 9812 additions and 262 deletions

View file

@ -502,8 +502,12 @@
Var NextPage = "ROOT/taobin_project/xml/page_back_to_main.xml"
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_choose_drink1.xml"
If new_layout = "true" Then
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_group_recommend.xml"
Else
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_choose_drink1.xml"
EndIf
TopView "show"
Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_main_blank.xml"