Browse Source

commit code

ShuanghongS 1 year ago
parent
commit
b7b4297f9b
4 changed files with 7 additions and 7 deletions
  1. 1 0
      service/ajax.class.php
  2. 1 2
      service/login.class.php
  3. 3 3
      service/ocean_booking.class.php
  4. 2 2
      utils/utils.class.php

+ 1 - 0
service/ajax.class.php

@@ -48,6 +48,7 @@ class ajax {
     public function save_setting_display() {
     public function save_setting_display() {
         $ids = $_POST['ids'];
         $ids = $_POST['ids'];
         if(!empty($ids)){
         if(!empty($ids)){
+            $ss = utils::implode(",", $_POST['ids']);
             column::getInstance()->saveSettingDisplay(utils::implode(",", $_POST['ids']),"", $_POST['model_name']);
             column::getInstance()->saveSettingDisplay(utils::implode(",", $_POST['ids']),"", $_POST['model_name']);
             $data = array(
             $data = array(
                 'msg' => 'success'
                 'msg' => 'success'

+ 1 - 2
service/login.class.php

@@ -33,8 +33,7 @@ class login {
         $login_error_times = common::excuteOneSql("select ra_value from ra_online_config where ra_name='Login_Error_Times'");
         $login_error_times = common::excuteOneSql("select ra_value from ra_online_config where ra_name='Login_Error_Times'");
         $lock_user_seconds = common::excuteOneSql("select ra_value from ra_online_config where ra_name='Lock_User_Seconds'");
         $lock_user_seconds = common::excuteOneSql("select ra_value from ra_online_config where ra_name='Lock_User_Seconds'");
         if (!empty($uname) || !empty($password)) {
         if (!empty($uname) || !empty($password)) {
-
-            
+    
         } else {
         } else {
             $uname = common::check_input($_POST['uname']);
             $uname = common::check_input($_POST['uname']);
             $verifcation_code = common::check_input($_POST['verifcation_code']);
             $verifcation_code = common::check_input($_POST['verifcation_code']);

+ 3 - 3
service/ocean_booking.class.php

@@ -255,11 +255,11 @@ class ocean_booking {
                 //按新逻辑处理status,现在是管理员权限,客户权限少了一种状态,先设置默认值防止出错
                 //按新逻辑处理status,现在是管理员权限,客户权限少了一种状态,先设置默认值防止出错
                 $status = "Created";
                 $status = "Created";
                 if(!($val['color'] == "FFFF0000" || $val['color'] == "FF00FF00" || $val['color'] == "FF0000FF")){
                 if(!($val['color'] == "FFFF0000" || $val['color'] == "FF00FF00" || $val['color'] == "FF0000FF")){
-                    $status = "Created";
-                }
-                if ($val['color'] == "FF00FF00"){
                     $status = "Confirmed";
                     $status = "Confirmed";
                 }
                 }
+                if ($val['color'] == "FF0000FF"){
+                    $status = "Created";
+                }
                 if ($val['color'] == "FFFF0000"){
                 if ($val['color'] == "FFFF0000"){
                     $status = "Cancelled";
                     $status = "Cancelled";
                 }
                 }

+ 2 - 2
utils/utils.class.php

@@ -415,9 +415,9 @@ class utils {
         return $count;
         return $count;
     }
     }
 
 
-    public static function implode($variable){
+    public static function implode($sp,$variable){
         $variable = isset($variable) && is_array($variable) ? $variable : array();
         $variable = isset($variable) && is_array($variable) ? $variable : array();
-        return implode(',', $variable);
+        return implode($sp, $variable);
     }
     }
 
 
     public static function in_array($str, $arr){
     public static function in_array($str, $arr){