Commit Graph

248 Commits

Author SHA1 Message Date
owen
11a28eb196 营销:增加商城装修组件【图片展示】
(cherry picked from commit fa710b560d)
2024-03-05 17:51:08 +08:00
YunaiV
f575ddacea code review:满减送活动
(cherry picked from commit f79d31a64a)
2024-03-05 17:43:11 +08:00
风狗
d47a60b18d update src/views/mall/trade/delivery/expressTemplate/ExpressTemplateForm.vue.
地区选择框placeholder 修改

Signed-off-by: 风狗 <909275705@qq.com>
(cherry picked from commit bf418653e4)
2024-03-05 17:41:43 +08:00
owen
97a94cd29f 营销:完善商城装修
1. 拆分页面设计用的属性修改接口
2. 增加模板的页面保存
3. 增加唯一名称校验
4. 增加页面编辑器,默认选中组件判断

(cherry picked from commit 881c4f3a29)
2024-03-05 17:41:01 +08:00
owen
d12dcde81d 商城装修
(cherry picked from commit e9ff8d3237)
2024-03-05 17:31:22 +08:00
puhui999
5359c4c862 解决列数据中的 table#header 数据不刷新的问题
(cherry picked from commit ca385bc08e)
2024-03-05 17:24:50 +08:00
YunaiV
9bc0638598 修复 banner 返回字段不对
(cherry picked from commit 539352f598)
2024-03-05 17:22:51 +08:00
YunaiV
6ca92b9251 code review:banner 逻辑
(cherry picked from commit e5d6a9dae1)
2024-03-05 17:22:30 +08:00
puhui999
11bc949309 优惠卷模版样式调整
(cherry picked from commit 95d7d1eb42)
2024-03-05 17:22:21 +08:00
puhui999
8c5cdd0ea5 商品 spu 脱离优惠卷模块
(cherry picked from commit 75135e1e4f)
2024-03-05 17:22:16 +08:00
puhui999
1298c3dd52 完善 banner 管理
(cherry picked from commit a7439ee08b)
2024-03-05 17:22:09 +08:00
KONGDY-PC\Kongdy
5a67f1c051 满减页面布局
(cherry picked from commit 7c8f7d570f)
2024-03-05 17:22:06 +08:00
YunaiV
eecf209aad code review:banner 逻辑
(cherry picked from commit 2dbfa77bee)
2024-03-05 17:21:37 +08:00
YunaiV
b7c81fb37d code review:限时折扣
(cherry picked from commit 423ea319e0)
2024-03-05 17:21:27 +08:00
puhui999
4fcdd63e51 新增 banner 管理
(cherry picked from commit 491b3a5018)
2024-03-05 17:21:03 +08:00
puhui999
ea546e4831 完善文章管理 review 提到的问题
(cherry picked from commit 0730e215d8)
2024-03-05 17:20:29 +08:00
zhangshuai
9f04b8e34b 限时折扣
(cherry picked from commit 9f77514c17)
2024-03-05 17:20:00 +08:00
puhui999
139f45003d SPU: 新增完善活动优先级拖拽排序
(cherry picked from commit 1e8945de63)
2024-03-05 17:16:39 +08:00
puhui999
ccec7ad410 SPU: 完善优惠卷选择
(cherry picked from commit 01d78429cc)
2024-03-05 17:15:16 +08:00
puhui999
de53601fcb SPU: 完善优惠卷选择
(cherry picked from commit 18df708b49)
2024-03-05 17:14:29 +08:00
YunaiV
801ea4c176 code review:门店自提
(cherry picked from commit 2457665b55)
2024-03-05 17:14:23 +08:00
puhui999
e9da54b100 SPU: 新增优惠卷选择
(cherry picked from commit 3464bb9c74)
2024-03-05 17:12:24 +08:00
puhui999
b8b549462d OrderTableColumn: 商品信息列样式调整2
(cherry picked from commit 5b3bcecef2)
2024-03-05 17:12:20 +08:00
puhui999
a313663c99 OrderTableColumn: 商品信息列样式调整
(cherry picked from commit 094f8e16db)
2024-03-05 17:12:15 +08:00
puhui999
9dae60b597 订单列表:完善表头宽度自适应
(cherry picked from commit 5270c83876)
2024-03-05 17:11:37 +08:00
puhui999
bb18f469de 订单列表:自定义列抽离封装为组件
(cherry picked from commit 04d88ce1a6)
2024-03-05 17:11:17 +08:00
puhui999
432620ffec 营销文章:新增表单属性移除浏览量
(cherry picked from commit d1a3fe5d5a)
2024-03-05 17:10:30 +08:00
owen
d04c1f0213 统计卡片修改为全局组件
(cherry picked from commit 431fff28ce)
2024-03-05 17:08:22 +08:00
owen
174b95fdef 交易:核销订单
(cherry picked from commit 61b3bdfd4c)
2024-03-05 17:07:35 +08:00
owen
18b7dd3b7e 交易:订单核销
(cherry picked from commit 6fc232b758)
2024-03-05 17:06:12 +08:00
owen
aaead6c2b9 统计:修复错误
(cherry picked from commit e3a0cfe5e9)
2024-03-05 17:03:47 +08:00
owen
1dba566d1d 统计:trade_statistics 字段【order_wallet_pay_price】改为【wallet_pay_price】
(cherry picked from commit 6204ce6c1b)
2024-03-05 17:03:42 +08:00
owen
25a1e27a12 统计:Review修改
(cherry picked from commit cd4b4cd322)
2024-03-05 17:03:35 +08:00
YunaiV
e3f1c21e53 code review:文章管理
(cherry picked from commit 66ec610801)
2024-03-05 17:03:19 +08:00
xingyu
d02f5570f5 style: stylelint
(cherry picked from commit 1a1b70a350)
2024-03-05 16:59:51 +08:00
owen
35803ba77a 统计:会员终端统计,处理未知终端情况
(cherry picked from commit edfd03903f)
2024-03-05 16:53:34 +08:00
owen
d46adb0683 统计:处理会员性别统计,存在未知的情况
(cherry picked from commit 2bfc9c3b13)
2024-03-05 16:53:25 +08:00
owen
eddac7c9be 统计:修复错误
(cherry picked from commit 661e72bcfd)
2024-03-05 16:53:16 +08:00
owen
3c51e98682 统计:Review修改
(cherry picked from commit e1a72779d4)
2024-03-05 16:53:07 +08:00
YunaiV
f0542fef06 code review:文章管理
(cherry picked from commit 99172ea088)
2024-03-05 16:52:46 +08:00
owen
230d073fb8 商城:增加商城首页
(cherry picked from commit 3802fee661)
2024-03-05 16:52:31 +08:00
puhui999
7c41ce1796 营销活动:新增文章管理。
(cherry picked from commit befffb3f7d)
2024-03-05 16:50:47 +08:00
puhui999
54e1a8843b 营销活动:新增文章分类管理
(cherry picked from commit 36bb90fbb8)
2024-03-05 16:50:22 +08:00
xingyu
46bce2750f fix: unocss eslint
(cherry picked from commit e04ca7aac7)
2024-03-05 16:49:25 +08:00
YunaiV
721fc5c026 code review:拼团记录列表
(cherry picked from commit 855b37c1ab)
2024-03-05 16:48:59 +08:00
puhui999
848e0b7023 营销活动:完善 review 提到的问题,添加拼团列表查看弹窗
(cherry picked from commit 3500a20630)
2024-03-05 16:33:41 +08:00
owen
c4e6163437 统计:会员统计
(cherry picked from commit 22adab8590)
2024-03-05 16:32:14 +08:00
YunaiV
a06369d427 code review:拼团记录列表
(cherry picked from commit 86323f970b)
2024-03-05 16:05:22 +08:00
puhui999
9f836ad25b 拼团记录:优化页面布局,添加日期快捷选项
(cherry picked from commit 5b4983a3e9)
2024-03-05 16:04:54 +08:00
puhui999
799ec653dd 拼团活动:表单添加虚拟成团控制按钮
(cherry picked from commit 8c347e5990)
2024-03-05 16:04:45 +08:00