From 81f6c4879444b3010d5ff9ae254e63b3d823b183 Mon Sep 17 00:00:00 2001
From: Haiyi <1021441632@qq.com>
Date: Tue, 6 Dec 2022 14:35:30 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20feat(ID1000781):=E3=80=90Bug?=
 =?UTF-8?q?=E8=BD=AC=E9=9C=80=E6=B1=82=E3=80=91=E8=AE=BE=E7=BD=AE=E4=BA=86?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=9C=B0=E5=9D=80=EF=BC=8C=E7=A1=AE=E5=AE=9A?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E9=A1=B5=E9=9D=A2=E9=80=89=E6=8B=A9=E2=80=9C?=
 =?UTF-8?q?=E7=89=A9=E6=B5=81=E2=80=9D=E6=96=B9=E5=BC=8F=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E9=9C=80=E8=A6=81=E8=87=AA=E5=8A=A8=E9=80=89=E6=8B=A9=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/submitOrder/index.tsx | 31 +++++++++++++++++++++++++++++--
 1 file changed, 29 insertions(+), 2 deletions(-)

diff --git a/src/pages/submitOrder/index.tsx b/src/pages/submitOrder/index.tsx
index 6d8fbed..a3950b8 100644
--- a/src/pages/submitOrder/index.tsx
+++ b/src/pages/submitOrder/index.tsx
@@ -15,6 +15,7 @@ import {
 import { alert } from '@/common/common'
 import { formatDateTime, formatPriceDiv, formatWeightDiv } from '@/common/format'
 import IconFont from '@/components/iconfont/iconfont'
+import { MpPurchaserAddressList } from '@/api/addressList'
 
 // 卡片盒子元素
 interface Obs {
@@ -99,6 +100,10 @@ const GoodsItem = (porps: PropGoods) => {
 const GoodsItemWithMemo = memo(GoodsItem)
 
 const SubmitOrder = () => {
+  const addrssRef = useRef<any>([])
+  const pages = Taro.getCurrentPages()
+  const currPage = pages[pages.length - 1] // 获取当前页面
+  const { fetchData: addressFetch } = MpPurchaserAddressList()
   const router: any = useRouter()
   const [infoObj, setInfoObj] = useState<any>({})
   let selectId = -1
@@ -116,6 +121,21 @@ const SubmitOrder = () => {
       title: '请稍等...',
       mask: true,
     })
+    if (value === 2 && addrssRef.current.length > 0 && !currPage.data?.addressObj) {
+      setInfoObj(val => ({
+        ...val,
+        province_name: addrssRef.current[0]?.province_name,
+        address_id: addrssRef.current[0]?.id,
+        city_name: addrssRef.current[0]?.city_name,
+        address_detail: addrssRef.current[0]?.address_detail,
+        district_name: addrssRef.current[0]?.district_name,
+        target_user_name: addrssRef.current[0]?.name,
+        purchaser_phone: addrssRef.current[0]?.phone,
+      }))
+    }
+    else {
+      alert.error('请选择一个收货地址')
+    }
     setReceivingStatus(value)
     Taro.hideLoading()
   }, 300)
@@ -213,13 +233,18 @@ const SubmitOrder = () => {
     })
   }
 
+  // 获取地址
+  const getAddress = async() => {
+    const result = await addressFetch({ purchaser_id: router.params.purchaser_id })
+    addrssRef.current = result?.data?.list.filter((item) => { return item.is_default })
+  }
+
   useEffect(() => {
     setInfoObj(infoObj)
   }, [infoObj])
   useDidShow(() => {
     // 获取选择的地址
-    const pages = Taro.getCurrentPages()
-    const currPage = pages[pages.length - 1] // 获取当前页面
+
     setInfoObj(val => ({
       ...val,
       sale_mode: Number(router.params.sale_mode),
@@ -253,7 +278,9 @@ const SubmitOrder = () => {
       setReceivingStatus(2)
     }
   })
+
   useEffect(() => {
+    getAddress()
     getDetail()
   }, [])
   return (