Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev

Application/Admin/Controller/RepairController.class.php

@@ -155,9 +155,9 @@ class RepairController extends ThinkController {
                     $spend = M($tab, "tab_");
                     if($result == "success"){
                         $rr = $spend->where(array('pay_order_number'=>$orderNo))->save(array('pay_game_status'=>1));
-                        if ($rr) {
+                        if ($rr !== false) {
                             $cpFlag = 1;
-                            M('spend', 'tab_')->commit();
+                            M($tab, 'tab_')->commit();
                         } else {
                             M($tab, 'tab_')->rollback();
                             $this->ajaxReturn(array('status'=>1,'msg'=>'补单失败.'));
@@ -207,7 +207,7 @@ class RepairController extends ThinkController {
                 if ($tab == 'spend' && $cpFlag == 0) {
                     $this->ajaxReturn(['status'=>0,'msg'=>'充值补单成功，通知CP失败！']);
                 }
-                $this->ajaxReturn(['status'=>0,'msg'=>'充值补单成功！']);
+                $this->ajaxReturn(['status'=>1,'msg'=>'充值补单成功！']);
             } else {
                 M('spend', 'tab_')->rollback();
                 $this->ajaxReturn(['status'=>0,'msg'=>'补单失败，请重试']);

Application/Admin/View/Finance/gameStatistics.html

@@ -92,7 +92,7 @@
       </div>
       <div class="input-list input-list-game search_label_rehab">
         <select id="game_name" name="game_name" class="select_gallery" >
-          <option value="">游戏名称</option>
+          <option value="">请选择游戏</option>
           <volist name=":getAllGame()" id="vo">
             <option value="{$vo.game_name}" <if condition="$vo.game_name eq I('game_name')">selected</if>
             >{$vo.game_name}</option>
@@ -276,7 +276,7 @@
             shadeClose: true,
             shade: 0.8,
             area: ['70%', '80%'],
-            content: [url, 'no']
+            content: url
         });
     });
 
@@ -318,21 +318,8 @@
           $("#search").click();
         }
       });
-      $(".ljcz").click(function(){
-        var id = $(this).attr('data-value');
-        var game_name = "{:I('game_name')}";
-        var server_name = "{:I('server_id')}";
-        layer.open({
-          type: 2,
-          title: '游戏消费记录',
-          shadeClose: true,
-          shade: 0.8,
-          area: ['70%', '80%'],
-          content: 'admin.php?s=/Platform/chongzhi_detail/promote_id/'+id+'/game_name/'+game_name+'/server_name/'+server_name+''//iframe的url
-        });
-      });
 
-    /*  function get_game_list()
+      function get_game_list()
       {
         var game_name = "{:I('game_name')}";
         var partner_id = $("#partner_id option:selected").val();
@@ -353,14 +340,18 @@
             // console.log(str);
             $("#game_name").empty();
             $("#game_name").append(str);
-            // $("#server_id").select2();
+            $("#game_name").select2();
 
           }
         })
       }
       $("#partner_id, #sdk_type").change(function(){
         get_game_list();
-      });*/
+      });
+
+      $("#game_name, #sdk_type").change(function(){
+        get_partnet_list();
+      });
 
       $('#time-start').datetimepicker({
         format: 'yyyy-mm-dd',
@@ -396,11 +387,9 @@
         return false;
       });
 
-    /*  $("#partner_id").change();
-
       function get_partnet_list()
       {
-        var partner_id = "{:I('partner_id')}";
+        var partner_id = $('#partner_id').val();
         $.ajax({
           url:"{:U('Finance/getPartnetList')}",
           type:"post",
@@ -414,7 +403,7 @@
             // console.log(str);
             $("#partner_id").empty();
             $("#partner_id").append(str);
-            // $("#server_id").select2();
+            $("#partner_id").select2();
 
           }
         })
@@ -423,11 +412,6 @@
         get_partnet_list();
       });
 
-      $("#game_name").change();
-      if ("{:I('get.game_name')}") {
-        $('#select2-game_name-container').text("{:I('get.game_name')}");
-      }*/
-
 
     })
   </script>

Application/Admin/View/FinancePromote/gameStatistics.html

@@ -288,20 +288,6 @@
           $("#search").click();
         }
       });
-      // $(".ljcz").click(function(){
-      //   var id = $(this).attr('data-value');
-      //   var game_name = "{:I('game_name')}";
-      //   var server_name = "{:I('server_id')}";
-      //   layer.open({
-      //     type: 2,
-      //     title: '游戏消费记录',
-      //     shadeClose: true,
-      //     shade: 0.8,
-      //     area: ['70%', '80%'],
-      //     content: 'admin.php?s=/Platform/chongzhi_detail/promote_id/'+id+'/game_name/'+game_name+'/server_name/'+server_name+''//iframe的url
-      //   });
-      // });
-
       function get_game_list()
       {
         var game_name = "{:I('game_name')}";
@@ -358,16 +344,16 @@
             // console.log(str);
             $("#partner_id").empty();
             $("#partner_id").append(str);
-            // $("#server_id").select2();
+            $("#partner_id").select2();
 
           }
         })
       }
-      $("#game_name, #game_type").change(function(){
-        get_partnet_list();
-      });
+      // $("#game_name, #game_type").change(function(){
+      //   get_partnet_list();
+      // });
 
-      $("#game_name").change();
+      // $("#game_name").change();
     })
   </script>
 </block>