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

xml/page_payment_credit2.xml

@@ -49,7 +49,7 @@
 
 		Var AcceptAuto = "false"
 
-		Var Tel_Confirm_State = "Enable"
+		;Var Tel_Confirm_State = "Enable"
 
         Var ShowTextNumber1 = "Enable"
         Var ShowTextNumber2= "Enable"
@@ -258,7 +258,8 @@
 	
 	StrLen PinNumber TelNumLen
 	If TelNumLen >= 4 Then 
-		Var Tel_Confirm_State = "Enable"
+		;Var Tel_Confirm_State = "Enable"
+		Function 2
 	EndIf
 	Var ShowErrorText = "Invisible"
 
@@ -302,7 +303,8 @@
 	
 	StrLen PinNumber TelNumLen
 	If TelNumLen >= 4 Then 
-		Var Tel_Confirm_State = "Enable"
+		;Var Tel_Confirm_State = "Enable"
+		Function 2
 	EndIf
 	Var ShowErrorText = "Invisible"
 
@@ -345,7 +347,8 @@
 	
 	StrLen PinNumber TelNumLen
 	If TelNumLen >= 4 Then 
-		Var Tel_Confirm_State = "Enable"
+		;Var Tel_Confirm_State = "Enable"
+		Function 2
 	EndIf
 	Var ShowErrorText = "Invisible"
 
@@ -388,7 +391,8 @@
 	
 	StrLen PinNumber TelNumLen
 	If TelNumLen >= 4 Then 
-		Var Tel_Confirm_State = "Enable"
+		;Var Tel_Confirm_State = "Enable"
+		Function 2
 	EndIf
 	Var ShowErrorText = "Invisible"
 
@@ -431,7 +435,8 @@
 	
 	StrLen PinNumber TelNumLen
 	If TelNumLen >= 4 Then 
-		Var Tel_Confirm_State = "Enable"
+		;Var Tel_Confirm_State = "Enable"
+		Function 2
 	EndIf
 	Var ShowErrorText = "Invisible"
 
@@ -474,7 +479,8 @@
 	
 	StrLen PinNumber TelNumLen
 	If TelNumLen >= 4 Then 
-		Var Tel_Confirm_State = "Enable"
+		;Var Tel_Confirm_State = "Enable"
+		Function 2
 	EndIf
 	Var ShowErrorText = "Invisible"
 
@@ -517,7 +523,8 @@
 	
 	StrLen PinNumber TelNumLen
 	If TelNumLen >= 4 Then 
-		Var Tel_Confirm_State = "Enable"
+		;Var Tel_Confirm_State = "Enable"
+		Function 2
 	EndIf
 	Var ShowErrorText = "Invisible"
 
@@ -560,7 +567,8 @@
 	
 	StrLen PinNumber TelNumLen
 	If TelNumLen >= 4 Then 
-		Var Tel_Confirm_State = "Enable"
+		;Var Tel_Confirm_State = "Enable"
+		Function 2
 	EndIf
 	Var ShowErrorText = "Invisible"
 
@@ -603,7 +611,8 @@
 	
 	StrLen PinNumber TelNumLen
 	If TelNumLen >= 4 Then 
-		Var Tel_Confirm_State = "Enable"
+		;Var Tel_Confirm_State = "Enable"
+		Function 2
 	EndIf
 	Var ShowErrorText = "Invisible"
 
@@ -685,7 +694,8 @@
 	Trim PinNumber 4
 	StrLen PinNumber TelNumLen
 	If TelNumLen >= 4 Then 
-		Var Tel_Confirm_State = "Enable"
+		;Var Tel_Confirm_State = "Enable"
+		Function 2
 	EndIf
 	Var ShowTextNumber = "Invisible"
 
@@ -927,6 +937,51 @@
 </EventSecurity>
 
 
+<Function2>
+
+		Var ShowSentSmsText = "Invisible"
+		Var Timeout = 0
+
+		If PinNumberUser = PinNumber Then
+
+			Var SumCreditAmount = CoffeeCredit
+
+			If SumCreditAmount >= PayAmount Then 
+
+				If ReqAdddata22 = 0 Then 
+					Var BmiYear = PayAmount
+					Var GetScore = "useCredit"
+					AddData 22 TelephoneNumber  BmiYear PointCrm GetScore
+					Var ReqAdddata22 = 1
+				EndIf
+
+				
+			Else
+				Open "ROOT/taobin_project/xml/page_payment_credit3.xml" 
+			EndIf
+
+		Else
+
+			Var ShowErrorText = "Enable"
+			Var PinNumber = ""
+			Var ShowTextNumber1 = "Invisible"
+			Var ShowTextNumber2 = "Invisible"
+			Var ShowTextNumber3 = "Invisible"
+			Var ShowTextNumber4 = "Invisible"
+
+		EndIf
+
+		;Var DataTmp = TelephoneNumber + "/"
+		;Var DataTmp = DataTmp + PinNumber
+		;GETACCEXT DataTmp 19
+		Var ReqFlag = 0
+
+		Refresh
+
+
+</Function2>
+
+
 
 
 

