forked from gxwebsoft/mp-10550
feat(user): 用户订单组件增加徽标提示
- 在用户订单组件中添加 Badge 徽标,用于提示未读消息或新订单数量 - 更新小程序分享功能,使用 showShareItems 替代 menus配置 - 修复团队和提现页面的下拉刷新组件,将 loading 属性改为 disabled
This commit is contained in:
@@ -153,7 +153,7 @@ const DealerQrcode: React.FC = () => {
|
|||||||
// 小程序分享
|
// 小程序分享
|
||||||
Taro.showShareMenu({
|
Taro.showShareMenu({
|
||||||
withShareTicket: true,
|
withShareTicket: true,
|
||||||
menus: ['shareAppMessage', 'shareTimeline']
|
showShareItems: ['shareAppMessage', 'shareTimeline']
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -310,7 +310,7 @@ const DealerTeam: React.FC = () => {
|
|||||||
|
|
||||||
const renderMemberList = (level?: number) => (
|
const renderMemberList = (level?: number) => (
|
||||||
<PullToRefresh
|
<PullToRefresh
|
||||||
loading={refreshing}
|
disabled={refreshing}
|
||||||
onRefresh={handleRefresh}
|
onRefresh={handleRefresh}
|
||||||
>
|
>
|
||||||
<View className="p-4">
|
<View className="p-4">
|
||||||
|
|||||||
@@ -349,7 +349,7 @@ const DealerWithdraw: React.FC = () => {
|
|||||||
|
|
||||||
const renderWithdrawRecords = () => (
|
const renderWithdrawRecords = () => (
|
||||||
<PullToRefresh
|
<PullToRefresh
|
||||||
loading={refreshing}
|
disabled={refreshing}
|
||||||
onRefresh={handleRefresh}
|
onRefresh={handleRefresh}
|
||||||
>
|
>
|
||||||
<View className="p-4">
|
<View className="p-4">
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
import {useEffect} from "react";
|
import {useEffect} from "react";
|
||||||
import navTo from "@/utils/common";
|
import navTo from "@/utils/common";
|
||||||
import {View, Text} from '@tarojs/components';
|
import {View, Text} from '@tarojs/components';
|
||||||
|
import {Badge} from '@nutui/nutui-react-taro';
|
||||||
import {ArrowRight, Wallet, Comment, Transit, Refund, Package} from '@nutui/icons-react-taro';
|
import {ArrowRight, Wallet, Comment, Transit, Refund, Package} from '@nutui/icons-react-taro';
|
||||||
|
|
||||||
function UserOrder() {
|
function UserOrder() {
|
||||||
@@ -22,6 +23,7 @@ function UserOrder() {
|
|||||||
background: 'linear-gradient(to bottom, #ffffff, #ffffff)', // 这种情况建议使用类名来控制样式(引入外联样式)
|
background: 'linear-gradient(to bottom, #ffffff, #ffffff)', // 这种情况建议使用类名来控制样式(引入外联样式)
|
||||||
// margin: '10px auto 0px auto',
|
// margin: '10px auto 0px auto',
|
||||||
height: '120px',
|
height: '120px',
|
||||||
|
// paddingBottom: '3px'
|
||||||
// borderRadius: '22px 22px 0 0',
|
// borderRadius: '22px 22px 0 0',
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
@@ -32,32 +34,40 @@ function UserOrder() {
|
|||||||
<ArrowRight color="#cccccc" size={12}/>
|
<ArrowRight color="#cccccc" size={12}/>
|
||||||
</View>
|
</View>
|
||||||
</View>
|
</View>
|
||||||
<View className={'flex justify-around pb-1'}>
|
<View className={'flex justify-around pb-1 mt-4'}>
|
||||||
<View className={'item flex justify-center flex-col items-center'}
|
<Badge value={8}>
|
||||||
onClick={() => navTo('/user/order/order?statusFilter=0', true)}>
|
<View className={'item flex justify-center flex-col items-center'}>
|
||||||
<Wallet size={26} className={'font-normal text-gray-500'}/>
|
<Wallet size={26} className={'font-normal text-gray-500'}
|
||||||
<Text className={'text-sm text-gray-600 py-1'}>待付款</Text>
|
onClick={() => navTo('/user/order/order?statusFilter=0', true)}/>
|
||||||
</View>
|
<Text className={'text-sm text-gray-600 py-1'}>待付款</Text>
|
||||||
<View className={'item flex justify-center flex-col items-center'}
|
</View>
|
||||||
onClick={() => navTo('/user/order/order?statusFilter=1', true)}>
|
</Badge>
|
||||||
<Package size={26} className={'text-gray-500 font-normal'}/>
|
<Badge value={8}>
|
||||||
<Text className={'text-sm text-gray-600 py-1'}>待发货</Text>
|
<View className={'item flex justify-center flex-col items-center'}
|
||||||
</View>
|
onClick={() => navTo('/user/order/order?statusFilter=1', true)}>
|
||||||
<View className={'item flex justify-center flex-col items-center'}
|
<Package size={26} className={'text-gray-500 font-normal'}/>
|
||||||
onClick={() => navTo('/user/order/order?statusFilter=3', true)}>
|
<Text className={'text-sm text-gray-600 py-1'}>待发货</Text>
|
||||||
<Transit size={24} className={'text-gray-500 font-normal'}/>
|
</View>
|
||||||
<Text className={'text-sm text-gray-600 py-1'}>待收货</Text>
|
</Badge>
|
||||||
</View>
|
<Badge value={8}>
|
||||||
|
<View className={'item flex justify-center flex-col items-center'}
|
||||||
|
onClick={() => navTo('/user/order/order?statusFilter=3', true)}>
|
||||||
|
<Transit size={24} className={'text-gray-500 font-normal'}/>
|
||||||
|
<Text className={'text-sm text-gray-600 py-1'}>待收货</Text>
|
||||||
|
</View>
|
||||||
|
</Badge>
|
||||||
<View className={'item flex justify-center flex-col items-center'}
|
<View className={'item flex justify-center flex-col items-center'}
|
||||||
onClick={() => navTo('/user/order/order?statusFilter=5', true)}>
|
onClick={() => navTo('/user/order/order?statusFilter=5', true)}>
|
||||||
<Comment size={24} className={'text-gray-500 font-normal'}/>
|
<Comment size={24} className={'text-gray-500 font-normal'}/>
|
||||||
<Text className={'text-sm text-gray-600 py-1'}>已完成</Text>
|
<Text className={'text-sm text-gray-600 py-1'}>已完成</Text>
|
||||||
</View>
|
</View>
|
||||||
<View className={'item flex justify-center flex-col items-center'}
|
<Badge value={8}>
|
||||||
onClick={() => navTo('/user/order/order?statusFilter=6', true)}>
|
<View className={'item flex justify-center flex-col items-center'}
|
||||||
<Refund size={26} className={'font-normal text-gray-500'}/>
|
onClick={() => navTo('/user/order/order?statusFilter=6', true)}>
|
||||||
<Text className={'text-sm text-gray-600 py-1'}>退货/售后</Text>
|
<Refund size={26} className={'font-normal text-gray-500'}/>
|
||||||
</View>
|
<Text className={'text-sm text-gray-600 py-1'}>退货/售后</Text>
|
||||||
|
</View>
|
||||||
|
</Badge>
|
||||||
</View>
|
</View>
|
||||||
</View>
|
</View>
|
||||||
</View>
|
</View>
|
||||||
|
|||||||
Reference in New Issue
Block a user