diff --git a/xml/page_brewing3.xml b/xml/page_brewing3.xml index 55802e96..99a3759b 100644 --- a/xml/page_brewing3.xml +++ b/xml/page_brewing3.xml @@ -468,7 +468,6 @@ EndIf EndIf - If MachineState_Result = 1 Then If waitAckPay = 0 Then diff --git a/xml/page_collect_point_1.xml b/xml/page_collect_point_1.xml index 2309907f..0189032f 100644 --- a/xml/page_collect_point_1.xml +++ b/xml/page_collect_point_1.xml @@ -8,7 +8,7 @@ ; On open - Var Tel_Confirm_State = "Disable" + Var Tel_Confirm_State = "Invisible" Var ShowTextNumber = "Enable" Var Timeout = 0 Var TelephoneNumber = "" @@ -105,6 +105,9 @@ SoundVolume Var Timeout = 0 + StrLen TelephoneNumber TelNumLen + If TelNumLen < 10 Then + Var TelephoneNumber = TelephoneNumber + "1" Trim TelephoneNumber 10 TimerReset @@ -130,6 +133,8 @@ Var number10 = "1" EndIf + EndIf + @@ -142,6 +147,8 @@ SoundVolume Var Timeout = 0 + StrLen TelephoneNumber TelNumLen + If TelNumLen < 10 Then Var TelephoneNumber = TelephoneNumber + "2" Trim TelephoneNumber 10 TimerReset @@ -166,6 +173,7 @@ If TelNumLen = 10 Then Var number10 = "2" EndIf + EndIf @@ -178,6 +186,8 @@ SoundVolume Var Timeout = 0 + StrLen TelephoneNumber TelNumLen + If TelNumLen < 10 Then Var TelephoneNumber = TelephoneNumber + "3" Trim TelephoneNumber 10 TimerReset @@ -202,6 +212,7 @@ If TelNumLen = 10 Then Var number10 = "3" EndIf + EndIf @@ -214,6 +225,8 @@ SoundVolume Var Timeout = 0 + StrLen TelephoneNumber TelNumLen + If TelNumLen < 10 Then Var TelephoneNumber = TelephoneNumber + "4" Trim TelephoneNumber 10 TimerReset @@ -238,6 +251,7 @@ If TelNumLen = 10 Then Var number10 = "4" EndIf + EndIf @@ -250,6 +264,8 @@ SoundVolume Var Timeout = 0 + StrLen TelephoneNumber TelNumLen + If TelNumLen < 10 Then Var TelephoneNumber = TelephoneNumber + "5" Trim TelephoneNumber 10 TimerReset @@ -274,6 +290,7 @@ If TelNumLen = 10 Then Var number10 = "5" EndIf + EndIf @@ -286,6 +303,8 @@ SoundVolume Var Timeout = 0 + StrLen TelephoneNumber TelNumLen + If TelNumLen < 10 Then Var TelephoneNumber = TelephoneNumber + "6" Trim TelephoneNumber 10 TimerReset @@ -310,6 +329,7 @@ If TelNumLen = 10 Then Var number10 = "6" EndIf + EndIf @@ -322,6 +342,8 @@ SoundVolume Var Timeout = 0 + StrLen TelephoneNumber TelNumLen + If TelNumLen < 10 Then Var TelephoneNumber = TelephoneNumber + "7" Trim TelephoneNumber 10 TimerReset @@ -346,6 +368,7 @@ If TelNumLen = 10 Then Var number10 = "7" EndIf + EndIf @@ -358,6 +381,8 @@ SoundVolume Var Timeout = 0 + StrLen TelephoneNumber TelNumLen + If TelNumLen < 10 Then Var TelephoneNumber = TelephoneNumber + "8" Trim TelephoneNumber 10 TimerReset @@ -382,6 +407,7 @@ If TelNumLen = 10 Then Var number10 = "8" EndIf + EndIf @@ -394,6 +420,8 @@ SoundVolume Var Timeout = 0 + StrLen TelephoneNumber TelNumLen + If TelNumLen < 10 Then Var TelephoneNumber = TelephoneNumber + "9" Trim TelephoneNumber 10 TimerReset @@ -418,6 +446,8 @@ If TelNumLen = 10 Then Var number10 = "9" EndIf + EndIf + @@ -430,6 +460,8 @@ SoundVolume Var Timeout = 0 + StrLen TelephoneNumber TelNumLen + If TelNumLen < 10 Then Var TelephoneNumber = TelephoneNumber + "0" Trim TelephoneNumber 10 StrLen TelephoneNumber TelNumLen @@ -456,6 +488,7 @@ If TelNumLen = 10 Then Var number10 = "0" EndIf + EndIf @@ -469,7 +502,7 @@ Var Timeout = 0 Trim TelephoneNumber -1 - Var Tel_Confirm_State = "Disable" + Var Tel_Confirm_State = "Invisible" StrLen TelephoneNumber TelNumLen diff --git a/xml/page_payment_credit.xml b/xml/page_payment_credit.xml index c2c5deae..55288c8b 100644 --- a/xml/page_payment_credit.xml +++ b/xml/page_payment_credit.xml @@ -111,6 +111,8 @@ SoundVolume Var Timeout = 0 + StrLen TelephoneNumber TelNumLen + If TelNumLen < 10 Then Var TelephoneNumber = TelephoneNumber + "1" Var ShowTextNumber = "Invisible" Trim TelephoneNumber 10 @@ -137,7 +139,7 @@ If TelNumLen = 10 Then Var number10 = "1" EndIf - + EndIf @@ -150,6 +152,8 @@ SoundVolume Var Timeout = 0 + StrLen TelephoneNumber TelNumLen + If TelNumLen < 10 Then Var TelephoneNumber = TelephoneNumber + "2" Var ShowTextNumber = "Invisible" Trim TelephoneNumber 10 @@ -176,6 +180,7 @@ If TelNumLen = 10 Then Var number10 = "2" EndIf + EndIf @@ -188,6 +193,8 @@ SoundVolume Var Timeout = 0 + StrLen TelephoneNumber TelNumLen + If TelNumLen < 10 Then Var TelephoneNumber = TelephoneNumber + "3" Var ShowTextNumber = "Invisible" Trim TelephoneNumber 10 @@ -214,6 +221,7 @@ If TelNumLen = 10 Then Var number10 = "3" EndIf + EndIf @@ -226,6 +234,8 @@ SoundVolume Var Timeout = 0 + StrLen TelephoneNumber TelNumLen + If TelNumLen < 10 Then Var TelephoneNumber = TelephoneNumber + "4" Var ShowTextNumber = "Invisible" Trim TelephoneNumber 10 @@ -252,6 +262,7 @@ If TelNumLen = 10 Then Var number10 = "4" EndIf + EndIf @@ -264,6 +275,8 @@ SoundVolume Var Timeout = 0 + StrLen TelephoneNumber TelNumLen + If TelNumLen < 10 Then Var TelephoneNumber = TelephoneNumber + "5" Var ShowTextNumber = "Invisible" Trim TelephoneNumber 10 @@ -290,6 +303,7 @@ If TelNumLen = 10 Then Var number10 = "5" EndIf + EndIf @@ -302,6 +316,8 @@ SoundVolume Var Timeout = 0 + StrLen TelephoneNumber TelNumLen + If TelNumLen < 10 Then Var TelephoneNumber = TelephoneNumber + "6" Var ShowTextNumber = "Invisible" Trim TelephoneNumber 10 @@ -328,6 +344,7 @@ If TelNumLen = 10 Then Var number10 = "6" EndIf + EndIf @@ -340,6 +357,8 @@ SoundVolume Var Timeout = 0 + StrLen TelephoneNumber TelNumLen + If TelNumLen < 10 Then Var TelephoneNumber = TelephoneNumber + "7" Var ShowTextNumber = "Invisible" Trim TelephoneNumber 10 @@ -366,6 +385,7 @@ If TelNumLen = 10 Then Var number10 = "7" EndIf + EndIf @@ -378,6 +398,8 @@ SoundVolume Var Timeout = 0 + StrLen TelephoneNumber TelNumLen + If TelNumLen < 10 Then Var TelephoneNumber = TelephoneNumber + "8" Var ShowTextNumber = "Invisible" Trim TelephoneNumber 10 @@ -404,6 +426,7 @@ If TelNumLen = 10 Then Var number10 = "8" EndIf + EndIf @@ -416,6 +439,8 @@ SoundVolume Var Timeout = 0 + StrLen TelephoneNumber TelNumLen + If TelNumLen < 10 Then Var TelephoneNumber = TelephoneNumber + "9" Var ShowTextNumber = "Invisible" Trim TelephoneNumber 10 @@ -442,6 +467,7 @@ If TelNumLen = 10 Then Var number10 = "9" EndIf + EndIf @@ -454,6 +480,8 @@ SoundVolume Var Timeout = 0 + StrLen TelephoneNumber TelNumLen + If TelNumLen < 10 Then Var TelephoneNumber = TelephoneNumber + "0" Trim TelephoneNumber 10 StrLen TelephoneNumber TelNumLen @@ -481,6 +509,7 @@ If TelNumLen = 10 Then Var number10 = "0" EndIf + EndIf diff --git a/xml/page_payment_credit3.xml b/xml/page_payment_credit3.xml index 5a9f1c00..d0ef470d 100644 --- a/xml/page_payment_credit3.xml +++ b/xml/page_payment_credit3.xml @@ -197,7 +197,7 @@ - + Var StoreCreditFlag = 1 Open "ROOT/taobin_project/xml/page_payment_cash.xml" diff --git a/xml/page_payment_storeCredit.xml b/xml/page_payment_storeCredit.xml index 5c502fc1..9ed7cf62 100644 --- a/xml/page_payment_storeCredit.xml +++ b/xml/page_payment_storeCredit.xml @@ -125,7 +125,7 @@ If Ext1a = "invalid password" Then Var ShowErrorText = "Enable" EndIf - + EndIf EndIf @@ -168,6 +168,8 @@ SoundVolume Var Timeout = 0 + StrLen TelephoneNumber TelNumLen + If TelNumLen < 10 Then Var TelephoneNumber = TelephoneNumber + "1" Var ShowTextNumber = "Invisible" Trim TelephoneNumber 10 @@ -194,7 +196,7 @@ If TelNumLen = 10 Then Var number10 = "1" EndIf - + EndIf @@ -207,6 +209,8 @@ SoundVolume Var Timeout = 0 + StrLen TelephoneNumber TelNumLen + If TelNumLen < 10 Then Var TelephoneNumber = TelephoneNumber + "2" Var ShowTextNumber = "Invisible" Trim TelephoneNumber 10 @@ -233,6 +237,7 @@ If TelNumLen = 10 Then Var number10 = "2" EndIf + EndIf @@ -245,6 +250,8 @@ SoundVolume Var Timeout = 0 + StrLen TelephoneNumber TelNumLen + If TelNumLen < 10 Then Var TelephoneNumber = TelephoneNumber + "3" Var ShowTextNumber = "Invisible" Trim TelephoneNumber 10 @@ -271,6 +278,7 @@ If TelNumLen = 10 Then Var number10 = "3" EndIf + EndIf @@ -283,6 +291,8 @@ SoundVolume Var Timeout = 0 + StrLen TelephoneNumber TelNumLen + If TelNumLen < 10 Then Var TelephoneNumber = TelephoneNumber + "4" Var ShowTextNumber = "Invisible" Trim TelephoneNumber 10 @@ -309,6 +319,7 @@ If TelNumLen = 10 Then Var number10 = "4" EndIf + EndIf @@ -322,6 +333,8 @@ SoundVolume Var Timeout = 0 + StrLen TelephoneNumber TelNumLen + If TelNumLen < 10 Then Var TelephoneNumber = TelephoneNumber + "5" Var ShowTextNumber = "Invisible" Trim TelephoneNumber 10 @@ -348,6 +361,7 @@ If TelNumLen = 10 Then Var number10 = "5" EndIf + EndIf @@ -360,6 +374,8 @@ SoundVolume Var Timeout = 0 + StrLen TelephoneNumber TelNumLen + If TelNumLen < 10 Then Var TelephoneNumber = TelephoneNumber + "6" Var ShowTextNumber = "Invisible" Trim TelephoneNumber 10 @@ -386,6 +402,7 @@ If TelNumLen = 10 Then Var number10 = "6" EndIf + EndIf @@ -398,6 +415,8 @@ SoundVolume Var Timeout = 0 + StrLen TelephoneNumber TelNumLen + If TelNumLen < 10 Then Var TelephoneNumber = TelephoneNumber + "7" Var ShowTextNumber = "Invisible" Trim TelephoneNumber 10 @@ -424,7 +443,7 @@ If TelNumLen = 10 Then Var number10 = "7" EndIf - + EndIf @@ -437,6 +456,8 @@ SoundVolume Var Timeout = 0 + StrLen TelephoneNumber TelNumLen + If TelNumLen < 10 Then Var TelephoneNumber = TelephoneNumber + "8" Var ShowTextNumber = "Invisible" Trim TelephoneNumber 10 @@ -463,7 +484,7 @@ If TelNumLen = 10 Then Var number10 = "8" EndIf - + EndIf @@ -476,6 +497,8 @@ SoundVolume Var Timeout = 0 + StrLen TelephoneNumber TelNumLen + If TelNumLen < 10 Then Var TelephoneNumber = TelephoneNumber + "9" Var ShowTextNumber = "Invisible" Trim TelephoneNumber 10 @@ -502,6 +525,7 @@ If TelNumLen = 10 Then Var number10 = "9" EndIf + EndIf @@ -514,6 +538,8 @@ SoundVolume Var Timeout = 0 + StrLen TelephoneNumber TelNumLen + If TelNumLen < 10 Then Var TelephoneNumber = TelephoneNumber + "0" Trim TelephoneNumber 10 StrLen TelephoneNumber TelNumLen @@ -541,6 +567,7 @@ If TelNumLen = 10 Then Var number10 = "0" EndIf + EndIf @@ -611,6 +638,7 @@ SoundVolume + Var GetAccFlag = 1 GETACCEXT TelephoneNumber 13