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

2020-11-22 21:51:00 +07:00 · 2020-11-22 21:51:00 +07:00 · 72decccf8e
commit 72decccf8e
parent f4a832c879 efd0ebe001
4 changed files with 5 additions and 3 deletions
--- a/xml/page_collect_point_2.xml
+++ b/xml/page_collect_point_2.xml
@ -75,7 +75,7 @@
 			
 		Else
 	
-			Var CoffeePoint1 = Ext21
+			Var CoffeePoint1 = Ext27
 			INT CoffeePoint1
 		
 			Var CoffeePoint = 1 + CoffeePoint1
--- a/xml/page_collect_point_3.xml
+++ b/xml/page_collect_point_3.xml
@ -11,7 +11,7 @@
 	Var Timeout = 0
 	;CoffeePoint
 	;Var CoffeePoint = 5
-    Var BmiYear = "0/0/0/1/0/0"
+    Var BmiYear = "0/0/0/0/0/0/0/0/0/1"
    Var PointCrm = "pdpa1"
    Var GetScore = ""
 	AddData 4 TelephoneNumber  BmiYear PointCrm GetScore
--- a/xml/page_payment.xml
+++ b/xml/page_payment.xml
@ -57,6 +57,8 @@

 		If GetPayInfoFlag = 0 Then

+			CoinVending ON
+
 			Var RemainAmount = 0


--- a/xml/page_payment_cash.xml
+++ b/xml/page_payment_cash.xml
@ -76,7 +76,7 @@
 			;Var VendingQRCode = "ERROR"
 			VendingQR ON
 			If CoinVendingOnFlag = 0 Then
-				CoinVending ON
+				;CoinVending ON
 				Var CoinVendingOnFlag = 1
 			Else