Commit b3bad4a1 authored by hujun's avatar hujun

//

parent d75a24f4
...@@ -146,14 +146,23 @@ class HouseService ...@@ -146,14 +146,23 @@ class HouseService
if ($is_app == 1) { if ($is_app == 1) {
if (isset($data['cover'])) { if (isset($data['cover'])) {
$data['cover'] = json_decode($data['cover'], true); $data['cover'] = json_decode($data['cover'], true);
foreach ($data['cover'] as $k=>$v) {
$data['cover'][$k] = stripslashes($v);
}
} }
if (isset($data['slide_show'])) { if (isset($data['slide_show'])) {
$data['slide_show'] = json_decode($data['slide_show'], true); $data['slide_show'] = json_decode($data['slide_show'], true);
foreach ($data['slide_show'] as $k=>$v) {
$data['slide_show'][$k] = stripslashes($v);
}
} }
if (isset($data['exclusive_img'])) { if (isset($data['exclusive_img'])) {
$data['exclusive_img'] = json_decode($data['exclusive_img'], true); $data['exclusive_img'] = json_decode($data['exclusive_img'], true);
foreach ($data['exclusive_img'] as $k=>$v) {
$data['exclusive_img'][$k] = stripslashes($v);
}
} }
} }
......
...@@ -95,21 +95,18 @@ class GHousesImgs extends BaseModel ...@@ -95,21 +95,18 @@ class GHousesImgs extends BaseModel
public function edit($params, $house_id) { public function edit($params, $house_id) {
try { try {
//编辑图片 //编辑图片
$where['img_status'] = ['<>', 1]; $where['img_status'] = 0;
$where['house_id'] = $house_id; $where['house_id'] = $house_id;
$house_img_data = $this->getListAll('id,img_name,img_type', $where); $house_img_data = $this->getListAll('id,img_name,img_type', $where);
$key = 0; $key = 0;
$house_img_edit = array(); $house_img_edit = array();
$slide_show = $params['slide_show'];
$plan = $params['plan'];
$exclusive_img = $params['exclusive_img'];
foreach ($house_img_data as $k => $v) { foreach ($house_img_data as $k => $v) {
switch ($v['img_type']) { switch ($v['img_type']) {
case 1 : case 1 :
//1列表页封面图 //1列表页封面图
if (isset($params['cover'])) { if (isset($params['cover'])) {
if ($params['cover'] != $v->img_name) { if ($params['cover'] != $v['img_name']) {
/*伪删除之前的图片*/ /*伪删除之前的图片*/
$house_img_edit[$key]['id'] = $v->id; $house_img_edit[$key]['id'] = $v->id;
$house_img_edit[$key]['img_status'] = 1; $house_img_edit[$key]['img_status'] = 1;
...@@ -123,15 +120,13 @@ class GHousesImgs extends BaseModel ...@@ -123,15 +120,13 @@ class GHousesImgs extends BaseModel
case 2 : case 2 :
//2详情页轮播图 //2详情页轮播图
if (isset($params['slide_show'])) { if (isset($params['slide_show'])) {
if (empty($slide_show)) { if (empty($params['slide_show'])) {
foreach ($slide_show as $kk => $vv) { if (in_array($v['img_name'],$params['slide_show'])) {
if (in_array($v->img_name,$slide_show)) { $params['slide_show'] = del_array_string($v->img_name, $params['slide_show']);
$params['slide_show'] = del_array_string($v->img_name, $params['slide_show']); } else {
} else { $house_img_edit[$key]['id'] = $v->id;
$house_img_edit[$key]['id'] = $v->id; $house_img_edit[$key]['img_status'] = 1;
$house_img_edit[$key]['img_status'] = 1; $key++;
$key++;
}
} }
} else { } else {
//伪删除全部的轮播图 //伪删除全部的轮播图
...@@ -144,15 +139,13 @@ class GHousesImgs extends BaseModel ...@@ -144,15 +139,13 @@ class GHousesImgs extends BaseModel
case 3 : case 3 :
//3楼层平面图 //3楼层平面图
if (isset($params['plan'])) { if (isset($params['plan'])) {
if (empty($plan)) { if (empty($params['plan'])) {
foreach ($plan as $kk => $vv) { if (in_array($v['img_name'],$params['plan'])) {
if (in_array($v->img_name,$plan)) { $params['plan'] = del_array_string($v->img_name, $params['plan']);
$params['plan'] = del_array_string($v->img_name, $params['plan']); } else {
} else { $house_img_edit[$key]['id'] = $v->id;
$house_img_edit[$key]['id'] = $v->id; $house_img_edit[$key]['img_status'] = 1;
$house_img_edit[$key]['img_status'] = 1; $key++;
$key++;
}
} }
} else { } else {
//伪删除全部的平面图 //伪删除全部的平面图
...@@ -165,15 +158,13 @@ class GHousesImgs extends BaseModel ...@@ -165,15 +158,13 @@ class GHousesImgs extends BaseModel
case 4 : case 4 :
//4独家合同 //4独家合同
if (isset($params['exclusive_img'])) { if (isset($params['exclusive_img'])) {
if (!empty($exclusive_img)) { if (!empty($params['exclusive_img'])) {
foreach ($exclusive_img as $kk => $vv) { if (in_array($v['img_name'], $params['exclusive_img'])) {
if (in_array($v->img_name,$exclusive_img)) { $params['exclusive_img'] = del_array_string($v['img_name'], $params['exclusive_img']);
$params['exclusive_img'] = del_array_string($v->img_name, $params['exclusive_img']); } else {
} else { $house_img_edit[$key]['id'] = $v->id;
$house_img_edit[$key]['id'] = $v->id; $house_img_edit[$key]['img_status'] = 1;
$house_img_edit[$key]['img_status'] = 1; $key++;
$key++;
}
} }
} else { } else {
//伪删除全部的独家图片 //伪删除全部的独家图片
...@@ -185,7 +176,6 @@ class GHousesImgs extends BaseModel ...@@ -185,7 +176,6 @@ class GHousesImgs extends BaseModel
break; break;
} }
} }
$this->add($params, $house_id); $this->add($params, $house_id);
$this->saveAll($house_img_edit); $this->saveAll($house_img_edit);
$result['status'] = 'successful'; $result['status'] = 'successful';
...@@ -274,28 +264,24 @@ class GHousesImgs extends BaseModel ...@@ -274,28 +264,24 @@ class GHousesImgs extends BaseModel
public function editExclusiveImg($params, $house_id) { public function editExclusiveImg($params, $house_id) {
//编辑图片 //编辑图片
$house_img_data = $this->field('id,img_name,img_type') $house_img_data = $this->field('id,img_name,img_type')
->where('img_status <> 1 AND img_type = 4 AND house_id = ' . $house_id)->select(); ->where('img_status = 0 AND img_type = 4 AND house_id = ' . $house_id)->select();
$key = 0; $key = 0;
$house_img_edit = array(); $house_img_edit = array();
$exclusive_img = $params['exclusive_img']; $exclusive_img = $params['exclusive_img'];
foreach ($house_img_data as $k=>$v) { foreach ($house_img_data as $k=>$v) {
if ($v->img_type == 4) { if ($exclusive_img != '') {
if ($exclusive_img != '') { if (in_array($v->img_name,$exclusive_img)) {
foreach ($exclusive_img as $kk => $vv) { $params['exclusive_img'] = del_array_string($v->img_name, $params['exclusive_img']);
if (in_array($v->img_name,$exclusive_img)) {
$params['exclusive_img'] = del_array_string($v->img_name, $params['exclusive_img']);
} else {
$house_img_edit[$key]['id'] = $v->id;
$house_img_edit[$key]['img_status'] = 1;
$key++;
}
}
} else { } else {
//伪删除全部的独家图片
$house_img_edit[$key]['id'] = $v->id; $house_img_edit[$key]['id'] = $v->id;
$house_img_edit[$key]['img_status'] = 1; $house_img_edit[$key]['img_status'] = 1;
$key++; $key++;
} }
} else {
//伪删除全部的独家图片
$house_img_edit[$key]['id'] = $v->id;
$house_img_edit[$key]['img_status'] = 1;
$key++;
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment