Merge branch 'feature/pay_white_list' of wmtx/platform into release

支付渠道意愿统计bug上传

Application/Admin/Controller/PayChannelIntentionController.class.php

@@ -559,8 +559,8 @@ class PayChannelIntentionController extends AdminController
            count(if(tab_pay_channel_intention.pay_way="yeepay",tab_pay_channel_intention.pay_way,null)) shorcut,
            tab_pay_channel_intention.user_account,
            tab_pay_channel_intention.pay_amount,
-           CASE WHEN pay_status is null THEN 2 ELSE pay_status END as pay_status,
+           CASE WHEN is_submit = 0 THEN 2 ELSE pay_status END as pay_status,
-           CASE WHEN pay_game_status is null THEN 2 ELSE pay_game_status END as pay_game_status,
+           CASE WHEN is_submit = 0 THEN 2 ELSE pay_game_status END as pay_game_status,
            tab_pay_channel_intention.pay_order_number,tab_pay_channel_intention.create_time')
 //            ->join('left join tab_spend on tab_pay_channel_intention.pay_order_number=tab_spend.pay_order_number')
             ->group('tab_pay_channel_intention.pay_order_number')

Application/Admin/View/PayChannelIntention/detail.html

@@ -215,7 +215,7 @@
       <!--游戏类型搜索END-->
 
       <div class="input-list">
-        <a class="sch-btn" href="javascript:history.go(-1)" style="background:#fff;color: #000;border: #000 solid 1px;width: 100px">返回</a>
+        <a class="sch-btn" href="{:U('PayChannelIntention/index')}" style="background:#fff;color: #000;border: #000 solid 1px;width: 100px">返回</a>
       </div>
 
       <div class="input-list">
@@ -378,14 +378,6 @@
       pickerPosition:'bottom-left'
     })
 
-
-    $('.page a').click(function () {
-      var href = $(this).attr('href');
-      $(this).removeAttr('href');
-      window.location.replace(href)
-      console.log(href)
-    });
-
     $('#forbit').click(function () {
       var text = $("input:checkbox[name='ids[]']:checked").map(function(index,elem) {
         return $(elem).val();
@@ -438,7 +430,17 @@
       }else{
         url += '?' + query;
       }
-      window.location.replace(url);
+
+      var start = $("#timestart").val();
+      var end =   $("#timeend").val();
+      if(start !='' && end != ''){
+        if (Date.parse(start) > Date.parse(end)){
+          layer.msg('开始时间必须小于等于结束时间');
+          return false;
+        }
+      }
+
+      window.location.href = url;
     });
 
     $('#noforbit').click(function () {

Application/Admin/View/PayChannelIntention/index.html

@@ -216,7 +216,7 @@
 
       <div class="input-list input-list-server search_label_rehab">
         <select id="pay_type" name="pay_type" class="select_gallery" >
-          <option value="">选择订单类型</option>
+          <option value="">选择支付类型</option>
           <option value="alipay" <if condition="$_GET['pay_type']  eq 'alipay'">selected</if>>支付宝</option>
           <option value="wxpay" <if condition="$_GET['pay_type']  eq 'wxpay'">selected</if>>微信支付</option>
           <option value="shorcut" <if condition="$_GET['pay_type']  eq 'shorcut'">selected</if>>易宝支付</option>
@@ -435,6 +435,16 @@
       }else{
         url += '?' + query;
       }
+
+      var start = $("#timestart").val();
+      var end =   $("#timeend").val();
+      if(start !='' && end != ''){
+        if (Date.parse(start) > Date.parse(end)){
+          layer.msg('开始时间必须小于等于结束时间');
+          return false;
+        }
+      }
+
       window.location.href = url;
     });