Merge branch 'dev' of http://59.110.10.99:53000/liuc/fe_supplier_frontend into dev

src/pages/login/login.tsx

@@ -26,19 +26,28 @@ const LoginPage: React.FC = () => {
 
   useEffect(() => {
     fetchCaptcha();
+    if(!sessionStorage.getItem('dict')) {
+      refreshDictCache().then((res) => {
+        if(res.code == 200) {
+          sessionStorage.setItem('dict', JSON.stringify(res.data))
+        }
+      })
+    }
+   
+
   }, [activeKey]);
 
    // 组件挂载时，检查是否有记住的用户名
   useEffect(() => {
-    const savedUser = localStorage.getItem('remember_user');
-    if (savedUser) {
-      const user = JSON.parse(savedUser);
-      form.setFieldsValue({
-        username: user.username,
-        password: user.password,
-        remember: true,
-      });
-    }
+    // const savedUser = localStorage.getItem('remember_user');
+    // if (savedUser) {
+    //   const user = JSON.parse(savedUser);
+    //   form.setFieldsValue({
+    //     username: user.username,
+    //     password: user.password,
+    //     remember: true,
+    //   });
+    // }
   }, [form]);
   const onFinish = async (values: any) => {
     setLoading(true);
@@ -80,12 +89,7 @@ const LoginPage: React.FC = () => {
         }
         sessionStorage.setItem('currentUser', JSON.stringify(loginRes.data));
 
-        refreshDictCache().then((res) => {
-          if(res.code == 200) {
-            sessionStorage.setItem('dict', JSON.stringify(res.data))
-          }
-        })
-
+        
         getUserinfo().then(async (res) => {
           // if(res.code == 200) {
           const roleIdList = res.authorityList.map((item: any) => {

src/pages/register/supplier/CommonFormSections.tsx

@@ -25,6 +25,7 @@ import { getRegionTree, getregionInternational } from '@/servers/api/register';
 import { getDictList } from '@/servers/api/dicts';
 import type { DictItem } from '@/servers/api/dicts';
 import FileUpload from '@/components/FileUpload/FileUpload';
+import DictRegionSelect from '@/components/CommonSelect/DictRegionSelect'
 
 const { Option } = Select;
 
@@ -407,12 +408,12 @@ export const BankAccountSection: React.FC<CommonFormSectionsProps> = ({ form, su
   }, []);
   useEffect(() => {
     if (supplierType) {
-      const submitInterface = supplierType === 'dvs' ? getRegionTree : getregionInternational;
-      submitInterface().then((res) => {
-        if (res.code === 200) {
-          setAddressOptions(convertToCascaderOptions(res.data));
-        }
-      });
+      // const submitInterface = supplierType === 'dvs' ? getRegionTree : getregionInternational;
+      // submitInterface({ pId: 0 }).then((res) => {
+      //   if (res.code === 200) {
+      //     setAddressOptions(convertToCascaderOptions(res.data));
+      //   }
+      // });
     }
   }, [supplierType]);
 
@@ -592,7 +593,8 @@ export const BankAccountSection: React.FC<CommonFormSectionsProps> = ({ form, su
                       noStyle
                       rules={[{ required: true, message: '请选择地址' }]}
                     >
-                      <Cascader
+                      <DictRegionSelect onChange={(value:any) => handleAddressChange(value as string[], record)} />
+                      {/* <Cascader
                         options={addressOptions}
                         placeholder="请选择地址"
                         onChange={(value) => handleAddressChange(value, record)}
@@ -608,7 +610,7 @@ export const BankAccountSection: React.FC<CommonFormSectionsProps> = ({ form, su
                             });
                           },
                         }}
-                      />
+                      /> */}
                     </Form.Item>
                   </>
                 ),

src/pages/register/supplier/ForeignForm.tsx

@@ -53,7 +53,7 @@ const ForeignForm: React.FC<ForeignFormProps> = ({
       }
     });
 
-    getregionInternational().then((res) => {
+    getregionInternational({ pId: 0 }).then((res) => {
       if (res.code === 200) {
         setRegionOptions(res.data);
       }