69 Commits

Author SHA1 Message Date
niou233
4d02972b86 refactor: 会员商品收藏
(cherry picked from commit f2c71d5836895b7d4ff6520388709f5426d88559)
2024-03-06 20:30:03 +08:00
dongshanshan
525e511670 feat: 会员商品收藏
(cherry picked from commit 9a3253ad20fd384c3692941ea2fb44323bf6db00)
2024-03-05 17:41:11 +08:00
puhui999
5359c4c862 解决列数据中的 table#header 数据不刷新的问题
(cherry picked from commit ca385bc08e10bde121423aa9e422dad03ab81c14)
2024-03-05 17:24:50 +08:00
puhui999
8c5cdd0ea5 商品 spu 脱离优惠卷模块
(cherry picked from commit 75135e1e4f8bc44aa9cadb81f1acce3093cf931b)
2024-03-05 17:22:16 +08:00
jason
16aba063d1 钱包 - 优化
支付应用 - 证书模式增加应用私钥

(cherry picked from commit bb5945958bfa27c9d1668c71b8397ada1bcefb23)
2024-03-05 17:21:11 +08:00
puhui999
067c89d987 UserOrderList 重构完善
(cherry picked from commit 70778fd9e6142d615fee800b53ac060733ef915a)
2024-03-05 17:12:09 +08:00
jason
e5f043c24b 钱包- 钱包余额查询
(cherry picked from commit 90d6f4da9f2077994751580b81d9bed74a43fa66)
2024-03-05 16:51:04 +08:00
xingyu
46bce2750f fix: unocss eslint
(cherry picked from commit e04ca7aac7a651d444753ed3f44e22faae408332)
2024-03-05 16:49:25 +08:00
YunaiV
a83db39abf trade:微调 order 列表界面
(cherry picked from commit 588ce1c9aeb2884b7a1194107e25bc754a445f4a)
2024-03-05 15:53:54 +08:00
owen
e05b749e4d 会员:会员配置的积分相关字段加上point前缀
(cherry picked from commit 3a96812d472f4976ac2a52ba069773a53a933450)
2024-03-05 15:53:20 +08:00
owen
24a650d89b 会员:积分配置改为会员配置
(cherry picked from commit 3ab1ed707f9821246f62f8b0fb52e80fa7aa86de)
2024-03-05 15:53:16 +08:00
owen
6b6c9f5f02 签到:签到后增加用户积分、经验
(cherry picked from commit 0066d79876b7c406bf70d4c03f4eeed2d3ede5e5)
2024-03-05 15:52:41 +08:00
owen
18bdea83be 会员详情,修改会员积分
(cherry picked from commit 4b7e57e67d51631662625b1f62ee788693edc82f)
2024-03-05 15:52:21 +08:00
owen
f9ff762977 会员:会员详情-推广用户列表
(cherry picked from commit 940a10254656fd304157b0b5d11d4b3a724f5950)
2024-03-05 15:52:12 +08:00
owen
5a2d22d285 会员:会员详情-优惠券列表
(cherry picked from commit b48f19c6467cf6677b8547e0e272b984750c2758)
2024-03-05 15:52:06 +08:00
owen
05e6668322 会员详情,查询钱包信息
(cherry picked from commit 675f3df5cbc8623058ae75ef5a4ca4a92334b8d0)
2024-03-05 15:50:46 +08:00
YunaiV
d299ad9395 增加 user detail 的 todo
(cherry picked from commit c6031ba2b21d14c4a15c106dc6f0bb66fbbbc967)
2024-03-05 13:17:30 +08:00
shizhong
3e08217c0d feat: 【工作流】--委派 2023-09-27 11:22:19 +08:00
shizhong
05e3f9ad02 修复 member 详情无法展示的问题 2023-09-25 13:29:16 +08:00
YunaiV
fa3acb21b0 修复 member 详情无法展示的问题
(cherry picked from commit 539f8a5bb5a63da15fe13be582ce23ee44b56ce3)
2023-09-25 13:24:41 +08:00
shizhong
969155c6cf style: unocss eslint 2023-09-25 13:14:05 +08:00
YunaiV
ca0ec86913 code review:会员详情
(cherry picked from commit 0e2ea3959164c2b5719bb906ee5408e92890981b)
2023-09-25 12:41:27 +08:00
owen
d33f42a525 trade: 分销业务从 member 模块 转移到 trade模块
(cherry picked from commit 2ed5d12be8c01bf8ed280086ef5b870f82553966)
2023-09-25 12:30:13 +08:00
owen
f5804431a3 trade: 增加交易中心配置表
(cherry picked from commit 35664d1f3296712e741b4f7e93830c4fdd76e799)
2023-09-25 12:30:09 +08:00
绮梦
9295030153 新增用户详情下订单页面
(cherry picked from commit 2318f176a60a88994e5d2139753a134e5af4e220)
2023-09-25 12:29:17 +08:00
绮梦
b58b8bb6ea 新增用户详情下成长值页面。
(cherry picked from commit fe6cf7ce98d475039aedf296c426e164d53e6220)
2023-09-25 12:26:40 +08:00
owen
4d0f941f7c member: 佣金记录
(cherry picked from commit 73f8cef3b44569f48eef2c2fb2bef3b87864a36f)
2023-09-25 12:25:28 +08:00
owen
c2f411607e member: 分销配置
(cherry picked from commit 5a9764c08c0a2c12cabd0416638313f9f4942db7)
2023-09-25 12:25:23 +08:00
shizhong
5cfe65b87a refactor: 统一 setup 格式 2023-09-22 14:25:05 +08:00
shizhong
20f483f561 refactor: vue3.3 defineOptions 2023-09-22 12:49:25 +08:00
xingyu
e2040244cf fix: eslint
(cherry picked from commit 5494756a6609d3698e259f2ab896b519eabf46ee)
2023-09-20 12:42:48 +08:00
YunaiV
2a280e8267 code review:优惠劵逻辑
(cherry picked from commit 4f7d6793fd09296d15c0c20e057619c477450ac2)
2023-09-20 12:38:39 +08:00
owen
529ac7d347 mall: 完善后台发送优惠券
(cherry picked from commit beef6a0a9478dd43c2c91d537097c169e3c156c7)
2023-09-20 12:25:36 +08:00
YunaiV
4ffc150701 code review:会员中心
(cherry picked from commit 2d8d32376703162daacb7c47841ebffd1263cb99)
2023-09-20 12:23:45 +08:00
绮梦
48a230aac4 账户信息组件 增加等级、成长值和积分的显示。
增加一些配套的svg 图标。
增加tab 的懒加载。

(cherry picked from commit 45a6b3bcc7461418c1d7822280948083f6f9b168)
2023-09-20 12:23:26 +08:00
YunaiV
e97a62fe06 code review:用户详情
(cherry picked from commit 1b6c9b2e2939a853e59843d5b9f321652bb38da8)
2023-09-20 12:22:09 +08:00
shizhong
19e96f1d0d Merge branch 'dev' of https://gitee.com/ls0/yudao-ui-admin-vue3 into dev 2023-09-20 12:21:52 +08:00
绮梦
72e494c532 重命名组件名称,增加用户地址查看api和页面、统一组件的props userId 变量名。
(cherry picked from commit 28951fb31d05de22ff264d1734852fa6013d0aa5)
2023-09-20 12:19:00 +08:00
绮梦
3ee076d0d9 重命名组件名称
(cherry picked from commit f17bb9a7eb6cd8e000d05038488f7034b244a3bc)
2023-09-20 12:17:22 +08:00
绮梦
2804d199c0 会员详情页的跳转携带参数方式改为params
(cherry picked from commit d1bb736973b98b16d73ccecc3b7c285f72e41cef)
2023-09-20 12:17:11 +08:00
xingyu
d327d28755 fix: 路径错误
(cherry picked from commit e30d5559e6b930185ec25ab70a3a2a843abde6cf)
2023-09-20 12:16:52 +08:00
绮梦
6b2064d979 会员列表页面增加详情页的跳转。
(cherry picked from commit 451458eb1e98aa42f8b6bcf7b2e1f7fbb974c0d1)
2023-09-20 12:16:36 +08:00
owen
4de2049956 会员: 会员等级取消分页功能
(cherry picked from commit e9120f06cf20e5c8708a42809050497278cec679)
2023-09-20 12:14:25 +08:00
YunaiV
92423dc00b code review:用户详情
(cherry picked from commit 55772cbba0d0729fd864f9cf338baabcba1e41d0)
2023-09-20 12:14:21 +08:00
YunaiV
46ab58ddf0 code review:订单列表、订单详情
(cherry picked from commit cfbc2ed74cd2854266746c88545affb85fb79551)
2023-09-20 12:14:05 +08:00
YunaiV
6556feed21 code review:会员等级
(cherry picked from commit bb0c1cb536494f87b61e15323826cb2bbecb2099)
2023-09-20 12:13:05 +08:00
绮梦
943516c502 用户详情-积分tab 去除无用的组件。
(cherry picked from commit c1a40e7c9825f8bdd2f3b6ac0eb028da16b5dbf3)
2023-09-20 12:12:20 +08:00
绮梦
612cc026b3 增加用户详情页以及 签到、积分等用户详情下的子tab页。
增加 用户、签到、积分 接口的VO,方便在组件中使用。

(cherry picked from commit 10d9f11fbaef14685b3860ed6fa1669b36637d9d)
2023-09-20 12:12:11 +08:00
owen
2b67180f80 会员: 修改会员等级,使用单独的表单、接口
(cherry picked from commit 51738f8f6e60b59666c3c9ace97d251a051bcb14)
2023-09-20 12:12:02 +08:00
owen
c01a8f9e99 会员:等级下拉框显示图标
(cherry picked from commit c5a703f488c6034a0f31c7b93f0feb1b3b1b2cc4)
2023-09-20 12:11:43 +08:00