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

xml/page_drinkok.xml

@@ -184,37 +184,45 @@
 	EndIf
 
 
-	If HaveCup = "false" Then
+	If MachineStage = "show-menu" Then
 
-		If MachineStage = "show-menu" Then
-
-			If 	CART_INDEX < CART_COUNT  Then   
+		If 	CART_INDEX < CART_COUNT  Then   	
+			
+			If HaveCup = "false" Then
 
 				Var CART_INDEX = CART_INDEX + 1
 				Cart "PreparID" CART_INDEX
 				Open "ROOT/taobin_project/xml/page_thankyouMore.xml"  
-
 			Else
-				If sendPayMultiFlag = 1 Then
-					Var TNumberTaobinMember = ""
-					
-					If FailedCount > 0 Then
-						Open "ROOT/taobin_project/xml/page_drinkfail2.xml"  
-					Else
-						Open "ROOT/taobin_project/xml/page_back_to_main.xml"  
-					EndIf
+
+				If CupOnArm = "true" Then
+					Var buttonRemoveCup = "Enable"
+				Else
+					Var buttonRemoveCup = "Invisible"
 				EndIf
 			EndIf
 
+		Else
+			If sendPayMultiFlag = 1 Then
+				Var TNumberTaobinMember = ""
+				
+				If FailedCount > 0 Then
+					Open "ROOT/taobin_project/xml/page_drinkfail2.xml"  
+				Else
+					Open "ROOT/taobin_project/xml/page_back_to_main.xml"  
+				EndIf
+			EndIf
 		EndIf
-	Else
+
+	EndIf
+
+	If HaveCup = "true" Then
+
 		If CupOnArm = "true" Then
 			Var buttonRemoveCup = "Enable"
 		Else
 			Var buttonRemoveCup = "Invisible"
 		EndIf
-
-			
 	EndIf
 	
 	If MachineStage = "remove-cup" Then