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

Merge branch 'master' of forthrd.ddns.net:/1TBHDD/ikong/taobin_project

Browse source
This commit is contained in:
kong 2021-11-30 15:42:49 +07:00
commit 9f979c93b6
2 changed files with 1 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

1
xml/page_board.xml
View file

@ -155,6 +155,7 @@
GenHashWithTimeStamp QRCODE99x
Var QRCODE99 = "https://taobin-beverage.web.app/" + QRCODE99x
;Var QRCODE99 = "https://uat-taobin-beverage.firebaseapp.com/" + QRCODE99x
WEB "ENABLE"
Else

11
xml/page_catalog.xml
View file

@ -392,7 +392,6 @@
</EventClick>
</Button>
<<<<<<< HEAD
;<QRCode>
;<X> 895 </X>
;<Y> QRCODE99_Y</Y>
@ -401,16 +400,6 @@
;<State> "Enable" </State>
;<Service> testservice </Service>
;</QRCode>
=======
<QRCode>
<X> 895 </X>
<Y> QRCODE99_Y</Y>
<Width> 178 </Width>
<Height> 178 </Height>
<State> WebAppShow </State>
<Service> testservice </Service>
</QRCode>
>>>>>>> 1a60ddb6f8d5f3277cd6ebf9fe23851855eee89c