From c6e6bb02d39176ccd6615a35f52e2db098557681 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Fri, 5 Sep 2025 14:38:28 +0800
Subject: [PATCH] =?UTF-8?q?refactor(sdy):=20=E8=B0=83=E6=95=B4=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E5=92=8C=E8=A1=A8?=
 =?UTF-8?q?=E6=A0=BC=E9=85=8D=E7=BD=AE-=20=E5=9C=A8=20sdyUser=20=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E4=B8=AD=E6=B7=BB=E5=8A=A0=20type=3D1=20=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6=EF=BC=8C=E7=94=A8=E4=BA=8E=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89=E7=89=B9=E5=AE=9A=E7=B1=BB=E5=9E=8B=E7=9A=84=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=20-=20=E4=BF=AE=E6=94=B9=20shopDealerApply=20?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E4=B8=AD=E7=9A=84=E8=A1=8C=E9=94=AE=E5=90=8D?=
 =?UTF-8?q?=EF=BC=8C=E4=BB=8E=20shopDealerApplyId=20=E6=94=B9=E4=B8=BA=20a?=
 =?UTF-8?q?pplyId=20-=20=E6=9B=B4=E6=96=B0=20shopAdmin=20=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E4=B8=AD=E7=9A=84=E6=8C=89=E9=92=AE=E6=96=87=E6=9C=AC?=
 =?UTF-8?q?=EF=BC=8C=E4=BB=8E"=E6=B7=BB=E5=8A=A0"=E6=94=B9=E4=B8=BA"?=
 =?UTF-8?q?=E9=82=80=E8=AF=B7=E6=B3=A8=E5=86=8C"=20-=20=E6=B3=A8=E9=87=8A?=
 =?UTF-8?q?=E6=8E=89=20.env.development=20=E4=B8=AD=E7=9A=84=20API=20URL?=
 =?UTF-8?q?=20=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                                                | 2 +-
 src/views/sdy/shopDealerApply/index.vue                         | 2 +-
 .../{sdyUser => shopDealerUserQuery}/components/org-select.vue  | 0
 .../sdy/{sdyUser => shopDealerUserQuery}/components/search.vue  | 0
 .../{sdyUser => shopDealerUserQuery}/components/status-test.vue | 0
 .../{sdyUser => shopDealerUserQuery}/components/user-edit.vue   | 0
 .../{sdyUser => shopDealerUserQuery}/components/user-import.vue | 0
 src/views/sdy/{sdyUser => shopDealerUserQuery}/index.vue        | 1 +
 src/views/shop/shopAdmin/index.vue                              | 2 +-
 src/views/shop/shopDealerApply/index.vue                        | 2 +-
 10 files changed, 5 insertions(+), 4 deletions(-)
 rename src/views/sdy/{sdyUser => shopDealerUserQuery}/components/org-select.vue (100%)
 rename src/views/sdy/{sdyUser => shopDealerUserQuery}/components/search.vue (100%)
 rename src/views/sdy/{sdyUser => shopDealerUserQuery}/components/status-test.vue (100%)
 rename src/views/sdy/{sdyUser => shopDealerUserQuery}/components/user-edit.vue (100%)
 rename src/views/sdy/{sdyUser => shopDealerUserQuery}/components/user-import.vue (100%)
 rename src/views/sdy/{sdyUser => shopDealerUserQuery}/index.vue (99%)

diff --git a/.env.development b/.env.development
index fbcc74b..b8ccd8b 100644
--- a/.env.development
+++ b/.env.development
@@ -1,5 +1,5 @@
 VITE_APP_NAME=后台管理(开发环境)
-VITE_API_URL=http://127.0.0.1:9200/api
+#VITE_API_URL=http://127.0.0.1:9200/api
 #VITE_SERVER_API_URL=http://127.0.0.1:8000/api
 
 
