Merge branch 'masterpiece' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project into masterpiece
This commit is contained in:
commit
60aa6d19b1
4 changed files with 28 additions and 17 deletions
|
|
@ -698,6 +698,8 @@
|
|||
|
||||
;inter-page-board
|
||||
If CountryName = "Australia" Then
|
||||
|
||||
Var SettingVideoBrewingUseCommon = 1
|
||||
|
||||
TRY "/mnt/sdcard/coffeevending/taobin_project/inter/aus/video/script_video.ev"
|
||||
|
||||
|
|
|
|||
|
|
@ -2547,6 +2547,9 @@
|
|||
EndIf
|
||||
|
||||
If Seeker.IntVendingCredit > 0 Then
|
||||
If Seeker.IntVendingCampaign > 0 Then
|
||||
Var ECommerceQR = ECommerceQR + ":"
|
||||
EndIf
|
||||
Var ECommerceQR = ECommerceQR + "CRD"
|
||||
Var ECommerceQR = ECommerceQR + ":"
|
||||
Var ECommerceQR = ECommerceQR + Seeker.TNumberTaobinCredit
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue