Merge branch 'master' of ssh://forthrd.ddns.net:2222/1TBHDD/ikong/taobin_project
This commit is contained in:
commit
8d9fd45683
1 changed files with 5 additions and 0 deletions
|
|
@ -147,6 +147,8 @@
|
||||||
|
|
||||||
SAVELOG SelectDrink
|
SAVELOG SelectDrink
|
||||||
|
|
||||||
|
Var QRCODE99 = ""
|
||||||
|
|
||||||
SAVELOG QRChannel
|
SAVELOG QRChannel
|
||||||
SAVELOG QRCODE99
|
SAVELOG QRCODE99
|
||||||
DEBUGVAR QRCODE99
|
DEBUGVAR QRCODE99
|
||||||
|
|
@ -1049,6 +1051,7 @@
|
||||||
If alphaState = "Enable" Then
|
If alphaState = "Enable" Then
|
||||||
Var QRErrorState = "Enable"
|
Var QRErrorState = "Enable"
|
||||||
Var LOADING_STATE = "Invisible"
|
Var LOADING_STATE = "Invisible"
|
||||||
|
Var QRCODE99 = ""
|
||||||
EndIf
|
EndIf
|
||||||
EndIf
|
EndIf
|
||||||
|
|
||||||
|
|
@ -1858,6 +1861,8 @@
|
||||||
Var QR_POPUP = "/img_popup1.png"
|
Var QR_POPUP = "/img_popup1.png"
|
||||||
EndIf
|
EndIf
|
||||||
|
|
||||||
|
Var QRCODE99 = ""
|
||||||
|
|
||||||
Var LOADING_STATE = "Enable"
|
Var LOADING_STATE = "Enable"
|
||||||
|
|
||||||
Var FlagQROpened = 1
|
Var FlagQROpened = 1
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue