Browse Source

admin update

haru haru 3 years ago
parent
commit
158a8367ae

+ 10 - 4
admin/control/ordersendlist.php

@@ -40,19 +40,25 @@ class ordersendlistControl extends SystemControl
             return $condition;
         };
         if ($_GET['time'] == 3) {
-            $condition = $time_out_order(300, $condition);
-            $time_cond[] = ['lt', (time() - 300)];
+            $condition = $time_out_order(180, $condition);
+            $time_cond[] = ['lt', (time() - 180)];
             $_GET['card_type'] = 'phone';
         }
         if ($_GET['time'] == 4) {
-            $condition = $time_out_order(900, $condition);
-            $time_cond[] = ['lt', (time() - 900)];
+            $condition = $time_out_order(300, $condition);
+            $time_cond[] = ['lt', (time() - 300)];
+            $_GET['card_type'] = 'phone';
         }
         if ($_GET['time'] == 5) {
             $condition = $time_out_order(600, $condition);
             $time_cond[] = ['lt', (time() - 600)];
+        }
+        if ($_GET['time'] == 6) {
+            $condition = $time_out_order(900, $condition);
+            $time_cond[] = ['lt', (time() - 900)];
             $_GET['card_type'] = 'phone';
         }
+
         if (!empty($_GET['card_type'])) {
             if (in_array($_GET['card_type'], ['1', '2', '4', '5', '6', '7'])) {
                 $condition['refill_order.card_type'] = $_GET['card_type'];

+ 10 - 5
admin/templates/default/refill.order.send.index.php

@@ -169,13 +169,16 @@
                                 <?php if ($_GET['time'] == '2'){ ?>selected<?php } ?>>耗时一小时订单
                         </option>
                         <option value="3"
-                                <?php if ($_GET['time'] == '3'){ ?>selected<?php } ?>>特定耗时5分钟订单
+                                <?php if ($_GET['time'] == '3'){ ?>selected<?php } ?>>特定耗时3分钟订单
+                        </option>
+                        <option value="4"
+                                <?php if ($_GET['time'] == '4'){ ?>selected<?php } ?>>特定耗时5分钟订单
                         </option>
                         <option value="5"
                                 <?php if ($_GET['time'] == '5'){ ?>selected<?php } ?>>特定耗时10分钟订单
                         </option>
-                        <option value="4"
-                                <?php if ($_GET['time'] == '4'){ ?>selected<?php } ?>>特定耗时15分钟订单
+                        <option value="6"
+                                <?php if ($_GET['time'] == '6'){ ?>selected<?php } ?>>特定耗时15分钟订单
                         </option>
                     </select>
                 </td>
@@ -219,11 +222,13 @@
                     <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>
+                        <li class="lineLi" style="color:#000;">超过3分钟订单数量:<?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>
+                        <li class="lineLi" style="color:#000;">超过5分钟订单数量:<?php echo $output['count'][2] ?? 0 ?></li>
                     <?php } elseif ($_GET['time'] == 5) { ?>
                         <li class="lineLi" style="color:#000;">超过10分钟订单数量:<?php echo $output['count'][2] ?? 0 ?></li>
+                    <?php } elseif ($_GET['time'] == 6) { ?>
+                    <li class="lineLi" style="color:#000;">超过15分钟订单数量:<?php echo $output['count'][2] ?? 0 ?></li>
                     <?php } ?>
                 </ul>
             </td>