Merge branch 'wj' of http://git.zonelife.cn:3000/zhangtao/city-gather-admin into wj

.env.test

@@ -2,15 +2,15 @@
 
 # VITE_SERVICE_BASE_URL=https://522d2ea1.r39.cpolar.top #王
 # VITE_SERVICE_BASE_URL=http://89561bkaq794.vicp.fun:53846 #张
-# VITE_SERVICE_BASE_URL=https://40e5b751.r3.cpolar.top#田
+ #VITE_SERVICE_BASE_URL=https://25740642.r3.cpolar.top #田
 # VITE_SERVICE_BASE_URL=https://425f86e6.r24.cpolar.top #邓
 # VITE_SERVICE_BASE_URL=http://74949mkfh190.vicp.fun #付
 # VITE_SERVICE_BASE_URL=https://smqjh.api.zswlgz.com
 # VITE_SERVICE_BASE_URL=https://735a1bda.r24.cpolar.top #黄
-# VITE_SERVICE_BASE_URL=http://192.168.0.11:8080 #wzq
+VITE_SERVICE_BASE_URL=http://192.168.0.11:8081 #wzq
 # VITE_SERVICE_BASE_URL=http://89561bkaq794.vicp.fun:53846
 
-VITE_SERVICE_BASE_URL=http://47.109.84.152:8081#打包测试本地服务器
+#VITE_SERVICE_BASE_URL=http://47.109.84.152:8081#打包测试本地服务器
 # VITE_SERVICE_BASE_URL=https://smqjh.api.zswlgz.com #服务器
 
 # other backend service base url, test environment

src/service/api/auth.ts

@@ -55,8 +55,8 @@ export function fetchLogin(data: {
     method: 'post',
     data: formData,
     headers: {
-      'Content-Type': 'multipart/form-data',
-      'X-Tenant-Domain': '192.168.0.11'
+      'Content-Type': 'multipart/form-data'
+      // 'X-Tenant-Domain': '192.168.0.11'
     }
   });
 }

src/views/manage/user/index.vue

@@ -11,7 +11,7 @@ import {
 } from '@/service/api';
 import { fetchGetChannelList } from '@/service/api/goods-center/store-goods';
 import { fetchGetDictDataList } from '@/service/api/system-manage';
-import { fetchGetDepartmentList } from '@/service/api/system-department';
+// import { fetchGetDepartmentList } from '@/service/api/system-department';
 import imgs from '@/assets/imgs/logo.png';
 import { useTable } from '@/components/zt/Table/hooks/useTable';
 import { $t } from '@/locales';
@@ -183,20 +183,20 @@ const [registerModalForm, { openModal, closeModal, getFieldsValue, setFieldsValu
             }
           }
         },
-
-        {
-          field: 'deptId',
-          label: '归属部门',
-          component: 'ApiTreeSelect',
-          required: true,
-          componentProps: {
-            api: fetchGetDepartmentList,
-            labelFeild: 'name',
-            valueFeild: 'id',
-            immediate: true,
-            resultFeild: 'data'
-          }
-        },
+        //
+        // {
+        //   field: 'deptId',
+        //   label: '归属部门',
+        //   component: 'ApiTreeSelect',
+        //   required: true,
+        //   componentProps: {
+        //     api: fetchGetDepartmentList,
+        //     labelFeild: 'name',
+        //     valueFeild: 'id',
+        //     immediate: true,
+        //     resultFeild: 'data'
+        //   }
+        // },
         {
           field: 'email',
           label: '邮箱',

src/views/tenant/tenant/index.vue

@@ -203,15 +203,15 @@ const [registerModalForm, { openModal, closeModal, getFieldsValue, setFieldsValu
           placeholder: '选择日期时间'
         } as any
       },
-      {
-        field: 'tenantDomain',
-        label: '绑定域名',
-        component: 'NInput',
-        required: true,
-        componentProps: {
-          placeholder: '请输入'
-        }
-      },
+      // {
+      //   field: 'tenantDomain',
+      //   label: '绑定域名',
+      //   component: 'NInput',
+      //   required: true,
+      //   componentProps: {
+      //     placeholder: '请输入'
+      //   }
+      // },
       {
         field: 'status',
         label: '租户状态',