update merchant time out

admin/control/merchant.php

@@ -139,7 +139,7 @@ class merchantControl extends SystemControl
             $update['password'] = md5($update['org_pwd']);
             $update['alarm_amount'] = $_POST['alarm_amount'] ?? 0;
             $update['credit_bonus'] = ncPriceFormat($_POST['credit_bonus']);
-            $update['time_out'] = intval($_POST['time_out'] * 60);
+            $update['time_out'] = intval($_POST['time_out']);
             $update['quality'] = intval($_POST['quality']);
             $member_id = $merchant['admin_id'];
             try {

admin/templates/default/merchant.edit.php

@@ -52,10 +52,10 @@
                 <td class="vatop tips"></td>
             </tr>
             <tr>
-                <td colspan="2" class="required"><label class="validation" for="time_out">失效时间(分钟):</label></td>
+                <td colspan="2" class="required"><label class="validation" for="time_out">失效时间(秒数):</label></td>
             </tr>
             <tr class="noborder">
-                <td class="vatop"><input type="text" id="time_out" name="time_out" class="txt" value="<?php echo $output['merchant']['time_out'] / 60;?>"></td>
+                <td class="vatop"><input type="text" id="time_out" name="time_out" class="txt" value="<?php echo $output['merchant']['time_out'];?>"></td>
                 <td class="vatop tips"></td>
             </tr>
             <tr>