admin update

admin/control/merchant.php

@@ -982,22 +982,26 @@ class merchantControl extends SystemControl
             foreach ($provider_list as $provider) {
                 $providers[$provider['provider_id']] = $provider;
             }
-            $pids = $_POST['pid'];
-            $types = $_POST['types'];
-            $amounts = $_POST['amount'];
+            $strs = $_POST['str'];
             $speeds = $_POST['speed'];
             $sorts = $_POST['sort'];
             $openeds = $_POST['opened'];
             $hass = $_POST['has'];
 
-            foreach ($pids as $key => $pid) {
-                if ($hass[$key] == 0) {
+            foreach ($strs as $key => $str) {
+                $item = explode('-', $str);
+
+                $pid = $item[0];
+                $type = $item[1];
+                $amount = $item[2];
+                $has = $item[3];
+                if ($has == 0) {
                     continue;
                 }
                 $data['pid'] = intval($pid);
                 $data['name'] = $providers[$pid]['name'];
-                $data['type'] = intval($types[$key]);
-                $data['amount'] = intval($amounts[$key]);
+                $data['type'] = intval($type);
+                $data['amount'] = intval($amount);
                 $data['speed'] = intval($speeds[$key]);
                 $data['sort'] = intval($sorts[$key]);
                 $data['opened'] = intval($openeds[$key]);
@@ -1005,6 +1009,7 @@ class merchantControl extends SystemControl
                 $index = "{$data['type']}-{$data['amount']}";
                 $result[$index][] = $data;
             }
+//            var_dump($result);die;
 //            Log::record("provider amount data:".json_encode($result),Log::DEBUG);
             wcache($rkey, ['data' => serialize($result)], 'provider-');
             showMessage('编辑成功', 'index.php?act=provider&op=index');

admin/control/order_search.php

@@ -34,6 +34,10 @@ class order_searchControl extends SystemControl
             $mch_orders = rtrim($_GET['mch_orders'], ',');
             $condition['refill_order.mch_order'] = ['in', $mch_orders];
         }
+        if(!empty($_GET['order_sns'])) {
+            $order_sns = trim($_GET['order_sns'], ',');
+            $condition['refill_order.order_sn'] = ['in', $order_sns];
+        }
 
         if(!empty($condition)) {
             $condition['refill_order.inner_status'] = 0;

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

@@ -171,10 +171,7 @@
                                 <?php echo $amount['text']?>
                             </td>
                             <?php foreach ($output['providers'] as $provider) { ?>
-                                <input type="hidden" name="pid[]" value="<?php echo $provider['provider_id'];?>">
-                                <input type="hidden" name="types[]" value="<?php echo $amount['type'];?>">
-                                <input type="hidden" name="amount[]" value="<?php echo $amount['amount'];?>">
-                                <input type="hidden" name="has[]" value="<?php echo $output['datas'][$provider['provider_id']][$key]['has'];?>">
+                                <input type="hidden" name="str[]" value="<?php echo "{$provider['provider_id']}-{$amount['type']}-{$amount['amount']}-{$output['datas'][$provider['provider_id']][$key]['has']}";?>">
 
                             <td class="batch-td">
                                 <div class="listNum">

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

@@ -280,6 +280,9 @@
                     <a href="#" class="btns" onclick="hCopyOrderSn(event)">
                         <span><i class="icon-edit"></i>拷贝订单号</span>
                     </a>
+                    <a href="#" class="btns" onclick="hCopyMchOrder(event)">
+                        <span><i class="icon-edit"></i>拷贝客户单号</span>
+                    </a>
                 </td>
                 <td></td>
                 <td>
@@ -898,4 +901,20 @@
         document.execCommand("Copy"); // 执行浏览器复制命令
         oInput.parentNode.removeChild(oInput)
     }
+
+    function hCopyMchOrder(e) {
+        let str = ''
+        $('#tbody tr').each(function () {
+            let res = $(this).find('td').eq(12).text()
+            str += res + '\n'
+        })
+        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)
+    }
 </script> 

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

@@ -64,6 +64,7 @@
         min-width: 883%!important;
         max-height: 280px!important;
         padding: 14px 0!important;
+        left: -599px!important;
     }
     .layui-form-select {
         width: 45%;
@@ -109,9 +110,10 @@
 .tb-type1 td input[type="text"], .tb-type1 td select {
     margin-right: 4px;
     margin-left: 0;
+    width: 195px;
 }
 .layui-form-select .layui-edge {
-    right: 6px!important;
+    right: -91px!important;
 }
 </style>
 
@@ -166,11 +168,7 @@
                         <?php }?>
                     </select>
                 </td>
-
-  
-            </tr>
-            <tr>
-            <th><label class="">客户名称</label></th>
+                <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>
@@ -181,7 +179,12 @@
                         <?php }?>
                     </select>
                 </td>
-
+       
+            </tr>
+            <tr>
+   
+                <th><label  class="query_ors">订单号（多行查询）</label></th>
+                <td><textarea style="width: 324px;" name="order_sns" id="order_sns" cols="30" rows="10"><?php echo $_GET['order_sns'];?></textarea></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>
@@ -390,6 +393,11 @@
            var result = test_mch.replace(/[\  \r\n\,]+/g, ",");
                 $(this).val(result)
             })
+            $("#order_sns").blur(function () {
+                var test_mch =  $("#order_sns").val();
+           var result = test_mch.replace(/[\  \r\n\,]+/g, ",");
+                $(this).val(result)
+            })
         // 表格hover时背景
         $('.trFlex').each(function () {
             $(this).hover(function () {