xml/page_payment_storeCredit2.xml

@@ -119,7 +119,8 @@
 	
 	StrLen PinNumber TelNumLen
 	If TelNumLen >= 4 Then 
-		Var Tel_Confirm_State = "Enable"
+		;Var Tel_Confirm_State = "Enable"
+		Function 2
 	EndIf
 	Var ShowErrorText = "Invisible"
 
@@ -161,7 +162,8 @@
 	
 	StrLen PinNumber TelNumLen
 	If TelNumLen >= 4 Then 
-		Var Tel_Confirm_State = "Enable"
+		;Var Tel_Confirm_State = "Enable"
+		Function 2
 	EndIf
 	Var ShowErrorText = "Invisible"
 
@@ -201,7 +203,8 @@
 	
 	StrLen PinNumber TelNumLen
 	If TelNumLen >= 4 Then 
-		Var Tel_Confirm_State = "Enable"
+		;Var Tel_Confirm_State = "Enable"
+		Function 2
 	EndIf
 	Var ShowErrorText = "Invisible"
 
@@ -241,7 +244,8 @@
 	
 	StrLen PinNumber TelNumLen
 	If TelNumLen >= 4 Then 
-		Var Tel_Confirm_State = "Enable"
+		;Var Tel_Confirm_State = "Enable"
+		Function 2
 	EndIf
 	Var ShowErrorText = "Invisible"
 
@@ -281,7 +285,8 @@
 	
 	StrLen PinNumber TelNumLen
 	If TelNumLen >= 4 Then 
-		Var Tel_Confirm_State = "Enable"
+		;Var Tel_Confirm_State = "Enable"
+		Function 2
 	EndIf
 	Var ShowErrorText = "Invisible"
 
@@ -321,7 +326,8 @@
 
 	StrLen PinNumber TelNumLen
 	If TelNumLen >= 4 Then 
-		Var Tel_Confirm_State = "Enable"
+		;Var Tel_Confirm_State = "Enable"
+		Function 2
 	EndIf
 	Var ShowErrorText = "Invisible"
 
@@ -361,7 +367,8 @@
 
 	StrLen PinNumber TelNumLen
 	If TelNumLen >= 4 Then 
-		Var Tel_Confirm_State = "Enable"
+		;Var Tel_Confirm_State = "Enable"
+		Function 2
 	EndIf
 	Var ShowErrorText = "Invisible"
 
@@ -401,7 +408,8 @@
 	
 	StrLen PinNumber TelNumLen
 	If TelNumLen >= 4 Then 
-		Var Tel_Confirm_State = "Enable"
+		;Var Tel_Confirm_State = "Enable"
+		Function 2
 	EndIf
 	Var ShowErrorText = "Invisible"
 
@@ -441,7 +449,8 @@
 	
 	StrLen PinNumber TelNumLen
 	If TelNumLen >= 4 Then 
-		Var Tel_Confirm_State = "Enable"
+		;Var Tel_Confirm_State = "Enable"
+		Function 2
 	EndIf
 	Var ShowErrorText = "Invisible"
 
@@ -482,7 +491,8 @@
 	Trim PinNumber 4
 	StrLen PinNumber TelNumLen
 	If TelNumLen >= 4 Then 
-		Var Tel_Confirm_State = "Enable"
+		;Var Tel_Confirm_State = "Enable"
+		Function 2
 	EndIf
 	Var ShowTextNumber = "Invisible"
 
@@ -737,5 +747,54 @@
 </EventMachine>
 
 
+<Function2>
+
+	If FlagOKButton = 0 Then
+
+		Var FlagOKButton = 1
+
+		Var Seeker.StoreCreditFlag = 1
+		Var Seeker.CoffeePinNumber = PinNumber
+
+
+		If Seeker.pageStoreCredit0 = 1 Then 
+
+
+			Var CoffeeCreditKeep = StoreCreditAmount + 0
+			Open "ROOT/taobin_project/xml/page_payment_storeCredit3.xml" 
+
+		Else
+
+			
+			
+
+
+			If ViewBill < RemainAmount Then
+				CoinVending BILLSTACKALL
+				;Open "ROOT/taobin_project/xml/page_payment_cash.xml" 
+				Var FlagWaitUpdateCoinAmount = 1
+				Var Timeout = 0
+			Else
+
+				CoinVending BILLSTACKALL
+
+				Var CoffeeCreditKeep = RemainAmountKeep + 0
+				Open "ROOT/taobin_project/xml/page_payment_storeCredit3.xml" 
+
+			EndIf
+
+		EndIf
+
+	EndIf
+
+
+		
+   
+	
+    Refresh
+
+</Function2>
+
+
 
 </Popup>