pakin/taobin_project
1
0
Fork 0
Code Issues Pull requests Projects 1 Releases 1 Packages Wiki Activity Actions

fix qr web

Browse source
This commit is contained in:
miggaze 2021-11-30 14:58:53 +07:00
parent 270ee86c09
commit 5eaf363774
6 changed files with 71 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
image/topping2/new_multi.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.5 KiB

BIN
image/topping2_en/new_multi.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.5 KiB

10
xml/page_board.xml
View file

@ -144,7 +144,15 @@
Var ShowNetworkProblemText = "" Var ShowNetworkProblemText = ""
Machine NetworkUp Machine NetworkUp
GenHashWithTimeStamp QRCODE99
Var QRCODE99x = ""
GenHashWithTimeStamp QRCODE99x
Var QRCODE99 = "https://taobin-beverage.web.app/" + QRCODE99x
WEB "ENABLE" WEB "ENABLE"
Else Else

16
xml/page_catalog.xml
View file

@ -392,14 +392,14 @@
</EventClick> </EventClick>
</Button> </Button>
<QRCode> ;<QRCode>
<X> 895 </X> ;<X> 895 </X>
<Y> QRCODE99_Y</Y> ;<Y> QRCODE99_Y</Y>
<Width> 178 </Width> ;<Width> 178 </Width>
<Height> 178 </Height> ;<Height> 178 </Height>
<State> "Enable" </State> ;<State> "Enable" </State>
<Service> testservice </Service> ;<Service> testservice </Service>
</QRCode> ;</QRCode>

31
xml/page_topping_select3.xml
View file

@ -153,17 +153,28 @@
Var ButtonNext = "false" Var ButtonNext = "false"
Var NEW_MULTI = "Invisible"
</EventOpen> </EventOpen>
<Timeout> 2000 </Timeout> <Timeout> 1000 </Timeout>
<EventTimeout> <EventTimeout>
DEBUGVAR Timeout DEBUGVAR Timeout
Var Timeout = Timeout + 1 Var Timeout = Timeout + 1
If Timeout > 20 Then If Timeout > 40 Then
Var Timeout = 0 Var Timeout = 0
Open "ROOT/taobin_project/xml/page_back_to_main.xml" Open "ROOT/taobin_project/xml/page_back_to_main.xml"
EndIf EndIf
If MultiPayEnable = "true" Then
If NEW_MULTI = "Invisible" Then
Var NEW_MULTI = "Enable"
Else
Var NEW_MULTI = "Invisible"
EndIf
EndIf
Refresh
TimerReset TimerReset
</EventTimeout> </EventTimeout>
@ -1411,6 +1422,10 @@
</EventClick> </EventClick>
</Button> </Button>
; add cart ; add cart
<Button> <Button>
<State> btnAddCart </State> <State> btnAddCart </State>
@ -1478,6 +1493,18 @@
Var CartUpdate = "true" Var CartUpdate = "true"
</EventClick> </EventClick>
</Button> </Button>
<Button>
<X> 277 </X>
<Y> 1772 </Y>
<State> NEW_MULTI </State>
;<Color> "0x00BDFF" </Color>
<Interval> 500 </Interval>
<Filename> Var( DirImage + "/new_multi.png" ) </Filename>
<EventClick>
</EventClick>
</Button>
; next ; next
<Button> <Button>
<X> 673 </X> <X> 673 </X>

27
xml/page_topping_select4.xml
View file

@ -152,18 +152,29 @@
Machine DoorLidClose Machine DoorLidClose
Var ButtonNext = "false" Var ButtonNext = "false"
Var NEW_MULTI = "Invisible"
</EventOpen> </EventOpen>
<Timeout> 2000 </Timeout> <Timeout> 1000 </Timeout>
<EventTimeout> <EventTimeout>
DEBUGVAR Timeout DEBUGVAR Timeout
Var Timeout = Timeout + 1 Var Timeout = Timeout + 1
If Timeout > 20 Then If Timeout > 40 Then
Var Timeout = 0 Var Timeout = 0
Open "ROOT/taobin_project/xml/page_back_to_main.xml" Open "ROOT/taobin_project/xml/page_back_to_main.xml"
EndIf EndIf
If MultiPayEnable = "true" Then
If NEW_MULTI = "Invisible" Then
Var NEW_MULTI = "Enable"
Else
Var NEW_MULTI = "Invisible"
EndIf
EndIf
Refresh
TimerReset TimerReset
</EventTimeout> </EventTimeout>
@ -1482,6 +1493,18 @@
Var CartUpdate = "true" Var CartUpdate = "true"
</EventClick> </EventClick>
</Button> </Button>
<Button>
<X> 277 </X>
<Y> 1772 </Y>
<State> NEW_MULTI </State>
;<Color> "0x00BDFF" </Color>
<Interval> 500 </Interval>
<Filename> Var( DirImage + "/new_multi.png" ) </Filename>
<EventClick>
</EventClick>
</Button>
; next ; next
<Button> <Button>
<X> 673 </X> <X> 673 </X>