root/ludu-admin-vue3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
667 Commits 8 Branches 11 Tags
Commit Graph

77 Commits

Author SHA1 Message Date
puhui999
22f869db89 feat: mall CombinationActivity 
(cherry picked from commit 2e96b1c9840b7adfbc8110eb3a36bd2b406dc392)
 2023-07-27 19:36:45 +08:00
puhui999
bc35b0c80f fix: 完善 mall seckillActivity add 
(cherry picked from commit 341303b014f1d24baf132575763d20a4a08c4b1c)
 2023-07-27 19:35:21 +08:00
puhui999
1d0d9d24ad fix: 封装 SpuSelect SpuAndSkuList 为商品活动商品选择商品编辑通用组件 
(cherry picked from commit 51e79f29cc70ad1670b93829bab3d5d23751c263)
 2023-07-27 19:35:12 +08:00
puhui999
670ebb8ba5 fix: 修复 spu 详情查看错误，同步 mall seckill 组件 name 配置方式 
(cherry picked from commit 76ccc54a350a6183b6aa89599d3e010b467263b6)
 2023-07-27 19:35:01 +08:00
YunaiV
a22eea8e90 review 营销活动 
(cherry picked from commit 5d613e69b3d651806f7710eebb2b14e5c7034097)
 2023-07-27 19:34:54 +08:00
puhui999
70c2fe409c fix：完善秒杀活动管理① 
(cherry picked from commit b1e7f149638243885ae97f6c31f5df24d9b6ffa2)
 2023-07-27 19:33:06 +08:00
YunaiV
2fdcdf983a review 订单 
(cherry picked from commit 0395b8f13887bbd6c04f7b5b6b7c1871b64b44ab)
 2023-07-27 19:32:55 +08:00
YunaiV
d32d3fb2ed 合并 master 代码的冲突 
(cherry picked from commit e1b1c134d9014ba0b1612e85468d145e124a7278)
 2023-07-27 19:32:36 +08:00
shizhong
419a572e80 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev 2023-07-27 19:32:27 +08:00
puhui999
7da1b04ae2 feat：添加秒杀活动管理 
(cherry picked from commit 3d47d6744e0dd78d4df350c5eb6421dba889f8af)
 2023-07-27 19:27:44 +08:00
shizhong
a35fd3ec62 提交订单列表和详情20230619 2023-07-27 19:17:22 +08:00
xiaobai
1b5c983d1d 提交订单页面和详情页面 20230619 
(cherry picked from commit 42a7aec0b51c4c9f0d2588972a3fddfd3bd2f981)
 2023-07-27 19:15:56 +08:00
puhui999
0f9629707f feat: 完事秒杀时段管理 
(cherry picked from commit f7b195b226308e4f016817a1bba5ca1a52921906)
 2023-07-27 19:14:57 +08:00
puhui999
a233d16dbb feat: 秒杀时段管理 
(cherry picked from commit a75720ec0646f4fe5bdf21126bd5c3cf719170e9)
 2023-07-27 19:14:47 +08:00
YunaiV
b6dff5f976 code review：订单详情 
(cherry picked from commit 91c53e2e3f846f6c090be56a093c449cfaf94adc)
 2023-07-27 19:14:39 +08:00
YunaiV
8bf1f04044 code review：订单列表 
(cherry picked from commit e3f250fff07ee496c54050d1ed28041c9786d0fd)
 2023-07-27 19:11:50 +08:00
YunaiV
1fad4f626c code review：spu todo 去掉 
(cherry picked from commit ae69492b53ceeb006c72c1ef70d1b0b15685dee2)
 2023-07-27 19:09:57 +08:00
puhui999
6976c26c37 fix: 完善 SPU 相关路由 review 
(cherry picked from commit d31ade7a5fccc98db7e90e41a31564205b393056)
 2023-07-27 19:04:38 +08:00
puhui999
9d8e0d507b fix: 数组操作添加 ? 可选操作符，避免属性值为 null 时报错 
(cherry picked from commit 20f3f7267023b21fc28541ed7a0f35f3a0d3e832)
 2023-07-27 19:02:29 +08:00
puhui999
2d88367e61 fix: review 
(cherry picked from commit b89db1af55127fef5b558e2fdcd6f8401ccdc7df)
 2023-07-27 19:02:19 +08:00
xiaobai
b9ba1d36c2 20230606 add trade-order and details 
(cherry picked from commit 985d764f623e24402b1ba91562d2994b28d1aeec)
 2023-07-27 18:54:36 +08:00
YunaiV
f641785df9 code review：优惠劵管理 
(cherry picked from commit 51e76ffd53aa1cc76f85cfb4389ac257f2804f8a)
 2023-07-27 18:53:49 +08:00
puhui999
ce62362982 fix: 优化 spu 相关路由配置 
(cherry picked from commit a1b45f80bc72c57b1fd7cfef6b4f314629ed637d)
 2023-07-27 18:50:14 +08:00
