Commit Graph

102 Commits

Author SHA1 Message Date
nuyue 9107affb85 feat: fix stock check and add admin order status update
Build and Push Docker Image / build-and-push (push) Successful in 1m3s
Build and Push Docker Image / deploy (push) Successful in 10s
2026-07-17 05:26:30 +08:00
nuyue 5669782e2d fix: show all fee items in admin order detail
Build and Push Docker Image / build-and-push (push) Successful in 1m5s
Build and Push Docker Image / deploy (push) Successful in 19s
2026-07-16 20:14:52 +08:00
nuyue f11631dce5 fix: format fee display in order detail
Build and Push Docker Image / build-and-push (push) Successful in 1m3s
Build and Push Docker Image / deploy (push) Successful in 8s
2026-07-16 18:40:39 +08:00
nuyue 13768f5f5b feat: update order model with packaging_fee and international_fee, remove tax
Build and Push Docker Image / build-and-push (push) Successful in 1m6s
Build and Push Docker Image / deploy (push) Successful in 8s
2026-07-16 18:17:29 +08:00
nuyue b99906ee2d feat: remove tax fee from checkout summary
Build and Push Docker Image / build-and-push (push) Successful in 1m3s
Build and Push Docker Image / deploy (push) Successful in 7s
2026-07-16 16:14:52 +08:00
nuyue 24d45d03b6 feat: add packaging fee and international fee to checkout summary
Build and Push Docker Image / build-and-push (push) Successful in 1m1s
Build and Push Docker Image / deploy (push) Successful in 8s
2026-07-16 16:09:39 +08:00
nuyue b390a3ca07 Revert "style: simplify announcement bar design, remove gradient background"
Build and Push Docker Image / build-and-push (push) Successful in 1m3s
Build and Push Docker Image / deploy (push) Successful in 7s
This reverts commit 2790310a25.
2026-07-16 15:53:57 +08:00
nuyue 2790310a25 style: simplify announcement bar design, remove gradient background
Build and Push Docker Image / build-and-push (push) Successful in 1m2s
Build and Push Docker Image / deploy (push) Successful in 7s
2026-07-16 15:39:18 +08:00
nuyue 43009ec3b9 feat: add announcement feature with admin management and home page display
Build and Push Docker Image / build-and-push (push) Successful in 1m3s
Build and Push Docker Image / deploy (push) Successful in 7s
2026-07-16 15:28:37 +08:00
nuyue c94641cda0 fix: redirect to login page when user tries to register lottery without login
Build and Push Docker Image / build-and-push (push) Successful in 1m3s
Build and Push Docker Image / deploy (push) Successful in 8s
2026-07-16 14:54:33 +08:00
nuyue a55484e3c0 fix: update auth-topbar logo to use project logo.png
Build and Push Docker Image / build-and-push (push) Successful in 1m4s
Build and Push Docker Image / deploy (push) Successful in 9s
2026-07-16 14:45:17 +08:00
nuyue 41e668a947 fix: update register and forgot-password page logos to use project logo.png
Build and Push Docker Image / build-and-push (push) Successful in 1m2s
Build and Push Docker Image / deploy (push) Successful in 7s
2026-07-16 12:44:42 +08:00
nuyue 2ed6bb2389 fix: update login page logo to use project logo.png
Build and Push Docker Image / build-and-push (push) Successful in 1m8s
Build and Push Docker Image / deploy (push) Successful in 9s
2026-07-16 12:24:11 +08:00
admin dfd7d6a256 fix: HashPay 支付跳转到外部支付页面
Build and Push Docker Image / build-and-push (push) Successful in 1m2s
Build and Push Docker Image / deploy (push) Successful in 8s
2026-07-14 08:11:32 +00:00
admin 917bd926c9 feat: 添加 HashPay 支付渠道支持
Build and Push Docker Image / build-and-push (push) Successful in 1m1s
Build and Push Docker Image / deploy (push) Successful in 7s
后端:
- payment.go: 添加 HashPay 支付处理器
  - RSA-SHA256 签名
  - RSA-OAEP-256+A256GCM 回调解密
  - 创建订单和回调处理
