stanley-king 3 anos atrás
pai
commit
36b739ee26
25 arquivos alterados com 1073 adições e 114 exclusões
  1. 28 5
      admin/control/provider_group.php
  2. 11 1
      admin/templates/default/css/recharge.css
  3. 0 0
      admin/templates/default/layui/css/layui.css
  4. 1 0
      admin/templates/default/layui/css/modules/code.css
  5. 1 0
      admin/templates/default/layui/css/modules/laydate/default/laydate.css
  6. BIN
      admin/templates/default/layui/css/modules/layer/default/icon-ext.png
  7. BIN
      admin/templates/default/layui/css/modules/layer/default/icon.png
  8. 1 0
      admin/templates/default/layui/css/modules/layer/default/layer.css
  9. BIN
      admin/templates/default/layui/css/modules/layer/default/loading-0.gif
  10. BIN
      admin/templates/default/layui/css/modules/layer/default/loading-1.gif
  11. BIN
      admin/templates/default/layui/css/modules/layer/default/loading-2.gif
  12. BIN
      admin/templates/default/layui/font/iconfont.eot
  13. 554 0
      admin/templates/default/layui/font/iconfont.svg
  14. BIN
      admin/templates/default/layui/font/iconfont.ttf
  15. BIN
      admin/templates/default/layui/font/iconfont.woff
  16. BIN
      admin/templates/default/layui/font/iconfont.woff2
  17. 0 0
      admin/templates/default/layui/layui.js
  18. 22 3
      admin/templates/default/merchant.order.stats.php
  19. 76 11
      admin/templates/default/provider.group.php
  20. 30 10
      admin/templates/default/provider.group.set.php
  21. 1 0
      admin/templates/default/provider.index.php
  22. 20 3
      admin/templates/default/provider.order.stats.php
  23. 1 0
      admin/templates/default/refill.order.index.php
  24. 107 80
      admin/templates/default/refill.order.send.index.php
  25. 220 1
      data/config/win/refill.ini.php

+ 28 - 5
admin/control/provider_group.php

@@ -1,6 +1,7 @@
 <?php
 require_once(BASE_CONFIG_PATH . CONFIG_PREFIX . '/refill.ini.php');
 require_once(BASE_HELPER_PATH . '/mtopcard/mtopcard.php');
+require_once(BASE_HELPER_PATH . '/refill/RefillFactory.php');
 
 class provider_groupControl extends SystemControl
 {
@@ -98,6 +99,14 @@ class provider_groupControl extends SystemControl
                 showMessage('编辑失败');
             }
         } else {
+            $group_info = $mod->getGroupInfos(['group_id' => $group_id]);
+            $check = [];
+            foreach ($group_info as $info) {
+                if(!empty($info['info'])) {
+                    $check[] = "{$info['quality']}-{$info['type']}";
+                }
+            }
+            Tpl::output('check', $check);
             Tpl::output('group', $provider_group);
             Tpl::showpage('provider.group');
         }
@@ -153,7 +162,12 @@ class provider_groupControl extends SystemControl
             $inserts['group_id'] = $group_id;
             $inserts['type'] = $type;
             $inserts['quality'] = $quality;
