Merge branch 'test' of https://gitee.com/zwyjjc/tl_estate into test

application/common.php

@@ -11,7 +11,8 @@ if (!function_exists('create_editor')) {
     function create_editor($id, $value = '', $config = array())
     {
         include_once "../public/resource/lib/Ckeditor/ckeditor.php";
-        $CKEditor = new CKEditor('http://' . $_SERVER['HTTP_HOST'] . '/resource/lib/Ckeditor/');
+        $http_type = ((isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') || (isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https')) ? 'https://' : 'http://';
+        $CKEditor = new CKEditor($http_type . $_SERVER['HTTP_HOST'] . '/resource/lib/Ckeditor/');
         $_config['filebrowserBrowseUrl'] = '/resource/lib/Ckfinder/ckfinder.html';
 
         $_config['filebrowserImageBrowseUrl'] = '/resource/lib/Ckfinder/ckfinder.html?Type=Images';

application/model/GHouses.php

@@ -322,6 +322,7 @@ class GHouses extends BaseModel
             $house_id = $this->id;
         } else {
             $params['operation_id'] = $params['userId'];
+            $params['status'] = 1;
             $this->allowField(true)->isUpdate(true)->save($params, [ 'id' => $params['id'] ]);
             $house_id = $this->id;
         }
@@ -432,7 +433,9 @@ class GHouses extends BaseModel
             $img = $this->table('g_houses_imgs')
                 ->field('img_name')
                 ->where('house_id', $houses_id)
-                ->where('img_status', 0)->select();
+                ->where('img_type', 4)
+                ->where('img_status', 0)
+                ->select();
 
             $return['id']                = $agents->id;
             $return['name']              = $agents['name'] . '-' . $agents['phone'];

public/resource/lib/js/ckfinderStart.js

@@ -27,6 +27,11 @@ function SetFileField( fileUrl , data )
     }
 
     if($.isFunction(window.browseServerBackFun)){
+    	if(~location.protocol.indexOf(fileUrl)){
+    		//一致
+    	}else{
+    		fileUrl = fileUrl.replace(/(http|https):\/\//g,location.protocol+'//');
+    	}
         window.browseServerBackFun(fileUrl);
     }
 }