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

2024-12-20 13:45:37 +07:00 · 2024-12-20 13:45:37 +07:00 · 49c62a2b77
commit 49c62a2b77
parent 27cf77f821 44da2f6113
29 changed files with 11 additions and 2 deletions
--- a/image/page_drink_disable_n2/bn_Caramel_Espresso_Oreo_smoothie.png
+++ b/image/page_drink_disable_n2/bn_Caramel_Espresso_Oreo_smoothie.png
--- a/image/page_drink_disable_n2/bn_Caramel_Espresso_Oreo_smoothie_weekday_discount.png
+++ b/image/page_drink_disable_n2/bn_Caramel_Espresso_Oreo_smoothie_weekday_discount.png
--- a/image/page_drink_disable_n2/bn_Caramel_GreenTea_Oreo_smoothie.png
+++ b/image/page_drink_disable_n2/bn_Caramel_GreenTea_Oreo_smoothie.png
--- a/image/page_drink_disable_n2/bn_Caramel_GreenTea_Oreo_smoothie_weekday_discount.png
+++ b/image/page_drink_disable_n2/bn_Caramel_GreenTea_Oreo_smoothie_weekday_discount.png
--- a/image/page_drink_disable_n2/bn_Caramel_ThaiTea_Oreo_smoothie.png
+++ b/image/page_drink_disable_n2/bn_Caramel_ThaiTea_Oreo_smoothie.png
--- a/image/page_drink_disable_n2/bn_Caramel_ThaiTea_Oreo_smoothie_weekday_discount.png
+++ b/image/page_drink_disable_n2/bn_Caramel_ThaiTea_Oreo_smoothie_weekday_discount.png
--- a/image/page_drink_disable_n2/bn_iced_pepsi_extra.png
+++ b/image/page_drink_disable_n2/bn_iced_pepsi_extra.png
--- a/image/page_drink_n/bn_Caramel_Espresso_Oreo_smoothie.png
+++ b/image/page_drink_n/bn_Caramel_Espresso_Oreo_smoothie.png
--- a/image/page_drink_n/bn_Caramel_Espresso_Oreo_smoothie_weekday_discount.png
+++ b/image/page_drink_n/bn_Caramel_Espresso_Oreo_smoothie_weekday_discount.png
--- a/image/page_drink_n/bn_Caramel_GreenTea_Oreo_smoothie.png
+++ b/image/page_drink_n/bn_Caramel_GreenTea_Oreo_smoothie.png
--- a/image/page_drink_n/bn_Caramel_GreenTea_Oreo_smoothie_weekday_discount.png
+++ b/image/page_drink_n/bn_Caramel_GreenTea_Oreo_smoothie_weekday_discount.png
--- a/image/page_drink_n/bn_Caramel_ThaiTea_Oreo_smoothie.png
+++ b/image/page_drink_n/bn_Caramel_ThaiTea_Oreo_smoothie.png
--- a/image/page_drink_n/bn_Caramel_ThaiTea_Oreo_smoothie_weekday_discount.png
+++ b/image/page_drink_n/bn_Caramel_ThaiTea_Oreo_smoothie_weekday_discount.png
--- a/image/page_drink_n/bn_iced_pepsi_extra.png
+++ b/image/page_drink_n/bn_iced_pepsi_extra.png
--- a/image/page_drink_picture2_n/bn_Caramel_Espresso_Oreo_smoothie.png
+++ b/image/page_drink_picture2_n/bn_Caramel_Espresso_Oreo_smoothie.png
--- a/image/page_drink_picture2_n/bn_Caramel_Espresso_Oreo_smoothie_weekday_discount.png
+++ b/image/page_drink_picture2_n/bn_Caramel_Espresso_Oreo_smoothie_weekday_discount.png
--- a/image/page_drink_picture2_n/bn_Caramel_GreenTea_Oreo_smoothie.png
+++ b/image/page_drink_picture2_n/bn_Caramel_GreenTea_Oreo_smoothie.png
--- a/image/page_drink_picture2_n/bn_Caramel_GreenTea_Oreo_smoothie_weekday_discount.png
+++ b/image/page_drink_picture2_n/bn_Caramel_GreenTea_Oreo_smoothie_weekday_discount.png
--- a/image/page_drink_picture2_n/bn_Caramel_ThaiTea_Oreo_smoothie.png
+++ b/image/page_drink_picture2_n/bn_Caramel_ThaiTea_Oreo_smoothie.png
--- a/image/page_drink_picture2_n/bn_Caramel_ThaiTea_Oreo_smoothie_weekday_discount.png
+++ b/image/page_drink_picture2_n/bn_Caramel_ThaiTea_Oreo_smoothie_weekday_discount.png
--- a/image/page_drink_picture2_n/bn_iced_pepsi_extra.png
+++ b/image/page_drink_picture2_n/bn_iced_pepsi_extra.png
--- a/image/page_drink_press_n/bn_Caramel_Espresso_Oreo_smoothie.png
+++ b/image/page_drink_press_n/bn_Caramel_Espresso_Oreo_smoothie.png
--- a/image/page_drink_press_n/bn_Caramel_Espresso_Oreo_smoothie_weekday_discount.png
+++ b/image/page_drink_press_n/bn_Caramel_Espresso_Oreo_smoothie_weekday_discount.png
--- a/image/page_drink_press_n/bn_Caramel_GreenTea_Oreo_smoothie.png
+++ b/image/page_drink_press_n/bn_Caramel_GreenTea_Oreo_smoothie.png
--- a/image/page_drink_press_n/bn_Caramel_GreenTea_Oreo_smoothie_weekday_discount.png
+++ b/image/page_drink_press_n/bn_Caramel_GreenTea_Oreo_smoothie_weekday_discount.png
--- a/image/page_drink_press_n/bn_Caramel_ThaiTea_Oreo_smoothie.png
+++ b/image/page_drink_press_n/bn_Caramel_ThaiTea_Oreo_smoothie.png
--- a/image/page_drink_press_n/bn_Caramel_ThaiTea_Oreo_smoothie_weekday_discount.png
+++ b/image/page_drink_press_n/bn_Caramel_ThaiTea_Oreo_smoothie_weekday_discount.png
--- a/image/page_drink_press_n/bn_iced_pepsi_extra.png
+++ b/image/page_drink_press_n/bn_iced_pepsi_extra.png
--- a/xml/page_payment_credit2.xml
+++ b/xml/page_payment_credit2.xml
@ -934,8 +934,17 @@
 				

 				If SumCreditAmount >= PayAmountSubDiscount Then 
-
-					Open "ROOT/taobin_project/xml/page_payment_credit3-0.xml" 
+				    If SumCreditAmount >= 100 Then
+                        If ReqAdddata22 = 0 Then
+                            Var useCreditAmount = PayAmountSubDiscount
+                            Var BmiYear = useCreditAmount
+                            Var GetScore = "useCredit"
+                            AddData 22 TelephoneNumber  BmiYear PointCrm GetScore
+                            Var ReqAdddata22 = 1
+                        EndIf
+					Else		
+					   Open "ROOT/taobin_project/xml/page_payment_credit3-0.xml" 
+					EndIf
 				Else
 					Var ShowNotEnoughText = "Enable"
 					Var Seeker.TNumberTaobinCredit = TelephoneNumber