fix: merge

fix: scopes接口

src/pages/home/index.tsx

@@ -39,12 +39,12 @@ const Home = () => {
   };
 
   useEffect(() => {
-    service.settingDetail(['front']).then((res) => {
+    service.settingDetail('front').then((res) => {
       if (res.status === 200) {
         setInitialState({
           ...initialState,
           settings: {
-            ...res.result[0].properties,
+            ...res.result,
           },
         });
       }

src/pages/home/service.ts

@@ -38,10 +38,14 @@ class Service {
       method: 'POST',
       data,
     });
-  settingDetail = (data?: any) =>
-    request(`/${SystemConst.API_BASE}/system/config/scopes`, {
-      method: 'POST',
-      data,
+  // settingDetail = (data?: any) =>
+  //   request(`/${SystemConst.API_BASE}/system/config/scopes`, {
+  //     method: 'POST',
+  //     data,
+  //   });
+  settingDetail = (scopes: any) =>
+    request(`/${SystemConst.API_BASE}/system/config/${scopes}`, {
+      method: 'GET',
     });
 }
 

src/pages/system/User/Save/index.tsx

@@ -451,7 +451,7 @@ const Save = (props: Props) => {
       onOk={save}
       width="35vw"
       permissionCode={'system/User'}
-      permission={['add', 'edit']}
+      permission={['update']}
     >
       <Form form={form} layout="vertical">
         <SchemaField schema={schema} scope={{ useAsyncDataSource, getRole, getOrg }} />