图片修改

app/admin/controller/Config.php

+<?php
+
+
+namespace app\admin\controller;
+
+
+use app\BaseController;
+
+class Config extends BaseController
+{
+
+}
\ No newline at end of file

app/common.php

@@ -135,7 +135,7 @@ function uploadImgs($up_dir,$base64_img,$imgName="") {
                 } else {
                     $http = "http://";
                 }
-                return ['code'=>200,'msg'=>$http.$_SERVER['SERVER_NAME'].$up_dir.$img_name.'.'.$type];
+                return ['code'=>200,'msg'=>$http.$_SERVER['SERVER_NAME'].$up_dir.$img_name.'.'.$type,'path'=>$up_dir.$img_name.'.'.$type];
             }else{
                 return ['code'=>400,'msg'=>'图片上传错误!'];
             }

app/common/controller/Common.php

@@ -78,6 +78,62 @@ class Common extends BaseController
         return $data;
     }
 
+
+    //对数组中的图片字段进行日期转换
+    public static function changeImg($data,$field="pic"){
+        if(empty($data)){
+               return $data;
+        }
+        if(isHTTPS()){
+            $http = "https://";
+        } else{
+            $http = 'http://';
+        }
+        $server_name = $http.$_SERVER['SERVER_NAME'].'/';
+        $prompt ='';
+        foreach($data as $k =>$v) {
+            if(is_array($v)) {
+                if(is_array($field)) {
+                    foreach ($field as $value) {
+                        if($v[$value] != '' || !is_null($v[$value])){
+                            $data[$k][$value] =  $server_name.$v[$value];
+                        } else {
+                            $data[$k][$value] = $prompt;
+                        }
+                    }
+                } else {
+                    if($v[$field] != '' || !is_null($v[$field])){
+                        $data[$k][$field] = $server_name.$v[$field];
+                    } else {
+                        $data[$k][$field] = $prompt;
+                    }
+                }
+            } else {
+                if(is_array($field)) {
+                    foreach ($field as $value) {
+                        if(isset($data[$value]) || $data[$value] !=0){
+                            $data[$value] =$server_name.$data[$value];
+                        } else{
+                            $data[$value] = $prompt;
+                        }
+                    }
+                    break;
+                } else {
+                    if(isset($data[$field]) || $data[$field] !=0) {
+                        $data[$field] = $server_name.$data[$field];
+                    } else {
+                        $data[$field] = $prompt;
+                    }
+                    break;
+                }
+            }
+        }
+
+        return $data;
+
+    }
+
+
     /**
      * @param $url_ids string 1,2,3
      * @param $navAl array

app/shequ/controller/News.php

@@ -4,7 +4,7 @@
 namespace app\shequ\controller;
 
 //社区新闻模块
-use app\admin\controller\Common;
+use app\common\controller\Common;
 use think\facade\Db;
 use think\facade\Request;
 
@@ -17,6 +17,7 @@ class News extends  Base
         $news_type_id = Request::param('news_type_id');
         $data['name'] = Request::param('name');
         $data['sort_id'] = Request::param('sort_id');
+        $data['img'] = Request::param('img');
         if($news_type_id) {
             $where['news_type_id'] = $news_type_id;
             $where['village_id'] = $this->village_id;
@@ -129,13 +130,14 @@ class News extends  Base
     }
 
 
-    //图片上传
+    //base图片上传
     public function uploadImgBase64() {
         $dir  = "/upload/village/".$this->village_id."/";
         $base_img = Request::param('base_img');
         $res = uploadImgs($dir,$base_img);
         if($res['code']==200){
             $data['data'] = $res['msg'];
+            $data['path'] = $res['path'];
             return $this->returnJson($data);
         } else {
             return $this->returnJson([],$res['msg'],400);
@@ -143,7 +145,7 @@ class News extends  Base
 
     }
 
-    //excel文件上传
+    //fiel图片上传
     public function uploadImg() {
         $file = request()->file('img');
         $ext = $file->getOriginalExtension();
@@ -156,8 +158,8 @@ class News extends  Base
         } else {
             $http = "http://";
         }
-        $data['data'] = $http.$_SERVER['SERVER_NAME']."/upload/".$savename;
-        file_put_contents('./log.txt',$http.$_SERVER['SERVER_NAME']."/upload/".$savename);
+        $data['path'] = $http.$_SERVER['SERVER_NAME']."/upload/".$savename;
+        $data['data'] = "/upload/".$savename;
         return $this->returnJson($data,'success');
 
     }

app/shequ/controller/Parking.php

@@ -146,7 +146,8 @@ class Parking extends Base
             ->field('pc.*,hv.vacancy_code')
             ->select()->toArray();
         foreach ($data as $k =>$v) {
-            $data[$k]['vacancy_address'] = $vacancy->getVacancyAddress($v['vacancy_code']);
+            $res = $vacancy->getVacancyAddress($v['vacancy_code']);
+            $data[$k]['vacancy_address'] = $res['vacancy_address'];
         }
         $total = Db::name('park_car')->alias('pc')->leftJoin('house_vacancy hv','hv.vacancy_id = pc.vacancy_id')->where($where)->count();
         $res['total'] = $total;

app/shequ/controller/Userbind.php

@@ -86,7 +86,8 @@ class Userbind extends Base
 
 
         foreach ($data as $k => $v) {
-            $data[$k]['vacancy_address'] = $vacancy->getVacancyAddress($v['vacancy_code'],$v['layout_id']);
+            $res = $vacancy->getVacancyAddress($v['vacancy_code'],$v['layout_id']);
+            $data[$k]['vacancy_address'] = $res['vacancy_address'];
         }
         $res['total'] = $total;
         $res['data'] = Common::changeField($data,['pass_time','unbind_time']);
@@ -137,21 +138,19 @@ class Userbind extends Base
     public function detailHouseOwner() {
         $vacancy = new Vacancy($this->app);
         $where['house_user_bind_id'] = Request::param('bind_id');
-
         $data = Db::name('house_user_bind')->alias('ub')->leftJoin('house_vacancy hv','hv.vacancy_id = ub.vacancy_id')->where($where)
                 ->field('ub.*,hv.vacancy_code,hv.layout_id')
                 ->find();
         $data = Common::changeField($data);
         if($data) {
-            $data['vacancy_address'] = $vacancy->getVacancyAddress($data['vacancy_code'],$data['layout_id']);
+            $res =  $vacancy->getVacancyAddress($data['vacancy_code'],$data['layout_id']);
+            $data['vacancy_address'] = $res['vacancy_address'];
         } else {
             $data = [];
         }
         return $this->returnJson($data,'success');
 
     }
-
-
     //添加绑定的人员
     public function createBindUser() {
         $data['village_id'] = $this->village_id;

app/shequ/controller/Vacancy.php

@@ -36,7 +36,9 @@ class Vacancy extends  Base
                 ->page($page,config('app.limit'))
                 ->select()->toArray();
         foreach ($data as $k =>$v) {
-            $data[$k]['vacancy_address'] =  $this->getVacancyAddress($v['vacancy_code'],$v['layout_id']);
+            $res =  $this->getVacancyAddress($v['vacancy_code'],$v['layout_id']);
+            $data[$k]['vacancy_address'] = $res['vacancy_address'];
+            $data[$k]['room_num'] =  $res['room_num'];
         }
         $res['total'] = $total;
         $res['data'] = Common::changeField($data);
@@ -49,8 +51,8 @@ class Vacancy extends  Base
         $where['hv.vacancy_id'] = $vacancy_id;
         $where['hv.village_id'] = $this->village_id;
         $data = Db::name('house_vacancy')->alias('hv')->where($where)->find();
-        $vacancyAddress = $this->getVacancyAddress($data['vacancy_code'],$data['layout_id']);
-        $data['vacancy_address'] = $vacancyAddress;
+        $res = $this->getVacancyAddress($data['vacancy_code'],$data['layout_id']);
+        $data['vacancy_address'] = $res['vacancy_address'];;
         unset($data['village_name']);//用连表查询的社区名称
         if($data['is_inherit'] ==1 ) {
             $p_info = Db::name('layout_build')->where(['layout_build_id'=>$data['parent_id']])
@@ -211,12 +213,27 @@ class Vacancy extends  Base
         $arr = explode('-',$vacancyCode);
         $room_code = array_pop($arr);
         $string = '';
+        $room_num = '';
         foreach ($arr as $v) {
              $code_name = Db::name('layout_build')->where(['layout_build_id'=>$v])->field('code,level')->find();
              $key =  $code_name['level'] -1;
              $string.=$code_name['code'].$codeArr[$key];
+             $room_num.=$code_name['code']."-";
         }
-        return $string.$room_code.$rom;
+        $room_num = $room_num.$room_code;
+        return ['vacancy_address'=>$string.$room_code.$rom,'room_num'=>$room_num];
+    }
+
+    //通过物业编号拼接房间编号
+    public function getVacancyRoomNum($vacancy_code){
+        $vacancy_codeArr = explode('-',$vacancy_code);
+        array_pop($vacancy_codeArr);
+        $room_num = '';
+        foreach ($vacancy_codeArr as $v){
+            $num = Db::name('layout_build')->where(['layout_build_id'=>$v])->value('code');
+            $room_num.=$num."-";
+        }
+        return trim($room_num,'-');
 
     }
 

app/shequ/controller/Village.php

@@ -25,6 +25,7 @@ class Village extends Base
         $data['village_id'] = $where['village_id'] = Request::param('village_id');
         $data['code'] = Request::param('code');
         $data['name'] = Request::param('name');
+        $data['pic'] = Request::param('pic');
         $data['level'] = $where['level'] = count(explode('-',$data['code']));
         if($layout_id) {
             //当前布局下没有房屋,可以修改