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

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

@@ -216,7 +216,7 @@
                 <div ng-if="('10000000000'|withRole)" class="col-sm-2 col-xs-6">
                     <a ui-sref="refundReview" ui-sref-opts="{reload:true}">
                         <div class="description-block">
-                            <img src="/static/images/main_menu/transaction_refund.png"/>
+                            <img src="/static/images/main_menu/transaction_refund_red.png"/>
                             <div class="description-text">
                                 <span class="description-text">退款审核</span>
                             </div>
@@ -298,7 +298,7 @@
               <div class="col-sm-2 col-xs-6">
                   <a ui-sref="manual_settle" ui-sref-opts="{reload:true}">
                       <div class="description-block">
-                          <img src="/static/images/main_menu/compliance_alipayexcel.png"/>
+                          <img src="/static/images/main_menu/transaction_arrears.png"/>
                           <div class="description-text">
                               <span>商户手动清算</span>
                           </div>
@@ -673,7 +673,7 @@
                 <div ng-if="'cashbackAnalysis'|withModule" class="col-sm-2 col-xs-6">
                     <a ui-sref="cashbackAnalysis" ui-sref-opts="{reload:true}">
                         <div class="description-block">
-                            <img src="/static/images/main_menu/bd_merchant_activity.png"/>
+                            <img src="/static/images/main_menu/bd_merchant_activity_green.png"/>
                             <div class="description-text">
                                 <span class="description-text">商户营销账户</span>
                             </div>
@@ -682,7 +682,7 @@
                 <div class="col-sm-2 col-xs-6">
                     <a ui-sref="manual_settle" ui-sref-opts="{reload:true}">
                         <div class="description-block">
-                            <img src="/static/images/main_menu/transaction_arrears.png"/>
+                            <img src="/static/images/main_menu/partner_settlement_green.png"/>
                             <div class="description-text">
                                 <span>商户手动清算</span>
                             </div>
@@ -692,7 +692,7 @@
                 <div ng-if="('preRefund'|withModule)" class="col-sm-2 col-xs-6">
                     <a ui-sref="analysis_monitoring.pre_refund" ui-sref-opts="{reload:true}">
                         <div class="description-block">
-                            <img src="/static/images/main_menu/transaction_arrears.png"/>
+                            <img src="/static/images/main_menu/transaction_arrears_green.png"/>
                             <div class="description-text">
                                 <span class="description-text">商户欠款</span>
                             </div>
@@ -910,7 +910,7 @@
                 <div ng-if="'log'|withModule" class="col-sm-2 col-xs-6">
                     <a ui-sref="logview.notify_logs" ui-sref-opts="{reload:true}">
                         <div class="description-block">
-                            <img src="/static/images/main_menu/transaction_callback_message.png"/>
+                            <img src="/static/images/main_menu/transaction_callback_message_red.png"/>
                             <div class="description-text">
                                 <span class="description-text">支付回调消息</span>
                             </div>