admin update

admin/control/orderstats.php

@@ -51,11 +51,11 @@ class orderstatsControl extends SystemControl
 
     public function ExportDataOp()
     {
-        $type = $_GET['type'] ? $_GET['type'] : 'system';
+        $type = $_GET['type'] ?? 'system';
         $model_refill_order = Model('refill_order');
         $condition['type'] = $type;
         if (!empty($_GET['cid'])) {
-            $condition['cid'] = $_GET['cid'];
+            $condition['cid'] = ['in', $_GET['cid']];
         }
         if (!empty($_GET['order_time_type'])) {
             $condition['order_time_type'] = $_GET['order_time_type'];

admin/templates/default/merchant.order.stats.php

@@ -40,7 +40,8 @@
         <input type="hidden" value="OrderStats" name="act">
         <input type="hidden" value="index" name="op">
         <input type="hidden" value="merchant" name="type">
-        <input type="hidden" value="<?php echo $_GET['cid']; ?>" name="cid">
+        <input type="hidden" name="cid" value=""/>
+        <input type="hidden" name="default_no_mch" value="<?php echo $_GET['cid']; ?>"/>
         
         <table class="tb-type1 noborder search">
             <tbody>
@@ -162,9 +163,27 @@
                         <td class="align-center"><?php echo $v['corder_success_count']; ?></td>
                         <td class="align-center"><?php echo $v['corder_success_amounts']; ?></td>
                         <td class="align-center"><?php echo $v['corder_success_refill_amounts']; ?></td>
-                        <td class="align-center"><?php echo $v['gap_order_count']; ?></td>
-                        <td class="align-center"><?php echo $v['gap_success_amounts']; ?></td>
-                        <td class="align-center"><?php echo $v['gap_success_refill_amounts']; ?></td>
+                        <td class="align-center">
+                            <?php if($v['gap_order_count'] != 0){?>
+                            <span style="color: #f30707">
+                            <?php }?>
+                            <?php echo $v['gap_order_count']; ?>
+                            </span>
+                        </td>
+                        <td class="align-center">
+                            <?php if($v['gap_success_amounts'] != 0){?>
+                            <span style="color: #f30707">
+                            <?php }?>
+                            <?php echo $v['gap_success_amounts']; ?>
+                            </span>
+                        </td>
+                        <td class="align-center">
+                            <?php if($v['gap_success_refill_amounts'] != 0){?>
+                            <span style="color: #f30707">
+                            <?php }?>
+                            <?php echo $v['gap_success_refill_amounts']; ?>
+                            </span>
+                        </td>
                         <td class="align-center"><?php echo $v['refund']; ?></td>
                         <td class="align-center"><?php echo $v['remark']; ?></td>
                         <td class="align-center">
@@ -360,13 +379,13 @@
         })
         //多选
         let selest_nc
