xyz lz config and order search

admin/config/config.ini.php

@@ -4,9 +4,14 @@ defined('InShopNC') or exit('Access Invalid!');
 $config['sys_log'] = true;
 
 $config['receive_bank'] = [
-    '椰子招行',
-    '椰子建行',
-    '国研建行'
+    'XYZ_COMPANY' => [
+        '椰子招行',
+        '椰子建行',
+        '国研建行'
+    ],
+    'LZKJ_COMPANY' => [
+        '琳珠收款'
+    ]
 ];
 
 return $config;

admin/control/merchant.php

@@ -526,7 +526,7 @@ class merchantControl extends SystemControl
                 Tpl::output('available_predeposit', $evidence_info['available_predeposit']);
             }
             global $config;
-            Tpl::output('receive_bank', $config['receive_bank']);
+            Tpl::output('receive_bank', $config['receive_bank'][COMPANY_NAME]);
             Tpl::showpage('recharge.add');
         }
     }
@@ -621,7 +621,7 @@ class merchantControl extends SystemControl
             }
             Tpl::output('merchant', $merchant);
             global $config;
-            Tpl::output('receive_bank', $config['receive_bank']);
+            Tpl::output('receive_bank', $config['receive_bank'][COMPANY_NAME]);
             $page = "recharge.manual.{$type}";
             Tpl::showpage($page);
         }

admin/control/order_search.php

@@ -19,6 +19,13 @@ class order_searchControl extends SystemControl
             $condition['vr_order.order_state'] = $_GET['order_state'];
         }
 
+        if (!empty($_GET['mchid'])) {
+            $condition['refill_order.mchid'] = $_GET['mchid'];
+        }
+        if (!empty($_GET['store_id'])) {
+            $condition['vr_order.store_id'] = $_GET['store_id'];
+        }
+
         //批量查询，二者都有，以卡号为主
         if(!empty($_GET['card_nos'])) {
             $card_nos = trim($_GET['card_nos'], ',');
@@ -63,6 +70,10 @@ class order_searchControl extends SystemControl
                 $order_list[$order_id]['quality_text'] = $this->quality_format($order_info['quality'],$order_info['card_type']);
             }
         }
+        $merchant_list = $this->merchants();
+        $provider_list = $this->providers();
+        Tpl::output('provider_list', $provider_list);
+        Tpl::output('merchant_list', $merchant_list);
         Tpl::output('order_list', $order_list);
         Tpl::output('show_page', $model_refill_order->showpage());
         Tpl::showpage('refill.order.search');

admin/control/refill_evidence.php

@@ -95,7 +95,7 @@ class refill_evidenceControl extends SystemControl
             exit;
         }
         global $config;
-        $receive_bank_text = $config['receive_bank'];
+        $receive_bank_text = $config['receive_bank'][COMPANY_NAME];
         $merchant_list = $this->merchants();
         Tpl::output('merchant_list', $merchant_list);
         Tpl::output('stats', $stats);

admin/templates/default/refill.order.search.php

@@ -25,8 +25,94 @@
         font-size:12px !important;
     }
     .query_ors {
-        width: 140px;
+        width: 125px;
     }
+ 
+    
+    th label { display: inline-block;width: 60px; }
+    .lineLi {
+        min-width: 150px;
+        font-size: 12px;
+        color:#000;
+    }
+    #prompt ul .noLineLi {
+        background:none;
+    }
+    #prompt div {
+        display:inline-block;
+        background:none
+    }
+    #prompt ul .lineLi {
+        color:#000;
+    }
+    #selest_nc {
+        width:220px
+    }
+    tbody {
+        font-size: 12px;
+    }
+    .layui-form-select .layui-input {
+        padding: 13px 5px;
+    }
+    .layui-form-selected dl {
+    display: flex!important;
+    flex-wrap: wrap!important;
+    }
+    .layui-form-select dl {
+      
+        top: 29px !important;
+        min-width: 883%!important;
+        max-height: 280px!important;
+        padding: 14px 0!important;
+    }
+    .layui-form-select {
+        width: 45%;
+    }
+    .layui-select-title {
+        width: 104%;
+    }
+    .layui-form-select .layui-input {
+    
+        padding-left: 11px;
+    }
+    .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; 
+    }
+    .xm-tips{
+    color: #333!important;
+    font-size: 12px;
+    }
+    .layui-form-select dl dd.layui-this{
+        display: none;
+    }
+    .layui-form-select dl dd {
+    cursor: pointer;
+    width: 130px;
+    
+
+    }
+
+    .tb-type1 td select {
+    width: 201px;
+}
+.tb-type1 td input[type="text"], .tb-type1 td select {
+    margin-right: 4px;
+    margin-left: 0;
+}
+.layui-form-select .layui-edge {
+    right: 6px!important;
+}
 </style>
 
 <?php defined('InShopNC') or exit('Access Invalid!'); ?>
@@ -46,24 +132,13 @@
         <table class="tb-type1 noborder search">
             <tr>
                 <th><label for="query_start_time">下单时间</label></th>
-                <td>
+                <td style="width: 327px">
                     <input class="txt date" type="text" value="<?php echo $_GET['query_start_time']; ?>"
                            id="startTime" name="query_start_time" autocomplete="off" style="width:120px" />
                     <label for="query_start_time">~</label>
                     <input class="txt date" type="text" value="<?php echo $_GET['query_end_time']; ?>"
                            id="endTime" name="query_end_time" autocomplete="off" style="width:120px" />
                 </td>
-                <th><label class="query_ors">充值卡号（多行查询）</label></th>
-                <td><textarea name="card_nos" id="card_nos" cols="30" rows="10"><?php echo $_GET['card_nos'];?></textarea></td>
-                <th><label class="query_ors">商家单号（多行查询）</label></th>
-                <td><textarea name="mch_orders" id="mch_orders" cols="30" rows="10"><?php echo $_GET['mch_orders'];?></textarea></td>
-                <td>
-                    <a href="javascript:void(0);" id="ncsubmit" class="btn-search "
-                       title="<?php echo $lang['nc_query']; ?>">&nbsp;
-                    </a>
-                </td>
-            </tr>
-            <tr>
                 <th><label>订单状态</label></th>
                 <td>
                     <select name="order_state" class="querySelect">
@@ -80,6 +155,42 @@
                                 <?php if ($_GET['order_state'] == '0'){ ?>selected<?php } ?>><?php echo $lang['order_state_cancel']; ?></option>
                     </select>
                 </td>
+                <th><label class="query_ors">供方名称</label></th>
+                <td >
+                    <select name="store_id" class="" >
+                        <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']?>
+                            </option>
+                        <?php }?>
+                    </select>
+                </td>
+
+  
+            </tr>
+            <tr>
+            <th><label class="">客户名称</label></th>
+                <td  class="layui-form td_time" style="width: 110px;">
+                    <select name="mchid" 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']?>"
+                                    <?php if ($_GET['mchid'] == $merchant['mchid']){ ?>selected<?php } ?>><?php echo $merchant['company_name'] == '' ? $merchant['name'] : $merchant['company_name'];?>
+                            </option>
+                        <?php }?>
+                    </select>
+                </td>
+
+                <th><label class="query_ors">充值卡号（多行查询）</label></th>
+                <td><textarea name="card_nos" id="card_nos" cols="30" rows="10"><?php echo $_GET['card_nos'];?></textarea></td>
+                <th><label class="query_ors">商家单号（多行查询）</label></th>
+                <td><textarea name="mch_orders" id="mch_orders" cols="30" rows="10"><?php echo $_GET['mch_orders'];?></textarea></td>
+                <td>
+                    <a href="javascript:void(0);" id="ncsubmit" class="btn-search "
+                       title="<?php echo $lang['nc_query']; ?>">&nbsp;
+                    </a>
+                </td>
             </tr>
             <tr>
                 <td></td>