Merge branch 'masterpiece' of ssh://forthrd.ddns.net:2222/1TBHDD/ikong/taobin_project into masterpiece
This commit is contained in:
commit
b433d3e3e4
1 changed files with 32 additions and 12 deletions
|
|
@ -515,13 +515,23 @@
|
||||||
EndIf
|
EndIf
|
||||||
EndIf
|
EndIf
|
||||||
If Seeker.IsLineMember = 0 Then
|
If Seeker.IsLineMember = 0 Then
|
||||||
If LuckyDrawCampaign = 1 Then
|
If CleanFeedbackFlag = 1 Then
|
||||||
Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
|
Var CleanFeedBackToCollectPoint = 0
|
||||||
Else
|
Open "ROOT/taobin_project/xml/page_clean_feedback.xml"
|
||||||
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
|
Else
|
||||||
EndIf
|
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
|
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
|
EndIf
|
||||||
Else
|
Else
|
||||||
If CART_INDEX >= 2 Then
|
If CART_INDEX >= 2 Then
|
||||||
|
|
@ -567,13 +577,23 @@
|
||||||
EndIf
|
EndIf
|
||||||
|
|
||||||
If Seeker.IsLineMember = 0 Then
|
If Seeker.IsLineMember = 0 Then
|
||||||
If LuckyDrawCampaign = 1 Then
|
If CleanFeedbackFlag = 1 Then
|
||||||
Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
|
Var CleanFeedBackToCollectPoint = 0
|
||||||
Else
|
Open "ROOT/taobin_project/xml/page_clean_feedback.xml"
|
||||||
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
|
Else
|
||||||
EndIf
|
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
|
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
|
EndIf
|
||||||
Else
|
Else
|
||||||
If CART_INDEX >= 2 Then
|
If CART_INDEX >= 2 Then
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue