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

支付渠道测试订单录入bug修正，支付意愿统计功能优化

Application/Admin/Controller/PayChannelIntentionController.class.php

@@ -381,8 +381,9 @@ class PayChannelIntentionController extends AdminController
            $pay_type = $_REQUEST['pay_ways'];
        }
 
-       $this->assign('pay_type',$pay_type);
+       if ($_REQUEST['pay_ways']) {
-//       var_dump($pay_type);die();
+           $this->assign('pay_type',$pay_type);
+       }
 
        if ($_REQUEST['user_account']) {
            $map['user_account'] = $_REQUEST['user_account'];

Application/Admin/View/PayChannelIntention/index.html

@@ -293,11 +293,11 @@
               <td >{$index}</td>
               <td >{$data.pay_ways_ch}</td>
               <td >{$data.pay_way}</td>
-              <td ><a class="detail" data-way="{$data.pay_ways}" data-status="1" data-start="{$_REQUEST['timestart']}" data-end="{$_REQUEST['timeend']}">{$data.success_invest_count}</a></td>
+              <td ><a class="detail" data-ways="{$_GET['pay_type']}" data-way="{$data.pay_ways}" data-status="1" data-start="{$_REQUEST['timestart']}" data-end="{$_REQUEST['timeend']}">{$data.success_invest_count}</a></td>
               <td >{$data.success_invest_amount}</td>
-              <td ><a class="detail" data-way="{$data.pay_ways}" data-status="0" data-start="{$_REQUEST['timestart']}" data-end="{$_REQUEST['timeend']}">{$data.fail_invest_count}</a></td>
+              <td ><a class="detail" data-ways="{$_GET['pay_type']}" data-way="{$data.pay_ways}" data-status="0" data-start="{$_REQUEST['timestart']}" data-end="{$_REQUEST['timeend']}">{$data.fail_invest_count}</a></td>
               <td >{$data.fail_invest_amount}</td>
-              <td ><a class="detail" data-way="{$data.pay_ways}" data-status="2" data-start="{$_REQUEST['timestart']}" data-end="{$_REQUEST['timeend']}">{$data.nothing_invest_count}</a></td>
+              <td ><a class="detail" data-ways="{$_GET['pay_type']}" data-way="{$data.pay_ways}" data-status="2" data-start="{$_REQUEST['timestart']}" data-end="{$_REQUEST['timeend']}">{$data.nothing_invest_count}</a></td>
               <td >{$data.nothing_invest_amount}</td>
             </tr>
           </volist>

Application/Admin/View/TestOrder/lists.html

@@ -84,8 +84,6 @@
           <option value="9" <if condition="$_GET['pay_way']  eq '9'">selected</if>>双乾支付-支付宝</option>
           <option value="10" <if condition="$_GET['pay_way']  eq '10'">selected</if>>双乾支付-银联</option>
           <option value="15" <if condition="$_GET['pay_way']  eq '15'">selected</if>>双乾支付-快捷</option>
-          <option value="0" <if condition="$_GET['pay_way']  eq '0'">selected</if>>平台币</option>
-          <option value="-1" <if condition="$_GET['pay_way']  eq '-1'">selected</if>>绑币</option>
           <option value="17" <if condition="$_GET['pay_way']  eq '17'">selected</if>>易宝支付</option>
         </select>
       </div>