更改过期设置

html/application/cache/building_rsync_begin_time

-a:3:{s:4:"time";i:1497507003;s:3:"ttl";i:86400;s:4:"data";i:1497507000;}
\ No newline at end of file
+a:3:{s:4:"time";i:1497607075;s:3:"ttl";i:86400;s:4:"data";i:1497607073;}
\ No newline at end of file

html/application/controllers/admin/buildingadmin.php

@@ -332,6 +332,7 @@ class Buildingadmin extends CI_Controller
 			return;
 		}
 		$this->data['info'] = $cur_info;
+		
 		$this->data['op'] = 'edit';
 
 		//获取图库

html/application/controllers/admin/files_upload.php

@@ -68,7 +68,7 @@ class Files_upload extends CI_Controller {
 		{
 			$fileinfo = $this->upload->data();
             $filename = $fileinfo['file_name'];
-			echo json_encode(array('success'=>true,'err_info'=>'','fileUrl'=>$config['upload_path'] . '/' . $filename));
+			echo json_encode(array('success'=>true,'err_info'=>'','fileUrl'=>APPLICATION_PATH."/".$config['upload_path'] . '/' . $filename));
 			return;
 		}
 		echo json_encode(array('success'=>false,'err_info'=>$this->upload->display_errors()));
@@ -143,7 +143,7 @@ class Files_upload extends CI_Controller {
 			$fileinfo = $this->upload->data();
 			$filename = $fileinfo['file_name'];
 			$insert_data = array(
-				'img_path' => '/'.$config['upload_path'] . '/' . $filename,
+				'img_path' => "/".$config['upload_path'] . '/' . $filename,
 				'entity_type' => $type,
 				'entity_id' => $relation_entity,
 				'is_deleted' => 0,

html/application/controllers/admin/report.php

@@ -904,7 +904,7 @@ class Report extends CI_Controller
 		$manager_info = $this->manager->get(array('id' => $user_id));
 		if (!empty($manager_info))
 		{
-			$where .= ' M.role_id = 10 AND M.id =' . $user_id; //' in(' . $manager_info["building_id"] . ') and';
+//			$where .= ' M.role_id = 10 AND M.id =' . $user_id; //' in(' . $manager_info["building_id"] . ') and';
 		}
 
 		$where = trim($where, ' and ');

html/application/controllers/cron/distributor.php

@@ -105,7 +105,7 @@ class Distributor extends CI_Controller{
 							$dataLog['remark']				= '报备已过保护期';
 							$this->customer_building_log->add($dataLog);
 
-							$this->customer_building->update('id =' . $cust['id'], array('update_time' => time(), 'recommend_status' => '8'));
+							$this->customer_building->update('id =' . $cust['id'], array('update_time' => time(), 'is_ expired' => '1'));
 						}
 					}
 

html/application/views/admin/building/tab/basic_info.php

@@ -168,12 +168,15 @@
 							</div>
 							<div class="form-group">
 								<label class="col-md-2 control-label"></label>
+								
 								<div class="col-md-4">
 									<div id="fileupload-thumb-content">
 										<?php if(isset($info['building_img']) && !empty($info['building_img'])):?>
 										<img src="<?php echo $info['building_img'];?>" style="width:260px;height:190px;"/>
+										
 										<?php endif;?>
 									</div>
+									
 								</div>
 								<div class="col-md-2">
 								</div>

html/assets/js/backend/custom/manager-content-add.js

@@ -130,7 +130,7 @@ var EcommerceProductsEdit = function () {
             onComplete: function (fileName, response) {
                 // response是json对象，格式可以按自己的意愿来定义，例子为： { success: true, fileUrl:'' }
                 if (response.success) {
-                    $("#fileupload-thumb-content").html('<img src="/'+response.fileUrl+'"/>');
+                    $("#fileupload-thumb-content").html('<img src="'+response.fileUrl+'"/>');
                     $("#img").val('/' + response.fileUrl);
                 } else {
                     alert(response.err_info);