- routes.go: 添加 HashPay 回调路由

前端:
- PaymentChannels.vue: 添加 HashPay 类型选项
  - 商户ID配置
  - RSA私钥配置
  - API地址配置

参考 bepusdt 的交互方式,支持多种加密货币支付
2026-07-13 04:21:16 +00:00
admin 51edee4d92 fix: 修复游客购物车商品显示和添加地址问题
Build and Push Docker Image / build-and-push (push) Successful in 1m5s
Build and Push Docker Image / deploy (push) Successful in 7s
- ProductDetail.vue: 添加购物车时传入完整商品信息
- Cart.vue: 未登录点击添加地址跳转登录页
- 游客购物车正确显示商品状态
2026-07-13 03:55:59 +00:00
admin 0c9cf4d347 feat: 将网页标题和导航标题改为星汐商店
Build and Push Docker Image / build-and-push (push) Successful in 1m1s
Build and Push Docker Image / deploy (push) Successful in 7s
2026-07-13 03:52:13 +00:00
admin ae28aa8ae8 fix: 购物车页面未登录时不调用需要认证的API
Build and Push Docker Image / build-and-push (push) Successful in 1m1s
Build and Push Docker Image / deploy (push) Successful in 7s
- fetchAddresses 未登录时跳过
- fetchUserProfile 未登录时跳过(已有)
- 避免触发 401 跳转登录页
2026-07-13 03:48:57 +00:00
admin dcb187502d fix: 将 /cart 加入公开接口列表,避免 401 时跳转登录页
Build and Push Docker Image / build-and-push (push) Successful in 59s
Build and Push Docker Image / deploy (push) Successful in 8s
2026-07-13 02:30:08 +00:00
admin 59dc14b529 fix: 移除购物车和抽奖页面的路由认证要求
Build and Push Docker Image / build-and-push (push) Successful in 1m1s
Build and Push Docker Image / deploy (push) Successful in 8s
- cart 路由移除 requiresAuth,支持游客浏览购物车
- lotteries 路由移除 requiresAuth,支持游客查看抽奖活动
- 下单和报名时在页面逻辑中检查登录状态
2026-07-13 02:18:18 +00:00
admin bdc9285845 feat: 支持游客购物车,下单时才需要登录
Build and Push Docker Image / build-and-push (push) Successful in 1m1s
Build and Push Docker Image / deploy (push) Successful in 8s
- cart.ts: 使用 localStorage 存储游客购物车,登录后合并
- Cart.vue: 下单时检查登录状态
- Login.vue: 登录成功后自动合并游客购物车
- api/index.ts: cart list 使用静默模式避免 401 跳转

游客可以浏览商品、添加购物车,只有下单时才需要登录
2026-07-13 01:51:56 +00:00
admin db2a2592ea fix: 抽奖页面查看不需要登录,仅报名需要登录
Build and Push Docker Image / build-and-push (push) Successful in 1m1s
Build and Push Docker Image / deploy (push) Successful in 7s
2026-07-13 01:46:39 +00:00
admin 625eb76ebc fix: 未登录时静默跳过需要认证的API调用
Build and Push Docker Image / build-and-push (push) Successful in 1m1s
Build and Push Docker Image / deploy (push) Successful in 8s
- ProductDetail.vue: fetchUserCredits 添加登录检查
- Cart.vue: fetchUserProfile 添加登录检查
- Lotteries.vue: fetchLotteries 添加登录检查
- LotteryDetail.vue: getById/register 添加登录检查和错误处理

