Fixed next button and sprial verify

inter/tha/xml/page_topping_frozen_fruit_select.lxml

@@ -13,12 +13,11 @@
 
 	CRLFToSpace showname
 	CRLFToSpace showdesc
-<<<<<<< HEAD
-=======
 
 	Var MachineEvent = 0
 	Var MatchineSpiralStage = "-"
->>>>>>> 25887b3556a64b1276a34f39bee2f62991f23df1
+	
+	Var NextButtonState = "Invisible"
 
 	;- Begin
 	Var PriceDrinkNoTop = PriceDrink
@@ -178,18 +177,19 @@
 
 		EndIf
 	EndIf
-
+	
-
+    If MachineEvent = 1 Then
-	DEBUGVAR MatchineSpiralStage
+        If MatchineSpiralStage = "-" Then
-
+        
-	If MachineEvent = 1 Then
-    	If MatchineSpiralStage = "spiral-valid" Then
-      		Function 2
         Else
-            ; Verify error
+            If MatchineSpiralStage = "spiral-valid" Then
-            DEBUGVAR MachineSpiralErrorCode
+                Function 2
-    		Open "ROOT/taobin_project/xml/page_spiral_invalid_failed.xml"
+            Else
-    	EndIf
+                ; Verify error
+                DEBUGVAR MachineSpiralErrorCode
+                Open "ROOT/taobin_project/xml/page_spiral_invalid_failed.xml"
+            EndIf
+        EndIf
     EndIf
 
 	Refresh
@@ -337,15 +337,9 @@
         DEBUGVAR LinkProductCodeAnotherMachine[0]
         DEBUGVAR LinkProductCodeAnotherMachine[1]
         DEBUGVAR LinkProductCodeAnotherMachine[2]
-<<<<<<< HEAD
-
-        Var MatchinePrialStage = "-"
-
-=======
 
         Var MatchineSpiralStage = "-"
 
->>>>>>> 25887b3556a64b1276a34f39bee2f62991f23df1
         GenHashWithTimeStamp SpiralRef
         SPIRAL_VERIFY LinkProductCodeAnotherMachine[0] SpiralRef
 
@@ -533,6 +527,7 @@
 
 ; next
 <Button>
+<State> NextButtonState </State>
 <X> 350 </X>
 <Y> 1422 </Y>
 <Filename> "ROOT/taobin_project/image/topping_inter/bn_next2.png" </Filename>
@@ -1084,7 +1079,8 @@
 
 
 	Var Timeout = 0
-
+	Var NextButtonState = "Enable"
+	
 	RefreshAll
 
 </Function2>