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

xml/page_brewing3.xml

@@ -155,11 +155,14 @@
 
 	If show_eng = "true" Then 
 		Var DirImage = "ROOT/taobin_project/image/page_payment_en/page_payment"
+		Var DirImage2 = "ROOT/taobin_project/image/topping2_en"
 	Else
 		Var DirImage = "ROOT/taobin_project/image/page_payment"
+		Var DirImage2 = "ROOT/taobin_project/image/topping2"
 	EndIf
 
 	Var next_pic_bg = DirImage + "/bn_add_order.png"
+	Var bg_strawlid = DirImage2 + "/bg_strawlidSmall.png"
 
 
 	If LastMakeDrinkResult = "success" Then

xml/page_check_member2.xml

@@ -583,7 +583,7 @@
                 Var CouponNameB = "/imgCouponC42.png"
             EndIf 
             If CouponTypeB = "109" Then
-                Var CouponTypeB = "/imgCouponC33.png"
+                Var CouponNameB = "/imgCouponC33.png"
             EndIf
 
             INT CouponExireB_D
@@ -694,7 +694,7 @@
                 Var CouponNameA = "/imgCouponC42.png"
             EndIf 
             If CouponTypeA = "109" Then
-                Var CouponTypeA = "/imgCouponC33.png"
+                Var CouponNameA = "/imgCouponC33.png"
             EndIf
 
             INT CouponExireA_D
@@ -798,7 +798,7 @@
                 Var CouponNameB = "/imgCouponC42.png"
             EndIf
             If CouponTypeB = "109" Then
-                Var CouponTypeB = "/imgCouponC33.png"
+                Var CouponNameB = "/imgCouponC33.png"
             EndIf 
 
             INT CouponExireB_D

xml/page_payment_multi.xml

@@ -230,7 +230,7 @@
 
 	
 </EventOpen>
-<Timeout> 500 </Timeout>
+<Timeout> 900 </Timeout>
 <EventTimeout> 
 	
 	If ReadyForBrew = "false" Then