Merge branch 'hotfix/market_percentage' of wmtx/platform into release

支付商户bug修改

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>
@@ -288,7 +288,7 @@
     $("#account").select2();
 
     //导航高亮
-    highlight_subnav('{:U('PayMerchant/index')}');
+    highlight_subnav('{:U('PayChannel/index')}');
 
     function showWindow() {
       layer.open({