From c61eda605eba08ea712d081c3c5fafbbaca5e041 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Thu, 8 Nov 2018 09:42:44 +0800
Subject: [PATCH] =?UTF-8?q?add=20=E9=A3=8E=E6=8E=A7=E4=B8=AD=E5=BF=83?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=95=86=E5=8A=A1=E5=8F=B7=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/ui/manage.html                          | 5 +++++
 src/main/ui/static/menu/templates/main_menu.html | 9 +++++++++
 2 files changed, 14 insertions(+)

diff --git a/src/main/ui/manage.html b/src/main/ui/manage.html
index 16eae02ea..d139c4903 100644
--- a/src/main/ui/manage.html
+++ b/src/main/ui/manage.html
@@ -379,6 +379,11 @@ margin-bottom: 10%;"/>
                         </span>
                     </p>
                     <ul class="sidebar-menu" ng-class="{'active':Risk}">
+                        <li ui-sref-active="active" ng-if="('merchantIdManage'|withModule)">
+                            <a ui-sref="merchant_id_manage" ui-sref-opts="{reload:true}">
+                                <i class="fa  fa-sitemap"></i> <span>商户号管理</span>
+                            </a>
+                        </li>
                         <li ui-sref-active="active">
                             <a ui-sref="analysis_monitoring.monitor" ui-sref-opts="{reload:true}">
                                 <i class="fa fa-tv"></i> <span>交易成功率监控</span>
diff --git a/src/main/ui/static/menu/templates/main_menu.html b/src/main/ui/static/menu/templates/main_menu.html
index f14815756..bbe6ab835 100644
--- a/src/main/ui/static/menu/templates/main_menu.html
+++ b/src/main/ui/static/menu/templates/main_menu.html
@@ -193,6 +193,15 @@
                 </div>
             </div>
             <div class="row">
+                <div class="col-sm-2 col-xs-6" ng-if="('merchantIdManage'|withModule)">
+                    <a ui-sref="merchant_id_manage" ui-sref-opts="{reload:true}" >
+                        <div class="description-block">
+                            <img src="/static/images/main_menu/configure_merchant_number.png"/>
+                            <div class="description-text">
+                                <span class="description-text">商户号</span>
+                            </div>
+                        </div>
+                    </a></div>
                 <div class="col-sm-2 col-xs-6">
                     <a ui-sref="analysis_monitoring.monitor" ui-sref-opts="{reload:true}">
                     <div class="description-block">