From 03eec6bb0dc59144e85fd5165fe67e1a546d29dc Mon Sep 17 00:00:00 2001
From: yaooo <272523191@qq.com>
Date: Mon, 27 Nov 2023 15:22:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=90=8E=E5=8F=B0=E7=BB=86?=
 =?UTF-8?q?=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/src/views/consumer/lists/index.vue | 20 +++++++++++++-------
 admin/src/views/land/index.vue           | 17 ++++++++++++++---
 app/adminapi/logic/land/ProductLogic.php |  1 +
 3 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/admin/src/views/consumer/lists/index.vue b/admin/src/views/consumer/lists/index.vue
index 02b14389..5664eb4a 100644
--- a/admin/src/views/consumer/lists/index.vue
+++ b/admin/src/views/consumer/lists/index.vue
@@ -30,12 +30,6 @@
                 <el-form-item>
                     <el-button type="primary" @click="resetPage">查询</el-button>
                     <el-button @click="resetParams">重置</el-button>
-                    <export-data
-                        class="ml-2.5"
-                        :fetch-fun="getUserList"
-                        :params="queryParams"
-                        :page-size="pager.size"
-                    />
                 </el-form-item>
             </el-form>
         </el-card>
@@ -54,8 +48,20 @@
                 </el-table-column>
                 <el-table-column label="注册来源" prop="channel" min-width="100" />
                 <el-table-column label="注册时间" prop="create_time" min-width="120" />
-                <el-table-column label="操作" width="120" fixed="right">
+                <el-table-column label="操作" width="200" align="center" fixed="right">
                     <template #default="{ row }">
+                        <el-button v-perms="['land.land/lists']" type="primary" link>
+                            <router-link
+                                :to="{
+                                    path: getRoutePath('land.land/lists'),
+                                    query: {
+                                        user_id: row.id
+                                    }
+                                }"
+                            >
+                                土地信息
+                            </router-link>
+                        </el-button>
                         <el-button v-perms="['user.user/detail']" type="primary" link>
                             <router-link
                                 :to="{
diff --git a/admin/src/views/land/index.vue b/admin/src/views/land/index.vue
index c0ac33c7..90b71364 100644
--- a/admin/src/views/land/index.vue
+++ b/admin/src/views/land/index.vue
@@ -26,13 +26,19 @@
             </el-form>
         </el-card>
         <el-card class="!border-none" v-loading="pager.loading" shadow="never">
-            <!-- <el-button
+            <el-button v-perms="['land.land/add']" type="primary" @click="handleAdd">
+                <template #icon>
+                    <icon name="el-icon-Plus" />
+                </template>
+                新增
+            </el-button>
+            <el-button
                 v-perms="['land.land/delete']"
                 :disabled="!selectData.length"
                 @click="handleDelete(selectData)"
             >
                 删除
-            </el-button> -->
+            </el-button>
             <div class="mt-4">
                 <el-table :data="pager.lists" @selection-change="handleSelectionChange">
                     <el-table-column type="selection" width="55" />
@@ -119,14 +125,19 @@ import { timeFormat } from '@/utils/util'
 import feedback from '@/utils/feedback'
 import EditPopup from './edit.vue'
 
+const { query } = useRoute()
 const editRef = shallowRef<InstanceType<typeof EditPopup>>()
 // 是否显示编辑框
 const showEdit = ref(false)
 
+let user_id = query.user_id
+if (typeof(user_id) == 'undefined') {
+    user_id = ''
+}
 
 // 查询条件
 const queryParams = reactive({
-    user_id: '',
+    user_id: user_id,
     title: '',
     master_name: '',
     master_phone: '',
diff --git a/app/adminapi/logic/land/ProductLogic.php b/app/adminapi/logic/land/ProductLogic.php
index 7f28866e..8e7df0c7 100644
--- a/app/adminapi/logic/land/ProductLogic.php
+++ b/app/adminapi/logic/land/ProductLogic.php
@@ -105,6 +105,7 @@ class ProductLogic extends BaseLogic
      */
     public static function delete(array $params): bool
     {
+        Db::name('land_product')->where('product_id', $params['id'])->delete();
         return Product::destroy($params['id']);
     }