diff --git a/xml/page_brewing2.xml b/xml/page_brewing2.xml index 606b370c..26510af7 100644 --- a/xml/page_brewing2.xml +++ b/xml/page_brewing2.xml @@ -12,6 +12,8 @@ Var Timeout = 0 + Var PrintCoinAmount = 0 + @@ -256,6 +258,8 @@ If ErrTimeout = 0 Then Var ErrTimeout = 1 + Var PrintCoinAmount = 400 + If PayWithQR = 0 Then If CodeChannel = 0 Then If ChangeFlag = 0 Then @@ -265,6 +269,7 @@ EndIf Else If CoinAmount > 0 Then + Var PrintCoinAmount = CoinAmount If ChangeFlag = 0 Then Var ChangeFlag = 1 Var ServiceAmount2 = ServiceAmount2 - IntVendingCampaign @@ -272,8 +277,11 @@ EndIf Else + Var PrintCoinAmount = 500 Var ChangeOK = 4 EndIf + + EndIf Else @@ -334,7 +342,7 @@ If RoadShow = "true" Then Open "ROOT/taobin_project/xml/page_back_to_error.xml" Else - Var MachineState_Result = 2 + ;Var MachineState_Result = 2 EndIf EndIf @@ -360,9 +368,11 @@ If RoadShow = "true" Then Open "ROOT/taobin_project/xml/page_back_to_error.xml" Else - Var MachineState_Result = 2 + ;Var MachineState_Result = 2 EndIf EndIf + + Refresh @@ -417,6 +427,8 @@ ShowCountDownBrewing + + 0 1880 diff --git a/xml/page_lid_straw.xml b/xml/page_lid_straw.xml index f4f9ad46..971af463 100644 --- a/xml/page_lid_straw.xml +++ b/xml/page_lid_straw.xml @@ -187,7 +187,6 @@ Open "ROOT/taobin_project/xml/page_brewing2.xml" EndIf - If MachineStage = "drink-success" Then Var MachineState_Result = 1 EndIf diff --git a/xml/page_thankyou.xml b/xml/page_thankyou.xml index fa9bcadd..199db450 100644 --- a/xml/page_thankyou.xml +++ b/xml/page_thankyou.xml @@ -14,6 +14,7 @@ Var ChangeFlag = 0 Var ErrTimeout = 0 Var ActionOKCase = 0 + Var ChangeTimeout = 0 1000