-        let cid = $('input[name="cid"]').val().split(',');
+        let default_no_mch = $('input[name="default_no_mch"]').val().split(',');
         $.get('index.php?act=refill_order&op=merchant_data', function(data) {
             data = JSON.parse(data)
-            if (cid) {
-                for(let index = 0; index < cid.lenght; index++) {
+            if (default_no_mch) {
+                for(let index = 0; index < default_no_mch.length; index++) {
                     for (let j = 0; j < data.length; j++) {
-                        if(cid[index] == data[j].value) {
+                        if(default_no_mch[index] == data[j].value) {
                             data[j].selected = true
                             
                         }
@@ -377,8 +396,8 @@
  
 
 
-            selest_nc = xmSelect.render({
-                    el: '#selest_nc',
+            selest_nc = xmSelect.render({
+                    el: '#selest_nc',
                     size: 'mini',
                     style: {
                         minHeight: '27px',

admin/templates/default/provider.order.stats.php

@@ -40,7 +40,7 @@
         <input type="hidden" value="index" name="op">
         <input type="hidden" value="provider" name="type">
         <input type="hidden" name="cid" value=""/>
-        <input type="hidden" name="cid" value="<?php echo $_GET['cid']; ?>"/>
+        <input type="hidden" name="default_no_mch" value="<?php echo $_GET['cid']; ?>"/>
         <table class="tb-type1 noborder search">
             <tbody>
             <tr>
@@ -153,9 +153,27 @@
                         <td class="align-center"><?php echo $v['corder_success_count']; ?></td>
                         <td class="align-center"><?php echo $v['corder_success_amounts']; ?></td>
                         <td class="align-center"><?php echo $v['corder_success_refill_amounts']; ?></td>
-                        <td class="align-center"><?php echo $v['gap_order_count']; ?></td>
-                        <td class="align-center"><?php echo $v['gap_success_amounts']; ?></td>
-                        <td class="align-center"><?php echo $v['gap_success_refill_amounts']; ?></td>
+                        <td class="align-center">
+                            <?php if($v['gap_order_count'] != 0){?>
+                            <span style="color: #f30707">
+                            <?php }?>
+                            <?php echo $v['gap_order_count']; ?>
+                            </span>
+                        </td>
+                        <td class="align-center">
+                            <?php if($v['gap_success_amounts'] != 0){?>
+                            <span style="color: #f30707">
+                            <?php }?>
+                            <?php echo $v['gap_success_amounts']; ?>
+                            </span>
+                        </td>
+                        <td class="align-center">
+                            <?php if($v['gap_success_refill_amounts'] != 0){?>
+                            <span style="color: #f30707">
+                            <?php }?>
+                            <?php echo $v['gap_success_refill_amounts']; ?>
+                            </span>
+                        </td>
                         <td class="align-center"><?php echo $v['refund']; ?></td>
                         <td class="align-center"><?php echo $v['remark']; ?></td>
                         <td class="align-center">
@@ -207,7 +225,7 @@
     $(function () {
         $('#ncsubmit').click(function () {
             $('input[name="op"]').val('index');
-            let selectArr = selest_nc.getValue();
+            let selectArr = selest_nc.getValue();
             let selectStr = ''
             for (let i = 0; i < selectArr.length; i++) {
                 selectStr += selectArr[i].value+','
@@ -356,8 +374,8 @@
             })
         })
         //多选
-        let selest_nc
-        let default_no_mch = $('input[name="cid"]').val().split(',');
+        let selest_nc
+        let default_no_mch = $('input[name="default_no_mch"]').val().split(',');
         
         $.get('index.php?act=refill_order&op=provider_data',function(data) {
             data = JSON.parse(data)
@@ -372,8 +390,8 @@
                     }
                 }
             }
-            selest_nc = xmSelect.render({
-                    el: '#selest_nc',
+            selest_nc = xmSelect.render({
+                    el: '#selest_nc',
                     size: 'mini',
                     style: {
                         minHeight: '27px',
@@ -381,7 +399,7 @@
                         marginLeft: '4px',
                         width: '250px'
                     },
-                    language: 'zn',
+                    language: 'zn',
                     data:data
                 })
         })

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

@@ -505,7 +505,7 @@
                 })
         })
         // 获取不包含客户
-        let selest_nc
+        let selest_nc
         let default_no_mch = $('input[name="default_no_mch"]').val().split(',');
         $.get('index.php?act=refill_order&op=merchant_data',function(data) {
             data = JSON.parse(data)
@@ -521,15 +521,15 @@
                 }
             }
            
-            selest_nc = xmSelect.render({
-                el: '#selest_nc',
+            selest_nc = xmSelect.render({
+                el: '#selest_nc',
                 size: 'mini',
                 style: {
                     minHeight: '27px',
                     lineHeight: '27px',
                     marginLeft: '4px'
                 },
-                language: 'zn',
+                language:'zn',
                 data:data
             })
             // console.log('data', data);
@@ -540,7 +540,7 @@
             var index = layer.load(0, {shade: false}); 
 
             $('input[name="op"]').val('index');
-            let selectArr = selest_nc.getValue();
+            let selectArr = selest_nc.getValue();
             let selectStr = ''
             for (let i = 0; i < selectArr.length; i++) {
                 selectStr += selectArr[i].value+','
@@ -557,7 +557,7 @@
             $('input[name="export"]').val('1');
             $('input[name="op"]').val('index');
             // 不包含客户
-            let selectArr = selest_nc.getValue();
+            let selectArr = selest_nc.getValue();
             let selectStr = ''
             for (let i = 0; i < selectArr.length; i++) {
                 selectStr += selectArr[i].value+','
@@ -581,7 +581,7 @@
             $('input[name="export_stats"]').val('1');
             $('input[name="op"]').val('index');
             // 不包含客户
-            let selectArr = selest_nc.getValue();
+            let selectArr = selest_nc.getValue();
             let selectStr = ''
             for (let i = 0; i < selectArr.length; i++) {
                 selectStr += selectArr[i].value+','
@@ -597,7 +597,7 @@
             $('input[name="fShowStat"]').val('1');
             $('input[name="op"]').val('index');
             // 不包含客户
-            let selectArr = selest_nc.getValue();
+            let selectArr = selest_nc.getValue();
             let selectStr = ''
             for (let i = 0; i < selectArr.length; i++) {
                 selectStr += selectArr[i].value+','
@@ -671,13 +671,13 @@
             let res = $(this).find('td').eq(13).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.select(); // 选择对象
+        document.execCommand("Copy"); // 执行浏览器复制命令
         oInput.parentNode.removeChild(oInput)
     }
     function hCopyCardNo(e) {
@@ -686,13 +686,13 @@
             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"); // 执行浏览器复制命令
+        oInput.select(); // 选择对象
+        document.execCommand("Copy"); // 执行浏览器复制命令
         oInput.parentNode.removeChild(oInput)
     }
 </script>