YunaiV
79a4aa5189 code review：商品管理 
(cherry picked from commit 158585670ccab231b7a0902f62b9d134af747d50)
 2023-07-27 18:50:01 +08:00
YunaiV
16c518e18a code review：门店自提、快递运费 
(cherry picked from commit 60c1604d4947df8f2eaaa748780af9db9f75831f)
 2023-07-27 18:46:14 +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
b28bfc4081 fix: 修复善品测试发现的问题 
(cherry picked from commit 7fb6258bed0ad06943000d9884a3757539d68519)
 2023-07-27 18:36:45 +08:00
shizhong
c2168466f3 fix: 引入 v-dompurify-html 指令解决 v-html 的安全隐患 2023-07-27 18:36:06 +08:00
puhui999
144be6ef44 fix: 完善 SPU 选择快递模版的功能 
(cherry picked from commit 2ddb6050763cb395dbe4c1d475a127e6e8da58ca)
 2023-07-27 13:11:05 +08:00
puhui999
d35ac547ac fix: 完善 SPU 查看详情 
(cherry picked from commit 39c92cb944e2b41007d1870d411f5255c9da1d70)
 2023-07-27 13:10:58 +08:00
jason
9e7fe34ae8 新增门店自提管理 
(cherry picked from commit 000aa950129d42aa141816f939c64639e89ff7c6)
 2023-07-27 13:10:46 +08:00
puhui999
cf7f4ff89e fix: 修改 review 提到的问题，完善分类选择层级校验、完整层级展示 
(cherry picked from commit e555977757f76516638ce2c8fb90eb6a186bc25b)
 2023-07-27 13:09:36 +08:00
shizhong
c6a9c0c5fb 所有菜单的 name 都加上模块的前缀，避免冲突 2023-07-10 19:11:15 +08:00
shizhong
6f266fb967 给所有组件添加name属性预防未知bug!!! 2023-06-13 21:05:25 +08:00
jason
88439669c0 运费模板区域改成多选 
(cherry picked from commit 70c50827761104b9eb41282d37e1405137e5f1b3)
 2023-06-13 14:15:44 +08:00
YunaiV
6e7ee28079 review + mall：快递公司管理 
(cherry picked from commit b12aefe46ed0dd9ff42de3e1fa4cc2ccc6d491b1)
 2023-06-13 14:15:31 +08:00
YunaiV
dfc3da744f review + mall：商品管理 
(cherry picked from commit 349a39e72f17f88a7d82123cfc4b9fcf25ead104)
 2023-06-13 14:15:28 +08:00
shizhong
61396246a5 Merge branch 'dev-to-dev' of https://gitee.com/puhui999/yudao-ui-admin-vue3 into dev 2023-06-13 14:14:42 +08:00
YunaiV
4cd4327bc8 review + mall：商品管理 
(cherry picked from commit 0fba3fd5033a451cfe2c33a1dc8a3d91c90ed9b3)
 2023-06-13 14:13:55 +08:00
puhui999
4eacb6dd8c fix: 完善善品导出 
(cherry picked from commit d877bfd26e488c4138e0d6e4d6a5b54817d8103e)
 2023-06-13 14:12:49 +08:00
jason
4850c05614 运费模板表格样式调整 
(cherry picked from commit c296c9e53de81a1cb5b708f9fad1e170af462467)
 2023-06-13 14:12:45 +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
c254222b5f fix: 优化相关逻辑，修复遗留bug 
(cherry picked from commit 38545e89c6b6cb98f7a70d69583110338b02d499)
 2023-06-13 14:07:33 +08:00
puhui999
4410bdd93c fix:解决商品上一版遗留的各种小bug关键部分已添加fix注释。完成的TODO也已添加fix标记 
(cherry picked from commit 0c42b76a52ce9b29ec68b54d9b74deb4483108dd)
 2023-06-13 14:07:22 +08:00
jason
4ec3d3fe72 新增快递公司菜单 
(cherry picked from commit b0984c901369dd45091cbe03448aedcab9573627)
 2023-06-13 14:06:19 +08:00
puhui999
ea4e2a0bcc fix: 解决商品上一版遗留的各种小bug关键部分已添加fix注释。完成的TODO也已添加fix标记 
(cherry picked from commit 4ddba9d454ebfd221f39ba12b375401768ff7f45)
 2023-06-13 14:06:16 +08:00
puhui999
d73a32106a fix: 修复 OtherSettingsForm TODO 优化相关算法,解决上一版本遗留的bug 
(cherry picked from commit 3c4a39df01d59be0a320044a75fad2412d578a7d)
 2023-06-13 14:06:02 +08:00
puhui999
085dbd6220 fix: 修复 SkuList TODO 优化相关算法 
(cherry picked from commit 9c06832d7e12bfd01e4633342fbff729b648474b)
 2023-06-13 14:05:57 +08:00