Merge remote-tracking branch 'origin/develop' into develop

6 years ago · f41822308f
parent 26d1390bcd 337ce2f305
commit f41822308f
2 changed files with 2 additions and 2 deletions
--- a/src/main/ui/manage.html
+++ b/src/main/ui/manage.html
@ -307,13 +307,13 @@ margin-bottom: 10%;"/>
                <!--</a>-->
                <!--</li>-->

-               <!-- <li ui-sref-active="active" ng-if="('encourage'|withModule)">
+               <li ui-sref-active="active" ng-if="('encourage'|withModule)">
                    <a ui-sref="encourageAct">
                        <i class="fa fa-gift"></i> <span>鼓励金</span>
                    </a>
                </li>

-                <li ui-sref-active="active" ng-if="('act_customer_redpack'|withModule)">
+                <!--<li ui-sref-active="active" ng-if="('act_customer_redpack'|withModule)">
                    <a ui-sref="customer_redpack">
                        <i class="fa fa-gift"></i> <span>红包返现</span>
                    </a>
--- a/src/main/ui/static/images/act/actChairty.jpeg
+++ b/src/main/ui/static/images/act/actChairty.jpeg