pakin/taobin_project
1
0
Fork 0
Code Issues Pull requests Projects 1 Releases 1 Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
kong 2022-02-23 14:16:57 +07:00
commit cd8df752dc
3 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
xml/page_brewing3.xml
View file

@ -155,11 +155,14 @@
If show_eng = "true" Then If show_eng = "true" Then
Var DirImage = "ROOT/taobin_project/image/page_payment_en/page_payment" Var DirImage = "ROOT/taobin_project/image/page_payment_en/page_payment"
Var DirImage2 = "ROOT/taobin_project/image/topping2_en"
Else Else
Var DirImage = "ROOT/taobin_project/image/page_payment" Var DirImage = "ROOT/taobin_project/image/page_payment"
Var DirImage2 = "ROOT/taobin_project/image/topping2"
EndIf EndIf
Var next_pic_bg = DirImage + "/bn_add_order.png" Var next_pic_bg = DirImage + "/bn_add_order.png"
Var bg_strawlid = DirImage2 + "/bg_strawlidSmall.png"
If LastMakeDrinkResult = "success" Then If LastMakeDrinkResult = "success" Then

6
xml/page_check_member2.xml
View file

@ -583,7 +583,7 @@
Var CouponNameB = "/imgCouponC42.png" Var CouponNameB = "/imgCouponC42.png"
EndIf EndIf
If CouponTypeB = "109" Then If CouponTypeB = "109" Then
Var CouponTypeB = "/imgCouponC33.png" Var CouponNameB = "/imgCouponC33.png"
EndIf EndIf
INT CouponExireB_D INT CouponExireB_D
@ -694,7 +694,7 @@
Var CouponNameA = "/imgCouponC42.png" Var CouponNameA = "/imgCouponC42.png"
EndIf EndIf
If CouponTypeA = "109" Then If CouponTypeA = "109" Then
Var CouponTypeA = "/imgCouponC33.png" Var CouponNameA = "/imgCouponC33.png"
EndIf EndIf
INT CouponExireA_D INT CouponExireA_D
@ -798,7 +798,7 @@
Var CouponNameB = "/imgCouponC42.png" Var CouponNameB = "/imgCouponC42.png"
EndIf EndIf
If CouponTypeB = "109" Then If CouponTypeB = "109" Then
Var CouponTypeB = "/imgCouponC33.png" Var CouponNameB = "/imgCouponC33.png"
EndIf EndIf
INT CouponExireB_D INT CouponExireB_D

2
xml/page_payment_multi.xml
View file

@ -230,7 +230,7 @@
</EventOpen> </EventOpen>
<Timeout> 500 </Timeout> <Timeout> 900 </Timeout>
<EventTimeout> <EventTimeout>
If ReadyForBrew = "false" Then If ReadyForBrew = "false" Then