From 19f59d6482d0ac1d696f0d38a111f09e57e8ad47 Mon Sep 17 00:00:00 2001
From: zhengyongxing <as123498@qq.com>
Date: Tue, 28 Jul 2020 15:07:36 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E6=A0=8F=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/View/PayMerchant/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Application/Admin/View/PayMerchant/index.html b/Application/Admin/View/PayMerchant/index.html
index 67ef204cd..17145013b 100644
--- a/Application/Admin/View/PayMerchant/index.html
+++ b/Application/Admin/View/PayMerchant/index.html
@@ -288,7 +288,7 @@
     $("#account").select2();
 
     //导航高亮
-    highlight_subnav('{:U('PayMerchant/index')}');
+    highlight_subnav('{:U('PayChannel/index')}');
 
     function showWindow() {
       layer.open({

From eb66cfd5d4cc39fd8d293692eea4ce98dda1f52e Mon Sep 17 00:00:00 2001
From: zhengyongxing <as123498@qq.com>
Date: Tue, 28 Jul 2020 17:24:05 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=94=AF=E4=BB=98=E5=95=86=E6=88=B7bug?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/View/PayMerchant/index.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Application/Admin/View/PayMerchant/index.html b/Application/Admin/View/PayMerchant/index.html
index 17145013b..8a3167e72 100644
--- a/Application/Admin/View/PayMerchant/index.html
+++ b/Application/Admin/View/PayMerchant/index.html
@@ -73,7 +73,7 @@
     <h3 class="page_title">支付方式统计</h3>
 <!--    <p class="description_text">说明：平台币直充金额2019.12.18以前sdk新包数据及sdk旧包数据，无法对应相关游戏无法计入以上平台币列表中，<span style="color:red">充值方式统计</span>一栏统计<span style="color:red">平台币直充总金额</span></p>-->
     <div class="fr">
-      <a href="PayChannel/index">游戏充值统计</a>
+      <a href="{:U('PayChannel/index')}">游戏充值统计</a>
       <a class="" href="{:U('Finance/payTypeStatistics')}">充值方式统计</a>
       <a class="tabchose">支付方式统计</a>
     </div>
@@ -253,7 +253,7 @@
               无
             </if>
             <volist name="sum_radio" id="sum_radio">
-              {$sum_radio.name}：{$sum_radio.ratio|default = 0}%  &nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp
+              {$sum_radio.name}({$sum_radio.merchant_way})：{$sum_radio.ratio|default = 0}%  &nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp
             </volist>
           </td>
         </tr>