Commit Graph

173 Commits

Author SHA1 Message Date
puhui999
cce1fadc33 CRM: 新增客户行业、来源、级别统计、区域数据统计 2024-03-24 22:22:09 +08:00
YunaiV
2dcd131097 调整启动命令,恢复 npm run dev;如果要连接远程服务 2024-01-18 12:47:23 +08:00
YunaiV
26bb847383 MALL:简化商品分类的 VO 转化 2024-01-13 22:58:32 +08:00
芋道源码
fdfb028dd9
!360 Review代码修改
Merge pull request !360 from 疯狂的世界/dev
2024-01-13 03:16:16 +00:00
YunaiV
a9400c5171 MALL:简化 SPU 属性的维护逻辑 2024-01-12 23:17:48 +08:00
YunaiV
a38ddb699a 📖 MALL:商品编辑 => 优化 DeliveryForm 表单 2024-01-12 20:53:17 +08:00
YunaiV
20b4a7fd66 📖 MALL:商品编辑 => 优化 SKU 表单 2024-01-11 22:22:07 +08:00
owen
bdf95dc0f8 Merge remote-tracking branch 'origin/dev' into dev 2024-01-11 11:35:08 +08:00
owen
a9c231bed6 营销:统一装修预览图片字段名称 2024-01-11 11:21:23 +08:00
YunaiV
2c76d3aeee 📖 MALL:商品编辑 => 将 detail 还是使用 form 复用,减少维护成本 2024-01-11 00:25:39 +08:00
YunaiV
f1c858b9af 📖 MALL:商品编辑的简化 2024-01-10 23:50:19 +08:00
YunaiV
ab64a1d1df 📖 MALL:code review 满减送活动 2024-01-07 22:41:17 +08:00
芋道源码
1e68cd53a0
!352 满减送模块
Merge pull request !352 from Bluemark/dev
2024-01-07 14:16:02 +00:00
芋道源码
9bdba0f67e
!351 商品统计
Merge pull request !351 from 疯狂的世界/dev
2024-01-07 07:23:49 +00:00
YunaiV
d36c4ab36c MALL:去除分销提现的银行配置 2024-01-05 22:46:22 +08:00
落日晚风
21e8dbf985 满减送数据对接 2023-12-22 18:04:29 +08:00
owen
ca35e1a4af 统计:增加商品统计 2023-12-16 23:48:09 +08:00
owen
08be359578 Merge remote-tracking branch 'origin/dev' into dev 2023-12-01 00:39:55 +08:00
owen
d4dc105b4f 营销:适配商城装修组件【营销文章】 2023-11-25 15:53:07 +08:00
芋道源码
54897b6d1b
!332 同步最新的代码到 dev
Merge pull request !332 from 芋道源码/master
2023-11-25 02:27:11 +00:00
owen
253401ace3 营销:适配商城装修组件【优惠券】 2023-11-22 16:58:00 +08:00
niou233
084009f7f2 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 2023-11-08 17:30:04 +08:00
niou233
f2c71d5836 refactor: 会员商品收藏 2023-11-08 17:29:57 +08:00
YunaiV
eb9f8c9f6f Merge branch 'dev' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 2023-11-06 21:43:55 +08:00
VicoHu
3f803767c4
fix: 修复关闭拼团活动请求URL错误的问题
Signed-off-by: VicoHu <vicohu@163.com>
2023-11-05 13:59:28 +00:00
dongshanshan
9a3253ad20 feat: 会员商品收藏 2023-10-31 16:53:44 +08:00
owen
881c4f3a29 营销:完善商城装修
1. 拆分页面设计用的属性修改接口
2. 增加模板的页面保存
3. 增加唯一名称校验
4. 增加页面编辑器,默认选中组件判断
2023-10-31 16:01:22 +08:00
owen
e9ff8d3237 商城装修 2023-10-29 22:03:24 +08:00
puhui999
75135e1e4f 商品 spu 脱离优惠卷模块 2023-10-24 16:57:20 +08:00
puhui999
a7439ee08b 完善 banner 管理 2023-10-24 16:10:55 +08:00
芋道源码
4709c18a6e
!284 完善 SPU,订单列表:完善表头宽度自适应
Merge pull request !284 from puhui999/dev-to-dev
2023-10-21 11:08:44 +00:00
芋道源码
e187c55408
!283 mall模块
Merge pull request !283 from zxiaoxiu/discount
2023-10-21 06:23:04 +00:00
puhui999
491b3a5018 新增 banner 管理 2023-10-21 02:40:20 +08:00
zhangshuai
9f77514c17 限时折扣 2023-10-20 20:51:18 +08:00
puhui999
d62bbcdd92 Merge remote-tracking branch 'yudao/dev' into dev-to-dev
# Conflicts:
#	package.json
#	src/views/member/user/detail/UserOrderList.vue
2023-10-20 16:40:19 +08:00
puhui999
01d78429cc SPU: 完善优惠卷选择 2023-10-20 15:35:01 +08:00
puhui999
18df708b49 SPU: 完善优惠卷选择 2023-10-20 11:48:59 +08:00
puhui999
3464bb9c74 SPU: 新增优惠卷选择 2023-10-19 17:33:42 +08:00
puhui999
04d88ce1a6 订单列表:自定义列抽离封装为组件 2023-10-18 17:20:13 +08:00
owen
61b3bdfd4c 交易:核销订单 2023-10-17 23:18:07 +08:00
owen
6fc232b758 交易:订单核销 2023-10-17 16:09:36 +08:00
owen
6204ce6c1b 统计:trade_statistics 字段【order_wallet_pay_price】改为【wallet_pay_price】 2023-10-16 22:09:20 +08:00
owen
cd4b4cd322 统计:Review修改 2023-10-16 22:03:36 +08:00
owen
8dec8edc6a Merge remote-tracking branch 'origin/dev' into dev 2023-10-16 13:01:02 +08:00
owen
e1a72779d4 统计:Review修改 2023-10-16 13:00:13 +08:00
YunaiV
99172ea088 code review:文章管理 2023-10-16 09:57:46 +08:00
owen
195309dbb6 Merge remote-tracking branch 'origin/dev' into dev 2023-10-16 09:52:35 +08:00
owen
3802fee661 商城:增加商城首页 2023-10-16 09:51:19 +08:00
puhui999
befffb3f7d 营销活动:新增文章管理。 2023-10-15 16:14:09 +08:00
puhui999
36bb90fbb8 营销活动:新增文章分类管理 2023-10-15 00:54:28 +08:00