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

xml/page_payment_cash.xml

@@ -192,6 +192,7 @@
     EndIf
 
     If PayInfoCFlag = 1 Then
+		If CodeChannel = 1 Then  
 			Var SessionID2 = SelectSlot + ":"
 			Var SessionID2 = SessionID2 + ExtendData
 
@@ -223,6 +224,7 @@
 			Var SessionID = ""
 			GetPayInfo TelephoneNumber ECommerce ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc
 			;Var Timeout = 0
+		EndIf
 		Open "ROOT/taobin_project/xml/page_catalog.xml"  
 	EndIf
     
@@ -297,6 +299,9 @@
 				;	Open "ROOT/taobin_project/xml/page_catalog.xml" 
 				;EndIf
 				Var ActionOKCase = 1
+				If IntVendingCampaign = 0 Then
+						Open "ROOT/taobin_project/xml/page_catalog.xml"  
+				EndIf
 			EndIf
 		EndIf
 	
@@ -397,6 +402,7 @@
         EndIf 
 	EndIf
 	VendingQR OFF
+	Refresh
 </EventVDCancle>
 
 
@@ -576,6 +582,8 @@
 
 	;Open "ROOT/taobin_project/xml/page_catalog.xml"  
 
+	Refresh
+	 
 </EventClick>
 </Button>
 

xml/page_payment_code.xml

@@ -147,6 +147,7 @@
 
 <EventActionError>
     If CodeChannel = 1 Then
+		Var TelephoneNumber = ""
 		Var ShowErrorText = "Enable"
 		Refresh
 	EndIf