避免未登录用户访问页面时出现401错误
2026-07-13 01:41:06 +00:00
admin 7b81d2944a fix: 商品详情页未登录时不触发登录跳转
Build and Push Docker Image / build-and-push (push) Successful in 1m0s
Build and Push Docker Image / deploy (push) Successful in 7s
- request.ts: 增加 silent 选项支持静默请求
- request.ts: 公开接口 401 不显示消息也不跳转
- ProductDetail.vue: fetchUserCredits 先检查 token,未登录直接跳过请求
2026-07-13 00:52:08 +00:00
admin 6af4ac907e fix: 公开接口401错误不应跳转登录页
Build and Push Docker Image / build-and-push (push) Successful in 1m4s
Build and Push Docker Image / deploy (push) Successful in 9s
- 扩展公开接口列表,包括 products/categories/brands/banners/articles/lotteries
- 公开接口的401错误静默处理,不跳转登录页
- 修复商品详情页未登录时跳转登录的问题
2026-07-13 00:43:39 +00:00
nuyue 3d02009602 chore: update logo and favicon from waiguoyan assets
Build and Push Docker Image / build-and-push (push) Successful in 1m0s
Build and Push Docker Image / deploy (push) Successful in 7s
2026-07-12 20:51:31 +08:00
nuyue bdefa34d41 feat: remove shipping settings, use shipping templates for cart calculation
Build and Push Docker Image / build-and-push (push) Successful in 1m0s
Build and Push Docker Image / deploy (push) Successful in 7s
2026-07-12 20:01:03 +08:00
nuyue d7716b463b feat: update sidebar logo to use custom logo.png
Build and Push Docker Image / build-and-push (push) Successful in 1m0s
Build and Push Docker Image / deploy (push) Successful in 7s
2026-07-12 19:54:58 +08:00
nuyue 46daa0999b feat: add shipping template management and update favicon
Build and Push Docker Image / build-and-push (push) Successful in 1m3s
Build and Push Docker Image / deploy (push) Successful in 7s
2026-07-12 18:52:27 +08:00
admin 4e86a9a6ad feat: 添加购买分组功能,替代跨分类购物选项
Build and Push Docker Image / build-and-push (push) Successful in 1m0s
Build and Push Docker Image / deploy (push) Successful in 7s
Docker Build / Build and Push Docker Image (push) Has been cancelled
Docker Build / Deploy to Server (push) Has been cancelled
2026-07-05 21:51:32 +08:00
admin b26fea9621 feat: 分类管理添加是否可跨分类购物选项
Build and Push Docker Image / build-and-push (push) Successful in 1m0s
Build and Push Docker Image / deploy (push) Successful in 8s
Docker Build / Build and Push Docker Image (push) Has been cancelled
Docker Build / Deploy to Server (push) Has been cancelled
2026-07-05 20:18:27 +08:00
admin d1c9770e77 添加新的工作流和临时文件 2026-06-27 04:12:17 +08:00
admin a02ae26c2d fix: 修复商品图片居中显示
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
2026-06-10 23:12:22 +08:00
admin 1405e13383 fix: 修复商品图片超出容器问题,约束el-image组件尺寸
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
2026-06-10 23:05:35 +08:00
admin cf08bf67cf fix: 修复商品图片缩放显示,使用深度选择器设置img样式
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
2026-06-10 22:50:55 +08:00
admin 4f47c15d4f fix: 恢复商品详情页图片显示,使用scale-down确保图片完整显示
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
2026-06-10 22:26:38 +08:00
admin 86d03886b4 feat: 商品详情页图片缩放显示改进
- 添加缩略图列表切换功能
- 点击主图可放大预览
- 添加缩放提示文字
- 优化移动端样式

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
2026-06-10 22:13:27 +08:00
admin 321681e2ea fix: 修复商品编辑表单布局问题
- 改为每行3个输入框布局,修复价格/库存/克重显示不全问题

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
2026-06-10 20:53:29 +08:00
admin 33f5d242e9 feat: 商品添加克重字段,订单添加通道费,运费按重量计算
- 商品模型: 添加weight字段(克重)
- 订单模型: 添加channel_fee字段(支付通道费)
- 后台商品管理: 添加克重输入框
- 后台订单详情: 显示通道费
- 订单创建: 根据商品重量计算运费,添加通道费计算
- 购物车: 根据商品重量计算运费,显示通道费

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
2026-06-10 20:01:45 +08:00
admin ded24ddccc feat: 用户管理显示资格和消费金额,订单管理添加详情功能
- 用户管理: 显示资格数和消费金额,支持编辑资格
- 订单管理: 添加订单详情查看功能
- 后端: AdminGetUsers返回消费金额, AdminGetByID获取订单详情

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
2026-06-10 18:36:19 +08:00
admin ec0a30c43d fix: 需要资格的商品每个订单消耗1个资格
- 移除后台商品管理的资格消耗设置
- 修改后端资格检查和扣除逻辑为每个订单项消耗1个资格
- 修改前端显示为需要1个资格

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
2026-06-10 18:08:26 +08:00
admin 057244d4b3 fix: 添加购物车时检查购物资格
- 后端 CartHandler.Add 新增购物资格检查
- 后端新增库存检查和最大购买数量检查
- 前端商品详情页添加资格不足提示和视觉反馈
- 显示用户当前资格和所需资格总数

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
2026-06-10 17:39:38 +08:00
admin 0df0a83b44 fix: 购物车添加库存和资格检查
库存检查:
- 库存为0的商品显示"缺货"状态
- 禁止选择缺货商品
- 禁止修改缺货商品数量
- 背景显示红色半透明样式

