forked from gxwebsoft/mp-10550
fix(order): 修复配送时间截单逻辑并移除微信地址功能
- 添加当日21点截单时间控制,超过时间下单最早配送日顺延到次日 - 在订单确认页面实现截单时间校验和自动调整配送时间 - 移除用户地址管理中的获取微信地址功能相关代码 - 修复地址表单中CellGroup组件嵌套结构问题 - 更新配送时间选择器的起始日期计算逻辑
This commit is contained in:
@@ -589,11 +589,13 @@ const AddUserAddress = () => {
|
||||
<Form.Item name="address" label="收货地址" initialValue={FormData.address} required>
|
||||
<TextArea maxLength={50} placeholder="请输入详细收货地址"/>
|
||||
</Form.Item>
|
||||
</CellGroup>
|
||||
<CellGroup>
|
||||
<Cell
|
||||
title="选择定位"
|
||||
description={
|
||||
selectedLocation?.address ||
|
||||
(selectedLocation ? `经纬度:${selectedLocation.lng}, ${selectedLocation.lat}` : '')
|
||||
(selectedLocation ? `经纬度:${selectedLocation.lng}, ${selectedLocation.lat}` : '用于计算是否超出配送范围')
|
||||
}
|
||||
extra={(
|
||||
<div className={'flex items-center gap-2'}>
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import {useState} from "react";
|
||||
import Taro, {useDidShow} from '@tarojs/taro'
|
||||
import {Button, Cell, CellGroup, Space, Empty, ConfigProvider, Divider} from '@nutui/nutui-react-taro'
|
||||
import {Dongdong, ArrowRight, CheckNormal, Checked} from '@nutui/icons-react-taro'
|
||||
import {Button, Cell, Space, Empty, ConfigProvider, Divider} from '@nutui/nutui-react-taro'
|
||||
import {CheckNormal, Checked} from '@nutui/icons-react-taro'
|
||||
import {View} from '@tarojs/components'
|
||||
import {ShopUserAddress} from "@/api/shop/shopUserAddress/model";
|
||||
import {listShopUserAddress, removeShopUserAddress, updateShopUserAddress} from "@/api/shop/shopUserAddress";
|
||||
@@ -144,8 +144,8 @@ const Address = () => {
|
||||
/>
|
||||
<Space>
|
||||
<Button onClick={() => Taro.navigateTo({url: '/user/address/add'})}>新增地址</Button>
|
||||
<Button type="success" fill="dashed"
|
||||
onClick={() => Taro.navigateTo({url: '/user/address/wxAddress'})}>获取微信地址</Button>
|
||||
{/*<Button type="success" fill="dashed"*/}
|
||||
{/* onClick={() => Taro.navigateTo({url: '/user/address/wxAddress'})}>获取微信地址</Button>*/}
|
||||
</Space>
|
||||
</div>
|
||||
</ConfigProvider>
|
||||
@@ -154,19 +154,19 @@ const Address = () => {
|
||||
|
||||
return (
|
||||
<>
|
||||
<CellGroup>
|
||||
<Cell
|
||||
onClick={() => Taro.navigateTo({url: '/user/address/wxAddress'})}
|
||||
>
|
||||
<div className={'flex justify-between items-center w-full'}>
|
||||
<div className={'flex items-center gap-3'}>
|
||||
<Dongdong className={'text-green-600'}/>
|
||||
<div>获取微信地址</div>
|
||||
</div>
|
||||
<ArrowRight className={'text-gray-400'}/>
|
||||
</div>
|
||||
</Cell>
|
||||
</CellGroup>
|
||||
{/*<CellGroup>*/}
|
||||
{/* <Cell*/}
|
||||
{/* onClick={() => Taro.navigateTo({url: '/user/address/wxAddress'})}*/}
|
||||
{/* >*/}
|
||||
{/* <div className={'flex justify-between items-center w-full'}>*/}
|
||||
{/* <div className={'flex items-center gap-3'}>*/}
|
||||
{/* <Dongdong className={'text-green-600'}/>*/}
|
||||
{/* <div>获取微信地址</div>*/}
|
||||
{/* </div>*/}
|
||||
{/* <ArrowRight className={'text-gray-400'}/>*/}
|
||||
{/* </div>*/}
|
||||
{/* </Cell>*/}
|
||||
{/*</CellGroup>*/}
|
||||
{list.map((item, _) => (
|
||||
<Cell.Group>
|
||||
<Cell className={'flex flex-col gap-1'} onClick={() => selectAddress(item)}>
|
||||
|
||||
Reference in New Issue
Block a user