68 Commits

Author SHA1 Message Date
puhui999
99ef6f83ba 订单列表:列表重构: 完善订单发货、修改地址、订单调价、订单备注
(cherry picked from commit be143ea21b70f2281c3f302fbacfd7dc07ab3ed4)
2023-09-20 12:12:52 +08:00
puhui999
c89d08e22a 订单列表:列表重构 ② and 完善订单详情
(cherry picked from commit 345c09ee6ce5a3c8893bef56c8334573fb0d9bf8)
2023-09-20 12:10:57 +08:00
YunaiV
f48c55a0b6 code review:积分记录
(cherry picked from commit 4bc3f15571d7d5d5646e510744a444964ea767b5)
2023-09-19 21:04:10 +08:00
dhb52
149a463a6b fix: 支付管理/退款订单 对标 vue2
(cherry picked from commit 620a2009c3bd146ebda815bc7805fe369474cbb7)
2023-09-19 20:51:33 +08:00
YunaiV
db1e2beaf0 code review:优化收银台的实现,解决 TODO
(cherry picked from commit 7625e6757c92e5dc5cf76fdc33e31ff3625268d5)
2023-09-19 20:44:38 +08:00
dhb52
191d149959 feat: 支付功能迁移(初稿)
(cherry picked from commit a6eab3cc9a998cff2120a6db82f6938ab1c2f206)
2023-09-19 20:39:21 +08:00
YunaiV
544adb9811 支付应用:模拟支付的添加代码优化
(cherry picked from commit a2fdff47df15822410ce53e7f6b9bfd5214e5bb9)
2023-09-19 20:32:24 +08:00
dhb52
3f479ecffc feat: 支付管理/应用信息(alpha)
(cherry picked from commit 323417b0d4afac0aa6aede6aae3c5d865efa47cb)
2023-09-19 20:25:26 +08:00
shizhong
b376e8e2a8 增加部门和菜单的详情,解决个人中心无法上传图片的问题 2023-08-22 17:33:04 +08:00
puhui999
0394f81dab fix: mall SeckillActivity and CombinationActivity
(cherry picked from commit 40571302753292182bb8a7052aae1fb6f3117503)
2023-07-27 19:41:21 +08:00
YunaiV
23fa3fe14c review 积分配置
(cherry picked from commit 4571f893ed93d3a012635a22137ecaff0ae34949)
2023-07-27 19:37:26 +08:00
puhui999
22f869db89 feat: mall CombinationActivity
(cherry picked from commit 2e96b1c9840b7adfbc8110eb3a36bd2b406dc392)
2023-07-27 19:36:45 +08:00
xiaqing
195ae79bfc 会员中心代码
1.合并积分模块只member module
3.添加会员中/会员积分、会员签到/xxx层级目录
4.删除无用的接口代码

(cherry picked from commit 4251dc5d6167db0befecfacf2402511314eda6ec)
2023-07-27 19:36:28 +08:00
YunaiV
a22eea8e90 review 营销活动
(cherry picked from commit 5d613e69b3d651806f7710eebb2b14e5c7034097)
2023-07-27 19:34:54 +08:00
puhui999
a233d16dbb feat: 秒杀时段管理
(cherry picked from commit a75720ec0646f4fe5bdf21126bd5c3cf719170e9)
2023-07-27 19:14:47 +08:00
YunaiV
8bf1f04044 code review:订单列表
(cherry picked from commit e3f250fff07ee496c54050d1ed28041c9786d0fd)
2023-07-27 19:11:50 +08:00
shizhong
1e8b1c8a1d !165 trade-order 列表和详情初版 Merge pull request !165 from 矿泉水/dev 2023-07-27 19:11:40 +08:00
YunaiV
d4902558e6 code review:会员积分配置
(cherry picked from commit 5eaf054646d4eb701f1ce54d566cce16549dde98)
2023-07-27 19:09:38 +08:00
shizhong
7a35f7fe6e Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev 2023-07-27 19:08:57 +08:00
YunaiV
24a4ed134a code review:处理字典数据的冲突
(cherry picked from commit 8666307d472cd1b335b0102af9a8fede76823919)
2023-07-27 19:07:23 +08:00
xiaqing
98c977a732 初始化积分模块
1.积分设置管理
2.积分签到规则管理
3.用户积分记录管理
4.用户签到积分管理

(cherry picked from commit 1dca8476b35962c278124075acc731319fca60cb)
2023-07-27 19:06:34 +08:00
puhui999
2d88367e61 fix: review
(cherry picked from commit b89db1af55127fef5b558e2fdcd6f8401ccdc7df)
2023-07-27 19:02:19 +08:00
shizhong
274d85010f add trade order 20230606 2023-07-27 19:01:41 +08:00
shizhong
45bf152dd2 sync dev-20230606 2023-07-27 19:00:31 +08:00
YunaiV
f641785df9 code review:优惠劵管理
(cherry picked from commit 51e76ffd53aa1cc76f85cfb4389ac257f2804f8a)
2023-07-27 18:53:49 +08:00
YunaiV
79a4aa5189 code review:商品管理
(cherry picked from commit 158585670ccab231b7a0902f62b9d134af747d50)
2023-07-27 18:50:01 +08:00
xiaobai
a29421dd41 临时提交
(cherry picked from commit 505f5cfa0c543f779abe43d6d77f260991486fdf)
2023-07-27 18:44:50 +08:00
dhb52
e2faf6a2a4 style: 添加VO
(cherry picked from commit c5a7d05821d4eae7197cbd0dba66f544ee214ecc)
2023-07-27 18:42:44 +08:00
puhui999
d35ac547ac fix: 完善 SPU 查看详情
(cherry picked from commit 39c92cb944e2b41007d1870d411f5255c9da1d70)
2023-07-27 13:10:58 +08:00
puhui999
cf7f4ff89e fix: 修改 review 提到的问题,完善分类选择层级校验、完整层级展示
(cherry picked from commit e555977757f76516638ce2c8fb90eb6a186bc25b)
2023-07-27 13:09:36 +08:00
周建
7ca76a5304 修复一些命名和拼写错误问题,修复一些BUG 2023-06-25 13:34:27 +08:00
周建
73cd6e303d 登录接口返回的过期时间是access token 的过期时间,但是被错误地设置在了refresh token 上,这导致过了几分钟登录状态便失效要求重新登录 2023-06-19 13:08:56 +08:00
YunaiV
4cd4327bc8 review + mall:商品管理
(cherry picked from commit 0fba3fd5033a451cfe2c33a1dc8a3d91c90ed9b3)
2023-06-13 14:13:55 +08:00
jason
bbe9e667c4 运费模板性能优化。区域选择使用懒加载
(cherry picked from commit af2fb4bf5f287a406700ba3a3e083c3d5755d2c1)
2023-06-13 14:12:41 +08:00
jason
90ccc11006 mall: 订单中心->运费模板(第一版 性能有问题)
(cherry picked from commit 4e69f15128b3d93958cc4082cff91c7230feb410)
2023-06-13 14:10:52 +08:00
puhui999
4410bdd93c fix:解决商品上一版遗留的各种小bug关键部分已添加fix注释。完成的TODO也已添加fix标记
(cherry picked from commit 0c42b76a52ce9b29ec68b54d9b74deb4483108dd)
2023-06-13 14:07:22 +08:00
puhui999
cafd74193f fix: 移动copyValueToTarget方法到utils/index中
(cherry picked from commit 43e541f9449e3474379b8bd7903666f783454963)
2023-06-13 14:05:38 +08:00
YunaiV
7a5993c584 code review 商品管理的实现
(cherry picked from commit e92361ed401771998c6abd6d9ba53801a6e0cfa6)
2023-06-13 13:56:48 +08:00
puhui999
b9fd7b7753 商品管理: 打通所有接口(第一版)
(cherry picked from commit 0c6e3a39c95190bb54538d548c4df4f0ff4d57b4)
2023-06-13 13:56:04 +08:00
puhui999
2152573c5e 商品管理: 调整相关组件优化逻辑
(cherry picked from commit 1116fb278bc5799839d7102322c0b5558374e70e)
2023-06-13 13:55:48 +08:00
puhui999
72fd0b8ed5 商品管理: 调整相关组件优化逻辑
(cherry picked from commit 6478d295dfc0b7a01c46abf3eb0dbc1b633f4f27)
2023-06-13 13:55:44 +08:00
puhui999
083a0c4760 商品管理: 完善表单校验,优化信息提示,完成新建、编辑、提交逻辑
(cherry picked from commit c38abc365c779528d5ea5d2926a895aa1211eaf9)
2023-06-13 13:52:42 +08:00
shizhong
cbaa6bc355 流程表单:使用异步组件的方式动态加载业务表单指定的查看表单的组件,直接显示到审批页面,不再需要点击查看 2023-06-13 13:24:02 +08:00
shizhong
5466e93d3a 移除 css 的引入 2023-06-13 12:51:11 +08:00
shizhong
76472bcd8e 代码生成,支持设置前端的模版 2023-06-13 12:34:01 +08:00
shizhong
ba4cc02bfd 项目全局使用formatDate方法移除parseTime方法 2023-06-13 11:03:33 +08:00
gexinzhineng/gxzn27
b967c4e01e 错误提交 2023-04-03 16:11:12 +08:00
gexinzhineng/gxzn27
0e578f8d0a 回退vxe版本 2023-04-03 15:26:56 +08:00
YunaiV
e6dac1ebda REVIEW 代码预览(PreviewCode) 2023-03-29 22:25:53 +08:00
kinlon92
658150c1c8 Vue3重构:公众号统计优化 TODO 2023-03-28 18:23:58 +08:00