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

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>