Merge branch 'rmaster' of 39.97.239.116:gyfl/xyzshop into rmaster

admin/control/provider_group.php

@@ -185,7 +185,7 @@ class provider_groupControl extends SystemControl
                 ->field('refill_provider.provider_id,refill_provider.name,store.store_name')
                 ->join('inner')
                 ->on('store.store_id=refill_provider.store_id')
-                ->where(['type' => $type, 'qualitys' => ['like', '%' . $quality . '%']])
+                ->where(['type' => $type, 'opened' => 1, 'qualitys' => ['like', '%' . $quality . '%']])
                 ->limit(1000)
                 ->order('opened asc , provider_id desc')
                 ->select();

admin/control/refill_successful.php

@@ -45,14 +45,12 @@ class refill_successfulControl extends SystemControl
         } else {
             $url = BASE_SITE_URL . '/plot/paths?time_stamp='.$_GET['timestamp'];
         }
-        $url = 'http://192.168.1.220/plot/mchpaths?time_stamp=1621353600';
         Log::record("successful get where url : {$url}", Log::DEBUG);
         $data = http_request($url);
         if(empty($data)) {
             echo(json_encode(''));
             exit;
         }
-//        $data = "['/1621353600/10096/1/2/100', '/1621353600/10096/1/2/1000', '/1621353600/10096/1/2/500', '/1621353600/10101/1/4/30']";
 
         if($type == 'system') {
             preg_match_all('/\d{10}\/\d+\/\d{1,2}\/\d\/\d{2,4}/', $data, $matches);

admin/templates/default/css/recharge.css

@@ -3,6 +3,7 @@
 .w46 {width:46px;}
 .w40 {width:40px;}
 .w50 {width:50px;}
+.w57 {width:57px;}
 .w70 {width: 70px;}
 .w82 {width:82px;}
 .w86 {width:86px;}

admin/templates/default/provider.group.set.php

@@ -20,20 +20,20 @@
         <input type="hidden" name="quality" value="<?php echo $_GET['quality']?>">
         <input type="hidden" name="is_only" value="<?php echo $output['is_only']?>">
         <table class=" tb-type2">
-            <thead>
+            <thead style="position: fixed;background-color: #fff;">
             <tr class="thead">
-                <th>
+                <th class="w180">
                 <a href="JavaScript:void(0);" class="btn" id="emptyBtn"><span>清空</span></a>
                 </th>
-                <th class="w50 align-center">
+                <th class="w57 align-center">
                     全选
                 </th>
                 <?php foreach ($output['amounts'] as $amount){?>
-                <th class="w50 align-center"><?php echo $amount;?></th>
+                <th class="w57 align-center"><?php echo $amount;?></th>
                 <?php }?>
             </tr>
             </thead>
-            <tbody>
+            <tbody style="display: block;padding-top: 47px;">
                 <?php if(!empty($output['providers'])){?>
                     <?php foreach ($output['providers'] as $provider){?>
                         <tr class="trFlex">

admin/templates/default/system.successful.php

@@ -188,12 +188,12 @@
                 layer.msg('请选择时间');
                 return
             }
-            let src = window.location.origin + "/plot/mchplot?time_stamp=" + time + "&interval=" + interval + "&chname=" + chname + "&quality=" + quality + "&card_type=" + card_type + "&amount=" + amount
+            let src = window.location.origin + "/plot/mchplot?time_stamp=" + time + "&interval=" + interval + "&mchid=" + chname + "&quality=" + quality + "&card_type=" + card_type + "&amount=" + amount
             if (!interval) {
                 src = src.replace("&interval=", "")
             }
             if (!chname) {
-                src = src.replace("&chname=", "")
+                src = src.replace("&mchid=", "")
             }
             if (!quality) {
                 src = src.replace("&quality=", "")