-            $inserts['info'] = implode(',', $info);
+            if(!empty($info)) {
+                $inserts['info'] = implode(',', $info);
+            }else{
+                $inserts['info'] = '';
+            }
+
             $inserts['is_only'] = $is_only;
             try {
                 $mod = Model('provider_group');
@@ -211,12 +225,21 @@ class provider_groupControl extends SystemControl
             $condition['type']  = $type;
             $group_info = $mod->getGroupInfo($condition);
 
-            $infos = explode(',', $group_info['info']);
             $sel_data = [];
-            foreach($infos as $info) {
-                $info = explode('-', $info);
-                $sel_data[] = "{$info[0]}-{$info[1]}-{$info[2]}-{$info[3]}-{$info[4]}";
+            if(!empty($group_info)) {
+                $infos = explode(',', $group_info['info']);
+                foreach($infos as $info) {
+                    $info = explode('-', $info);
+                    $sel_data[] = "{$info[0]}-{$info[1]}-{$info[2]}-{$info[3]}-{$info[4]}";
+                }
             }
+
+            $ProviderManager = new \refill\ProviderManager();
+            $ProviderManager->load();
+            $QPTA = $ProviderManager->getQPTA();
+            $QPTA = $QPTA[$quality];
+
+            Tpl::output('QPTA', $QPTA);
             Tpl::output('is_only', $group_info['is_only']);
             Tpl::output('sel_data', $sel_data);
             Tpl::output('providers', $results);

+ 11 - 1
admin/templates/default/css/recharge.css

@@ -97,7 +97,7 @@
 
 /* 通道组分配 */
 .provider_group .group {margin-right: 10px; }
-.provider_group .group p { height: 35px;line-height: 35px;text-align: center;font-size: 14px; background-color: #e7f7fd;margin-bottom: 0px;border: 1px solid#daf3fd;}
+.provider_group .group p { height: 35px;line-height: 35px;text-align: left;padding-left: 10px; background-color: #e7f7fd;margin-bottom: 0px;border: 1px solid#daf3fd;}
 .provider_group .group p:hover { cursor: pointer; }
 
 /* 表单 */
@@ -116,4 +116,14 @@ input[type="number"] {
 }
 input[type="checkbox"] {
   vertical-align: middle;
+}
+
+/* 对账管理-上游 下游 */
+.page .fixed-bar .item-title h3 {
+  margin-top:18px !important;
+  margin-bottom:10px !important;
+  font-weight:700 !important;
+}
+.tab-base li span {
+  font-size:12px !important;
 }

admin/templates/default/css/layui.css → admin/templates/default/layui/css/layui.css


Diferenças do arquivo suprimidas por serem muito extensas
+ 1 - 0
admin/templates/default/layui/css/modules/code.css


Diferenças do arquivo suprimidas por serem muito extensas
+ 1 - 0
admin/templates/default/layui/css/modules/laydate/default/laydate.css


BIN
admin/templates/default/layui/css/modules/layer/default/icon-ext.png


BIN
admin/templates/default/layui/css/modules/layer/default/icon.png


Diferenças do arquivo suprimidas por serem muito extensas
+ 1 - 0
admin/templates/default/layui/css/modules/layer/default/layer.css


BIN
admin/templates/default/layui/css/modules/layer/default/loading-0.gif


BIN
admin/templates/default/layui/css/modules/layer/default/loading-1.gif


BIN
admin/templates/default/layui/css/modules/layer/default/loading-2.gif


BIN
admin/templates/default/layui/font/iconfont.eot


Diferenças do arquivo suprimidas por serem muito extensas
+ 554 - 0
admin/templates/default/layui/font/iconfont.svg


BIN
admin/templates/default/layui/font/iconfont.ttf


BIN
admin/templates/default/layui/font/iconfont.woff


BIN
admin/templates/default/layui/font/iconfont.woff2


admin/templates/default/js/layui.js → admin/templates/default/layui/layui.js


+ 22 - 3
admin/templates/default/merchant.order.stats.php

@@ -1,5 +1,21 @@
 <?php defined('InShopNC') or exit('Access Invalid!'); ?>
-
+<style>
+    .page .fixed-bar .item-title h3 {
+        margin-top:18px !important;
+        margin-bottom:10px !important;
+        font-weight:700 !important;
+    }
+    .tab-base li span {
+        font-size:12px !important;
+    }
+    .layui-form-select .layui-input {
+        height:26px;
+    }
+    input::placeholder{ 
+        color:#333; 
+    }
+    
+</style>
 <div class="page">
     <div class="fixed-bar">
         <div class="item-title">
@@ -14,7 +30,7 @@
         </div>
     </div>
     <div class="fixed-empty"></div>
-    <form method="get" name="formSearch" id="formSearch">
+    <form method="get" name="formSearch" id="formSearch" class="layui-form">
         <input type="hidden" value="OrderStats" name="act">
         <input type="hidden" value="index" name="op">
         <input type="hidden" value="merchant" name="type">
@@ -31,7 +47,7 @@
                 </td>
                 <th><label>商户名称</label></th>
                 <td>
-                    <select name="cid" class="querySelect">
+                    <select name="cid" class="querySelect" lay-verify="" lay-search>
                         <option value=""><?php echo $lang['nc_please_choose']; ?></option>
                         <?php foreach($output['merchant_list'] as $merchant){?>
                             <option value="<?php echo $merchant['mchid']?>"
@@ -153,6 +169,9 @@
 </div>
 <script type="text/javascript" src="<?php echo RESOURCE_SITE_URL; ?>/js/jquery.edit.js" charset="utf-8"></script>
 <script type="text/javascript" src="<?php echo RESOURCE_SITE_URL; ?>/laydate/laydate.js"></script>
+<script type="text/javascript" src="<?php echo ADMIN_TEMPLATES_URL;?>/layui/layui.js"></script>
+<link rel="stylesheet" type="text/css"
+      href="<?php echo ADMIN_TEMPLATES_URL; ?>/layui/css/layui.css"/>
 <script>
     $(function () {
         $('#ncsubmit').click(function () {

+ 76 - 11
admin/templates/default/provider.group.php

@@ -1,4 +1,4 @@
-<link href="<?php echo ADMIN_TEMPLATES_URL;?>/css/recharge.css?<?php echo rand(1,10);?>" rel="stylesheet" type="text/css" id="cssfile2" />
+<link href="<?php echo ADMIN_TEMPLATES_URL;?>/css/recharge.css" rel="stylesheet" type="text/css" id="cssfile2" />
 <?php defined('InShopNC') or exit('Access Invalid!'); ?>
 
 <div class="page provider_group">
@@ -31,16 +31,79 @@
             </tr>
             <tr class="noborder" style="display: block;">
                 <td class="inblock w100pre" style="display: flex;height: auto;">
-                    <div style="width:165px" class="group inblock">
-                        <p data-quality="1" data-type="2">普通话费通道</p>
-                        <p data-quality="2" data-type="2">快充话费通道</p>
-                        <p data-quality="3" data-type="2">卡密话费通道</p>
-                        <p data-quality="4" data-type="2">三方话费通道</p>
-                        <p data-quality="5" data-type="2">慢充二十四小时话费通道</p>
-                        <p data-quality="6" data-type="2">慢充六小时话费通道</p>
-                        <p data-quality="7" data-type="2">慢充两小时话费通道</p>
-                        <p data-quality="1" data-type="1">普通油卡通道</p>
-                        <p data-quality="2" data-type="1">慢充油卡通道</p>
+                    <div style="width:175px" class="group inblock">
+                        <p data-quality="1" data-type="2">
+                            <?php if(in_array('1-2',$output['check'])){?>
+                                <i class="layui-icon layui-icon-rate-solid"></i>
+                            <?php }else{?>
+                                <i class="layui-icon layui-icon-rate"></i>
+                            <?php }?>
+                            普通话费通道
+                        </p>
+                        <p data-quality="2" data-type="2">
+                        <?php if(in_array('2-2',$output['check'])){?>
+                                <i class="layui-icon layui-icon-rate-solid"></i>
+                            <?php }else{?>
+                                <i class="layui-icon layui-icon-rate"></i>
+                            <?php }?> 
+                            快充话费通道
+                        </p>
+                        <p data-quality="3" data-type="2">
+                        <?php if(in_array('3-2',$output['check'])){?>
+                                <i class="layui-icon layui-icon-rate-solid"></i>
+                            <?php }else{?>
+                                <i class="layui-icon layui-icon-rate"></i>
+                            <?php }?>
+                            卡密话费通道
+                        </p>
+                        <p data-quality="4" data-type="2">
+                        <?php if(in_array('4-2',$output['check'])){?>
+                                <i class="layui-icon layui-icon-rate-solid"></i>
+                            <?php }else{?>
+                                <i class="layui-icon layui-icon-rate"></i>
+                            <?php }?>
+                            三方话费通道
+                        </p>
+                        <p data-quality="5" data-type="2">
+                        <?php if(in_array('5-2',$output['check'])){?>
+                                <i class="layui-icon layui-icon-rate-solid"></i>
+                            <?php }else{?>
+                                <i class="layui-icon layui-icon-rate"></i>
+                            <?php }?>
+                            慢充二十四小时话费通道
+                        </p>
+                        <p data-quality="6" data-type="2">
+                        <?php if(in_array('6-2',$output['check'])){?>
+                                <i class="layui-icon layui-icon-rate-solid"></i>
+                            <?php }else{?>
+                                <i class="layui-icon layui-icon-rate"></i>
+                            <?php }?>
+                            慢充六小时话费通道
+                        </p>
+                        <p data-quality="7" data-type="2">
+                        <?php if(in_array('7-2',$output['check'])){?>
+                                <i class="layui-icon layui-icon-rate-solid"></i>
+                            <?php }else{?>
+                                <i class="layui-icon layui-icon-rate"></i>
+                            <?php }?>
+                            慢充两小时话费通道
+                        </p>
+                        <p data-quality="1" data-type="1">
+                        <?php if(in_array('1-1',$output['check'])){?>
+                                <i class="layui-icon layui-icon-rate-solid"></i>
+                            <?php }else{?>
+                                <i class="layui-icon layui-icon-rate"></i>
+                            <?php }?>
+                            普通油卡通道
+                        </p>
+                        <p data-quality="2" data-type="1">
+                        <?php if(in_array('2-1',$output['check'])){?>
+                                <i class="layui-icon layui-icon-rate-solid"></i>
+                            <?php }else{?>
+                                <i class="layui-icon layui-icon-rate"></i>
+                            <?php }?>
+                            慢充油卡通道
+                        </p>
                     </div>
                     <div class="inblock" style="flex:1">
                         <table class="tb-type2">
@@ -76,6 +139,8 @@
 <script type="text/javascript" src="<?php echo RESOURCE_SITE_URL;?>/refill/layer.js"></script>
 <link href="<?php echo RESOURCE_SITE_URL; ?>/js/jquery.Jcrop/jquery.Jcrop.min.css" rel="stylesheet" type="text/css"
       id="cssfile2"/>
+<script type="text/javascript" src="<?php echo ADMIN_TEMPLATES_URL;?>/layui/layui.js"></script>
+<link rel="stylesheet" type="text/css" href="<?php echo ADMIN_TEMPLATES_URL; ?>/layui/css/layui.css"/>
 <script type="text/javascript">
     $(function () {
         $('.group p').click(function () {

+ 30 - 10
admin/templates/default/provider.group.set.php

@@ -36,13 +36,18 @@
             <tbody style="display: block;padding-top: 47px;">
                 <?php if(!empty($output['providers'])){?>
                     <?php foreach ($output['providers'] as $provider){?>
-                        <tr class="trFlex">
+                    <tr class="trFlex">
                             <td class="w180"><?php echo $provider['name'];?></td>
                             <td class="w50 align-center">
                                 <input type="checkbox" class="w50 checkAll">
                             </td>
                             <?php foreach ($output['amounts'] as $amount){?>
-                            <td class="w50 align-center">
+
+                            <?php if(is_array($output['QPTA']["{$provider['provider_name']}-{$provider['card_type']}-{$amount}"]) && array_key_exists("{$provider['provider_name']}-{$provider['card_type']}-{$amount}", $output['QPTA'])){?>
+                                <td class="w50 align-center td_readonly" data-readonly = '0'>
+                            <?php }else{?>
+                                <td class="w50 align-center td_readonly" data-readonly = '1'>
+                            <?php }?>
                                 <input type="checkbox" class="w50 input" name="info[]" style="vertical-align: middle;"
                                        value="<?php echo "{$_GET['quality']}-{$provider['provider_name']}-{$provider['card_type']}-{$amount}-{$provider['provider_id']}";?>"
                                        <?php if(in_array("{$_GET['quality']}-{$provider['provider_name']}-{$provider['card_type']}-{$amount}-{$provider['provider_id']}", $output['sel_data'])){ echo 'checked';}?>
@@ -91,21 +96,36 @@
                 }
             })
         })
+        //全选td
+        $('.td_readonly').each(function () {
+            let isReadonly = $(this).attr('data-readonly')
+            if (isReadonly == 1) {
+                $(this).children().attr('disabled', true)
+            }
+        })
+        
+
         // 全选
         $('.checkAll').click(function () {
             let hang = $(this).parent().parent().prevAll().length + 1
             if ($(this).is(':checked')) {
-                $('.input').each(function () {
-                    let inputH = $(this).parent().parent().prevAll().length + 1
-                    if (hang == inputH) {
-                        $(this).attr("checked",true)
+                $('.td_readonly').each(function () {
+                    let isReadonly = $(this).attr('data-readonly')
+                    if (isReadonly == 0) {
+                        let inputH = $(this).parent().prevAll().length + 1
+                        if (hang == inputH) {
+                            $(this).children().attr("checked",true)
+                        }
                     }
                 })
             } else {
-                $('.input').each(function () {
-                    let inputH = $(this).parent().parent().prevAll().length + 1
-                    if (hang == inputH) {
-                        $(this).attr("checked",false)
+                $('.td_readonly').each(function () {
+                    let isReadonly = $(this).attr('data-readonly')
+                    if (isReadonly == 0) {
+                        let inputH = $(this).parent().prevAll().length + 1
+                        if (hang == inputH) {
+                            $(this).children().attr("checked",false)
+                        }
                     }
                 })
             }

+ 1 - 0
admin/templates/default/provider.index.php

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

+ 20 - 3
admin/templates/default/provider.order.stats.php

@@ -1,5 +1,20 @@
 <?php defined('InShopNC') or exit('Access Invalid!'); ?>
-
+<style>
+    .page .fixed-bar .item-title h3 {
+        margin-top:18px !important;
+        margin-bottom:10px !important;
+        font-weight:700 !important;
+    }
+    .tab-base li span {
+        font-size:12px !important;
+    }
+    .layui-form-select .layui-input {
+        height:26px;
+    }
+    input::placeholder{ 
+        color:#333; 
+    }
+</style>
 <div class="page">
     <div class="fixed-bar">
         <div class="item-title">
@@ -14,7 +29,7 @@
         </div>
     </div>
     <div class="fixed-empty"></div>
-    <form method="get" name="formSearch" id="formSearch">
+    <form method="get" name="formSearch" id="formSearch" class="layui-form">
         <input type="hidden" value="OrderStats" name="act">
         <input type="hidden" value="index" name="op">
         <input type="hidden" value="provider" name="type">
@@ -31,7 +46,7 @@
                 </td>
                 <th><label>通道名称</label></th>
                 <td>
-                    <select name="cid" class="querySelect">
+                    <select name="cid" class="querySelect" lay-verify="" lay-search>
                         <option value=""><?php echo $lang['nc_please_choose']; ?></option>
                         <?php foreach($output['provider_list'] as $provider){?>
                             <option value="<?php echo $provider['store_id']?>"
@@ -153,6 +168,8 @@
 </div>
 <script type="text/javascript" src="<?php echo RESOURCE_SITE_URL; ?>/js/jquery.edit.js" charset="utf-8"></script>
 <script type="text/javascript" src="<?php echo RESOURCE_SITE_URL; ?>/laydate/laydate.js"></script>
+<script type="text/javascript" src="<?php echo ADMIN_TEMPLATES_URL;?>/layui/layui.js"></script>
+<link rel="stylesheet" type="text/css" href="<?php echo ADMIN_TEMPLATES_URL; ?>/layui/css/layui.css"/>
 <script>
     $(function () {
         $('#ncsubmit').click(function () {

+ 1 - 0
admin/templates/default/refill.order.index.php

@@ -18,6 +18,7 @@
     #selest_nc {
         width:220px
     }
+    
 </style>
 
 <?php defined('InShopNC') or exit('Access Invalid!'); ?>

+ 107 - 80
admin/templates/default/refill.order.send.index.php

@@ -1,5 +1,9 @@
 <style>
-    th label { display: inline-block;width: 60px; }
+    th label {
+        display: inline-block;
+        width: 60px;
+    }
+
     .lineLi {
         display: inline-block;
         min-width: 150px;
@@ -13,7 +17,7 @@
         <div class="item-title">
             <h3>订单监控列表</h3>
             <ul class="tab-base">
-                <li><a href="JavaScript:void(0);" class="current" ><span>超时订单监控</span></a></li>
+                <li><a href="JavaScript:void(0);" class="current"><span>超时订单监控</span></a></li>
             </ul>
         </div>
     </div>
@@ -27,24 +31,25 @@
                 <td>
                     <select name="mchid" class="querySelect">
                         <option value=""><?php echo $lang['nc_please_choose']; ?></option>
-                        <?php foreach($output['merchant_list'] as $merchant){?>
-                            <option value="<?php echo $merchant['mchid']?>"
-                                    <?php if ($_GET['mchid'] == $merchant['mchid']){ ?>selected<?php } ?>><?php echo $merchant['company_name'] == '' ? $merchant['name'] : $merchant['company_name'];?>
+                        <?php foreach ($output['merchant_list'] as $merchant) { ?>
+                            <option value="<?php echo $merchant['mchid'] ?>"
+                                    <?php if ($_GET['mchid'] == $merchant['mchid']){ ?>selected<?php } ?>><?php echo $merchant['company_name'] == '' ? $merchant['name'] : $merchant['company_name']; ?>
                             </option>
-                        <?php }?>
+                        <?php } ?>
                     </select>
                 </td>
                 <th><label>供方名称</label></th>
                 <td>
                     <select name="store_id" class="querySelect">
                         <option value=""><?php echo $lang['nc_please_choose']; ?></option>
-                        <?php foreach($output['provider_list'] as $provider){?>
-                            <option value="<?php echo $provider['store_id']?>"
-                                    <?php if ($_GET['store_id'] == $provider['store_id']){ ?>selected<?php } ?> data-color="<?php echo $provider['opened']?>" class="textColor">
-                                <?php echo $provider['store_name']?>
+                        <?php foreach ($output['provider_list'] as $provider) { ?>
+                            <option value="<?php echo $provider['store_id'] ?>"
+                                    <?php if ($_GET['store_id'] == $provider['store_id']){ ?>selected<?php } ?>
+                                    data-color="<?php echo $provider['opened'] ?>" class="textColor">
+                                <?php echo $provider['store_name'] ?>
 
                             </option>
-                        <?php }?>
+                        <?php } ?>
                     </select>
                 </td>
                 <th><label>充值类型</label></th>
@@ -53,21 +58,29 @@
                     <select name="card_type" class="querySelect">
                         <option value=""><?php echo $lang['nc_please_choose']; ?></option>
                         <option value="1"
-                                <?php if ($_GET['card_type'] == '1'){ ?>selected<?php } ?>>中石油</option>
+                                <?php if ($_GET['card_type'] == '1'){ ?>selected<?php } ?>>中石油
+                        </option>
                         <option value="2"
-                                <?php if ($_GET['card_type'] == '2'){ ?>selected<?php } ?>>中石化</option>
+                                <?php if ($_GET['card_type'] == '2'){ ?>selected<?php } ?>>中石化
+                        </option>
                         <option value="4"
-                                <?php if ($_GET['card_type'] == '4'){ ?>selected<?php } ?>>中国移动</option>
+                                <?php if ($_GET['card_type'] == '4'){ ?>selected<?php } ?>>中国移动
+                        </option>
                         <option value="5"
-                                <?php if ($_GET['card_type'] == '5'){ ?>selected<?php } ?>>中国联通</option>
+                                <?php if ($_GET['card_type'] == '5'){ ?>selected<?php } ?>>中国联通
+                        </option>
                         <option value="6"
-                                <?php if ($_GET['card_type'] == '6'){ ?>selected<?php } ?>>中国电信</option>
+                                <?php if ($_GET['card_type'] == '6'){ ?>selected<?php } ?>>中国电信
+                        </option>
                         <option value="7"
-                                <?php if ($_GET['card_type'] == '7'){ ?>selected<?php } ?>>增值业务</option>
+                                <?php if ($_GET['card_type'] == '7'){ ?>selected<?php } ?>>增值业务
+                        </option>
                         <option value="oil"
-                                <?php if ($_GET['card_type'] == 'oil'){ ?>selected<?php } ?>>油费</option>
+                                <?php if ($_GET['card_type'] == 'oil'){ ?>selected<?php } ?>>油费
+                        </option>
                         <option value="phone"
-                                <?php if ($_GET['card_type'] == 'phone'){ ?>selected<?php } ?>>手机费</option>
+                                <?php if ($_GET['card_type'] == 'phone'){ ?>selected<?php } ?>>手机费
+                        </option>
                     </select>
                 </td>
                 <th><label>通道质量</label></th>
@@ -75,23 +88,47 @@
                     <select name="quality" class="querySelect">
                         <option value=""><?php echo $lang['nc_please_choose']; ?></option>
                         <option value="1"
-                                <?php if ($_GET['quality'] == '1'){ ?>selected<?php } ?>>普充</option>
+                                <?php if ($_GET['quality'] == '1'){ ?>selected<?php } ?>>普充
+                        </option>
                         <option value="2"
-                                <?php if ($_GET['quality'] == '2'){ ?>selected<?php } ?>>快充</option>
+                                <?php if ($_GET['quality'] == '2'){ ?>selected<?php } ?>>快充
+                        </option>
                         <option value="3"
-                                <?php if ($_GET['quality'] == '3'){ ?>selected<?php } ?>>卡密</option>
+                                <?php if ($_GET['quality'] == '3'){ ?>selected<?php } ?>>卡密
+                        </option>
                         <option value="4"
-                                <?php if ($_GET['quality'] == '4'){ ?>selected<?php } ?>>三方</option>
+                                <?php if ($_GET['quality'] == '4'){ ?>selected<?php } ?>>三方
+                        </option>
                         <option value="5"
-                                <?php if ($_GET['quality'] == '5'){ ?>selected<?php } ?>>慢充二十四小时</option>
+                                <?php if ($_GET['quality'] == '5'){ ?>selected<?php } ?>>慢充二十四小时
+                        </option>
                         <option value="6"
-                                <?php if ($_GET['quality'] == '6'){ ?>selected<?php } ?>>慢充六小时</option>
+                                <?php if ($_GET['quality'] == '6'){ ?>selected<?php } ?>>慢充六小时
+                        </option>
                         <option value="7"
-                                <?php if ($_GET['quality'] == '7'){ ?>selected<?php } ?>>慢充两小时</option>
+                                <?php if ($_GET['quality'] == '7'){ ?>selected<?php } ?>>慢充两小时
+                        </option>
+                    </select>
+                </td>
+                <th><label>订单耗时</label></th>
+                <td>
+                    <select name="time" class="querySelect">
+                        <option value=""><?php echo $lang['nc_please_choose']; ?></option>
+                        <option value="1"
+                                <?php if ($_GET['time'] == '1'){ ?>selected<?php } ?>>耗时半小时订单
+                        </option>
+                        <option value="2"
+                                <?php if ($_GET['time'] == '2'){ ?>selected<?php } ?>>耗时一小时订单
+                        </option>
+                        <option value="3"
+                                <?php if ($_GET['time'] == '3'){ ?>selected<?php } ?>>特定耗时5分钟订单
+                        </option>
+                        <option value="4"
+                                <?php if ($_GET['time'] == '4'){ ?>selected<?php } ?>>特定耗时15分钟订单
+                        </option>
                     </select>
                 </td>
                 <td>
-                    <input type="hidden" name="time" value="<?php echo $_GET['time'];?>">
                     <a href="javascript:void(0);" id="ncsubmit" class="btn-search "
                        title="<?php echo $lang['nc_query']; ?>">&nbsp;
                     </a>
@@ -101,7 +138,7 @@
         <table class="tb-type1 noborder search">
             <tr>
                 <td>
-                    <a href="index.php?act=merchant&op=OrderQuery" class="btns" >
+                    <a href="index.php?act=merchant&op=OrderQuery" class="btns">
                         <span><i class="icon-edit"></i>更新待收货订单状态</span>
                     </a>
                     <a href="#" class="btns" onclick="hCopyChannel(event)">
@@ -110,22 +147,6 @@
                     <a href="#" class="btns" onclick="hCopyCardNo(event)">
                         <span><i class="icon-edit"></i>拷贝充值卡号</span>
                     </a>
-                    <a href="index.php?act=OrderSendList&op=index&time=1&card_type=<?php echo $_GET['card_type']?>
-                    &store_id=<?php echo $_GET['store_id']?>&mchid=<?php echo $_GET['mchid'];?>&quality=<?php echo $_GET['quality'];?>" class="btns" >
-                        <span><i class="icon-edit"></i>耗时半小时订单</span>
-                    </a>
-                    <a href="index.php?act=OrderSendList&op=index&time=2&card_type=<?php echo $_GET['card_type']?>
-                    &store_id=<?php echo $_GET['store_id']?>&mchid=<?php echo $_GET['mchid'];?>&quality=<?php echo $_GET['quality'];?>" class="btns" >
-                        <span><i class="icon-edit"></i>耗时一小时订单</span>
-                    </a>
-                    <a href="index.php?act=OrderSendList&op=index&time=3&card_type=<?php echo $_GET['card_type']?>
-                    &store_id=<?php echo $_GET['store_id']?>&mchid=<?php echo $_GET['mchid'];?>&quality=<?php echo $_GET['quality'];?>" class="btns" >
-                        <span><i class="icon-edit"></i>特定耗时5分钟订单</span>
-                    </a>
-                    <a href="index.php?act=OrderSendList&op=index&time=4&card_type=<?php echo $_GET['card_type']?>
-                    &store_id=<?php echo $_GET['store_id']?>&mchid=<?php echo $_GET['mchid'];?>&quality=<?php echo $_GET['quality'];?>" class="btns" >
-                        <span><i class="icon-edit"></i>特定耗时15分钟订单</span>
-                    </a>
                 </td>
             </tr>
         </table>
@@ -133,21 +154,24 @@
     <table class="table tb-type2" id="prompt">
         <tbody>
         <tr class="space odd" id="autoClick">
-            <th colspan="12"><div class="title"><h5>
-                        金额统计</h5><span class="arrow"></span></div></th>
+            <th colspan="12">
+                <div class="title"><h5>
+                        金额统计</h5><span class="arrow"></span></div>
+            </th>
         </tr>
         <tr>
             <td>
                 <ul>
-                    <li class="lineLi" style="color:#000;">总计充值金额:<?php echo $output['stat']['refill_amounts'] ?? 0?></li>
-                    <li class="lineLi" style="color:#000;">总计订单数量:<?php echo $output['stat']['order_count'] ?? 0?></li>
-                    <li class="lineLi" style="color:#000;">超过30分钟订单数量:<?php echo $output['count'][0] ?? 0?></li>
-                    <li class="lineLi" style="color:#000;">超过1小时订单数量:<?php echo $output['count'][1] ?? 0?></li>
-                    <?php if($_GET['time'] == 3) {?>
-                    <li class="lineLi" style="color:#000;">超过5分钟订单数量:<?php echo $output['count'][2] ?? 0?></li>
-                    <?php }elseif($_GET['time'] == 4) {?>
-                    <li class="lineLi" style="color:#000;">超过15分钟订单数量:<?php echo $output['count'][2] ?? 0?></li>
-                    <?php }?>
+                    <li class="lineLi" style="color:#000;">
+                        总计充值金额:<?php echo $output['stat']['refill_amounts'] ?? 0 ?></li>
+                    <li class="lineLi" style="color:#000;">总计订单数量:<?php echo $output['stat']['order_count'] ?? 0 ?></li>
+                    <li class="lineLi" style="color:#000;">超过30分钟订单数量:<?php echo $output['count'][0] ?? 0 ?></li>
+                    <li class="lineLi" style="color:#000;">超过1小时订单数量:<?php echo $output['count'][1] ?? 0 ?></li>
+                    <?php if ($_GET['time'] == 3) { ?>
+                        <li class="lineLi" style="color:#000;">超过5分钟订单数量:<?php echo $output['count'][2] ?? 0 ?></li>
+                    <?php } elseif ($_GET['time'] == 4) { ?>
+                        <li class="lineLi" style="color:#000;">超过15分钟订单数量:<?php echo $output['count'][2] ?? 0 ?></li>
+                    <?php } ?>
                 </ul>
             </td>
         </tr>
@@ -180,7 +204,7 @@
             <?php
             foreach ($output['order_list'] as $key => $order) { ?>
                 <tr class="hover trFlex">
-                    <td class="align-center"><?php echo $key+1;?></td>
+                    <td class="align-center"><?php echo $key + 1; ?></td>
                     <td class="align-left"><?php echo $order['order_sn']; ?></td>
                     <td class="align-center"><?php echo $order['mchid']; ?></td>
                     <td class="align-center"><?php echo $order['mch_name']; ?></td>
@@ -189,18 +213,19 @@
                     <td class="align-center"><?php echo $order['refill_amount']; ?></td>
                     <td class="align-right"><?php echo date('Y-m-d H:i:s', $order['order_time']); ?></td>
                     <td class="align-right">
-                        <?php if(empty($order['notify_time'])) {
-                            if($order['diff_time'] >= 1800 && $order['diff_time'] <= 3600) {
-                        ?>
-                                <span style="color: #fd9d0e"><?php echo $order['diff_time_text']?></span>
-                            <?php }elseif($order['diff_time'] > 3600) {?>
-                                <span style="color: #f30707"><?php echo $order['diff_time_text']?></span>
-                            <?php }else{?>
-                                <?php echo $order['diff_time_text']?>
-                            <?php }?>
-                        <?php }else{?>
-                         <?php echo $order['diff_time_text']?>
-                        <?php }?>
+                        <?php if (empty($order['notify_time'])) {
+                            if ($order['diff_time'] >= 1800 && $order['diff_time'] <= 3600) {
+                                ?>
+                                <span style="color: #fd9d0e"><?php echo $order['diff_time_text'] ?></span>
+                            <?php } elseif ($order['diff_time'] > 3600) { ?>
+                                <span style="color: #f30707"><?php echo $order['diff_time_text'] ?></span>
+                            <?php } else {
+                                ?>
+                                <?php echo $order['diff_time_text'] ?>
+                            <?php } ?>
+                        <?php } else { ?>
+                            <?php echo $order['diff_time_text'] ?>
+                        <?php } ?>
                     </td>
                     <td class="align-center"><?php echo orderState($order); ?></td>
                     <td class="align-left"><?php echo $order['quality_text']; ?></td>
@@ -211,7 +236,7 @@
                     <td class="align-center"><?php echo $order['channel_name']; ?></td>
                     <td class="w144 align-center">
                         <a href="index.php?act=merchant&op=notify_merchant&order_id=<?php echo $order['order_id']; ?>">
-                                回调</a>
+                            回调</a>
                         |
                         <a href="index.php?act=merchant&op=notify_manual_merchant&type=cancel&order_id=<?php echo $order['order_id']; ?>">
                             手动失败</a>
@@ -267,12 +292,12 @@
         let num
         if (Number(isWring) > 0) {
             window.clearTimeout(setTimer)
-            setTimer = setTimeout(function() {
+            setTimer = setTimeout(function () {
                 $("#auto")[0].play();
                 // $("#auto").attr("src", '<?php echo RESOURCE_SITE_URL; ?>/warning.mp3');
             }, 1000);
             window.clearTimeout(num)
-            num = setTimeout(function() {
+            num = setTimeout(function () {
                 window.location.reload();
             }, 60000);
         }
@@ -280,7 +305,7 @@
         $('.trFlex').each(function () {
             $(this).hover(function () {
                 $(this)[0].style.backgroundColor = '#cbe9f3'
-            },function() {
+            }, function () {
                 $(this)[0].style.backgroundColor = '#fff'
             })
         })
@@ -294,31 +319,33 @@
             }
         })
     });
+
     function hCopyChannel(e) {
         let str = ''
         $('#tbody tr').each(function () {
             let res = $(this).find('td').eq(14).text()
             str += res + '\n'
         })
-        let oInput = document.createElement("textarea");
-        oInput.style.border = "0 none";
-        oInput.style.color = "transparent";
-        oInput.value = str;
+        let oInput = document.createElement("textarea");
+        oInput.style.border = "0 none";
+        oInput.style.color = "transparent";
+        oInput.value = str;
         document.body.appendChild(oInput);
         oInput.select(); // 选择对象
         document.execCommand("Copy"); // 执行浏览器复制命令
         oInput.parentNode.removeChild(oInput)
     }
+
     function hCopyCardNo(e) {
         let str = ''
         $('#tbody tr').each(function () {
             let res = $(this).find('td').eq(4).text()
             str += res + '\n'
         })
-        let oInput = document.createElement("textarea");
-        oInput.style.border = "0 none";
-        oInput.style.color = "transparent";
-        oInput.value = str;
+        let oInput = document.createElement("textarea");
+        oInput.style.border = "0 none";
+        oInput.style.color = "transparent";
+        oInput.value = str;
         document.body.appendChild(oInput);
         oInput.select(); // 选择对象
         document.execCommand("Copy"); // 执行浏览器复制命令

+ 220 - 1
data/config/win/refill.ini.php

@@ -56,6 +56,7 @@ $zzx_oil = ['name' => 'zzx', 'store_id' => 13,'qualitys' => '1',
 
 //赵梓暄提供的加油通道
 $lx_oil = ['name' => 'lx', 'store_id' => 14,'qualitys' => '1',
+<<<<<<< HEAD
     'amount' => [
         500 => [['goods_id' => 6322, 'price' => 479, 'quality' => 1, 'card_type' => 'sinopec']],
         1000 => [['goods_id' => 6311, 'price' => 958, 'quality' => 1, 'card_type' => 'sinopec']] //,
@@ -66,6 +67,18 @@ $lx_oil = ['name' => 'lx', 'store_id' => 14,'qualitys' => '1',
 //赛虎
 $saihu_oil = ['name' => 'saihu', 'store_id' => 15,'qualitys' => '1',
     'amount' => [
+=======
+    'amount' => [
+        500 => [['goods_id' => 6322, 'price' => 479, 'quality' => 1, 'card_type' => 'sinopec']],
+        1000 => [['goods_id' => 6311, 'price' => 958, 'quality' => 1, 'card_type' => 'sinopec']] //,
+//        2000 => ['goods_id' => 6322, 'price' => 1916]
+    ],
+    'period' => ['start' => '14:00', 'end' => '19:00'], 'official_sn' => true, 'refill_type' => 'inner_store'];
+
+//赛虎
+$saihu_oil = ['name' => 'saihu', 'store_id' => 15,'qualitys' => '1',
+    'amount' => [
+>>>>>>> 6a1eaa304f4923c2435d844ea6ee67d9d4b38315
         100 => [['goods_id' => 6313, 'price' => 97, 'quality' => 1, 'card_type' => 'sinopec']],
         200 => [['goods_id' => 6314, 'price' => 194, 'quality' => 1, 'card_type' => 'sinopec']],
         500 => [['goods_id' => 6315, 'price' => 485, 'quality' => 1, 'card_type' => 'sinopec']],
@@ -526,6 +539,7 @@ $luqian_phone = ['name' => 'luqian', 'store_id' => 40, 'qualitys' => '1',
         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']]
+<<<<<<< HEAD
     ],
     'official_sn' => true, 'refill_type' => 'api'];
 
@@ -555,6 +569,37 @@ $yunling_phone = ['name' => 'yunling', 'store_id' => 37, 'qualitys' => '1',
     ],
     'official_sn' => true, 'refill_type' => 'api'];
 
+=======
+    ],
+    'official_sn' => true, 'refill_type' => 'api'];
+
+$afandfs_phone = ['name' => 'afandfs', 'store_id' => 41, 'qualitys' => '1',
+    'amount' => [
+        10 => [['goods_id' => 6480, 'price' => 9.45, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        20 => [['goods_id' => 6481, 'price' => 18.9, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        30 => [['goods_id' => 6482, 'price' => 28.35, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        50 => [['goods_id' => 6483, 'price' => 47.25, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        100 => [['goods_id' => 6484, 'price' => 94.5, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        200 => [['goods_id' => 6485, 'price' => 189, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        300 => [['goods_id' => 6486, 'price' => 283.5, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        500 => [['goods_id' => 6487, 'price' => 472.5, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']]
+    ],
+    'official_sn' => true, 'refill_type' => 'api'];
+
+$yunling_phone = ['name' => 'yunling', 'store_id' => 37, 'qualitys' => '1',
+    'amount' => [
+        10 => [['goods_id' => 6456, 'price' => 9.53, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        20 => [['goods_id' => 6457, 'price' => 19.02, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        30 => [['goods_id' => 6458, 'price' => 28.59, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        50 => [['goods_id' => 6459, 'price' => 47.65, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        100 => [['goods_id' => 6460, 'price' => 95.3, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        200 => [['goods_id' => 6461, 'price' => 190.6, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        300 => [['goods_id' => 6462, 'price' => 285.9, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        500 => [['goods_id' => 6463, 'price' => 476.5, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']]
+    ],
+    'official_sn' => true, 'refill_type' => 'api'];
+
+>>>>>>> 6a1eaa304f4923c2435d844ea6ee67d9d4b38315
 $yunlingfs_phone = ['name' => 'yunlingfs', 'store_id' => 42, 'qualitys' => '1',
     'amount' => [
         10 => [['goods_id' => 6488, 'price' => 9.53, 'quality' => 1, 'card_type' => 'chinamobile']],
@@ -615,6 +660,7 @@ $suyuan_phone = ['name' => 'suyuan', 'store_id' => 39, 'qualitys' => '1',
         200 => [['goods_id' => 6469, 'price' => 190.6, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
         300 => [['goods_id' => 6470, 'price' => 285.9, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
         500 => [['goods_id' => 6471, 'price' => 476.5, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']]
+<<<<<<< HEAD
     ],
     'official_sn' => true, 'refill_type' => 'api'];
 
@@ -771,10 +817,106 @@ $afd_phone = ['name' => 'afd', 'store_id' => 54,'qualitys' => '1',
         500 => [
             ['goods_id' => 6570, 'price' => 474, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom'],
             ['goods_id' => 6570, 'price' => 471.5, 'quality' => 1, 'card_type' => 'chinatelecom']
+=======
+    ],
+    'official_sn' => true, 'refill_type' => 'api'];
+
+$xunao_phone = ['name' => 'xunao', 'store_id' => 44, 'qualitys' => '1',
+    'amount' => [
+        10 => [['goods_id' => 6504, 'price' => 9.45, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        20 => [['goods_id' => 6505, 'price' => 18.9, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        30 => [['goods_id' => 6506, 'price' => 28.35, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        50 => [['goods_id' => 6507, 'price' => 47.25, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        100 => [['goods_id' => 6508, 'price' => 94.5, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        200 => [['goods_id' => 6509, 'price' => 189, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        300 => [['goods_id' => 6510, 'price' => 283.5, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        500 => [['goods_id' => 6511, 'price' => 472.5, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']]
+    ],
+    'official_sn' => true, 'refill_type' => 'api'];
+
+$weiyiman_phone = ['name' => 'weiyiman', 'store_id' => 45, 'qualitys' => '5',
+    'amount' => [
+        10 => [['goods_id' => 6512, 'price' => 8.9, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        20 => [['goods_id' => 6513, 'price' => 17.8, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        30 => [['goods_id' => 6514, 'price' => 26.7, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        50 => [['goods_id' => 6515, 'price' => 44.5, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        100 => [['goods_id' => 6516, 'price' => 89, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        200 => [['goods_id' => 6517, 'price' => 178, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        300 => [['goods_id' => 6518, 'price' => 267, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        500 => [['goods_id' => 6519, 'price' => 445, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']]
+    ],
+    'official_sn' => true, 'refill_type' => 'api'];
+
+$yonghe_phone = ['name' => 'yonghe', 'store_id' => 46,'qualitys' => '2',
+    'amount' => [
+        30 => [['goods_id' => 6520, 'price' => 29.955, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6520, 'price' => 29.985, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6520, 'price' => 29.82, 'quality' => 2, 'card_type' => 'chinatelecom']],
+
+        50 => [['goods_id' => 6521, 'price' => 49.925, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6521, 'price' => 49.975, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6521, 'price' => 49.7, 'quality' => 2, 'card_type' => 'chinatelecom']],
+
+        100 => [['goods_id' => 6522, 'price' => 99.85, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6522, 'price' => 99.95, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6522, 'price' => 99.4, 'quality' => 2, 'card_type' => 'chinatelecom']],
+
+        200 => [['goods_id' => 6523, 'price' => 199.7, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6523, 'price' => 199.9, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6523, 'price' => 198.8, 'quality' => 2, 'card_type' => 'chinatelecom']],
+
+        300 => [['goods_id' => 6524, 'price' => 299.55, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6524, 'price' => 299.85, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6524, 'price' => 298.2, 'quality' => 2, 'card_type' => 'chinatelecom']],
+
+        500 => [['goods_id' => 6525, 'price' => 499.25, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6525, 'price' => 499.75, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6525, 'price' => 497, 'quality' => 2, 'card_type' => 'chinatelecom']]
+    ],
+    'official_sn' => true, 'refill_type' => 'api'];
+
+$jumi_phone = ['name' => 'jumikc', 'store_id' => 47, 'qualitys' => '2',
+    'amount' => [
+        10 => [['goods_id' => 6545, 'price' => 9.72, 'quality' => 2, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        20 => [['goods_id' => 6546, 'price' => 19.44, 'quality' => 2, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        30 => [['goods_id' => 6547, 'price' => 29.16, 'quality' => 2, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        50 => [['goods_id' => 6526, 'price' => 48.6, 'quality' => 2, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        100 => [['goods_id' => 6527, 'price' => 97.2, 'quality' => 2, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        200 => [['goods_id' => 6528, 'price' => 194.4, 'quality' => 2, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        300 => [['goods_id' => 6548, 'price' => 291.6, 'quality' => 2, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        500 => [['goods_id' => 6549, 'price' => 486, 'quality' => 2, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']]
+    ],
+    'official_sn' => true, 'refill_type' => 'api'];
+
+$qianqian_phone = ['name' => 'qianqian', 'store_id' => 48, 'qualitys' => '1',
+    'amount' => [
+//        10 => [
+//            ['goods_id' => 6529, 'price' => 9.53, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom'],
+//        ],
+//        20 => [
+//            ['goods_id' => 74, 'price' => 19.06, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom'],
+//        ],
+        30 => [
+            ['goods_id' => 6529, 'price' => 28.59, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6529, 'price' => 28.53, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
+        ],
+        50 => [
+            ['goods_id' => 6530, 'price' => 47.65, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6530, 'price' => 47.55, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
+        ],
+        100 => [
+            ['goods_id' => 6531, 'price' => 95.3, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6531, 'price' => 95.1, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
+        ],
+        200 => [
+            ['goods_id' => 6532, 'price' => 190.6, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6532, 'price' => 190.2, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
+>>>>>>> 6a1eaa304f4923c2435d844ea6ee67d9d4b38315
         ]
     ],
     'refill_type' => 'api'];
 
+<<<<<<< HEAD
 $qianqianman_phone = ['name' => 'qianqianman', 'store_id' => 53, 'qualitys' => '7',
     'amount' => [
         50 => [
@@ -785,10 +927,72 @@ $qianqianman_phone = ['name' => 'qianqianman', 'store_id' => 53, 'qualitys' => '
         ],
         200 => [
             ['goods_id' => 6562, 'price' => 182, 'quality' => 7, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']
-        ]
+=======
+$fengye_phone = ['name' => 'fengye', 'store_id' => 49, 'qualitys' => '1',
+    'amount' => [
+        10 => [['goods_id' => 6533, 'price' => 9.45, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        20 => [['goods_id' => 6534, 'price' => 18.9, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        30 => [['goods_id' => 6535, 'price' => 28.35, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        50 => [['goods_id' => 6536, 'price' => 47.25, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        100 => [['goods_id' => 6537, 'price' => 94.5, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        200 => [['goods_id' => 6538, 'price' => 189, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        300 => [['goods_id' => 6539, 'price' => 283.5, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        500 => [['goods_id' => 6540, 'price' => 472.5, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']]
     ],
     'official_sn' => true, 'refill_type' => 'api'];
 
+$yunsuoyao_phone = ['name' => 'yunsuoyao', 'store_id' => 55, 'qualitys' => '1',
+    'amount' => [
+        10 => [['goods_id' => 6571, 'price' => 9.58, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        20 => [['goods_id' => 6572, 'price' => 19.16, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        30 => [['goods_id' => 6573, 'price' => 28.74, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        50 => [['goods_id' => 6574, 'price' => 47.9, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        100 => [['goods_id' => 6575, 'price' => 95.8, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        200 => [['goods_id' => 6576, 'price' => 191.6, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        300 => [['goods_id' => 6577, 'price' => 287.4, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        500 => [['goods_id' => 6578, 'price' => 479, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']]
+    ],
+    'official_sn' => true, 'refill_type' => 'api'];
+
+$afd_phone = ['name' => 'afd', 'store_id' => 54,'qualitys' => '1',
+    'amount' => [
+        10 => [
+            ['goods_id' => 6563, 'price' => 9.48, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom'],
+            ['goods_id' => 6563, 'price' => 9.43, 'quality' => 1, 'card_type' => 'chinatelecom']
+        ],
+        20 => [
+            ['goods_id' => 6564, 'price' => 18.96, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom'],
+            ['goods_id' => 6564, 'price' => 18.86, 'quality' => 1, 'card_type' => 'chinatelecom']
+        ],
+        30 => [
+            ['goods_id' => 6565, 'price' => 28.44, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom'],
+            ['goods_id' => 6565, 'price' => 28.29, 'quality' => 1, 'card_type' => 'chinatelecom']
+        ],
+        50 => [
+            ['goods_id' => 6566, 'price' => 47.4, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom'],
+            ['goods_id' => 6566, 'price' => 47.15, 'quality' => 1, 'card_type' => 'chinatelecom']
+        ],
+        100 => [
+            ['goods_id' => 6567, 'price' => 94.8, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom'],
+            ['goods_id' => 6567, 'price' => 94.3, 'quality' => 1, 'card_type' => 'chinatelecom']
+        ],
+        200 => [
+            ['goods_id' => 6568, 'price' => 189.6, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom'],
+            ['goods_id' => 6568, 'price' => 188.6, 'quality' => 1, 'card_type' => 'chinatelecom']
+        ],
+        300 => [
+            ['goods_id' => 6569, 'price' => 284.4, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom'],
+            ['goods_id' => 6569, 'price' => 282.9, 'quality' => 1, 'card_type' => 'chinatelecom']
+        ],
+        500 => [
+            ['goods_id' => 6570, 'price' => 474, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom'],
+            ['goods_id' => 6570, 'price' => 471.5, 'quality' => 1, 'card_type' => 'chinatelecom']
+>>>>>>> 6a1eaa304f4923c2435d844ea6ee67d9d4b38315
+        ]
+    ],
+    'refill_type' => 'api'];
+
+<<<<<<< HEAD
 $weiyiwt_phone = ['name' => 'weiyiwt', 'store_id' => 58,'qualitys' => '1',
     'amount' => [
         10 => [
@@ -822,6 +1026,18 @@ $weiyiwt_phone = ['name' => 'weiyiwt', 'store_id' => 58,'qualitys' => '1',
         500 => [
             ['goods_id' => 6602, 'price' => 474, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6602, 'price' => 472.5, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
+=======
+$qianqianman_phone = ['name' => 'qianqianman', 'store_id' => 53, 'qualitys' => '7',
+    'amount' => [
+        50 => [
+            ['goods_id' => 6560, 'price' => 45.5, 'quality' => 7, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']
+        ],
+        100 => [
+            ['goods_id' => 6561, 'price' => 91, 'quality' => 7, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']
+        ],
+        200 => [
+            ['goods_id' => 6562, 'price' => 182, 'quality' => 7, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']
+>>>>>>> 6a1eaa304f4923c2435d844ea6ee67d9d4b38315
         ]
     ],
     'official_sn' => true, 'refill_type' => 'api'];
@@ -860,7 +1076,10 @@ $phone_providers = [
     ['name' => 'yunsuoyao', 'cfg' => $yunsuoyao_phone],
     ['name' => 'afd', 'cfg' => $afd_phone],
     ['name' => 'qianqianman', 'cfg' => $qianqianman_phone],
+<<<<<<< HEAD
     ['name' => 'weiyiwt', 'cfg' => $weiyiwt_phone],
+=======
+>>>>>>> 6a1eaa304f4923c2435d844ea6ee67d9d4b38315
 ];
 $config['phone_providers'] = $phone_providers;