diff --git a/app/admin/controller/nk/Village.php b/app/admin/controller/nk/Village.php
index 9f62a8f..96b9784 100644
--- a/app/admin/controller/nk/Village.php
+++ b/app/admin/controller/nk/Village.php
@@ -65,16 +65,31 @@ class Village extends BaseController
     {
         if (request()->isAjax()) {
             $params= get_params();
-            if ($params['is_hot']=='on'){
+            if (isset($params['is_hot']) &&  $params['is_hot']=='on'){
                 $params['is_hot']=1;
             }else{
                 $params['is_hot']=0;
             }
-            if ($params['is_tourism']=='on'){
+            if (isset($params['is_tourism']) && $params['is_tourism']=='on'){
                 $params['is_tourism']=1;
             }else{
                 $params['is_tourism']=0;
             }
+
+            //            组装地址名
+            if ($params['area_id'] != '') {
+                $area_name = Db::table('fa_geo_area')->where('area_code', $params['area_id'])->value('area_name');
+            }
+            if ($params['street_id'] != '') {
+                $street_name = Db::table('fa_geo_street')->where('street_code', $params['street_id'])->value('street_name');
+            }
+
+            if ($params['village_id'] != '') {
+                $village = Db::table('fa_geo_village')->where('village_code', $params['village_id'])->find();
+                $params['village_id']=$village['village_id'];
+            }
+            $address_name = $area_name . $street_name . $village['village_name'] ;
+            $params['address'] = $address_name;
             $res=Db::table('fa_szxc_village')->strict(false)->field(true)->insertGetId($params);
             if ($res){
                 return to_assign(0,'操作成功',['aid'=>$res]);
@@ -83,6 +98,10 @@ class Village extends BaseController
         }else{
             View::assign('editor', get_system_config('other','editor'));
             View::assign('url', $this->url);
+            $street = Db::table('fa_geo_area')->where(['switch' => 1, 'city_code' => '510500'])
+                ->field('area_id id,area_code code,area_name name')
+                ->select();
+            View::assign('street', $street);
             return view();
         }
     }
@@ -93,6 +112,33 @@ class Village extends BaseController
     {
         $params= get_params();
         if (request()->isAjax()) {
+
+            if (isset($params['is_hot']) &&  $params['is_hot']=='on'){
+                $params['is_hot']=1;
+            }else{
+                $params['is_hot']=0;
+            }
+            if (isset($params['is_tourism']) && $params['is_tourism']=='on'){
+                $params['is_tourism']=1;
+            }else{
+                $params['is_tourism']=0;
+            }
+
+            //            组装地址名
+            if ($params['area_id'] != '') {
+                $area_name = Db::table('fa_geo_area')->where('area_code', $params['area_id'])->value('area_name');
+            }
+            if ($params['street_id'] != '') {
+                $street_name = Db::table('fa_geo_street')->where('street_code', $params['street_id'])->value('street_name');
+            }
+
+            if ($params['village_id'] != '') {
+                $village = Db::table('fa_geo_village')->where('village_code', $params['village_id'])->find();
+                $params['village_id']=$village['village_id'];
+            }
+            $address_name = $area_name . $street_name . $village['village_name'] ;
+            $params['address'] = $address_name;
+
             $res=Db::table('fa_szxc_village')->where('id',$params['id'])->strict(false)->field(true)->update($params);
             if ($res){
                 return to_assign();
@@ -101,9 +147,13 @@ class Village extends BaseController
             }
         }
         $detail = Db::table('fa_szxc_village')->where('id',$params['id'])->find();
-
+        $detail['village_code'] = Db::table('fa_geo_village')->where('village_id', $detail['village_id'])->value('village_code');
         View::assign('detail', $detail);
         View::assign('url', $this->url);
+        $street = Db::table('fa_geo_area')->where(['switch' => 1, 'city_code' => '510500'])
+            ->field('area_id id,area_code code,area_name name')
+            ->select();
+        View::assign('street', $street);
         return view();
     }
     /**
@@ -126,7 +176,7 @@ class Village extends BaseController
         $param= get_params();
         $id = isset($param['id']) ? $param['id'] : 0;
         $type = isset($param['type']) ? $param['type'] : 0;
-        $res = Db::table('fa_szxc_village')->where('id',$id)->update(['status'=>$type]);
+        $res = Db::table('fa_szxc_village')->where('id',$id)->delete();
         if ($res){
             return to_assign();
         }else{
diff --git a/app/admin/view/nk/slideinfo/add.html b/app/admin/view/nk/slideinfo/add.html
index 739ed3b..77180df 100644
--- a/app/admin/view/nk/slideinfo/add.html
+++ b/app/admin/view/nk/slideinfo/add.html
@@ -51,7 +51,7 @@
                     <button type="button" class="layui-btn layui-btn-sm" id="upload_btn_thumb">上传图片</button>
                     <div class="layui-upload-list" id="upload_box_thumb" style="width: 120px; height:66px; overflow: hidden;">
                         <img src="" onerror="javascript:this.src='{__GOUGU__}/gougu/images/nonepic600x360.jpg';this.onerror=null;" width="150" style="max-width: 100%; height:66px;"/>
-                        <input type="hidden" name="img" value="">
+                        <input type="hidden" name="img" value="" lay-verify="required">
                     </div>
                 </div>
             </td>
diff --git a/app/admin/view/nk/slideinfo/edit.html b/app/admin/view/nk/slideinfo/edit.html
index 71a193e..b522bd1 100644
--- a/app/admin/view/nk/slideinfo/edit.html
+++ b/app/admin/view/nk/slideinfo/edit.html
@@ -51,7 +51,7 @@
                     <button type="button" class="layui-btn layui-btn-sm" id="upload_btn_thumb">上传图片</button>
                     <div class="layui-upload-list" id="upload_box_thumb" style="width: 120px; height:66px; overflow: hidden;">
                         <img src="{$detail.img}" onerror="javascript:this.src='{__GOUGU__}/gougu/images/nonepic600x360.jpg';this.onerror=null;" width="150" style="max-width: 100%; height:66px;"/>
-                        <input type="hidden" name="img" value="{$detail.img}">
+                        <input type="hidden" name="img" value="{$detail.img}" lay-verify="required">
                     </div>
                 </div>
             </td>
diff --git a/app/admin/view/nk/village/add.html b/app/admin/view/nk/village/add.html
index 984e78e..a11cb29 100644
--- a/app/admin/view/nk/village/add.html
+++ b/app/admin/view/nk/village/add.html
@@ -15,6 +15,43 @@
 <form class="layui-form p-4">
     <h3 class="pb-3">添加内容</h3>
     <table class="layui-table layui-table-form">
+
+        <tr>
+            <td class="layui-td-gray">区域<font>*</font></td>
+            <td colspan="3">
+                <div class="layui-form-item">
+                    <label class="layui-form-label">区县</label>
+                    <div class="layui-input-block">
+                        {if {:session('gougu_admin')['group_access']==1}
+                        <select name="area_id" lay-filter="area_id" lay-verify="required">
+                            {volist name='street' id='vo'}
+                            <option value="{$vo.code}">{$vo.name}</option>
+                            {/volist}
+                        </select>
+                        {else /}
+                        {volist name='street' id='vo'}
+                        {if $address.area_id==$vo.code}
+                        <input type="text" value="{$vo.name}" autocomplete="off" class="layui-input" disabled>
+                        {/if}
+                        {/volist}
+                        {/if}
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label">街道/镇</label>
+                    <div class="layui-input-block">
+                        <div id="demo1"></div>
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label">村/社区</label>
+                    <div class="layui-input-block">
+                        <div id="demo2"></div>
+                    </div>
+                </div>
+            </td>
+        </tr>
+
         <tr>
             <td class="layui-td-gray">标题<font>*</font></td>
             <td colspan="7"><input type="text" name="title" lay-verify="required" lay-reqText="请输入标题"
@@ -48,7 +85,7 @@
                         <img src=""
                              onerror="javascript:this.src='{__GOUGU__}/gougu/images/nonepic600x360.jpg';this.onerror=null;"
                              width="100" style="max-width: 100%; height:66px;"/>
-                        <input type="hidden" name="image" value="">
+                        <input type="hidden" name="images" value="" lay-verify="required">
                     </div>
                 </div>
             </td>
@@ -73,10 +110,13 @@
 
 <!-- 脚本 -->
 {block name="script"}
+<script src="/static/assets/js/xm-select.js"></script>
 <script>
     const editorType = '{$editor}';
     var moduleInit = ['tool', 'tagpicker', 'tinymce'];
-
+    var group_access = "{:session('gougu_admin')['group_access']}"
+    var area_id = ""
+    var street_id = ""
     function gouguInit() {
         var form = layui.form, tool = layui.tool, tagspicker = layui.tagpicker;
 
@@ -100,10 +140,63 @@
             selector: "#container_content",
             height: 500
         });
+
+        if (area_id != 0) {
+            street(area_id)
+        }
+        if (street_id != 0) {
+            village(street_id)
+        }
+        form.on('select(area_id)', function (data) {
+            street(data.value)
+        });
+        function street (id) {
+            var demo1 = xmSelect.render({
+                name: 'street_id',
+                el: '#demo1',
+                initValue: [street_id],
+                prop: {
+                    name: 'name',
+                    value: 'code',
+                },
+                data: [],
+                radio: true,
+
+                on: function (data) {
+                    var arr = data.arr;
+                    village(arr[0]['code'])
+                },
+            })
+            $.get('/api/geo/street?pcode=' + id, function (result) {
+                demo1.update({
+                    data: result.data
+                })
+            });
+        }
+        function village (id) {
+            var demo2 = xmSelect.render({
+                name: 'village_id',
+                el: '#demo2',
+                initValue: [],
+                prop: {
+                    name: 'name',
+                    value: 'code',
+                },
+                data: [],
+                radio: true,
+
+            })
+            $.get('/api/geo/village?pcode=' + id, function (result) {
+                demo2.update({
+                    data: result.data
+                })
+            });
+        }
+
         //监听提交
         form.on('submit(webform)', function (data) {
-            data.field.content = tinyMCE.editors['container_content'].getContent();
-            if (data.field.content == '') {
+            data.field.introduce = tinyMCE.editors['container_content'].getContent();
+            if (data.field.introduce == '') {
                 layer.msg('请先完善文章内容');
                 return false;
             }
diff --git a/app/admin/view/nk/village/edit.html b/app/admin/view/nk/village/edit.html
index 99328b9..b911c41 100644
--- a/app/admin/view/nk/village/edit.html
+++ b/app/admin/view/nk/village/edit.html
@@ -15,6 +15,43 @@
 <form class="layui-form p-4">
     <h3 class="pb-3">编辑文章表</h3>
     <table class="layui-table layui-table-form">
+
+        <tr>
+            <td class="layui-td-gray">区域<font>*</font></td>
+            <td colspan="3">
+                <div class="layui-form-item">
+                    <label class="layui-form-label">区县</label>
+                    <div class="layui-input-block">
+                        {if {:session('gougu_admin')['group_access']==1}
+                        <select name="area_id" lay-filter="area_id" lay-verify="required">
+                            {volist name='street' id='vo'}
+                            <option value="{$vo.code}">{$vo.name}</option>
+                            {/volist}
+                        </select>
+                        {else /}
+                        {volist name='street' id='vo'}
+                        {if $address.area_id==$vo.code}
+                        <input type="text" value="{$vo.name}" autocomplete="off" class="layui-input" disabled>
+                        {/if}
+                        {/volist}
+                        {/if}
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label">街道/镇</label>
+                    <div class="layui-input-block">
+                        <div id="demo1"></div>
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label">村/社区</label>
+                    <div class="layui-input-block">
+                        <div id="demo2"></div>
+                    </div>
+                </div>
+            </td>
+        </tr>
+
         <tr>
             <td class="layui-td-gray">标题<font>*</font></td>
             <td colspan="7"><input type="text" name="title" lay-verify="required" lay-reqText="请输入标题"
@@ -74,8 +111,12 @@
 
 <!-- 脚本 -->
 {block name="script"}
+<script src="/static/assets/js/xm-select.js"></script>
 <script>
     var  moduleInit = ['tool', 'tagpicker', 'tinymce'];
+    var group_access = "{:session('gougu_admin')['group_access']}"
+    var area_id = "{$detail.area_id}"
+    var street_id = "{$detail.street_id}"
     function gouguInit() {
         var form = layui.form, tool = layui.tool, tagpicker = layui.tagpicker;
 
@@ -99,10 +140,63 @@
             selector: "#container_content",
             height: 500
         });
+
+        if (area_id != 0) {
+            street(area_id)
+        }
+        if (street_id != 0) {
+            village(street_id)
+        }
+        form.on('select(area_id)', function (data) {
+            street(data.value)
+        });
+        function street (id) {
+            var demo1 = xmSelect.render({
+                name: 'street_id',
+                el: '#demo1',
+                initValue: [street_id],
+                prop: {
+                    name: 'name',
+                    value: 'code',
+                },
+                data: [],
+                radio: true,
+
+                on: function (data) {
+                    var arr = data.arr;
+                    village(arr[0]['code'])
+                },
+            })
+            $.get('/api/geo/street?pcode=' + id, function (result) {
+                demo1.update({
+                    data: result.data
+                })
+            });
+        }
+        function village (id) {
+            var demo2 = xmSelect.render({
+                name: 'village_id',
+                el: '#demo2',
+                initValue: ["{$detail.village_code}"],
+                prop: {
+                    name: 'name',
+                    value: 'code',
+                },
+                data: [],
+                radio: true,
+
+            })
+            $.get('/api/geo/village?pcode=' + id, function (result) {
+                demo2.update({
+                    data: result.data
+                })
+            });
+        }
+
         //监听提交
         form.on('submit(webform)', function (data) {
-            data.field.content = tinyMCE.editors['container_content'].getContent();
-            if (data.field.content == '') {
+            data.field.introduce = tinyMCE.editors['container_content'].getContent();
+            if (data.field.introduce == '') {
                 layer.msg('请先完善文章内容');
                 return false;
             }