From c2cd2dbbc9b5c8acc83c9c3a106c1e9dc7efc906 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Wed, 3 Jun 2026 15:52:49 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E8=AE=BE=E5=A4=87=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E4=B8=8D=E5=88=B0=E5=AD=90=E5=95=86=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                     | 8 ++++----
 src/components/Select/SelectMch.vue  | 2 +-
 src/views/hard/hard-manager/form.vue | 4 +++-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/.env.development b/.env.development
index 8875532..6549a56 100644
--- a/.env.development
+++ b/.env.development
@@ -10,16 +10,16 @@ ENV = 'development'
 # ADMIN 服务地址
 # VITE_ADMIN_PROXY_PATH = http://123.157.250.162:8089/api/ # 测试线上
 # VITE_ADMIN_PROXY_PATH = http://123.156.230.15:8089/api/ # 测试线上-过期
-VITE_ADMIN_PROXY_PATH = http://localhost:9999/
+# VITE_ADMIN_PROXY_PATH = http://localhost:9999/
 # VITE_ADMIN_PROXY_PATH = https://dzc-test-1.fy.takin.cc # 邓-本地
-# VITE_ADMIN_PROXY_PATH = https://stgl.pj.gov.cn/api # 正式环境线上
+VITE_ADMIN_PROXY_PATH = https://stgl.pj.gov.cn/api # 正式环境线上
 
 # 图片访问基础地址
 # VITE_IMAGE_BASE_PATH = http://123.157.250.162:8089/api/ # 测试线上
 # VITE_IMAGE_BASE_PATH = http://123.156.230.15:8089/api/ # 测试线上-过期
-VITE_IMAGE_BASE_PATH = http://localhost:9999
+# VITE_IMAGE_BASE_PATH = http://localhost:9999
 # VITE_IMAGE_BASE_PATH = https://dzc-test-1.fy.takin.cc # 邓-本地
-# VITE_IMAGE_BASE_PATH = https://stgl.pj.gov.cn/api/ # 正式环境线上
+VITE_IMAGE_BASE_PATH = https://stgl.pj.gov.cn/api/ # 正式环境线上
 
 # 代码生成服务地址
 VITE_GEN_PROXY_PATH = http://192.168.110.156:5003
diff --git a/src/components/Select/SelectMch.vue b/src/components/Select/SelectMch.vue
index 3c11246..1f6bd56 100644
--- a/src/components/Select/SelectMch.vue
+++ b/src/components/Select/SelectMch.vue
@@ -41,7 +41,7 @@ const props = withDefaults(
 const queryForm = reactive<any>({
 	name: null,
 	current: 1,
-	size: 9999,
+	size: 20,
 })
 
 const state = reactive<any>({
diff --git a/src/views/hard/hard-manager/form.vue b/src/views/hard/hard-manager/form.vue
index aa41bae..5f292d1 100644
--- a/src/views/hard/hard-manager/form.vue
+++ b/src/views/hard/hard-manager/form.vue
@@ -10,7 +10,9 @@
 				</el-col>
 				<el-col :span="24" class="mb20">
 					<el-form-item label="商户" prop="merchantId">
-						<select-mch v-model="form.merchantId" placeholder="请选择商户" />
+						<select-mch :apiParams="{
+							parentIsNull: false
+						}" v-model="form.merchantId" placeholder="请选择商户" />
 					</el-form-item>
 				</el-col>
 				<el-col v-if="false" :span="24" class="mb20">