diff --git a/src/components/AddressList/index.tsx b/src/components/AddressList/index.tsx index 20f97dd..0387299 100644 --- a/src/components/AddressList/index.tsx +++ b/src/components/AddressList/index.tsx @@ -20,7 +20,8 @@ interface Params { // 地址列表 const AddressList = memo(forwardRef((props: Params, AddressListRef) => { - + let pages = Taro.getCurrentPages(); // 获取当前的页面栈 + let prevPage = pages[pages.length - 2]; const { addButtonEnabled = true, focusBorderEnabled = false } = props; const { fetchData, state } = mppurchaseraddresslist() @@ -38,6 +39,13 @@ const AddressList = memo(forwardRef((props: Params, AddressListRef) => { return true; }) } + let itemList: any[] = [] + result?.data?.list?.forEach(item => { + itemList.push(item?.id) + }) + prevPage.setData({ //设置上一个页面的值 + ids: itemList + }); } useDidShow(() => { getData(); @@ -86,10 +94,9 @@ const AddressList = memo(forwardRef((props: Params, AddressListRef) => { }) } } else { - let pages = Taro.getCurrentPages(); // 获取当前的页面栈 - let prevPage = pages[pages.length - 2]; prevPage.setData({ //设置上一个页面的值 - addressObj: item + addressObj: item, + // ids: itemList }); Taro.navigateBack({ delta: 1 diff --git a/src/pages/addAddress/index.module.scss b/src/pages/addAddress/index.module.scss index e8ee99d..c336c51 100644 --- a/src/pages/addAddress/index.module.scss +++ b/src/pages/addAddress/index.module.scss @@ -191,6 +191,7 @@ color: #337FFF; text-align: center; line-height: 80px; + background-color: #fff; } .nobtn { diff --git a/src/pages/submitOrder/index.tsx b/src/pages/submitOrder/index.tsx index a154e48..ba260e2 100644 --- a/src/pages/submitOrder/index.tsx +++ b/src/pages/submitOrder/index.tsx @@ -17,15 +17,15 @@ import IconFont from '@/components/iconfont/iconfont' export default () => { const router: any = useRouter() const [infoObj, setInfoObj] = useState({}) + let selectId: number = -1 useDidShow(() => { - - //获取选择的客户 + //获取选择的地址 let pages = Taro.getCurrentPages(); let currPage = pages[pages.length - 1]; // 获取当前页面 setInfoObj((val) => ({ ...val, sale_mode: Number(router.params.sale_mode), - province_name: currPage.data?.addressObj?.province_name ? currPage.data?.addressObj?.province_name : '---', + province_name: currPage.data?.addressObj?.province_name ? currPage.data?.addressObj?.province_name : '', address_id: currPage.data?.addressObj?.id ? currPage.data?.addressObj?.id : '', city_name: currPage.data?.addressObj?.city_name ? currPage.data?.addressObj?.city_name : '', address_detail: currPage.data?.addressObj?.address_detail ? currPage.data?.addressObj?.address_detail : '', @@ -33,6 +33,21 @@ export default () => { target_user_name: currPage.data?.addressObj?.name ? currPage.data?.addressObj?.name : '', purchaser_phone: currPage.data?.addressObj?.phone ? currPage.data?.addressObj?.phone : '', })) + selectId = currPage.data?.addressObj?.id + let obj = currPage?.data?.ids?.filter(item => { return item == selectId }) + if (currPage?.data?.ids && obj.length === 0) { + setInfoObj((val) => ({ + ...val, + sale_mode: Number(router.params.sale_mode), + province_name: '', + address_id: '', + city_name: '', + address_detail: '', + district_name: '', + target_user_name: '', + purchaser_phone: '', + })) + } if (!currPage.data?.addressObj) { setReceivingStatus(1) } else { @@ -277,7 +292,7 @@ const GoodsItem = memo((porps: PropGoods) => { x{obj?.sale_mode === 0 ? it.roll : it.length / 100}{obj?.sale_mode === 0 ? '条' : 'm'} - ¥{it.sale_price / 100}/{obj?.sale_mode === 0 ? '条' : 'm'} + ¥{it.sale_price / 100}/{obj?.sale_mode === 0 ? 'kg' : 'm'} ¥{formatPriceDiv(it.estimate_amount)}