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

xml/page_check_member2.xml

@@ -393,6 +393,12 @@
             If CouponTypeA = "103" Then
                 Var CouponNameA = "/imgCouponC40.png"
             EndIf 
+            If CouponTypeA = "106" Then
+                Var CouponNameA = "/imgCouponC41.png"
+            EndIf 
+            If CouponTypeA = "107" Then
+                Var CouponNameA = "/imgCouponC42.png"
+            EndIf 
 
             INT CouponExireA_D
             INT CouponExireA_Y
@@ -484,6 +490,12 @@
             If CouponTypeB = "103" Then
                 Var CouponNameB = "/imgCouponC40.png"
             EndIf 
+            If CouponTypeB = "106" Then
+                Var CouponNameB = "/imgCouponC41.png"
+            EndIf
+            If CouponTypeB = "107" Then
+                Var CouponNameB = "/imgCouponC42.png"
+            EndIf 
 
             INT CouponExireB_D
             INT CouponExireB_Y
@@ -581,6 +593,12 @@
             If CouponTypeA = "103" Then
                 Var CouponNameA = "/imgCouponC40.png"
             EndIf 
+            If CouponTypeA = "106" Then
+                Var CouponNameA = "/imgCouponC41.png"
+            EndIf
+            If CouponTypeA = "107" Then
+                Var CouponNameA = "/imgCouponC42.png"
+            EndIf 
 
             INT CouponExireA_D
             INT CouponExireA_Y
@@ -671,6 +689,12 @@
             If CouponTypeB = "103" Then
                 Var CouponNameB = "/imgCouponC40.png"
             EndIf 
+            If CouponTypeB = "106" Then
+                Var CouponNameB = "/imgCouponC41.png"
+            EndIf
+            If CouponTypeB = "107" Then
+                Var CouponNameB = "/imgCouponC42.png"
+            EndIf 
 
             INT CouponExireB_D
             INT CouponExireB_Y
@@ -972,6 +996,10 @@
     Var CouponSendSms = CouponIDA
     Var CouponExpireDate = "Expires  " +  CouponExpireA
     Var CouponName = CouponNameA
+    Var BmiYear = CouponSendSms
+	Var PointCrm = ""
+	Var GetScore = ""
+    AddData 12 TelephoneNumber  BmiYear PointCrm GetScore
     Open "ROOT/taobin_project/xml/page_check_member3.xml"
 </EventClick>
 </Button>
@@ -1001,6 +1029,10 @@
     Var CouponSendSms = CouponIDB
     Var CouponExpireDate = "Expires  " + CouponExpireB
     Var CouponName = CouponNameB
+    Var BmiYear = CouponSendSms
+	Var PointCrm = ""
+	Var GetScore = ""
+    AddData 12 TelephoneNumber  BmiYear PointCrm GetScore
      Open "ROOT/taobin_project/xml/page_check_member3.xml"
 </EventClick>
 </Button>

xml/page_check_member3.xml

@@ -130,10 +130,13 @@
 <Volume> SoundVolume </Volume>
 <EventClick> 
 	; goto lid straw
-	Var BmiYear = CouponSendSms
+
-	Var PointCrm = ""
+	If MakeDrinkState = 1 Then
-	Var GetScore = ""
+       Open "ROOT/taobin_project/xml/page_lid_straw.xml"
-    AddData 12 TelephoneNumber  BmiYear PointCrm GetScore
+    EndIf
+	Open "ROOT/taobin_project/xml/page_catalog.xml"
+   
+	
     
 </EventClick>
 </Button>

xml/page_show_error.xml

@@ -4,7 +4,7 @@
 <Cache> "Enable" </Cache>
 <Width> 1080 </Width>
 <Height> 1312 </Height>
-<Background> "0xEFEDEA" </Background>
+<Background> "0xEAE6E1" </Background>
 <Volume> SoundVolume </Volume>
 <EventOpen>
 	Var countClick = 0