diff --git a/xml/page_brewing2.xml b/xml/page_brewing2.xml index e36ea202..543ac74a 100644 --- a/xml/page_brewing2.xml +++ b/xml/page_brewing2.xml @@ -277,8 +277,12 @@ EndIf Else - - Var ChangeOK = 4 + + If ChangeFlag2 = 1 Then + Var ChangeOK = 2 + Else + Var ChangeOK = 4 + EndIf EndIf @@ -308,7 +312,11 @@ EndIf Else - Var ChangeOK = 4 + If ChangeFlag2 = 1 Then + Var ChangeOK = 2 + Else + Var ChangeOK = 4 + EndIf EndIf EndIf diff --git a/xml/page_payment_code.xml b/xml/page_payment_code.xml index 55c38a38..4038f71a 100644 --- a/xml/page_payment_code.xml +++ b/xml/page_payment_code.xml @@ -64,7 +64,12 @@ Var QRChannel = 0 If IntVendingCampaign >= PayAmount Then - Open "ROOT/taobin_project/xml/page_payment_cash.xml" + ;Open "ROOT/taobin_project/xml/page_payment_cash.xml" + Var FreeVendingCampaign = 1 + CoinVending OFF + ;Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif" + MakeDrinkV1 SelectDrink SelectSugarID + Open "ROOT/taobin_project/xml/page_thankyou.xml" EndIf diff --git a/xml/page_thankyou.xml b/xml/page_thankyou.xml index 7df35035..6cf9ab2e 100644 --- a/xml/page_thankyou.xml +++ b/xml/page_thankyou.xml @@ -15,6 +15,7 @@ Var ErrTimeout = 0 Var ActionOKCase = 0 Var ChangeTimeout = 0 + Var ChangeFlag2 = 0 1000 @@ -31,6 +32,7 @@ Var Canout = SumCoinAmount - PayAmount If Canout > 0 Then Change Canout + Var ChangeFlag2 = 1 EndIf EndIf EndIf @@ -39,6 +41,7 @@ Var Canout = CoinAmount If Canout > 0 Then Change Canout + Var ChangeFlag2 = 1 EndIf EndIf