资格检查:
- 获取用户purchase_credits
- 检查是否有足够资格购买需要资格的商品
- 资格不足显示"资格不足"状态
- 禁止选择资格不足的商品

结账检查:
- 结账前检查选中商品是否都可购买
- 显示不可购买商品的名称

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
2026-06-02 22:12:23 +08:00
admin 5e1ab2cf4c fix: 优化供应商授权弹窗的标签和默认值
- 标签根据类型动态显示"分类"或"商品"
- 默认值改为undefined,显示placeholder而非0
- 切换类型时清空选择

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
2026-06-02 20:40:37 +08:00
admin ac6119a0ba fix: 修复供应商授权弹窗选择类型后无选项问题
- 根据选择的类型动态加载分类或商品列表
- 使用下拉选择框替代手动输入ID
- 支持搜索过滤(filterable)
- 添加加载状态提示

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
2026-06-02 20:27:13 +08:00
admin d69b1444ff fix: 修复未登录访问购物车页面报错不跳转登录页
- 给需要认证的路由添加 requiresAuth meta
- 修改 API 拦截器,401 错误时跳转登录页
- 路由守卫在用户未登录时拦截并跳转登录页
- 避免公开接口和登录/注册接口的 401 错误触发跳转

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
2026-06-02 20:09:15 +08:00
admin c6400f5f67 fix: 优化删除按钮和数量选择器样式
删除按钮:
- 改用垃圾桶图标,更直观美观
- 圆角矩形背景,hover效果
- 红色主题,符合删除语义

数量选择器:
- 增加宽度至110px
- 调整padding确保数字居中
- 加减按钮宽度32px,易于点击
- 数字居中显示,不再重叠

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
2026-06-01 21:40:13 +08:00
admin 5aa57bec3c fix: 简化购物车移动端布局结构
- 统一桌面/移动端DOM结构,避免重复
- 移动端:复选框+图片+内容区三列布局
- 内容区内:标题行(名称+删除按钮),底部行(价格+数量)
- 删除按钮与商品名同行,右对齐
- 价格和数量选择器在底部行,左右分布
- 整体结构更清晰,元素位置更合理

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
2026-06-01 21:22:12 +08:00
admin 137e221f4a fix: 按主流电商标准重构购物车移动端布局
布局结构(参考京东/淘宝):
┌──────────────────────────────────────────────────┐
│ [☑] [图片] 商品名称...                  [删除]  │
│            标签                                   │
│            ¥价格                  [数量选择器]   │
└──────────────────────────────────────────────────┘

- 复选框+图片+内容三列布局
- 商品名称和删除按钮在同一行
- 价格和数量选择器在底部行
- 桌面端和移动端完全分离的DOM结构
- 各元素位置清晰,不会错位

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
2026-06-01 18:48:58 +08:00
admin 730e12e9b9 fix: 参考京东风格重新设计购物车移动端布局
- 商品项采用卡片式布局,圆角设计
- 复选框在左侧,商品图片80x80px
- 商品名称和标签在图片右侧
- 价格(红色醒目)和数量选择器在底部
- 删除按钮绝对定位在右上角
- 订单摘要和各区块统一宽度100%
- 整体风格简洁清晰,符合主流电商设计

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
2026-06-01 18:01:49 +08:00