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

This commit is contained in:
wanlop run 2025-01-30 21:41:25 +07:00
commit b433d3e3e4

View file

@ -515,13 +515,23 @@
EndIf
EndIf
If Seeker.IsLineMember = 0 Then
If LuckyDrawCampaign = 1 Then
Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
If CleanFeedbackFlag = 1 Then
Var CleanFeedBackToCollectPoint = 0
Open "ROOT/taobin_project/xml/page_clean_feedback.xml"
Else
If LuckyDrawCampaign = 1 Then
Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
EndIf
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
If CleanFeedbackFlag = 1 Then
Var CleanFeedBackToCollectPoint = 0
Open "ROOT/taobin_project/xml/page_clean_feedback.xml"
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
EndIf
Else
If CART_INDEX >= 2 Then
@ -567,13 +577,23 @@
EndIf
If Seeker.IsLineMember = 0 Then
If LuckyDrawCampaign = 1 Then
Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
If CleanFeedbackFlag = 1 Then
Var CleanFeedBackToCollectPoint = 0
Open "ROOT/taobin_project/xml/page_clean_feedback.xml"
Else
If LuckyDrawCampaign = 1 Then
Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
EndIf
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
If CleanFeedbackFlag = 1 Then
Var CleanFeedBackToCollectPoint = 0
Open "ROOT/taobin_project/xml/page_clean_feedback.xml"
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
EndIf
Else
If CART_INDEX >= 2 Then