changed image bx_add_order, remove check show-menu,show next order after cancel and adddata 24 auto
This commit is contained in:
parent
a770eba892
commit
f6ca11fb44
8 changed files with 48 additions and 8 deletions
Binary file not shown.
|
Before Width: | Height: | Size: 3.6 KiB After Width: | Height: | Size: 4.4 KiB |
BIN
image/page_payment/bp_add_order.png
Normal file
BIN
image/page_payment/bp_add_order.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 3.8 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 2.6 KiB After Width: | Height: | Size: 4.8 KiB |
BIN
image/page_payment_en/page_payment/bp_add_order.png
Normal file
BIN
image/page_payment_en/page_payment/bp_add_order.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 4 KiB |
|
|
@ -168,7 +168,8 @@
|
||||||
Var DirImage2 = "ROOT/taobin_project/image/topping2"
|
Var DirImage2 = "ROOT/taobin_project/image/topping2"
|
||||||
EndIf
|
EndIf
|
||||||
|
|
||||||
Var next_pic_bg = DirImage + "/bn_add_order.png"
|
Var next_pic_bn = DirImage + "/bn_add_order.png"
|
||||||
|
Var next_pic_bp = DirImage + "/bp_add_order.png"
|
||||||
Var bg_strawlid = DirImage2 + "/bg_strawlidSmall.png"
|
Var bg_strawlid = DirImage2 + "/bg_strawlidSmall.png"
|
||||||
|
|
||||||
Var bg_strawlid_ST = "Enable"
|
Var bg_strawlid_ST = "Enable"
|
||||||
|
|
@ -792,9 +793,9 @@
|
||||||
|
|
||||||
If MachineStage = "show-menu" Then
|
If MachineStage = "show-menu" Then
|
||||||
If MachineState_Result = 0 Then
|
If MachineState_Result = 0 Then
|
||||||
SAVELOG "back_to_main from line > 714."
|
;SAVELOG "back_to_main from line > 714."
|
||||||
;Open "ROOT/taobin_project/xml/page_drinkok.xml"
|
;Open "ROOT/taobin_project/xml/page_drinkok.xml"
|
||||||
Var MachineState_Result = 1
|
;Var MachineState_Result = 1
|
||||||
EndIf
|
EndIf
|
||||||
EndIf
|
EndIf
|
||||||
|
|
||||||
|
|
@ -1076,10 +1077,11 @@
|
||||||
|
|
||||||
|
|
||||||
<Button>
|
<Button>
|
||||||
<X> 10 </X>
|
<X> 733 </X>
|
||||||
<Y> 424 </Y>
|
<Y> 1787 </Y>
|
||||||
<State>EnableSelectMenuBetweenBrew</State>
|
<State>EnableSelectMenuBetweenBrew</State>
|
||||||
<Filename> next_pic_bg </Filename>
|
<Filename> next_pic_bn </Filename>
|
||||||
|
<FilenamePress> next_pic_bp </FilenamePress>
|
||||||
<EventClick>
|
<EventClick>
|
||||||
If MachineState_Result = 0 Then
|
If MachineState_Result = 0 Then
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -14,11 +14,23 @@
|
||||||
EndIf
|
EndIf
|
||||||
|
|
||||||
If show_eng = "true" Then
|
If show_eng = "true" Then
|
||||||
|
Var DirImage = "ROOT/taobin_project/image/page_payment_en/page_payment"
|
||||||
Var DirImage2 = "ROOT/taobin_project/image/topping2_en"
|
Var DirImage2 = "ROOT/taobin_project/image/topping2_en"
|
||||||
Else
|
Else
|
||||||
|
Var DirImage = "ROOT/taobin_project/image/page_payment"
|
||||||
Var DirImage2 = "ROOT/taobin_project/image/topping2"
|
Var DirImage2 = "ROOT/taobin_project/image/topping2"
|
||||||
EndIf
|
EndIf
|
||||||
|
|
||||||
|
Var next_pic_bn = DirImage + "/bn_add_order.png"
|
||||||
|
Var next_pic_bp = DirImage + "/bp_add_order.png"
|
||||||
|
|
||||||
|
If NextOrder = "true" Then
|
||||||
|
Var EnableSelectMenuBetweenBrew = "Invisible"
|
||||||
|
Else
|
||||||
|
Var EnableSelectMenuBetweenBrew = "Enable"
|
||||||
|
EndIf
|
||||||
|
|
||||||
|
|
||||||
Var bg_strawlid = DirImage2 + "/bg_strawlidSmall.png"
|
Var bg_strawlid = DirImage2 + "/bg_strawlidSmall.png"
|
||||||
If Seeker.thankLidFlag = 1 Then
|
If Seeker.thankLidFlag = 1 Then
|
||||||
Var bg_strawlid = DirImage2 + "/bg_strawSmall.png"
|
Var bg_strawlid = DirImage2 + "/bg_strawSmall.png"
|
||||||
|
|
@ -861,6 +873,26 @@
|
||||||
<Value> ShowCountDownBrewing </Value>
|
<Value> ShowCountDownBrewing </Value>
|
||||||
</Text>
|
</Text>
|
||||||
|
|
||||||
|
<Button>
|
||||||
|
<X> 733 </X>
|
||||||
|
<Y> 1787 </Y>
|
||||||
|
<State>EnableSelectMenuBetweenBrew</State>
|
||||||
|
<Filename> next_pic_bn </Filename>
|
||||||
|
<FilenamePress> next_pic_bp </FilenamePress>
|
||||||
|
<EventClick>
|
||||||
|
If MachineState_Result = 0 Then
|
||||||
|
|
||||||
|
SAVELOG "User click next button"
|
||||||
|
|
||||||
|
Var Seeker = "next"
|
||||||
|
Var MultiPayEnable = "false"
|
||||||
|
CoinPause
|
||||||
|
|
||||||
|
Open "ROOT/taobin_project/xml/page_catalog.xml"
|
||||||
|
EndIf
|
||||||
|
</EventClick>
|
||||||
|
</Button>
|
||||||
|
|
||||||
<Button>
|
<Button>
|
||||||
<X> 10 </X>
|
<X> 10 </X>
|
||||||
<Y> 500 </Y>
|
<Y> 500 </Y>
|
||||||
|
|
|
||||||
|
|
@ -691,9 +691,9 @@
|
||||||
|
|
||||||
If MachineStage = "show-menu" Then
|
If MachineStage = "show-menu" Then
|
||||||
If MachineState_Result = 0 Then
|
If MachineState_Result = 0 Then
|
||||||
SAVELOG "back_to_main from line > 655."
|
;SAVELOG "back_to_main from line > 655."
|
||||||
;Open "ROOT/taobin_project/xml/page_drinkok.xml"
|
;Open "ROOT/taobin_project/xml/page_drinkok.xml"
|
||||||
Var MachineState_Result = 1
|
;Var MachineState_Result = 1
|
||||||
EndIf
|
EndIf
|
||||||
EndIf
|
EndIf
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -785,6 +785,12 @@
|
||||||
<Volume> SoundVolume </Volume>
|
<Volume> SoundVolume </Volume>
|
||||||
<EventClick>
|
<EventClick>
|
||||||
DEBUGVAR "USER BN_BACK"
|
DEBUGVAR "USER BN_BACK"
|
||||||
|
If ReqAdddata22 = 1 Then
|
||||||
|
|
||||||
|
Var BmiYear = PayAmount
|
||||||
|
Var GetScore = "useCredit"
|
||||||
|
AddData 24 TelephoneNumber BmiYear PointCrm GetScore
|
||||||
|
EndIf
|
||||||
Open "ROOT/taobin_project/xml/page_payment_credit.xml"
|
Open "ROOT/taobin_project/xml/page_payment_credit.xml"
|
||||||
</EventClick>
|
</EventClick>
|
||||||
</Button>
|
</Button>
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue