Merge branch 'hotfix' into develop

src/main/ui/manage.html

@@ -289,6 +289,7 @@ margin-bottom: 10%;"/>
                         <i class="fa fa-file-text-o"></i> <span>活动管理|Activity Manage</span>
                     </a>
                 </li>
+                <!--
                <li ui-sref-active="active" ng-if="('activities'|withModule) && (currentUser.org_id==1 || currentUser.org_id==null)">
                <a ui-sref="activity.detail({act_id:'3'})" ui-sref-opts="{reload:true}">
                <i class="fa fa-compass"></i> <span>店长行动|Activities</span>
@@ -298,13 +299,15 @@ margin-bottom: 10%;"/>
                    <a ui-sref="act_partners" ui-sref-opts="{reload:true}">
                        <i class="fa fa-compass"></i> <span>店长行动参与情况</span>
                    </a>
-                </li>
+               </li>-->
+
                 <!--<li ui-sref-active="active" ng-if="('act_redpack'|withModule) && (currentUser.org_id==1 || currentUser.org_id==null)">-->
                 <!--<a ui-sref="act_partners" ui-sref-opts="{reload:true}">-->
                 <!--<i class="fa fa-compass"></i> <span>新费率签约情况</span>-->
                 <!--</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>
@@ -314,7 +317,7 @@ margin-bottom: 10%;"/>
                     <a ui-sref="customer_redpack">
                         <i class="fa fa-gift"></i> <span>红包返现</span>
                     </a>
-                </li>
+                </li>-->
 
 
                 <li ui-sref-active="active" ng-if="('cashbackAnalysis'|withModule)">
@@ -323,11 +326,11 @@ margin-bottom: 10%;"/>
                     </a>
                 </li>
 
-                <li ui-sref-active="active" ng-if="('funds'|withModule)">
+               <!-- <li ui-sref-active="active" ng-if="('funds'|withModule)">
                     <a ui-sref="funds">
                         <i class="fa fa-money"></i> <span>增值计划</span>
                     </a>
-                </li>
+                </li>-->
 
                 <li ui-sref-active="active" ng-if="'settleDelay'|withModule">
                     <a ui-sref="settle_delay" ui-sref-opts="{reload:true}">