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

src/main/ui/manage.html

@@ -321,12 +321,12 @@ margin-bottom: 10%;"/>
                                 <i class="fa fa-area-chart"></i> <span>商户交易额统计</span>
                             </a>
                         </li>
-                        <li ui-sref-active="active"
+                        <!--<li ui-sref-active="active"
                             ng-if="('partnerapply'|withModule) && ('100'|withRole)">
                             <a ui-sref="partner_apply" ui-sref-opts="{reload:true}">
                                 <i class="fa fa-envelope-o"></i> <span>自主申请|Partner Applies</span>
                             </a>
-                        </li>
+                        </li>-->
                     </ul>
                 </li>
 

src/main/ui/static/menu/templates/main_menu.html

@@ -101,7 +101,7 @@
                     </div>
                     </a>
                 </div>
-                <div class="col-sm-2 col-xs-6" ng-if="('partnerapply'|withModule) && ('100'|withRole)">
+                <!--<div class="col-sm-2 col-xs-6" ng-if="('partnerapply'|withModule) && ('100'|withRole)">
                     <a ui-sref="partner_apply" ui-sref-opts="{reload:true}">
                         <div class="description-block">
                             <img src="/static/images/main_menu/finance_statistics.png"/>
@@ -110,7 +110,7 @@
                             </div>
                         </div>
                     </a>
-                </div>
+                </div>-->
             </div>
         </div>
         <div class="list-group" ng-if="role!=null && role!='administrator' && role!='developer' && role!='sitemanager'">