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

xml/page_payment_code.xml

@@ -91,6 +91,14 @@
 	    SPLIT  ECommerce "/"  7  VendingCampaignRI3
 	    SPLIT  ECommerce "/"  8  VendingCampaign1
 
+		If VendingCode = "" Then
+			Var VendingCode = "C00" 
+		EndIf
+
+		If VendingCode = "C00" Then
+
+		Else
+
 			Var IntVendingCampaign = VendingCampaignRI3
 			INT IntVendingCampaign
 		
@@ -129,7 +137,7 @@
 				Var ECommerce =	ECommerce + "/"
 				Var ECommerce =	ECommerce + SelectDrink 
 				Var ECommerce =	ECommerce + "/"
-			Var ECommerce =	ECommerce + "KBA:1/"
+				Var ECommerce =	ECommerce + "KBA:2/"
 				Var ECommerce =	ECommerce + VendingCode
 				Var ECommerce =	ECommerce + ":"
 				Var ECommerce =	ECommerce + CodeNumber
@@ -235,6 +243,8 @@
 
 			EndIf
 
+		EndIf
+
 	Else 
 	
 		Var CreditAmount = 0
@@ -585,6 +595,7 @@
 		
 
 	    If GetPayInfoFlag = 0 Then
+			Var GetPayInfoFlag = 1
 
 			VendingQR OFF
 
@@ -625,7 +636,7 @@
 
 			GetPayInfo TelephoneNumber2 ECommerce ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc
 			Var Timeout = 0
-			Var GetPayInfoFlag = 1
+			
 	        Var TelephoneNumber = CodeNumber
 	        Var CodeChannel = 1
 	       
@@ -678,6 +689,7 @@
 <Image>
 <X> 330 </X>
 <Y> 942 </Y>
+<Refresh> "Enable" </Refresh>
 <State> ShowErrorText </State>
 <Filename> "ROOT/taobin_project/image/collectiing/text_show_error.png" </Filename>
 </Image>

xml/page_payment_credit.xml

@@ -33,6 +33,8 @@
 	Var number9 = ""
 	Var number10 = ""
 
+	Var Ext1a = ""
+
 </EventOpen>
 <Timeout> 1000 </Timeout>
 <EventTimeout> 

xml/page_payment_credit2.xml

@@ -38,6 +38,9 @@
 	Else
 		Var DirImage = "ROOT/taobin_project/image/collectiing"
 	EndIf
+
+	Var Ext1a = ""
+	
 </EventOpen>
 <Timeout> 1000 </Timeout>
 <EventTimeout>