merge

admin/control/merchant.php

@@ -25,7 +25,6 @@ class merchantControl extends SystemControl
      */
     public function merchantOp()
     {
-        $this->successful_where();
         $model_merchant = Model('merchant');
 
         if (trim($_GET['merchant_name']) != '') {

admin/templates/default/css/recharge.css

@@ -61,7 +61,7 @@
 .provider_amount_control #tableHread th,
 .provider_amount_control #tableHread td{ background-color: #fff;}
 .provider_amount_control #tableHread  { position: fixed;top:138px;left:20px;background-color: #fff;z-index:999;width: 96.5%;}
-.provider_amount_control .batch-td { text-align: center;width: 150px;min-width:150px;padding-right: 10px;}
+.provider_amount_control .batch-td { text-align: center;width: 160px;min-width:160px;padding-right: 10px;}
 .provider_amount_control .batch-td .listNum { width: 51px;display:inline-block;}
 .provider_amount_control .batch-td .priority { width: 45px;display:inline-block;}
 /* 提示边框 */

admin/templates/default/merchant.refill.evidence_list.php

@@ -68,6 +68,7 @@
                 <th class="align-center">申请日期</th>
                 <th class="align-center">审核日期</th>
                 <th class="align-center">审核管理员</th>
+                <th class="align-center">备注信息</th>
                 <th class="align-center"><?php echo $lang['operation']; ?></th>
             </tr>
             </thead>
@@ -115,6 +116,7 @@
                         <td class="nowarp align-center"><?php echo $v['add_time'] ? date('Y-m-d H:i', $v['add_time']) : $lang['no_limit']; ?></td>
                         <td class="nowarp align-center"><?php echo $v['check_time'] ? date('Y-m-d H:i', $v['check_time']) : $lang['no_limit']; ?></td>
                         <td class="nowarp align-center"><?php echo $v['admin_name']?></td>
+                        <td class="nowarp align-center"><?php echo $v['bz']?></td>
                         <td class="align-center w200">
                             <?php if($v['voucher_name'] != '/') {?>
                             <a target="_blank"

admin/templates/default/provider.amount.control.php

@@ -1,4 +1,4 @@
-<link href="<?php echo ADMIN_TEMPLATES_URL;?>/css/recharge.css?2" rel="stylesheet" type="text/css" id="cssfile2" />
+<link href="<?php echo ADMIN_TEMPLATES_URL;?>/css/recharge.css?3" rel="stylesheet" type="text/css" id="cssfile2" />
 <?php defined('InShopNC') or exit('Access Invalid!'); ?>
 <div class="page provider_amount_control">
     <div class="fixed-bar">

admin/templates/default/provider.successful.php

@@ -77,9 +77,15 @@
         </table>
     </form>
     <div>
+<<<<<<< HEAD
     <!-- style="position: absolute;min-width:1650px;min-height:900px;" -->
         <iframe
             src="" noresize="noresize" frameborder="0" id="mainframe"></iframe>
+=======
+        <iframe
+            src="" width="100%" height="100%"
+            scrolling="no" id="Iframe" frameborder="0"></iframe>
+>>>>>>> 863592fcd6e1ae3de37cc58581e025a7808cad18
     </div>
 </div>
 <script type="text/javascript" src="<?php echo RESOURCE_SITE_URL; ?>/laydate/laydate.js"></script>
@@ -91,18 +97,10 @@
       href="<?php echo RESOURCE_SITE_URL; ?>/js/jquery-ui/themes/ui-lightness/jquery.ui.css"/>
 <script type="text/javascript">
     $(function () {
-        $("#mainframe").load(function(){ 
-            console.log(1);
-            var ifm= document.getElementById("mainframe");
-            if (document.frames) {
-                var subWeb = document.frames["mainframe"].document
-            } else {
-                var subWeb = ifm.contentDocument
-            }
-            if(ifm != null && subWeb != null) {
-                alert(subWeb.body.scrollHeight);
-            }
-        })
+        $("#Iframe").load(function(){
+            $(this).css("min-height", '900px')
+            $(this).css("min-width", '1650px')
+        });
         $('#timeSelect').change(function () {
             let val = $(this).val()
             // console.log('val', val);
@@ -174,7 +172,7 @@
             if (!amount) {
                 src = src.replace("&amount=", "")
             }
-            $('iframe').attr('src',src)
+            // $('iframe').attr('src',src)
             // console.log('src',src);
             $.get(src, function (data){
                 if (!data) {

data/config/win/base.ini.php

@@ -11,7 +11,7 @@ define('USE_BONUS_RATE',false);
 define('SERVER_TYPE','panda');
 define('CROSS_DOAMIN',true);
 define('COOKIE_DOMAIN','192.168.1.195');
-define('COMPANY_NAME', 'LZKJ_COMPANY');
+define('COMPANY_NAME', 'XYZ_COMPANY');
 define('NET_IP','125.33.203.108');
 
 $SRV_HOST = 'http://192.168.1.195';

data/config/xyz/refill.ini.php

@@ -443,6 +443,82 @@ $yunling_phone = ['name' => 'yunling', 'store_id' => 37, 'qualitys' => '1',
     ],
     'official_sn' => true, 'refill_type' => 'api'];
 
+$zhongst_phone = ['name' => 'zhongst', 'store_id' => 39, 'qualitys' => '4',
+    'amount' => [
+        10 => [['goods_id' => 6464, 'price' => 9.35, 'quality' => 4, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        20 => [['goods_id' => 6465, 'price' => 18.6, 'quality' => 4, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        30 => [['goods_id' => 6466, 'price' => 27.9, 'quality' => 4, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        50 => [['goods_id' => 6467, 'price' => 46.5, 'quality' => 4, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        100 => [['goods_id' => 6468, 'price' => 93, 'quality' => 4, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        200 => [['goods_id' => 6469, 'price' => 186, 'quality' => 4, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        300 => [['goods_id' => 6470, 'price' => 279, 'quality' => 4, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        500 => [['goods_id' => 6471, 'price' => 465, 'quality' => 4, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']]
+    ],
+    'official_sn' => true, 'refill_type' => 'api'];
+
+$luqian_phone = ['name' => 'luqian', 'store_id' => 40, 'qualitys' => '1',
+    'amount' => [
+        10 => [['goods_id' => 6472, 'price' => 9.4, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        20 => [['goods_id' => 6473, 'price' => 18.8, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        30 => [['goods_id' => 6474, 'price' => 28.2, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        50 => [['goods_id' => 6475, 'price' => 47, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        100 => [['goods_id' => 6476, 'price' => 94, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        200 => [['goods_id' => 6477, 'price' => 188, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        300 => [['goods_id' => 6478, 'price' => 282, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        500 => [['goods_id' => 6479, 'price' => 470, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']]
+    ],
+    'official_sn' => true, 'refill_type' => 'api'];
+
+$afandfs_phone = ['name' => 'afandfs', 'store_id' => 41, 'qualitys' => '1',
+    'amount' => [
+        10 => [
+            ['goods_id' => 6480, 'price' => 9.48, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6480, 'price' => 9.5, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
+        ],
+        20 => [
+            ['goods_id' => 6481, 'price' => 18.96, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6481, 'price' => 19, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
+        ],
+        30 => [
+            ['goods_id' => 6482, 'price' => 28.44, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6482, 'price' => 28.5, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
+        ],
+        50 => [
+            ['goods_id' => 6483, 'price' => 47.4, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6483, 'price' => 47.5, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
+        ],
+        100 => [
+            ['goods_id' => 6484, 'price' => 94.8, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6484, 'price' => 95, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
+        ],
+        200 => [
+            ['goods_id' => 6485, 'price' => 189.6, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6485, 'price' => 190, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
+        ],
+        300 => [
+            ['goods_id' => 6486, 'price' => 284.4, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6486, 'price' => 285, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
+        ],
+        500 => [
+            ['goods_id' => 6487, 'price' => 474, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6487, 'price' => 475, 'quality' => 1, 'card_type' => 'chinamobile,chinatelecom']
+        ]
+    ],
+    'official_sn' => true, 'refill_type' => 'api'];
+
+$yunlingfs_phone = ['name' => 'yunlingfs', 'store_id' => 42, 'qualitys' => '1',
+    'amount' => [
+        10 => [['goods_id' => 6488, 'price' => 9.56, 'quality' => 1, 'card_type' => 'chinamobile']],
+        20 => [['goods_id' => 6489, 'price' => 19.12, 'quality' => 1, 'card_type' => 'chinamobile']],
+        30 => [['goods_id' => 6490, 'price' => 28.68, 'quality' => 1, 'card_type' => 'chinamobile']],
+        50 => [['goods_id' => 6491, 'price' => 47.8, 'quality' => 1, 'card_type' => 'chinamobile']],
+        100 => [['goods_id' => 6492, 'price' => 95.6, 'quality' => 1, 'card_type' => 'chinamobile']],
+        200 => [['goods_id' => 6493, 'price' => 191.2, 'quality' => 1, 'card_type' => 'chinamobile']],
+        300 => [['goods_id' => 6494, 'price' => 286.8, 'quality' => 1, 'card_type' => 'chinamobile']],
+        500 => [['goods_id' => 6495, 'price' => 478, 'quality' => 1, 'card_type' => 'chinamobile']]
+    ],
+    'official_sn' => true, 'refill_type' => 'api'];
+
 $phone_providers = [
 //    ['name' => 'beixt', 'cfg' => $beixt_phone],
 //    ['name' => 'bxtwt', 'cfg' => $bxtwt_phone],
@@ -463,5 +539,9 @@ $phone_providers = [
     ['name' => 'xunyin', 'cfg' => $xunyin_phone],
     ['name' => 'wantong', 'cfg' => $wantong_phone],
     ['name' => 'yunling', 'cfg' => $yunling_phone],
+    ['name' => 'zhongst', 'cfg' => $zhongst_phone],
+    ['name' => 'luqian', 'cfg' => $luqian_phone],
+    ['name' => 'afandfs', 'cfg' => $afandfs_phone],
+    ['name' => 'yunlingfs', 'cfg' => $yunlingfs_phone],
 ];
 $config['phone_providers'] = $phone_providers;

plot/DataCenter.py

@@ -188,6 +188,7 @@ class DataCenter(object):
             ax.set_title('success ratio')
             ax.set(xlabel='time', ylabel='ratio')
             fig.autofmt_xdate()
+            fig.subplots_adjust(left=0.05, right=0.999, top=0.95, bottom=0.1)
 
             buf = BytesIO()
             fig.savefig(buf, format="png")