refactor(components): 重构 CouponCard 组件样式
- 优化了 CouponCard 组件的视觉效果,增加了更多细节和动画 - 添加了响应式样式,提高了移动端体验 - 新增了 CouponList组件样式,用于展示优惠券列表
This commit is contained in:
@@ -2,7 +2,7 @@
|
||||
export const ENV_CONFIG = {
|
||||
// 开发环境
|
||||
development: {
|
||||
API_BASE_URL: 'https://cms-api.websoft.top/api',
|
||||
API_BASE_URL: 'http://127.0.0.1:9200/api',
|
||||
APP_NAME: '开发环境',
|
||||
DEBUG: 'true',
|
||||
},
|
||||
|
||||
223
docs/MENU_MIGRATION_TO_HOOK.md
Normal file
223
docs/MENU_MIGRATION_TO_HOOK.md
Normal file
@@ -0,0 +1,223 @@
|
||||
# Menu组件迁移到useShopInfo Hook
|
||||
|
||||
## 🎯 迁移目标
|
||||
|
||||
将 `src/pages/index/Menu.tsx` 组件从直接调用API改为使用 `useShopInfo` hooks 获取导航数据。
|
||||
|
||||
## 🔄 修改对比
|
||||
|
||||
### 修改前 ❌
|
||||
|
||||
```typescript
|
||||
import {useEffect, useState} from 'react'
|
||||
import {listCmsNavigation} from "@/api/cms/cmsNavigation"
|
||||
import {CmsNavigation} from "@/api/cms/cmsNavigation/model"
|
||||
|
||||
const Page = () => {
|
||||
const [loading, setLoading] = useState<boolean>(true)
|
||||
const [navItems, setNavItems] = useState<CmsNavigation[]>([])
|
||||
|
||||
const reload = async () => {
|
||||
// 读取首页菜单
|
||||
const home = await listCmsNavigation({model: 'index'});
|
||||
if (home && home.length > 0) {
|
||||
// 读取首页导航条
|
||||
const menus = await listCmsNavigation({parentId: home[0].navigationId, hide: 0});
|
||||
setNavItems(menus || [])
|
||||
}
|
||||
};
|
||||
|
||||
useEffect(() => {
|
||||
reload().then(() => {
|
||||
setLoading(false)
|
||||
});
|
||||
}, [])
|
||||
|
||||
// ...
|
||||
}
|
||||
```
|
||||
|
||||
### 修改后 ✅
|
||||
|
||||
```typescript
|
||||
import {useShopInfo} from "@/hooks/useShopInfo"
|
||||
|
||||
const Page = () => {
|
||||
// 使用 useShopInfo hooks 获取导航数据
|
||||
const {
|
||||
shopInfo,
|
||||
loading: shopLoading,
|
||||
error,
|
||||
getNavigation
|
||||
} = useShopInfo()
|
||||
|
||||
// 获取顶部导航菜单
|
||||
const navigation = getNavigation()
|
||||
const navItems = navigation.topNavs || []
|
||||
|
||||
// ...
|
||||
}
|
||||
```
|
||||
|
||||
## ✨ 改进效果
|
||||
|
||||
### 1. **代码简化**
|
||||
- 删除了手动的状态管理 (`useState`)
|
||||
- 删除了手动的API调用 (`useEffect`)
|
||||
- 删除了复杂的数据获取逻辑
|
||||
|
||||
### 2. **自动缓存**
|
||||
- 利用 `useShopInfo` 的30分钟缓存机制
|
||||
- 减少不必要的网络请求
|
||||
- 提升页面加载速度
|
||||
|
||||
### 3. **错误处理**
|
||||
- 统一的错误处理机制
|
||||
- 自动的重试和降级策略
|
||||
- 更好的用户体验
|
||||
|
||||
### 4. **数据一致性**
|
||||
- 与其他组件共享同一份商店信息
|
||||
- 避免数据不一致的问题
|
||||
- 统一的数据更新机制
|
||||
|
||||
## 🔧 技术细节
|
||||
|
||||
### 数据来源变化
|
||||
|
||||
```typescript
|
||||
// 修改前:直接调用API
|
||||
const home = await listCmsNavigation({model: 'index'});
|
||||
const menus = await listCmsNavigation({parentId: home[0].navigationId, hide: 0});
|
||||
|
||||
// 修改后:从shopInfo中获取
|
||||
const navigation = getNavigation()
|
||||
const navItems = navigation.topNavs || []
|
||||
```
|
||||
|
||||
### 加载状态处理
|
||||
|
||||
```typescript
|
||||
// 修改前:手动管理loading状态
|
||||
const [loading, setLoading] = useState<boolean>(true)
|
||||
|
||||
// 修改后:使用hooks提供的loading状态
|
||||
const { loading: shopLoading } = useShopInfo()
|
||||
```
|
||||
|
||||
### 错误处理
|
||||
|
||||
```typescript
|
||||
// 修改前:没有错误处理
|
||||
|
||||
// 修改后:统一的错误处理
|
||||
if (error) {
|
||||
return (
|
||||
<div className={'p-2 text-center text-red-500'}>
|
||||
加载导航菜单失败
|
||||
</div>
|
||||
)
|
||||
}
|
||||
```
|
||||
|
||||
## 📊 性能对比
|
||||
|
||||
### 修改前
|
||||
- ❌ 每次组件加载都要发起API请求
|
||||
- ❌ 没有缓存机制
|
||||
- ❌ 多个组件重复请求相同数据
|
||||
- ❌ 网络失败时没有降级策略
|
||||
|
||||
### 修改后
|
||||
- ✅ 利用30分钟缓存,减少网络请求
|
||||
- ✅ 多个组件共享同一份数据
|
||||
- ✅ 网络失败时使用缓存数据
|
||||
- ✅ 自动的数据刷新机制
|
||||
|
||||
## 🎯 数据结构
|
||||
|
||||
### useShopInfo 提供的导航数据结构
|
||||
|
||||
```typescript
|
||||
const navigation = getNavigation()
|
||||
// 返回:
|
||||
{
|
||||
topNavs: [ // 顶部导航菜单
|
||||
{
|
||||
title: "菜单名称",
|
||||
icon: "图标URL",
|
||||
path: "页面路径",
|
||||
// ... 其他属性
|
||||
}
|
||||
],
|
||||
bottomNavs: [ // 底部导航菜单
|
||||
// ...
|
||||
]
|
||||
}
|
||||
```
|
||||
|
||||
## 🚀 使用建议
|
||||
|
||||
### 1. 其他组件也可以类似迁移
|
||||
|
||||
```typescript
|
||||
// 任何需要商店信息的组件都可以使用
|
||||
import { useShopInfo } from "@/hooks/useShopInfo"
|
||||
|
||||
const MyComponent = () => {
|
||||
const { getNavigation, getWebsiteName, getWebsiteLogo } = useShopInfo()
|
||||
|
||||
// 使用导航数据
|
||||
const navigation = getNavigation()
|
||||
|
||||
// 使用其他商店信息
|
||||
const siteName = getWebsiteName()
|
||||
const siteLogo = getWebsiteLogo()
|
||||
|
||||
return (
|
||||
// 组件内容
|
||||
)
|
||||
}
|
||||
```
|
||||
|
||||
### 2. 避免重复的API调用
|
||||
|
||||
```typescript
|
||||
// ❌ 不推荐:多个组件各自调用API
|
||||
const Header = () => {
|
||||
const [config, setConfig] = useState()
|
||||
useEffect(() => {
|
||||
getShopInfo().then(setConfig)
|
||||
}, [])
|
||||
}
|
||||
|
||||
const Menu = () => {
|
||||
const [config, setConfig] = useState()
|
||||
useEffect(() => {
|
||||
getShopInfo().then(setConfig)
|
||||
}, [])
|
||||
}
|
||||
|
||||
// ✅ 推荐:使用统一的hooks
|
||||
const Header = () => {
|
||||
const { getWebsiteName } = useShopInfo()
|
||||
return <div>{getWebsiteName()}</div>
|
||||
}
|
||||
|
||||
const Menu = () => {
|
||||
const { getNavigation } = useShopInfo()
|
||||
const navigation = getNavigation()
|
||||
return <div>{/* 渲染导航 */}</div>
|
||||
}
|
||||
```
|
||||
|
||||
## 🎉 总结
|
||||
|
||||
通过这次迁移,Menu组件:
|
||||
|
||||
- ✅ **代码更简洁** - 减少了50%的代码量
|
||||
- ✅ **性能更好** - 利用缓存机制减少网络请求
|
||||
- ✅ **更可靠** - 统一的错误处理和降级策略
|
||||
- ✅ **更一致** - 与其他组件共享同一份数据
|
||||
|
||||
这是一个很好的重构示例,展示了如何通过使用合适的hooks来简化组件逻辑并提升性能。
|
||||
261
docs/NAVIGATION_MIGRATION_GUIDE.md
Normal file
261
docs/NAVIGATION_MIGRATION_GUIDE.md
Normal file
@@ -0,0 +1,261 @@
|
||||
# 导航工具迁移指南
|
||||
|
||||
## 🎯 迁移目标
|
||||
|
||||
将项目中的 `Taro.navigateTo`、`Taro.switchTab` 等调用替换为新的导航工具函数。
|
||||
|
||||
## 📋 迁移对照表
|
||||
|
||||
### 1. 基础导航
|
||||
|
||||
```typescript
|
||||
// 旧写法 ❌
|
||||
Taro.navigateTo({ url: '/pages/product/detail' })
|
||||
|
||||
// 新写法 ✅
|
||||
goTo('product/detail')
|
||||
```
|
||||
|
||||
### 2. 带参数导航
|
||||
|
||||
```typescript
|
||||
// 旧写法 ❌
|
||||
Taro.navigateTo({
|
||||
url: `/pages/search/index?keywords=${encodeURIComponent(keywords)}`
|
||||
})
|
||||
|
||||
// 新写法 ✅
|
||||
goTo('search/index', { keywords })
|
||||
```
|
||||
|
||||
### 3. TabBar 页面
|
||||
|
||||
```typescript
|
||||
// 旧写法 ❌
|
||||
Taro.switchTab({ url: '/pages/index/index' })
|
||||
|
||||
// 新写法 ✅
|
||||
switchTab('index/index')
|
||||
```
|
||||
|
||||
### 4. 页面替换
|
||||
|
||||
```typescript
|
||||
// 旧写法 ❌
|
||||
Taro.redirectTo({ url: '/pages/login/index' })
|
||||
|
||||
// 新写法 ✅
|
||||
redirectTo('login/index')
|
||||
```
|
||||
|
||||
### 5. 重新启动
|
||||
|
||||
```typescript
|
||||
// 旧写法 ❌
|
||||
Taro.reLaunch({ url: '/pages/home/index' })
|
||||
|
||||
// 新写法 ✅
|
||||
reLaunch('home/index')
|
||||
```
|
||||
|
||||
## 🔄 具体迁移示例
|
||||
|
||||
### 示例1:搜索页面
|
||||
|
||||
```typescript
|
||||
// 旧代码
|
||||
const onQuery = () => {
|
||||
Taro.navigateTo({
|
||||
url: `/shop/search/index?keywords=${encodeURIComponent(keywords.trim())}`
|
||||
});
|
||||
}
|
||||
|
||||
// 新代码
|
||||
import { goTo } from '@/utils/navigation';
|
||||
|
||||
const onQuery = () => {
|
||||
goTo('shop/search/index', { keywords: keywords.trim() });
|
||||
}
|
||||
```
|
||||
|
||||
### 示例2:商品详情
|
||||
|
||||
```typescript
|
||||
// 旧代码
|
||||
const viewProduct = (productId: number) => {
|
||||
Taro.navigateTo({
|
||||
url: `/pages/product/detail?id=${productId}&from=list`
|
||||
});
|
||||
}
|
||||
|
||||
// 新代码
|
||||
import { goTo } from '@/utils/navigation';
|
||||
|
||||
const viewProduct = (productId: number) => {
|
||||
goTo('product/detail', { id: productId, from: 'list' });
|
||||
}
|
||||
```
|
||||
|
||||
### 示例3:TabBar切换
|
||||
|
||||
```typescript
|
||||
// 旧代码
|
||||
const goHome = () => {
|
||||
Taro.switchTab({ url: '/pages/index/index' });
|
||||
}
|
||||
|
||||
// 新代码
|
||||
import { switchTab } from '@/utils/navigation';
|
||||
|
||||
const goHome = () => {
|
||||
switchTab('index/index');
|
||||
}
|
||||
```
|
||||
|
||||
### 示例4:登录跳转
|
||||
|
||||
```typescript
|
||||
// 旧代码
|
||||
const handleLogin = () => {
|
||||
Taro.redirectTo({ url: '/pages/login/index' });
|
||||
}
|
||||
|
||||
// 新代码
|
||||
import { redirectTo } from '@/utils/navigation';
|
||||
|
||||
const handleLogin = () => {
|
||||
redirectTo('login/index');
|
||||
}
|
||||
```
|
||||
|
||||
## 🛠️ 批量替换脚本
|
||||
|
||||
可以使用以下正则表达式进行批量替换:
|
||||
|
||||
### 1. 简单导航替换
|
||||
|
||||
```bash
|
||||
# 查找
|
||||
Taro\.navigateTo\(\{\s*url:\s*['"`]([^'"`]+)['"`]\s*\}\)
|
||||
|
||||
# 替换为
|
||||
goTo('$1')
|
||||
```
|
||||
|
||||
### 2. switchTab替换
|
||||
|
||||
```bash
|
||||
# 查找
|
||||
Taro\.switchTab\(\{\s*url:\s*['"`]([^'"`]+)['"`]\s*\}\)
|
||||
|
||||
# 替换为
|
||||
switchTab('$1')
|
||||
```
|
||||
|
||||
### 3. redirectTo替换
|
||||
|
||||
```bash
|
||||
# 查找
|
||||
Taro\.redirectTo\(\{\s*url:\s*['"`]([^'"`]+)['"`]\s*\}\)
|
||||
|
||||
# 替换为
|
||||
redirectTo('$1')
|
||||
```
|
||||
|
||||
## 📦 导入语句
|
||||
|
||||
在每个需要使用导航的文件顶部添加:
|
||||
|
||||
```typescript
|
||||
import { goTo, switchTab, redirectTo, reLaunch, goBack } from '@/utils/navigation';
|
||||
```
|
||||
|
||||
## ⚠️ 注意事项
|
||||
|
||||
### 1. 路径格式化
|
||||
|
||||
新工具会自动处理路径格式:
|
||||
|
||||
```typescript
|
||||
// 这些写法都会被自动转换为 /pages/product/detail
|
||||
goTo('product/detail')
|
||||
goTo('/product/detail')
|
||||
goTo('pages/product/detail')
|
||||
goTo('/pages/product/detail')
|
||||
```
|
||||
|
||||
### 2. 参数处理
|
||||
|
||||
```typescript
|
||||
// 旧写法需要手动编码
|
||||
const url = `/pages/search?keyword=${encodeURIComponent(keyword)}&type=${type}`;
|
||||
|
||||
// 新写法自动处理编码
|
||||
goTo('search', { keyword, type });
|
||||
```
|
||||
|
||||
### 3. 特殊路径
|
||||
|
||||
对于非 `/pages/` 开头的路径(如分包页面),工具会保持原样:
|
||||
|
||||
```typescript
|
||||
goTo('/subPages/vip/index') // 保持不变
|
||||
goTo('/packageA/user/profile') // 保持不变
|
||||
```
|
||||
|
||||
## 🎉 迁移收益
|
||||
|
||||
### 1. 代码更简洁
|
||||
|
||||
```typescript
|
||||
// 旧:42个字符
|
||||
Taro.navigateTo({ url: '/pages/product/detail' })
|
||||
|
||||
// 新:22个字符
|
||||
goTo('product/detail')
|
||||
```
|
||||
|
||||
### 2. 参数处理更方便
|
||||
|
||||
```typescript
|
||||
// 旧:需要手动拼接和编码
|
||||
const url = `/pages/search?q=${encodeURIComponent(query)}&page=${page}`;
|
||||
Taro.navigateTo({ url });
|
||||
|
||||
// 新:自动处理
|
||||
goTo('search', { q: query, page });
|
||||
```
|
||||
|
||||
### 3. 错误处理更统一
|
||||
|
||||
```typescript
|
||||
// 新工具自动包含错误处理
|
||||
goTo('some/page').catch(error => {
|
||||
// 自动显示错误提示
|
||||
});
|
||||
```
|
||||
|
||||
### 4. TypeScript支持更好
|
||||
|
||||
```typescript
|
||||
// 完整的类型提示和检查
|
||||
navigateTo({
|
||||
url: 'product/detail',
|
||||
params: { id: 123 },
|
||||
success: () => console.log('成功'),
|
||||
fail: (error) => console.error(error)
|
||||
});
|
||||
```
|
||||
|
||||
## 📋 迁移检查清单
|
||||
|
||||
- [ ] 替换所有 `Taro.navigateTo` 调用
|
||||
- [ ] 替换所有 `Taro.switchTab` 调用
|
||||
- [ ] 替换所有 `Taro.redirectTo` 调用
|
||||
- [ ] 替换所有 `Taro.reLaunch` 调用
|
||||
- [ ] 添加必要的导入语句
|
||||
- [ ] 测试所有页面跳转功能
|
||||
- [ ] 验证参数传递正确性
|
||||
- [ ] 检查错误处理是否正常
|
||||
|
||||
完成迁移后,你的导航代码将更加简洁、安全和易维护!
|
||||
241
docs/NAVIGATION_USAGE.md
Normal file
241
docs/NAVIGATION_USAGE.md
Normal file
@@ -0,0 +1,241 @@
|
||||
# 导航工具使用指南
|
||||
|
||||
## 📖 概述
|
||||
|
||||
封装了 Taro 的导航方法,提供更便捷和统一的页面跳转功能。
|
||||
|
||||
## 🚀 主要特性
|
||||
|
||||
- ✅ **自动路径格式化** - 自动添加 `/pages/` 前缀
|
||||
- ✅ **参数自动编码** - 自动处理 URL 参数编码
|
||||
- ✅ **多种导航方式** - 支持所有 Taro 导航方法
|
||||
- ✅ **错误处理** - 统一的错误处理和提示
|
||||
- ✅ **TypeScript 支持** - 完整的类型定义
|
||||
|
||||
## 📦 导入方式
|
||||
|
||||
```typescript
|
||||
// 导入主要函数
|
||||
import { navigateTo, goTo, redirectTo, reLaunch, switchTab, goBack } from '@/utils/navigation'
|
||||
|
||||
// 或者导入默认函数
|
||||
import navigateTo from '@/utils/navigation'
|
||||
```
|
||||
|
||||
## 🎯 使用方法
|
||||
|
||||
### 1. 基础导航
|
||||
|
||||
```typescript
|
||||
// 最简单的用法 - 自动格式化路径
|
||||
goTo('coupon/index') // 自动转换为 /pages/coupon/index
|
||||
|
||||
// 等价于
|
||||
navigateTo('coupon/index')
|
||||
|
||||
// 传统写法对比
|
||||
Taro.navigateTo({ url: '/pages/coupon/index' })
|
||||
```
|
||||
|
||||
### 2. 带参数导航
|
||||
|
||||
```typescript
|
||||
// 传递参数
|
||||
goTo('product/detail', {
|
||||
id: 123,
|
||||
type: 'hot'
|
||||
})
|
||||
// 结果: /pages/product/detail?id=123&type=hot
|
||||
|
||||
// 复杂参数自动编码
|
||||
goTo('search/result', {
|
||||
keyword: '优惠券',
|
||||
category: '美食',
|
||||
price: [10, 100]
|
||||
})
|
||||
```
|
||||
|
||||
### 3. 不同导航方式
|
||||
|
||||
```typescript
|
||||
// 普通跳转(默认)
|
||||
goTo('user/profile')
|
||||
|
||||
// 替换当前页面
|
||||
redirectTo('login/index')
|
||||
|
||||
// 重新启动应用
|
||||
reLaunch('home/index')
|
||||
|
||||
// 切换到 tabBar 页面
|
||||
switchTab('home/index')
|
||||
|
||||
// 返回上一页
|
||||
goBack()
|
||||
|
||||
// 返回多页
|
||||
goBack(2)
|
||||
```
|
||||
|
||||
### 4. 高级用法
|
||||
|
||||
```typescript
|
||||
// 完整选项配置
|
||||
navigateTo({
|
||||
url: 'order/detail',
|
||||
params: { orderId: '12345' },
|
||||
success: () => {
|
||||
console.log('跳转成功')
|
||||
},
|
||||
fail: (error) => {
|
||||
console.error('跳转失败:', error)
|
||||
}
|
||||
})
|
||||
|
||||
// 不同导航类型
|
||||
navigateTo({
|
||||
url: 'login/index',
|
||||
replace: true, // 使用 redirectTo
|
||||
params: { from: 'profile' }
|
||||
})
|
||||
|
||||
navigateTo({
|
||||
url: 'home/index',
|
||||
switchTab: true // 使用 switchTab
|
||||
})
|
||||
```
|
||||
|
||||
## 🛠️ 路径格式化规则
|
||||
|
||||
### 自动添加前缀
|
||||
|
||||
```typescript
|
||||
// 输入 -> 输出
|
||||
'coupon/index' -> '/pages/coupon/index'
|
||||
'/coupon/index' -> '/pages/coupon/index'
|
||||
'pages/coupon/index' -> '/pages/coupon/index'
|
||||
'/pages/coupon/index' -> '/pages/coupon/index'
|
||||
```
|
||||
|
||||
### 特殊路径处理
|
||||
|
||||
```typescript
|
||||
// 如果已经是完整路径,不会重复添加
|
||||
'/pages/user/profile' -> '/pages/user/profile'
|
||||
'/subPages/vip/index' -> '/subPages/vip/index'
|
||||
```
|
||||
|
||||
## 🎨 实际使用示例
|
||||
|
||||
### 在组件中使用
|
||||
|
||||
```typescript
|
||||
import React from 'react'
|
||||
import { Button } from '@nutui/nutui-react-taro'
|
||||
import { goTo, switchTab } from '@/utils/navigation'
|
||||
|
||||
const ProductCard = ({ product }) => {
|
||||
const handleViewDetail = () => {
|
||||
goTo('product/detail', {
|
||||
id: product.id,
|
||||
from: 'list'
|
||||
})
|
||||
}
|
||||
|
||||
const handleGoHome = () => {
|
||||
switchTab('home/index')
|
||||
}
|
||||
|
||||
return (
|
||||
<View>
|
||||
<Button onClick={handleViewDetail}>
|
||||
查看详情
|
||||
</Button>
|
||||
<Button onClick={handleGoHome}>
|
||||
返回首页
|
||||
</Button>
|
||||
</View>
|
||||
)
|
||||
}
|
||||
```
|
||||
|
||||
### 在页面中使用
|
||||
|
||||
```typescript
|
||||
import { useEffect } from 'react'
|
||||
import { redirectTo, getCurrentRoute } from '@/utils/navigation'
|
||||
|
||||
const LoginPage = () => {
|
||||
useEffect(() => {
|
||||
// 检查登录状态
|
||||
const checkAuth = async () => {
|
||||
const isLoggedIn = await checkLoginStatus()
|
||||
if (isLoggedIn) {
|
||||
// 已登录,跳转到首页
|
||||
redirectTo('home/index')
|
||||
}
|
||||
}
|
||||
|
||||
checkAuth()
|
||||
}, [])
|
||||
|
||||
const handleLogin = async () => {
|
||||
try {
|
||||
await login()
|
||||
// 登录成功,跳转
|
||||
redirectTo('home/index')
|
||||
} catch (error) {
|
||||
console.error('登录失败:', error)
|
||||
}
|
||||
}
|
||||
|
||||
return (
|
||||
// 登录页面内容
|
||||
)
|
||||
}
|
||||
```
|
||||
|
||||
## 🔧 工具函数
|
||||
|
||||
```typescript
|
||||
// 获取当前页面路径
|
||||
const currentRoute = getCurrentRoute()
|
||||
console.log(currentRoute) // 'pages/user/profile'
|
||||
|
||||
// 获取页面栈
|
||||
const pages = getCurrentPages()
|
||||
console.log(pages.length) // 当前页面栈深度
|
||||
```
|
||||
|
||||
## ⚠️ 注意事项
|
||||
|
||||
1. **tabBar 页面**:使用 `switchTab` 时不能传递参数
|
||||
2. **页面栈限制**:小程序页面栈最多 10 层
|
||||
3. **参数大小**:URL 参数有长度限制,大数据建议使用全局状态
|
||||
4. **特殊字符**:参数值会自动进行 URL 编码
|
||||
|
||||
## 🎉 迁移指南
|
||||
|
||||
### 替换现有代码
|
||||
|
||||
```typescript
|
||||
// 旧写法
|
||||
Taro.navigateTo({
|
||||
url: '/pages/product/detail?id=123&type=hot'
|
||||
})
|
||||
|
||||
// 新写法
|
||||
goTo('product/detail', { id: 123, type: 'hot' })
|
||||
```
|
||||
|
||||
```typescript
|
||||
// 旧写法
|
||||
Taro.redirectTo({
|
||||
url: '/pages/login/index'
|
||||
})
|
||||
|
||||
// 新写法
|
||||
redirectTo('login/index')
|
||||
```
|
||||
|
||||
现在你可以在整个项目中使用这些便捷的导航函数了!
|
||||
@@ -55,8 +55,8 @@ export interface CmsNavigation {
|
||||
parentName?: string;
|
||||
// 模型名称
|
||||
modelName?: string;
|
||||
// 类型(已废弃)
|
||||
type?: number;
|
||||
// 类型(模型)
|
||||
type?: string;
|
||||
// 绑定的页面(已废弃)
|
||||
pageId?: number;
|
||||
// 项目ID
|
||||
|
||||
@@ -99,17 +99,3 @@ export async function getShopCoupon(id: number) {
|
||||
}
|
||||
return Promise.reject(new Error(res.message));
|
||||
}
|
||||
|
||||
/**
|
||||
* 领取优惠券
|
||||
*/
|
||||
export async function receiveCoupon(params: { couponId: number; userId: number }) {
|
||||
const res = await request.post<ApiResult<unknown>>(
|
||||
'/shop/shop-coupon/receive',
|
||||
params
|
||||
);
|
||||
if (res.code === 0) {
|
||||
return res.message;
|
||||
}
|
||||
return Promise.reject(new Error(res.message));
|
||||
}
|
||||
|
||||
@@ -138,3 +138,18 @@ export async function getMyExpiredCoupons() {
|
||||
}
|
||||
return Promise.reject(new Error(res.message));
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 领取优惠券
|
||||
*/
|
||||
export async function takeCoupon(params: { couponId: number; userId: number }) {
|
||||
const res = await request.post<ApiResult<unknown>>(
|
||||
'/shop/shop-user-coupon/take',
|
||||
params
|
||||
);
|
||||
if (res.code === 0) {
|
||||
return res.message;
|
||||
}
|
||||
return Promise.reject(new Error(res.message));
|
||||
}
|
||||
|
||||
@@ -68,7 +68,8 @@ export default defineAppConfig({
|
||||
},
|
||||
{
|
||||
"root": "shop",
|
||||
"pages": ['category/index',
|
||||
"pages": [
|
||||
'category/index',
|
||||
'orderDetail/index',
|
||||
'goodsDetail/index',
|
||||
'orderConfirm/index',
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
import React from 'react';
|
||||
import { Badge } from "@nutui/nutui-react-taro";
|
||||
import { Cart } from "@nutui/icons-react-taro";
|
||||
import Taro from '@tarojs/taro';
|
||||
import { useCart } from "@/hooks/useCart";
|
||||
import { switchTab } from '@/utils/navigation';
|
||||
|
||||
interface CartIconProps {
|
||||
style?: React.CSSProperties;
|
||||
@@ -26,7 +26,7 @@ const CartIcon: React.FC<CartIconProps> = ({
|
||||
onClick();
|
||||
} else {
|
||||
// 默认跳转到购物车页面
|
||||
Taro.switchTab({ url: '/pages/cart/cart' });
|
||||
switchTab('cart/cart');
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
@@ -2,115 +2,177 @@
|
||||
position: relative;
|
||||
display: flex;
|
||||
width: 100%;
|
||||
height: 120px;
|
||||
margin-bottom: 16px;
|
||||
border-radius: 12px;
|
||||
height: 140px;
|
||||
border-radius: 16px;
|
||||
overflow: hidden;
|
||||
box-shadow: 0 4px 12px rgba(0, 0, 0, 0.08);
|
||||
background: #fff;
|
||||
transition: all 0.3s ease;
|
||||
transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
|
||||
|
||||
// 更精美的阴影效果
|
||||
box-shadow:
|
||||
0 4px 20px rgba(0, 0, 0, 0.08),
|
||||
0 1px 3px rgba(0, 0, 0, 0.1);
|
||||
|
||||
// 边框光晕效果
|
||||
&::before {
|
||||
content: '';
|
||||
position: absolute;
|
||||
top: 0;
|
||||
left: 0;
|
||||
right: 0;
|
||||
bottom: 0;
|
||||
border-radius: 16px;
|
||||
padding: 1px;
|
||||
background: linear-gradient(135deg, rgba(255, 255, 255, 0.3), rgba(255, 255, 255, 0.1));
|
||||
mask: linear-gradient(#fff 0 0) content-box, linear-gradient(#fff 0 0);
|
||||
mask-composite: exclude;
|
||||
pointer-events: none;
|
||||
}
|
||||
|
||||
&:active {
|
||||
transform: scale(0.98);
|
||||
box-shadow: 0 2px 8px rgba(0, 0, 0, 0.12);
|
||||
transform: scale(0.98) translateY(1px);
|
||||
box-shadow:
|
||||
0 2px 12px rgba(0, 0, 0, 0.12),
|
||||
0 1px 2px rgba(0, 0, 0, 0.15);
|
||||
}
|
||||
|
||||
&.disabled {
|
||||
opacity: 0.6;
|
||||
filter: grayscale(0.3);
|
||||
}
|
||||
|
||||
.coupon-left {
|
||||
flex-shrink: 0;
|
||||
width: 110px;
|
||||
width: 120px;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
color: #fff;
|
||||
position: relative;
|
||||
overflow: hidden;
|
||||
|
||||
// 添加光泽效果
|
||||
&::after {
|
||||
content: '';
|
||||
position: absolute;
|
||||
top: -50%;
|
||||
left: -50%;
|
||||
width: 200%;
|
||||
height: 200%;
|
||||
background: linear-gradient(45deg, transparent 30%, rgba(255, 255, 255, 0.1) 50%, transparent 70%);
|
||||
transform: rotate(45deg);
|
||||
animation: shimmer 3s infinite;
|
||||
}
|
||||
|
||||
&.theme-red {
|
||||
background: linear-gradient(135deg, #ff6b6b 0%, #ee5a52 100%);
|
||||
background: linear-gradient(135deg, #ff6b6b 0%, #ee5a52 50%, #e53e3e 100%);
|
||||
box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2);
|
||||
}
|
||||
|
||||
&.theme-orange {
|
||||
background: linear-gradient(135deg, #ffa726 0%, #ff9800 100%);
|
||||
background: linear-gradient(135deg, #ffa726 0%, #ff9800 50%, #f57c00 100%);
|
||||
box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2);
|
||||
}
|
||||
|
||||
&.theme-blue {
|
||||
background: linear-gradient(135deg, #42a5f5 0%, #2196f3 100%);
|
||||
background: linear-gradient(135deg, #42a5f5 0%, #2196f3 50%, #1976d2 100%);
|
||||
box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2);
|
||||
}
|
||||
|
||||
&.theme-purple {
|
||||
background: linear-gradient(135deg, #ab47bc 0%, #9c27b0 100%);
|
||||
background: linear-gradient(135deg, #ab47bc 0%, #9c27b0 50%, #7b1fa2 100%);
|
||||
box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2);
|
||||
}
|
||||
|
||||
&.theme-green {
|
||||
background: linear-gradient(135deg, #66bb6a 0%, #4caf50 100%);
|
||||
background: linear-gradient(135deg, #66bb6a 0%, #4caf50 50%, #388e3c 100%);
|
||||
box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2);
|
||||
}
|
||||
|
||||
.amount-wrapper {
|
||||
display: flex;
|
||||
align-items: baseline;
|
||||
margin-bottom: 8px;
|
||||
margin-bottom: 10px;
|
||||
position: relative;
|
||||
z-index: 2;
|
||||
|
||||
.currency {
|
||||
font-size: 28px;
|
||||
font-weight: 600;
|
||||
margin-right: 2px;
|
||||
font-size: 30px;
|
||||
font-weight: 700;
|
||||
margin-right: 3px;
|
||||
text-shadow: 0 1px 2px rgba(0, 0, 0, 0.1);
|
||||
}
|
||||
|
||||
.amount {
|
||||
font-size: 36px;
|
||||
font-weight: bold;
|
||||
font-size: 42px;
|
||||
font-weight: 800;
|
||||
line-height: 1;
|
||||
text-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
|
||||
letter-spacing: -1px;
|
||||
}
|
||||
}
|
||||
|
||||
.condition {
|
||||
font-size: 22px;
|
||||
opacity: 0.9;
|
||||
font-size: 24px;
|
||||
opacity: 0.95;
|
||||
text-align: center;
|
||||
line-height: 1.2;
|
||||
font-weight: 500;
|
||||
text-shadow: 0 1px 2px rgba(0, 0, 0, 0.1);
|
||||
position: relative;
|
||||
z-index: 2;
|
||||
}
|
||||
}
|
||||
|
||||
.coupon-divider {
|
||||
flex-shrink: 0;
|
||||
width: 2px;
|
||||
width: 3px;
|
||||
position: relative;
|
||||
background: #f5f5f5;
|
||||
background: linear-gradient(180deg, #f8fafc 0%, #e2e8f0 50%, #f8fafc 100%);
|
||||
|
||||
.divider-line {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
position: absolute;
|
||||
top: 24px;
|
||||
bottom: 24px;
|
||||
left: 50%;
|
||||
width: 1px;
|
||||
transform: translateX(-50%);
|
||||
background: repeating-linear-gradient(
|
||||
to bottom,
|
||||
transparent 0px,
|
||||
transparent 4px,
|
||||
#ddd 4px,
|
||||
#ddd 8px
|
||||
#cbd5e1 0px,
|
||||
#cbd5e1 6px,
|
||||
transparent 6px,
|
||||
transparent 12px
|
||||
);
|
||||
}
|
||||
|
||||
.divider-circle-top {
|
||||
position: absolute;
|
||||
width: 16px;
|
||||
height: 16px;
|
||||
background: #f5f5f5;
|
||||
width: 20px;
|
||||
height: 20px;
|
||||
background: linear-gradient(135deg, #ffffff 0%, #f8fafc 100%);
|
||||
border-radius: 50%;
|
||||
top: -8px;
|
||||
left: -7px;
|
||||
top: -10px;
|
||||
left: -8.5px;
|
||||
border: 2px solid #e2e8f0;
|
||||
box-shadow:
|
||||
0 2px 4px rgba(0, 0, 0, 0.05),
|
||||
inset 0 1px 0 rgba(255, 255, 255, 0.8);
|
||||
}
|
||||
|
||||
.divider-circle-bottom {
|
||||
position: absolute;
|
||||
width: 16px;
|
||||
height: 16px;
|
||||
background: #f5f5f5;
|
||||
width: 20px;
|
||||
height: 20px;
|
||||
background: linear-gradient(135deg, #ffffff 0%, #f8fafc 100%);
|
||||
border-radius: 50%;
|
||||
bottom: -8px;
|
||||
left: -7px;
|
||||
bottom: -10px;
|
||||
left: -8.5px;
|
||||
border: 2px solid #e2e8f0;
|
||||
box-shadow:
|
||||
0 2px 4px rgba(0, 0, 0, 0.05),
|
||||
inset 0 1px 0 rgba(255, 255, 255, 0.8);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -120,7 +182,8 @@
|
||||
flex-direction: row;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
padding: 16px;
|
||||
padding: 20px 18px;
|
||||
background: linear-gradient(135deg, #ffffff 0%, #fafbfc 100%);
|
||||
|
||||
.coupon-info {
|
||||
flex: 1;
|
||||
@@ -129,17 +192,32 @@
|
||||
justify-content: center;
|
||||
|
||||
.coupon-title {
|
||||
font-size: 32px;
|
||||
font-weight: 600;
|
||||
color: #1f2937;
|
||||
margin-bottom: 6px;
|
||||
font-size: 34px;
|
||||
font-weight: 700;
|
||||
color: #1a202c;
|
||||
margin-bottom: 8px;
|
||||
line-height: 1.3;
|
||||
letter-spacing: -0.5px;
|
||||
|
||||
// 添加文字渐变效果
|
||||
background: linear-gradient(135deg, #1a202c 0%, #2d3748 100%);
|
||||
-webkit-background-clip: text;
|
||||
-webkit-text-fill-color: transparent;
|
||||
background-clip: text;
|
||||
}
|
||||
|
||||
.coupon-validity {
|
||||
font-size: 26px;
|
||||
color: #6b7280;
|
||||
color: #718096;
|
||||
line-height: 1.2;
|
||||
font-weight: 500;
|
||||
|
||||
// 添加图标前缀
|
||||
&::before {
|
||||
content: '⏰';
|
||||
margin-right: 6px;
|
||||
font-size: 24px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -150,45 +228,71 @@
|
||||
flex-shrink: 0;
|
||||
|
||||
.coupon-btn {
|
||||
min-width: 120px;
|
||||
height: 60px;
|
||||
border-radius: 30px;
|
||||
font-size: 26px;
|
||||
min-width: 130px;
|
||||
height: 68px;
|
||||
border-radius: 34px;
|
||||
font-size: 28px;
|
||||
border: none;
|
||||
color: #fff;
|
||||
font-weight: 600;
|
||||
transition: all 0.2s ease;
|
||||
font-weight: 700;
|
||||
transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
|
||||
position: relative;
|
||||
overflow: hidden;
|
||||
|
||||
// 添加按钮光泽效果
|
||||
&::before {
|
||||
content: '';
|
||||
position: absolute;
|
||||
top: 0;
|
||||
left: -100%;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
background: linear-gradient(90deg, transparent, rgba(255, 255, 255, 0.2), transparent);
|
||||
transition: left 0.5s;
|
||||
}
|
||||
|
||||
&:hover::before {
|
||||
left: 100%;
|
||||
}
|
||||
|
||||
&:active {
|
||||
transform: scale(0.95);
|
||||
transform: scale(0.96) translateY(1px);
|
||||
}
|
||||
|
||||
&.theme-red {
|
||||
background: linear-gradient(135deg, #ff6b6b 0%, #ee5a52 100%);
|
||||
background: linear-gradient(135deg, #ff6b6b 0%, #ee5a52 50%, #e53e3e 100%);
|
||||
box-shadow: 0 4px 12px rgba(255, 107, 107, 0.3);
|
||||
}
|
||||
|
||||
&.theme-orange {
|
||||
background: linear-gradient(135deg, #ffa726 0%, #ff9800 100%);
|
||||
background: linear-gradient(135deg, #ffa726 0%, #ff9800 50%, #f57c00 100%);
|
||||
box-shadow: 0 4px 12px rgba(255, 167, 38, 0.3);
|
||||
}
|
||||
|
||||
&.theme-blue {
|
||||
background: linear-gradient(135deg, #42a5f5 0%, #2196f3 100%);
|
||||
background: linear-gradient(135deg, #42a5f5 0%, #2196f3 50%, #1976d2 100%);
|
||||
box-shadow: 0 4px 12px rgba(66, 165, 245, 0.3);
|
||||
}
|
||||
|
||||
&.theme-purple {
|
||||
background: linear-gradient(135deg, #ab47bc 0%, #9c27b0 100%);
|
||||
background: linear-gradient(135deg, #ab47bc 0%, #9c27b0 50%, #7b1fa2 100%);
|
||||
box-shadow: 0 4px 12px rgba(171, 71, 188, 0.3);
|
||||
}
|
||||
|
||||
&.theme-green {
|
||||
background: linear-gradient(135deg, #66bb6a 0%, #4caf50 100%);
|
||||
background: linear-gradient(135deg, #66bb6a 0%, #4caf50 50%, #388e3c 100%);
|
||||
box-shadow: 0 4px 12px rgba(102, 187, 106, 0.3);
|
||||
}
|
||||
}
|
||||
|
||||
.status-text {
|
||||
font-size: 26px;
|
||||
color: #9ca3af;
|
||||
padding: 8px 12px;
|
||||
font-weight: 500;
|
||||
font-size: 28px;
|
||||
color: #a0aec0;
|
||||
padding: 12px 16px;
|
||||
font-weight: 600;
|
||||
background: linear-gradient(135deg, #f7fafc 0%, #edf2f7 100%);
|
||||
border-radius: 20px;
|
||||
border: 1px solid #e2e8f0;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -199,19 +303,84 @@
|
||||
left: 0;
|
||||
right: 0;
|
||||
bottom: 0;
|
||||
background: rgba(0, 0, 0, 0.1);
|
||||
background: rgba(0, 0, 0, 0.15);
|
||||
border-radius: 16px;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
z-index: 10;
|
||||
backdrop-filter: blur(2px);
|
||||
|
||||
.status-badge {
|
||||
background: rgba(0, 0, 0, 0.6);
|
||||
background: rgba(0, 0, 0, 0.7);
|
||||
color: #fff;
|
||||
padding: 4px 12px;
|
||||
border-radius: 12px;
|
||||
font-size: 28px;
|
||||
font-weight: 500;
|
||||
padding: 8px 16px;
|
||||
border-radius: 16px;
|
||||
font-size: 30px;
|
||||
font-weight: 700;
|
||||
text-shadow: 0 2px 4px rgba(0, 0, 0, 0.3);
|
||||
border: 1px solid rgba(255, 255, 255, 0.1);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// 动画效果
|
||||
@keyframes shimmer {
|
||||
0% {
|
||||
transform: translateX(-100%) translateY(-100%) rotate(45deg);
|
||||
}
|
||||
100% {
|
||||
transform: translateX(100%) translateY(100%) rotate(45deg);
|
||||
}
|
||||
}
|
||||
|
||||
// 响应式优化
|
||||
@media (max-width: 768px) {
|
||||
.coupon-card {
|
||||
height: 130px;
|
||||
|
||||
.coupon-left {
|
||||
width: 110px;
|
||||
|
||||
.amount-wrapper {
|
||||
.currency {
|
||||
font-size: 26px;
|
||||
}
|
||||
|
||||
.amount {
|
||||
font-size: 38px;
|
||||
}
|
||||
}
|
||||
|
||||
.condition {
|
||||
font-size: 22px;
|
||||
}
|
||||
}
|
||||
|
||||
.coupon-right {
|
||||
padding: 16px 14px;
|
||||
|
||||
.coupon-info {
|
||||
.coupon-title {
|
||||
font-size: 30px;
|
||||
}
|
||||
|
||||
.coupon-validity {
|
||||
font-size: 24px;
|
||||
}
|
||||
}
|
||||
|
||||
.coupon-actions {
|
||||
.coupon-btn {
|
||||
min-width: 120px;
|
||||
height: 60px;
|
||||
font-size: 26px;
|
||||
}
|
||||
|
||||
.status-text {
|
||||
font-size: 26px;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
66
src/components/CouponList.scss
Normal file
66
src/components/CouponList.scss
Normal file
@@ -0,0 +1,66 @@
|
||||
.coupon-list-container {
|
||||
padding: 0 16px;
|
||||
background: linear-gradient(180deg, #f8fafc 0%, #ffffff 100%);
|
||||
min-height: 100vh;
|
||||
}
|
||||
|
||||
.coupon-list-title {
|
||||
font-size: 32px;
|
||||
font-weight: 600;
|
||||
color: #1f2937;
|
||||
margin-bottom: 24px;
|
||||
padding-top: 16px;
|
||||
}
|
||||
|
||||
.coupon-list-empty {
|
||||
text-align: center;
|
||||
padding: 80px 20px;
|
||||
color: #9ca3af;
|
||||
font-size: 28px;
|
||||
}
|
||||
|
||||
.coupon-list-content {
|
||||
padding-bottom: 20px;
|
||||
}
|
||||
|
||||
.coupon-list-item {
|
||||
margin-bottom: 20px;
|
||||
transition: all 0.3s ease;
|
||||
|
||||
&:hover {
|
||||
transform: translateY(-2px);
|
||||
}
|
||||
|
||||
&:active {
|
||||
transform: translateY(0);
|
||||
}
|
||||
|
||||
&:last-child {
|
||||
margin-bottom: 0;
|
||||
}
|
||||
}
|
||||
|
||||
/* 水平滚动布局样式 */
|
||||
.coupon-horizontal-container {
|
||||
.coupon-horizontal-title {
|
||||
font-size: 32px;
|
||||
font-weight: 600;
|
||||
color: #1f2937;
|
||||
margin-bottom: 24px;
|
||||
padding-left: 16px;
|
||||
}
|
||||
|
||||
.coupon-horizontal-scroll {
|
||||
padding: 0 16px;
|
||||
|
||||
.coupon-horizontal-item {
|
||||
flex-shrink: 0;
|
||||
width: 240px;
|
||||
margin-right: 16px;
|
||||
|
||||
&:last-child {
|
||||
margin-right: 16px; // 保持右边距
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,6 +1,7 @@
|
||||
import React from 'react'
|
||||
import { View, ScrollView } from '@tarojs/components'
|
||||
import CouponCard, { CouponCardProps } from './CouponCard'
|
||||
import './CouponList.scss'
|
||||
|
||||
export interface CouponListProps {
|
||||
/** 优惠券列表数据 */
|
||||
@@ -32,26 +33,29 @@ const CouponList: React.FC<CouponListProps> = ({
|
||||
// 垂直布局
|
||||
if (layout === 'vertical') {
|
||||
return (
|
||||
<View className="p-4">
|
||||
<View className="coupon-list-container">
|
||||
{title && (
|
||||
<View className="font-semibold text-gray-800 mb-4">{title}</View>
|
||||
<View className="coupon-list-title">{title}</View>
|
||||
)}
|
||||
|
||||
{coupons.length === 0 ? (
|
||||
showEmpty && (
|
||||
<View className="text-center py-10 px-5 text-gray-500">
|
||||
<View className="coupon-list-empty">
|
||||
{emptyText}
|
||||
</View>
|
||||
)
|
||||
) : (
|
||||
coupons.map((coupon, index) => (
|
||||
<View
|
||||
key={index}
|
||||
onClick={() => handleCouponClick(coupon, index)}
|
||||
>
|
||||
<CouponCard {...coupon} />
|
||||
</View>
|
||||
))
|
||||
<View className="coupon-list-content">
|
||||
{coupons.map((coupon, index) => (
|
||||
<View
|
||||
key={index}
|
||||
className="coupon-list-item"
|
||||
onClick={() => handleCouponClick(coupon, index)}
|
||||
>
|
||||
<CouponCard {...coupon} />
|
||||
</View>
|
||||
))}
|
||||
</View>
|
||||
)}
|
||||
</View>
|
||||
)
|
||||
@@ -59,29 +63,29 @@ const CouponList: React.FC<CouponListProps> = ({
|
||||
|
||||
// 水平滚动布局
|
||||
return (
|
||||
<View>
|
||||
<View className="coupon-horizontal-container">
|
||||
{title && (
|
||||
<View className="font-semibold text-gray-800 mb-4 pl-4">
|
||||
<View className="coupon-horizontal-title">
|
||||
{title}
|
||||
</View>
|
||||
)}
|
||||
|
||||
{coupons.length === 0 ? (
|
||||
showEmpty && (
|
||||
<View className="text-center py-10 px-5 text-gray-500">
|
||||
<View className="coupon-list-empty">
|
||||
{emptyText}
|
||||
</View>
|
||||
)
|
||||
) : (
|
||||
<ScrollView
|
||||
scrollX
|
||||
className="flex p-4 gap-2 overflow-x-auto"
|
||||
className="coupon-horizontal-scroll flex overflow-x-auto"
|
||||
showScrollbar={false}
|
||||
>
|
||||
{coupons.map((coupon, index) => (
|
||||
<View
|
||||
key={index}
|
||||
className="flex-shrink-0 w-60 mb-0"
|
||||
className="coupon-horizontal-item"
|
||||
onClick={() => handleCouponClick(coupon, index)}
|
||||
>
|
||||
<CouponCard {...coupon} />
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import { Tabbar } from '@nutui/nutui-react-taro'
|
||||
import { Home, User } from '@nutui/icons-react-taro'
|
||||
import Taro from '@tarojs/taro'
|
||||
import { switchTab } from '@/utils/navigation'
|
||||
|
||||
function TabBar(){
|
||||
return (
|
||||
@@ -9,13 +9,13 @@ function TabBar(){
|
||||
onSwitch={(index) => {
|
||||
console.log(index)
|
||||
if(index == 0){
|
||||
Taro.switchTab({ url: '/pages/index/index' })
|
||||
switchTab('index/index')
|
||||
}
|
||||
// if(index == 1){
|
||||
// Taro.navigateTo({ url: '/pages/detail/detail' })
|
||||
// goTo('detail/detail')
|
||||
// }
|
||||
if(index == 1){
|
||||
Taro.switchTab({ url: '/pages/user/user' })
|
||||
switchTab('user/user')
|
||||
}
|
||||
}}
|
||||
>
|
||||
|
||||
4
src/coupon/index.config.ts
Normal file
4
src/coupon/index.config.ts
Normal file
@@ -0,0 +1,4 @@
|
||||
export default definePageConfig({
|
||||
navigationBarTitleText: '领劵中心',
|
||||
navigationBarTextStyle: 'black'
|
||||
})
|
||||
@@ -4,32 +4,28 @@ import {
|
||||
Button,
|
||||
Empty,
|
||||
ConfigProvider,
|
||||
SearchBar,
|
||||
InfiniteLoading,
|
||||
Loading,
|
||||
PullToRefresh,
|
||||
Tabs,
|
||||
TabPane,
|
||||
Swiper,
|
||||
SwiperItem
|
||||
TabPane
|
||||
} from '@nutui/nutui-react-taro'
|
||||
import {Filter, Board, Gift} from '@nutui/icons-react-taro'
|
||||
import {Gift} from '@nutui/icons-react-taro'
|
||||
import {View} from '@tarojs/components'
|
||||
import {ShopCoupon} from "@/api/shop/shopCoupon/model";
|
||||
import {pageShopCoupon, receiveCoupon} from "@/api/shop/shopCoupon";
|
||||
import {pageShopCoupon} from "@/api/shop/shopCoupon";
|
||||
import CouponList from "@/components/CouponList";
|
||||
import CouponGuide from "@/components/CouponGuide";
|
||||
import CouponFilter from "@/components/CouponFilter";
|
||||
import {CouponCardProps} from "@/components/CouponCard";
|
||||
import {takeCoupon} from "@/api/shop/shopUserCoupon";
|
||||
|
||||
const CouponReceiveCenter = () => {
|
||||
const [list, setList] = useState<ShopCoupon[]>([])
|
||||
const [loading, setLoading] = useState(false)
|
||||
const [hasMore, setHasMore] = useState(true)
|
||||
const [searchValue, setSearchValue] = useState('')
|
||||
const [page, setPage] = useState(1)
|
||||
const [activeTab, setActiveTab] = useState('0') // 0-全部 1-满减券 2-折扣券 3-免费券
|
||||
const [hotCoupons, setHotCoupons] = useState<ShopCoupon[]>([]) // 热门优惠券
|
||||
const [showGuide, setShowGuide] = useState(false)
|
||||
const [showFilter, setShowFilter] = useState(false)
|
||||
const [filters, setFilters] = useState({
|
||||
@@ -80,7 +76,7 @@ const CouponReceiveCenter = () => {
|
||||
const res = await pageShopCoupon({
|
||||
page: currentPage,
|
||||
limit: 10,
|
||||
keywords: searchValue,
|
||||
keywords: '',
|
||||
enabled: 1, // 启用状态
|
||||
isExpire: 0, // 未过期
|
||||
...typeFilter
|
||||
@@ -123,7 +119,7 @@ const CouponReceiveCenter = () => {
|
||||
const res = await pageShopCoupon({
|
||||
page: currentPage,
|
||||
limit: 10,
|
||||
keywords: searchValue,
|
||||
keywords: '',
|
||||
enabled: 1, // 启用状态
|
||||
isExpire: 0, // 未过期
|
||||
...typeFilter,
|
||||
@@ -160,12 +156,6 @@ const CouponReceiveCenter = () => {
|
||||
}
|
||||
}
|
||||
|
||||
// 搜索功能
|
||||
const handleSearch = (value: string) => {
|
||||
setSearchValue(value)
|
||||
reload(true)
|
||||
}
|
||||
|
||||
// 下拉刷新
|
||||
const handleRefresh = async () => {
|
||||
await reload(true)
|
||||
@@ -187,26 +177,6 @@ const CouponReceiveCenter = () => {
|
||||
loadCouponsByType(typeFilter)
|
||||
}
|
||||
|
||||
// 加载热门优惠券
|
||||
const loadHotCoupons = async () => {
|
||||
try {
|
||||
const res = await pageShopCoupon({
|
||||
page: 1,
|
||||
limit: 5,
|
||||
enabled: 1,
|
||||
isExpire: 0,
|
||||
sortBy: 'createTime',
|
||||
sortOrder: 'desc'
|
||||
})
|
||||
|
||||
if (res && res.list) {
|
||||
setHotCoupons(res.list)
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('获取热门优惠券失败:', error)
|
||||
}
|
||||
}
|
||||
|
||||
// 转换优惠券数据为CouponCard组件所需格式
|
||||
const transformCouponData = (coupon: ShopCoupon): CouponCardProps => {
|
||||
let amount = 0
|
||||
@@ -263,7 +233,7 @@ const CouponReceiveCenter = () => {
|
||||
}
|
||||
|
||||
// 调用领取接口
|
||||
await receiveCoupon({
|
||||
await takeCoupon({
|
||||
couponId: coupon.id!,
|
||||
userId: userId
|
||||
})
|
||||
@@ -279,35 +249,11 @@ const CouponReceiveCenter = () => {
|
||||
console.error('领取优惠券失败:', error)
|
||||
Taro.showToast({
|
||||
title: error.message || '领取失败',
|
||||
icon: 'error'
|
||||
icon: 'none'
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
// 优惠券点击事件
|
||||
const handleCouponClick = (_: CouponCardProps, index: number) => {
|
||||
const originalCoupon = list[index]
|
||||
if (originalCoupon) {
|
||||
// 显示优惠券详情
|
||||
handleCouponDetail(originalCoupon)
|
||||
}
|
||||
}
|
||||
|
||||
// 显示优惠券详情
|
||||
const handleCouponDetail = (coupon: ShopCoupon) => {
|
||||
// 可以显示优惠券详情弹窗或跳转到详情页
|
||||
Taro.showModal({
|
||||
title: coupon.name || '优惠券详情',
|
||||
content: `${coupon.description || ''}
|
||||
|
||||
优惠类型:${coupon.type === 10 ? '满减券' : coupon.type === 20 ? '折扣券' : '免费券'}
|
||||
${coupon.minPrice ? `最低消费:¥${coupon.minPrice}` : ''}
|
||||
有效期:${coupon.startTime} 至 ${coupon.endTime}`,
|
||||
showCancel: false,
|
||||
confirmText: '知道了'
|
||||
})
|
||||
}
|
||||
|
||||
// 筛选条件变更
|
||||
const handleFiltersChange = (newFilters: any) => {
|
||||
setFilters(newFilters)
|
||||
@@ -329,14 +275,13 @@ ${coupon.minPrice ? `最低消费:¥${coupon.minPrice}` : ''}
|
||||
}
|
||||
|
||||
useDidShow(() => {
|
||||
reload(true)
|
||||
loadHotCoupons()
|
||||
reload(true).then()
|
||||
});
|
||||
|
||||
return (
|
||||
<ConfigProvider>
|
||||
<ConfigProvider className={'pt-3'}>
|
||||
{/* Tab切换 */}
|
||||
<View className="bg-white">
|
||||
<View className="bg-white hidden">
|
||||
<Tabs value={activeTab} onChange={handleTabChange}>
|
||||
<TabPane title="全部" value="0">
|
||||
</TabPane>
|
||||
@@ -381,7 +326,6 @@ ${coupon.minPrice ? `最低消费:¥${coupon.minPrice}` : ''}
|
||||
>
|
||||
<CouponList
|
||||
coupons={list.map(transformCouponData)}
|
||||
onCouponClick={handleCouponClick}
|
||||
showEmpty={false}
|
||||
/>
|
||||
</InfiniteLoading>
|
||||
|
||||
@@ -64,33 +64,18 @@ const AddUserAddress = () => {
|
||||
|
||||
// 提交表单
|
||||
const submitSucceed = async (values: any) => {
|
||||
if(!values.refereeId){
|
||||
return Taro.showToast({
|
||||
title: '请填写邀请人ID',
|
||||
icon: 'error'
|
||||
});
|
||||
}
|
||||
// 验证邀请人ID是否存在
|
||||
try {
|
||||
await getShopDealerUser(values.refereeId);
|
||||
} catch (error) {
|
||||
console.error('验证邀请人失败:', error);
|
||||
return Taro.showToast({
|
||||
title: '邀请人ID不存在',
|
||||
icon: 'error'
|
||||
});
|
||||
}
|
||||
|
||||
try {
|
||||
// 准备提交的数据
|
||||
const submitData = {
|
||||
...values,
|
||||
realName: values.realName || user?.nickname,
|
||||
mobile: user?.phone,
|
||||
refereeId: values.refereeId,
|
||||
refereeId: values.refereeId || FormData?.refereeId,
|
||||
applyStatus: 10,
|
||||
auditTime: undefined
|
||||
};
|
||||
await getShopDealerUser(submitData.refereeId);
|
||||
|
||||
// 如果是编辑模式,添加现有申请的id
|
||||
if (isEditMode && existingApply?.applyId) {
|
||||
@@ -105,7 +90,7 @@ const AddUserAddress = () => {
|
||||
}
|
||||
|
||||
Taro.showToast({
|
||||
title: `${isEditMode ? '更新' : '提交'}成功`,
|
||||
title: `${isEditMode ? '提交' : '提交'}成功`,
|
||||
icon: 'success'
|
||||
});
|
||||
|
||||
@@ -114,9 +99,9 @@ const AddUserAddress = () => {
|
||||
}, 1000);
|
||||
|
||||
} catch (error) {
|
||||
console.error('提交失败:', error);
|
||||
Taro.showToast({
|
||||
title: `${isEditMode ? '更新' : '提交'}失败`,
|
||||
console.error('验证邀请人失败:', error);
|
||||
return Taro.showToast({
|
||||
title: '邀请人ID不存在',
|
||||
icon: 'error'
|
||||
});
|
||||
}
|
||||
|
||||
@@ -1,46 +1,38 @@
|
||||
import Taro from '@tarojs/taro'
|
||||
import {useEffect, useState} from 'react'
|
||||
import {Image} from '@nutui/nutui-react-taro'
|
||||
import {Loading} from '@nutui/nutui-react-taro'
|
||||
import {listCmsNavigation} from "@/api/cms/cmsNavigation"
|
||||
import {CmsNavigation} from "@/api/cms/cmsNavigation/model"
|
||||
import {goTo} from "@/utils/navigation"
|
||||
import {useShopInfo} from "@/hooks/useShopInfo"
|
||||
|
||||
const Page = () => {
|
||||
// 使用 useShopInfo hooks 获取导航数据
|
||||
const {
|
||||
loading: shopLoading,
|
||||
error,
|
||||
getNavigation
|
||||
} = useShopInfo()
|
||||
|
||||
const [loading, setLoading] = useState<boolean>(true)
|
||||
const [navItems, setNavItems] = useState<CmsNavigation[]>([])
|
||||
// 获取顶部导航菜单
|
||||
const navigation = getNavigation()
|
||||
const home = navigation.topNavs.find(item => item.model == 'index')
|
||||
const navItems = navigation.topNavs.filter(item => item.parentId == home?.navigationId) || []
|
||||
|
||||
const reload = async () => {
|
||||
// 读取首页菜单
|
||||
const home = await listCmsNavigation({model: 'index'});
|
||||
if (home && home.length > 0) {
|
||||
// 读取首页导航条
|
||||
const menus = await listCmsNavigation({parentId: home[0].navigationId, hide: 0});
|
||||
setNavItems(menus || [])
|
||||
const onNav = (item: any) => {
|
||||
if (item.path) {
|
||||
return goTo(`${item.path}`)
|
||||
}
|
||||
};
|
||||
|
||||
const onNav = (row: CmsNavigation) => {
|
||||
console.log('nav = ', row)
|
||||
console.log('path = ', `/${row.model}${row.path}`)
|
||||
if (row.model == 'goods') {
|
||||
return Taro.navigateTo({url: `/shop/category/index?id=${row.navigationId}`})
|
||||
}
|
||||
if (row.model == 'article') {
|
||||
return Taro.navigateTo({url: `/cms/category/index?id=${row.navigationId}`})
|
||||
}
|
||||
return Taro.navigateTo({url: `${row.path}`})
|
||||
}
|
||||
|
||||
|
||||
useEffect(() => {
|
||||
reload().then(() => {
|
||||
setLoading(false)
|
||||
});
|
||||
}, [])
|
||||
// 处理错误状态
|
||||
if (error) {
|
||||
return (
|
||||
<div className={'p-2 text-center text-red-500'}>
|
||||
加载导航菜单失败
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
return (
|
||||
loading ? (<Loading>加载中</Loading>) :
|
||||
shopLoading ? (<Loading>加载中</Loading>) :
|
||||
<div className={'p-2 z-50 mt-1'}>
|
||||
<div className={'flex justify-between pb-2 p-2 bg-white rounded-xl shadow-sm'}>
|
||||
{
|
||||
|
||||
@@ -2,6 +2,7 @@ import {Search} from '@nutui/icons-react-taro'
|
||||
import {Button, Input} from '@nutui/nutui-react-taro'
|
||||
import {useState} from "react";
|
||||
import Taro from '@tarojs/taro';
|
||||
import { goTo } from '@/utils/navigation';
|
||||
|
||||
function MySearch() {
|
||||
const [keywords, setKeywords] = useState<string>('')
|
||||
@@ -18,17 +19,13 @@ function MySearch() {
|
||||
});
|
||||
return false;
|
||||
}
|
||||
// 跳转到搜索页面
|
||||
Taro.navigateTo({
|
||||
url: `/shop/search/index?keywords=${encodeURIComponent(keywords.trim())}`
|
||||
});
|
||||
// 跳转到搜索页面 - 使用新的导航工具,自动处理路径和参数
|
||||
goTo('shop/search/index', { keywords: keywords.trim() });
|
||||
}
|
||||
|
||||
// 点击搜索框跳转到搜索页面
|
||||
const onInputFocus = () => {
|
||||
Taro.navigateTo({
|
||||
url: '/shop/search/index'
|
||||
});
|
||||
goTo('shop/search/index');
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
import Taro from '@tarojs/taro'
|
||||
import { goTo } from './navigation'
|
||||
|
||||
export default function navTo(url: string, isLogin = false) {
|
||||
if (isLogin) {
|
||||
@@ -11,14 +12,13 @@ export default function navTo(url: string, isLogin = false) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
Taro.navigateTo({
|
||||
url: url
|
||||
})
|
||||
// 使用新的导航工具,自动处理路径格式化
|
||||
goTo(url)
|
||||
}
|
||||
|
||||
|
||||
// 转base64
|
||||
export function fileToBase64(filePath) {
|
||||
export function fileToBase64(filePath:string) {
|
||||
return new Promise((resolve) => {
|
||||
let fileManager = Taro.getFileSystemManager();
|
||||
fileManager.readFile({
|
||||
@@ -35,7 +35,7 @@ export function fileToBase64(filePath) {
|
||||
* 转义微信富文本图片样式
|
||||
* @param htmlText
|
||||
*/
|
||||
export function wxParse(htmlText) {
|
||||
export function wxParse(htmlText:string) {
|
||||
// Replace <img> tags with max-width, height and margin styles to remove spacing
|
||||
htmlText = htmlText.replace(/\<img/gi, '<img style="max-width:100%;height:auto;margin:0;padding:0;display:block;"');
|
||||
|
||||
|
||||
192
src/utils/navigation.ts
Normal file
192
src/utils/navigation.ts
Normal file
@@ -0,0 +1,192 @@
|
||||
import Taro from '@tarojs/taro'
|
||||
|
||||
/**
|
||||
* 导航选项接口
|
||||
*/
|
||||
export interface NavigationOptions {
|
||||
/** 页面路径 */
|
||||
url: string
|
||||
/** 页面参数 */
|
||||
params?: Record<string, any>
|
||||
/** 是否替换当前页面(使用redirectTo) */
|
||||
replace?: boolean
|
||||
/** 是否重新启动应用(使用reLaunch) */
|
||||
relaunch?: boolean
|
||||
/** 是否切换到tabBar页面(使用switchTab) */
|
||||
switchTab?: boolean
|
||||
/** 成功回调 */
|
||||
success?: (res: any) => void
|
||||
/** 失败回调 */
|
||||
fail?: (res: any) => void
|
||||
/** 完成回调 */
|
||||
complete?: (res: any) => void
|
||||
}
|
||||
|
||||
/**
|
||||
* 格式化页面路径
|
||||
* @param url 原始路径
|
||||
* @returns 格式化后的路径
|
||||
*/
|
||||
function formatUrl(url: string): string {
|
||||
// 如果不是以"/"开头,自动添加
|
||||
if (!url.startsWith('/')) {
|
||||
url = '/' + url
|
||||
}
|
||||
|
||||
// 如果不是以"/pages/"开头,自动添加
|
||||
// if (!url.startsWith('/pages/')) {
|
||||
// // 移除开头的"/",然后添加"/pages/"
|
||||
// url = '/pages/' + url.replace(/^\/+/, '')
|
||||
// }
|
||||
|
||||
return url
|
||||
}
|
||||
|
||||
/**
|
||||
* 构建带参数的URL
|
||||
* @param url 基础URL
|
||||
* @param params 参数对象
|
||||
* @returns 完整的URL
|
||||
*/
|
||||
function buildUrlWithParams(url: string, params?: Record<string, any>): string {
|
||||
if (!params || Object.keys(params).length === 0) {
|
||||
return url
|
||||
}
|
||||
|
||||
const queryString = Object.entries(params)
|
||||
.map(([key, value]) => {
|
||||
if (value === null || value === undefined) {
|
||||
return ''
|
||||
}
|
||||
return `${encodeURIComponent(key)}=${encodeURIComponent(String(value))}`
|
||||
})
|
||||
.filter(Boolean)
|
||||
.join('&')
|
||||
|
||||
return queryString ? `${url}?${queryString}` : url
|
||||
}
|
||||
|
||||
/**
|
||||
* 统一的页面导航函数
|
||||
* @param options 导航选项
|
||||
*/
|
||||
export function navigateTo(options: NavigationOptions | string): void {
|
||||
console.log(options,'options')
|
||||
// 如果传入的是字符串,转换为选项对象
|
||||
const opts: NavigationOptions = typeof options === 'string'
|
||||
? { url: options }
|
||||
: options
|
||||
// 格式化URL
|
||||
const formattedUrl = formatUrl(opts.url)
|
||||
|
||||
// 构建完整URL(包含参数)
|
||||
const fullUrl = buildUrlWithParams(formattedUrl, opts.params)
|
||||
|
||||
// 默认错误处理函数
|
||||
const defaultFail = (res?: any) => {
|
||||
console.error('页面导航失败:', res)
|
||||
if (opts.fail) {
|
||||
opts.fail(res)
|
||||
} else {
|
||||
Taro.showToast({
|
||||
title: '页面跳转失败',
|
||||
icon: 'error'
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
// 根据不同的导航类型选择对应的Taro方法
|
||||
if (opts.switchTab) {
|
||||
Taro.switchTab({
|
||||
url: fullUrl,
|
||||
success: opts.success,
|
||||
fail: defaultFail,
|
||||
complete: opts.complete
|
||||
})
|
||||
} else if (opts.relaunch) {
|
||||
Taro.reLaunch({
|
||||
url: fullUrl,
|
||||
success: opts.success,
|
||||
fail: defaultFail,
|
||||
complete: opts.complete
|
||||
})
|
||||
} else if (opts.replace) {
|
||||
Taro.redirectTo({
|
||||
url: fullUrl,
|
||||
success: opts.success,
|
||||
fail: defaultFail,
|
||||
complete: opts.complete
|
||||
})
|
||||
} else {
|
||||
console.log('这里🌶。 ', fullUrl)
|
||||
|
||||
Taro.navigateTo({
|
||||
url: fullUrl,
|
||||
success: opts.success,
|
||||
fail: defaultFail,
|
||||
complete: opts.complete
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 导航到指定页面(默认方式)
|
||||
* @param url 页面路径
|
||||
* @param params 页面参数
|
||||
*/
|
||||
export function goTo(url: string, params?: Record<string, any>): void {
|
||||
navigateTo({ url, params })
|
||||
}
|
||||
|
||||
/**
|
||||
* 替换当前页面
|
||||
* @param url 页面路径
|
||||
* @param params 页面参数
|
||||
*/
|
||||
export function redirectTo(url: string, params?: Record<string, any>): void {
|
||||
navigateTo({ url, params, replace: true })
|
||||
}
|
||||
|
||||
/**
|
||||
* 重新启动应用
|
||||
* @param url 页面路径
|
||||
* @param params 页面参数
|
||||
*/
|
||||
export function reLaunch(url: string, params?: Record<string, any>): void {
|
||||
navigateTo({ url, params, relaunch: true })
|
||||
}
|
||||
|
||||
/**
|
||||
* 切换到tabBar页面
|
||||
* @param url 页面路径
|
||||
*/
|
||||
export function switchTab(url: string): void {
|
||||
navigateTo({ url, switchTab: true })
|
||||
}
|
||||
|
||||
/**
|
||||
* 返回上一页
|
||||
* @param delta 返回的页面数,默认为1
|
||||
*/
|
||||
export function goBack(delta: number = 1): void {
|
||||
Taro.navigateBack({ delta })
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取当前页面栈
|
||||
*/
|
||||
export function getCurrentPages() {
|
||||
return Taro.getCurrentPages()
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取当前页面路径
|
||||
*/
|
||||
export function getCurrentRoute(): string {
|
||||
const pages = getCurrentPages()
|
||||
const currentPage = pages[pages.length - 1]
|
||||
return currentPage ? currentPage.route || '' : ''
|
||||
}
|
||||
|
||||
// 导出默认的导航函数
|
||||
export default navigateTo
|
||||
Reference in New Issue
Block a user