From 63d124b1e44386a9fcd016c3687b1dc78cf52bf6 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期一, 13 八月 2018 13:43:01 +0800
Subject: [PATCH] 2453【前端】消费返利迁移至精彩活动界面
---
System/OpenServerActivity/ImpactRankModel.cs | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/System/OpenServerActivity/ImpactRankModel.cs b/System/OpenServerActivity/ImpactRankModel.cs
index c3c5686..0db6864 100644
--- a/System/OpenServerActivity/ImpactRankModel.cs
+++ b/System/OpenServerActivity/ImpactRankModel.cs
@@ -633,6 +633,8 @@
OSTimeLimitGiftModel timeLimitGiftModel { get { return ModelCenter.Instance.GetModel<OSTimeLimitGiftModel>(); } }
FlashSaleModel flashSaleModel { get { return ModelCenter.Instance.GetModel<FlashSaleModel>(); } }
+ ConsumeRebateModel consumeRebateModel { get { return ModelCenter.Instance.GetModel<ConsumeRebateModel>(); } }
+
public event Action openServerActivityStateChange;
public OpenServerActivityCenter()
@@ -693,6 +695,11 @@
_functionOrder = 0;
return true;
}
+ if (IsConsumeRebateOpen())
+ {
+ _functionOrder = 1;
+ return true;
+ }
if (IsRedEnvelopeOpen())
{
_functionOrder = 2;
@@ -744,6 +751,11 @@
return false;
}
+ public bool IsConsumeRebateOpen()
+ {
+ return consumeRebateModel.IsOpen;
+ }
+
public void ProcessErrorTip()
{
SysNotifyMgr.Instance.ShowTip("ActiveOutTime");
--
Gitblit v1.8.0