diff --git a/image/page_payment/CancelOrder2.png b/image/page_payment/CancelOrder2.png new file mode 100644 index 00000000..fbcfea93 Binary files /dev/null and b/image/page_payment/CancelOrder2.png differ diff --git a/image/page_payment/bn_back2.png b/image/page_payment/bn_back2.png new file mode 100644 index 00000000..f3a7d130 Binary files /dev/null and b/image/page_payment/bn_back2.png differ diff --git a/image/page_payment/bp_back2.png b/image/page_payment/bp_back2.png new file mode 100644 index 00000000..94dc0b80 Binary files /dev/null and b/image/page_payment/bp_back2.png differ diff --git a/image/page_payment_en/page_payment/CancelOrder2.png b/image/page_payment_en/page_payment/CancelOrder2.png new file mode 100644 index 00000000..97859358 Binary files /dev/null and b/image/page_payment_en/page_payment/CancelOrder2.png differ diff --git a/image/page_payment_en/page_payment/bn_back2.png b/image/page_payment_en/page_payment/bn_back2.png new file mode 100644 index 00000000..449c8021 Binary files /dev/null and b/image/page_payment_en/page_payment/bn_back2.png differ diff --git a/image/page_payment_en/page_payment/bp_back2.png b/image/page_payment_en/page_payment/bp_back2.png new file mode 100644 index 00000000..3222ed9a Binary files /dev/null and b/image/page_payment_en/page_payment/bp_back2.png differ diff --git a/xml/page_payment_cash.xml b/xml/page_payment_cash.xml index e6081bdb..e316cead 100644 --- a/xml/page_payment_cash.xml +++ b/xml/page_payment_cash.xml @@ -222,6 +222,7 @@ Var Cancel_Img = "/CancelOrder.png" + Var PressCancel_CashPopup = 0 @@ -1805,9 +1806,15 @@ ;Var Timeout = 0 EndIf If Seeker = "curr" Then + If PressCancel_CashPopup = 2 Then + Open "ROOT/taobin_project/xml/page_payment.xml" + EndIf Open "ROOT/taobin_project/xml/page_catalog.xml" Else + If PressCancel_CashPopup = 2 Then + Open "ROOT/taobin_project/xml/page_payment.xml" + EndIf Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" EndIf EndIf @@ -1927,6 +1934,11 @@ Var ActionOKCase = 1 Var PayInfoCFlag = 1 EndIf + + If PressCancel_CashPopup = 1 Then + Var PressCancel_CashPopup = 2 + EndIf + EndIf VendingQR OFF @@ -2989,6 +3001,7 @@ Var CancelNumber = 12 EndIf Var Cancel_Img = "/CancelOrder2.png" + Var PressCancel_CashPopup = 1 EndIf EndIf