Merge branch 'develop'

src/pages/rentManage/rentGoods/rentAddOrEdit/components/addressInfo/index.tsx

@@ -23,10 +23,17 @@ const AddressInfo = forwardRef<any, selfProps>(({ rentGoodsDetails }, ref) => {
   }>();
 
   const [addOrEditAddressModalShow, setAddOrEditAddressModalShow] = useState<boolean>(false);
-
+  // 当前用户地址列表
   const [addressOptionList, setAddressOptionList] = useState<
     { label: string; value: number; districtCode: string }[]
   >([]);
+  // 编辑查询的某个用户地址
+  const [addressItem, setAddressItem] = useState<{
+    label: string;
+    value: number;
+    districtCode: string;
+  }>();
+
   const [expressOptionList, setExpressOptionList] = useState<{ label: string; value: string }[]>(
     [],
   );
@@ -50,7 +57,7 @@ const AddressInfo = forwardRef<any, selfProps>(({ rentGoodsDetails }, ref) => {
           districtCode: v.districtCode,
         }));
         const addressItemObj = result.find((v) => v.type === 0);
-        if (addressItemObj) {
+        if (addressItemObj && !addressItem) {
           addressInfoForm.setFieldsValue({
             returnAddress: addressItemObj.id,
             shipAddress: addressItemObj.id,
@@ -105,14 +112,18 @@ const AddressInfo = forwardRef<any, selfProps>(({ rentGoodsDetails }, ref) => {
     setAddOrEditAddressModalShow(false);
   };
   // 获取地址
-  const getUserAddressInfo = (userAddressId: number, key: string) => {
+  const getUserAddressInfo = (userAddressId: number) => {
     SystemManageAPI.getUserAddressInfo({ userAddressId }).then(({ result }) => {
-      addressInfoForm.setFieldValue(
-        key,
-        result.takeName +
-          result.takePhone +
-          `(${result.takeRegion.split('/').join('') + result.takeAddress})`,
-      );
+      if (result) {
+        setAddressItem({
+          value: result.id,
+          label:
+            result.takeName +
+            result.takePhone +
+            `(${result.takeRegion.split('/').join('') + result.takeAddress})`,
+          districtCode: result.districtCode,
+        });
+      }
     });
   };
 
@@ -124,9 +135,11 @@ const AddressInfo = forwardRef<any, selfProps>(({ rentGoodsDetails }, ref) => {
 
   useEffect(() => {
     if (rentGoodsDetails) {
-      getUserAddressInfo(rentGoodsDetails.shipAddress, 'shipAddress');
-      getUserAddressInfo(rentGoodsDetails.returnAddress, 'returnAddress');
+      getUserAddressInfo(rentGoodsDetails.shipAddress);
+      getUserAddressInfo(rentGoodsDetails.returnAddress);
       addressInfoForm.setFieldsValue({
+        shipAddress: rentGoodsDetails.shipAddress,
+        returnAddress: rentGoodsDetails.returnAddress,
         logisticsCompany: rentGoodsDetails.logisticsCompany,
         modeOfDelivery: rentGoodsDetails.modeOfDelivery,
       });
@@ -141,7 +154,10 @@ const AddressInfo = forwardRef<any, selfProps>(({ rentGoodsDetails }, ref) => {
           name='shipAddress'
           rules={[{ required: true, message: '请选择发货地址' }]}
         >
-          <Select placeholder='请选择发货地址' options={addressOptionList}></Select>
+          <Select
+            placeholder='请选择发货地址'
+            options={addressItem ? [...addressOptionList, addressItem] : addressOptionList}
+          ></Select>
         </Form.Item>
         <Form.Item>
           <Row>
@@ -159,7 +175,10 @@ const AddressInfo = forwardRef<any, selfProps>(({ rentGoodsDetails }, ref) => {
           name='returnAddress'
           rules={[{ required: true, message: '请选择归还地址' }]}
         >
-          <Select placeholder='请选择归还地址' options={addressOptionList}></Select>
+          <Select
+            placeholder='请选择归还地址'
+            options={addressItem ? [...addressOptionList, addressItem] : addressOptionList}
+          ></Select>
         </Form.Item>
         <Form.Item>
           <Row>