From 9af5e2d25eb01168d39080e2fcddd30fae2ac726 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Tue, 31 Jan 2023 11:45:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B08?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/controller/Index.php   |  4 ++--
 app/admin/controller/nk/User.php | 25 +++++++++++++------------
 app/admin/view/nk/user/edit.html | 20 ++++++++------------
 app/home/controller/Index.php    |  1 +
 4 files changed, 24 insertions(+), 26 deletions(-)

diff --git a/app/admin/controller/Index.php b/app/admin/controller/Index.php
index e502868..5a846ff 100644
--- a/app/admin/controller/Index.php
+++ b/app/admin/controller/Index.php
@@ -45,7 +45,7 @@ class Index extends BaseController
     public function main()
     {
         if ($this->adminInfo['id']!=1){
-            $find = Db::name('szxc_information_useraddress')->where('user_id', $this->adminInfo['id'])->find();
+            $find = Db::table('fa_szxc_information_useraddress')->where('user_id', $this->adminInfo['id'])->find();
             if ($find) {
                 if ($find['auth_range']==1){
                     $where[] = ['village_id', '=', $find['village_id']];
@@ -93,7 +93,7 @@ class Index extends BaseController
             $work_num = Db::table('fa_szxc_information_usermsg')
                 ->alias('m')
                 ->where($where)
-                ->join(['user'=>'u'],'m.user_id=u.id and u.group_id = 3')->count();
+                ->join(['fa_user'=>'u'],'m.user_id=u.id and u.group_id = 3')->count();
         }else{
             $work_num = Db::table('fa_user')
                 ->alias('u')
diff --git a/app/admin/controller/nk/User.php b/app/admin/controller/nk/User.php
index cc23c8f..e5c0d44 100644
--- a/app/admin/controller/nk/User.php
+++ b/app/admin/controller/nk/User.php
@@ -175,18 +175,6 @@ class User extends BaseController
         //种植信息
         $planting = Db::table('fa_szxc_information_planting')->where('user_id', $params['id'])
             ->find();
-        $strlen = strlen($planting['breed_msg']);
-        if ($strlen != 0 || $strlen > 10) {
-            $planting['breed_msg'] = json_decode($planting['breed_msg'], true);
-        }
-        $strlen1 = strlen($planting['crops_msg']);
-        if ($strlen1 != 0 || $strlen1 > 10) {
-            $planting['crops_msg'] = json_decode($planting['crops_msg'], true);
-        }
-        $strlen2 = strlen($planting['tools_msg']);
-        if ($strlen2 != 0 || $strlen2 > 10) {
-            $planting['tools_msg'] = json_decode($planting['tools_msg'], true);
-        }
         //保险信息
         $insurancearr = Db::table('fa_szxc_information_insurance')->where('user_id', $params['id'])->find();
         //健康信息
@@ -199,6 +187,19 @@ class User extends BaseController
                 "is_wz" => '',
                 "nature_of_land" => "",
             ];
+        }else{
+            $strlen = strlen($planting['breed_msg']);
+            if ($strlen != 0 || $strlen > 10) {
+                $planting['breed_msg'] = json_decode($planting['breed_msg'], true);
+            }
+            $strlen1 = strlen($planting['crops_msg']);
+            if ($strlen1 != 0 || $strlen1 > 10) {
+                $planting['crops_msg'] = json_decode($planting['crops_msg'], true);
+            }
+            $strlen2 = strlen($planting['tools_msg']);
+            if ($strlen2 != 0 || $strlen2 > 10) {
+                $planting['tools_msg'] = json_decode($planting['tools_msg'], true);
+            }
         }
         if ($insurancearr == null) {
             $insurancearr = [
diff --git a/app/admin/view/nk/user/edit.html b/app/admin/view/nk/user/edit.html
index 93d2e85..b9fee01 100644
--- a/app/admin/view/nk/user/edit.html
+++ b/app/admin/view/nk/user/edit.html
@@ -197,11 +197,12 @@
                                 <div class="layui-input-inline">
                                     面积 <input type="text" name="crops_msg[{$key-1}][mianji]" autocomplete="off" class="layui-input" value="{$vo.mianji}">
                                 </div>
+                                <button type="button" class="layui-btn layui-btn-normal a2" style="position: relative; top:18px">删除</button>
+
                         </div2>
                         {/volist}
 
                         <button type="button" class="layui-btn layui-btn-normal" id="a1" style="display: block; margin-left: 100px;">添加</button>
-                        <button type="button" class="layui-btn layui-btn-normal" id="a2" style="position: relative; left: 170px;top:-38px">删除</button>
                     </div>
                     <div class="pt-3">
                         <button class="layui-btn layui-btn-normal" lay-submit="" lay-filter="webform2">立即提交</button>
@@ -483,7 +484,7 @@
                     <div class="pt-3">
                         <button class="layui-btn layui-btn-normal" lay-submit="" lay-filter="webform4">立即提交</button>
                         <button type="reset" class="layui-btn layui-btn-primary">重置</button>
-                    </div>  
+                    </div>
                 </form>
             </div>
             <div class="layui-tab-item">
@@ -498,6 +499,9 @@
     {block name="script"}
     <script>
         var moduleInit = ['tool'];
+        function ceshi(e){
+            $(e).parent().remove();
+        }
         function gouguInit () {
             var form = layui.form, tool = layui.tool;
             var htmlid= $("#nzw").children("div2").length;
@@ -514,21 +518,13 @@
                         <div class="layui-input-inline">
                             面积 <input type="text" name="crops_msg[`+htmlid+`][mianji]" autocomplete="off" class="layui-input">
                         </div>
+                       <div  class="layui-btn layui-btn-normal"  onclick="ceshi(this)" style="position: relative;top:18px">删除</div>
                  </div2>
                 `
-
-                $("#nzw div2:last").after(html);
+                $("#nzw").append(html);
                 ++htmlid
             });
 
-            $("#a2").on("click", function(e) {
-                if(htmlid === 1){
-                    return;
-                }
-                $("#nzw div2:last").remove();
-                --htmlid
-            });
-
             //监听提交
             form.on('submit(webform1)', function (data) {
                 let callback = function (e) {
diff --git a/app/home/controller/Index.php b/app/home/controller/Index.php
index 008f511..8f8105e 100644
--- a/app/home/controller/Index.php
+++ b/app/home/controller/Index.php
@@ -16,6 +16,7 @@ class Index extends BaseController
 {
     public function index()
     {
+        return redirect('/admin');
         add_user_log('view', '首页');
 		$count = \think\facade\Db::name('UserLog')->where(array('type' => 'down'))->count();
         return View('',['count'=>$count]);