diff --git a/src/views/sdy/shopDealerApply/index.vue b/src/views/sdy/shopDealerApply/index.vue
index 1d34613..509fe47 100644
--- a/src/views/sdy/shopDealerApply/index.vue
+++ b/src/views/sdy/shopDealerApply/index.vue
@@ -3,7 +3,7 @@
     <a-card :bordered="false" :body-style="{ padding: '16px' }">
       <ele-pro-table
         ref="tableRef"
-        row-key="shopDealerApplyId"
+        row-key="applyId"
         :columns="columns"
         :datasource="datasource"
         :customRow="customRow"
diff --git a/src/views/sdy/sdyUser/components/org-select.vue b/src/views/sdy/shopDealerUserQuery/components/org-select.vue
similarity index 100%
rename from src/views/sdy/sdyUser/components/org-select.vue
rename to src/views/sdy/shopDealerUserQuery/components/org-select.vue
diff --git a/src/views/sdy/sdyUser/components/search.vue b/src/views/sdy/shopDealerUserQuery/components/search.vue
similarity index 100%
rename from src/views/sdy/sdyUser/components/search.vue
rename to src/views/sdy/shopDealerUserQuery/components/search.vue
diff --git a/src/views/sdy/sdyUser/components/status-test.vue b/src/views/sdy/shopDealerUserQuery/components/status-test.vue
similarity index 100%
rename from src/views/sdy/sdyUser/components/status-test.vue
rename to src/views/sdy/shopDealerUserQuery/components/status-test.vue
diff --git a/src/views/sdy/sdyUser/components/user-edit.vue b/src/views/sdy/shopDealerUserQuery/components/user-edit.vue
similarity index 100%
rename from src/views/sdy/sdyUser/components/user-edit.vue
rename to src/views/sdy/shopDealerUserQuery/components/user-edit.vue
diff --git a/src/views/sdy/sdyUser/components/user-import.vue b/src/views/sdy/shopDealerUserQuery/components/user-import.vue
similarity index 100%
rename from src/views/sdy/sdyUser/components/user-import.vue
rename to src/views/sdy/shopDealerUserQuery/components/user-import.vue
diff --git a/src/views/sdy/sdyUser/index.vue b/src/views/sdy/shopDealerUserQuery/index.vue
similarity index 99%
rename from src/views/sdy/sdyUser/index.vue
rename to src/views/sdy/shopDealerUserQuery/index.vue
index d2c6379..5f818b6 100644
--- a/src/views/sdy/sdyUser/index.vue
+++ b/src/views/sdy/shopDealerUserQuery/index.vue
@@ -319,6 +319,7 @@ const datasource: DatasourceFunction = ({
   where.roleId = filters.roles;
   where.keywords = searchText.value;
   where.isAdmin = 0;
+  where.type = 1;
   return pageUsers({page, limit, ...where, ...orders});
 };
 
diff --git a/src/views/shop/shopAdmin/index.vue b/src/views/shop/shopAdmin/index.vue
index 8fcd34a..3fccdbd 100644
--- a/src/views/shop/shopAdmin/index.vue
+++ b/src/views/shop/shopAdmin/index.vue
@@ -20,7 +20,7 @@
               <template #icon>
                 <plus-outlined/>
               </template>
-              <span>添加</span>
+              <span>邀请注册</span>
             </a-button>
             <a-input-search
               allow-clear
diff --git a/src/views/shop/shopDealerApply/index.vue b/src/views/shop/shopDealerApply/index.vue
index f1ba135..17ebf8e 100644
--- a/src/views/shop/shopDealerApply/index.vue
+++ b/src/views/shop/shopDealerApply/index.vue
@@ -3,7 +3,7 @@
     <a-card :bordered="false" :body-style="{ padding: '16px' }">
       <ele-pro-table
         ref="tableRef"
-        row-key="shopDealerApplyId"
+        row-key="applyId"
         :columns="columns"
         :datasource="datasource"
         :customRow="customRow"