dev

admin/control/merchant.php

@@ -180,8 +180,8 @@ class merchantControl extends SystemControl
                 $day_timeout = 180;
             }
 
-            if($night_timeout < $day_timeout) {
-                $night_timeout = $day_timeout;
+            if($night_timeout <= 0) {
+                $day_timeout = 180;
             }
 
             $update['day_timeout'] = $day_timeout;

admin/templates/default/merchant.edit.php

@@ -67,7 +67,7 @@
                 <td class="vatop tips"></td>
             </tr>
             <tr>
-                <td colspan="2" class="required"><label for="night_timeout">夜里(0:00~6:00)超时秒数(不可以小于白天时间):</label></td>
+                <td colspan="2" class="required"><label for="night_timeout">夜里(0:00~6:00)超时秒数(不设置默认为180秒):</label></td>
             </tr>
             <tr class="noborder">
                 <td class="vatop"><input type="text" id="night_timeout" name="night_timeout" class="txt" value="<?php echo $output['merchant']['night_timeout'];?>"></td>