Merge branch 'masterpiece' of ssh://forthrd.ddns.net:2222/1TBHDD/ikong/taobin_project into masterpiece
This commit is contained in:
commit
8f9c4430f9
67 changed files with 48005 additions and 67284 deletions
|
|
@ -406,7 +406,7 @@
|
|||
|
||||
|
||||
|
||||
TRY "/mnt/sdcard/coffeevending/taobin_project/xml/multi_ads/ads_path.ev"
|
||||
|
||||
|
||||
|
||||
Var showCart = "Invisible"
|
||||
|
|
@ -879,13 +879,13 @@
|
|||
Else
|
||||
Var LanguageObjectShow = "Invisible"
|
||||
Var NoLangObjectShow = "Enable"
|
||||
|
||||
TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/tricker.ev"
|
||||
|
||||
Var RootPath = "ROOT/taobin_project/"
|
||||
|
||||
|
||||
EndIf
|
||||
TRY "/mnt/sdcard/coffeevending/taobin_project/xml/multi_ads/ads_path.ev"
|
||||
|
||||
|
||||
Var StrXMLPageVer = "ver=" + XMLPageVersionInt
|
||||
|
|
@ -1491,7 +1491,12 @@
|
|||
Var ChackMemberPage = CountryRootPath + "xml/page_check_member.lxml"
|
||||
OpenInst 2 ChackMemberPage
|
||||
Else
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_check_member.xml"
|
||||
If CountryName = "Malaysia" Then
|
||||
Var ChackMemberPage = CountryRootPath + "xml/page_check_member.lxml"
|
||||
OpenInst 2 ChackMemberPage
|
||||
Else
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_check_member.xml"
|
||||
EndIf
|
||||
EndIf
|
||||
Else
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_check_member.xml"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue