8641221274
!183 同步商城实现 Merge pull request !183 from 芋道源码/dev
2023-07-27 19:50:13 +08:00
84d538ad69
fix: 完善拼团活动 CRUD
...
(cherry picked from commit dc39ad0cd1
2023-07-27 19:45:36 +08:00
e7e0c7a6b7
update src/views/Login/components/MobileForm.vue.
...
我发现，这个手机号登陆时，登陆成功了但是没有自动跳转，我手动路由到/，又自动跳转到登陆页面，应该是token没存进去，我就照这loginform的逻辑修改了一下
Signed-off-by: water <2778335106@qq.com >
(cherry picked from commit b061c8f32b
2023-07-27 19:44:36 +08:00
85cc7cdb46
fix: mall SeckillConfig
...
(cherry picked from commit 3fd9f1b43e
2023-07-27 19:43:51 +08:00
5e0d09769d
fix: login error
...
(cherry picked from commit 44efb13c0e
2023-07-27 19:43:43 +08:00
a7fe002abd
fix: eslint
...
(cherry picked from commit ba1254f397
2023-07-27 19:43:38 +08:00
a507f26664
fix: mall SeckillActivity
...
(cherry picked from commit b67fabcf1f
2023-07-27 19:41:28 +08:00
0394f81dab
fix: mall SeckillActivity and CombinationActivity
...
(cherry picked from commit 4057130275
2023-07-27 19:41:21 +08:00
d1cc7d134b
fix: mall SeckillActivity
...
(cherry picked from commit ce3ca7c6ce
2023-07-27 19:41:03 +08:00
de53abb249
fix: mall SeckillActivity
...
(cherry picked from commit 36c0bce184
2023-07-27 19:40:57 +08:00
1ab348f8df
fix: mall SeckillActivity
...
(cherry picked from commit b98149f1a7
2023-07-27 19:40:48 +08:00
23fa3fe14c
review 积分配置
...
(cherry picked from commit 4571f893ed
2023-07-27 19:37:26 +08:00
401112f668
review 秒杀活动
...
(cherry picked from commit b1ce2672e4
2023-07-27 19:37:02 +08:00
22f869db89
feat: mall CombinationActivity
...
(cherry picked from commit 2e96b1c984
2023-07-27 19:36:45 +08:00
195ae79bfc
会员中心代码
...
1.合并积分模块只member module
3.添加会员中/会员积分、会员签到/xxx层级目录
4.删除无用的接口代码
(cherry picked from commit 4251dc5d61
2023-07-27 19:36:28 +08:00
bc35b0c80f
fix: 完善 mall seckillActivity add
...
(cherry picked from commit 341303b014
2023-07-27 19:35:21 +08:00
1d0d9d24ad
fix: 封装 SpuSelect SpuAndSkuList 为商品活动商品选择商品编辑通用组件
...
(cherry picked from commit 51e79f29cc
2023-07-27 19:35:12 +08:00
670ebb8ba5
fix: 修复 spu 详情查看错误，同步 mall seckill 组件 name 配置方式
...
(cherry picked from commit 76ccc54a35
2023-07-27 19:35:01 +08:00
a22eea8e90
review 营销活动
...
(cherry picked from commit 5d613e69b3
2023-07-27 19:34:54 +08:00
70c2fe409c
fix：完善秒杀活动管理①
...
(cherry picked from commit b1e7f14963
2023-07-27 19:33:06 +08:00
2fdcdf983a
review 订单
...
(cherry picked from commit 0395b8f138
2023-07-27 19:32:55 +08:00
d32d3fb2ed
合并 master 代码的冲突
...
(cherry picked from commit e1b1c134d9
2023-07-27 19:32:36 +08:00
419a572e80
Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
2023-07-27 19:32:27 +08:00
7da1b04ae2
feat：添加秒杀活动管理
...
(cherry picked from commit 3d47d6744e
2023-07-27 19:27:44 +08:00
1745a61d04
fix: style lint
...
(cherry picked from commit d639401646
2023-07-27 19:26:28 +08:00
a35fd3ec62
提交订单列表和详情20230619
2023-07-27 19:17:22 +08:00
1b5c983d1d
提交订单页面和详情页面 20230619
...
(cherry picked from commit 42a7aec0b5
2023-07-27 19:15:56 +08:00
0f9629707f
feat: 完事秒杀时段管理
...
(cherry picked from commit f7b195b226
2023-07-27 19:14:57 +08:00
a233d16dbb
feat: 秒杀时段管理
...
(cherry picked from commit a75720ec06
2023-07-27 19:14:47 +08:00
b6dff5f976
code review：订单详情
...
(cherry picked from commit 91c53e2e3f
2023-07-27 19:14:39 +08:00
8bf1f04044
code review：订单列表
...
(cherry picked from commit e3f250fff0
2023-07-27 19:11:50 +08:00
1fad4f626c
code review：spu todo 去掉
...
(cherry picked from commit ae69492b53
2023-07-27 19:09:57 +08:00
98c977a732
初始化积分模块
...
1.积分设置管理
2.积分签到规则管理
3.用户积分记录管理
4.用户签到积分管理
(cherry picked from commit 1dca8476b3
2023-07-27 19:06:34 +08:00
6976c26c37
fix: 完善 SPU 相关路由 review
...
(cherry picked from commit d31ade7a5f
2023-07-27 19:04:38 +08:00
9d8e0d507b
fix: 数组操作添加 ? 可选操作符，避免属性值为 null 时报错
...
(cherry picked from commit 20f3f72670
2023-07-27 19:02:29 +08:00
2d88367e61
fix: review
...
(cherry picked from commit b89db1af55
2023-07-27 19:02:19 +08:00
b9ba1d36c2
20230606 add trade-order and details
...
(cherry picked from commit 985d764f62
2023-07-27 18:54:36 +08:00
f641785df9
code review：优惠劵管理
...
(cherry picked from commit 51e76ffd53
2023-07-27 18:53:49 +08:00
ce62362982
fix: 优化 spu 相关路由配置
...
(cherry picked from commit a1b45f80bc
2023-07-27 18:50:14 +08:00
79a4aa5189
code review：商品管理
...
(cherry picked from commit 158585670c
2023-07-27 18:50:01 +08:00
16c518e18a
code review：门店自提、快递运费
...
(cherry picked from commit 60c1604d49
2023-07-27 18:46:14 +08:00
a29421dd41
临时提交
...
(cherry picked from commit 505f5cfa0c
2023-07-27 18:44:50 +08:00
e2faf6a2a4
style: 添加VO
...
(cherry picked from commit c5a7d05821
2023-07-27 18:42:44 +08:00
b28bfc4081
fix: 修复善品测试发现的问题
...
(cherry picked from commit 7fb6258bed
2023-07-27 18:36:45 +08:00
c2168466f3
fix: 引入 v-dompurify-html 指令解决 v-html 的安全隐患
2023-07-27 18:36:06 +08:00
144be6ef44
fix: 完善 SPU 选择快递模版的功能
...
(cherry picked from commit 2ddb605076
2023-07-27 13:11:05 +08:00
d35ac547ac
fix: 完善 SPU 查看详情
...
(cherry picked from commit 39c92cb944
2023-07-27 13:10:58 +08:00
9e7fe34ae8
新增门店自提管理
...
(cherry picked from commit 000aa95012
2023-07-27 13:10:46 +08:00
cf7f4ff89e
fix: 修改 review 提到的问题，完善分类选择层级校验、完整层级展示
...
(cherry picked from commit e555977757
2023-07-27 13:09:36 +08:00
c6a9c0c5fb
所有菜单的 name 都加上模块的前缀，避免冲突
2023-07-10 19:11:15 +08:00
