236 Commits

Author SHA1 Message Date
YunaiV
eecf209aad code review:banner 逻辑
(cherry picked from commit 2dbfa77bee275031d732112bc178232ecaa2c33d)
2024-03-05 17:21:37 +08:00
YunaiV
b7c81fb37d code review:限时折扣
(cherry picked from commit 423ea319e006c1da3c6ffe6d4d64ab75fd084f3d)
2024-03-05 17:21:27 +08:00
puhui999
4fcdd63e51 新增 banner 管理
(cherry picked from commit 491b3a5018db069f0237473441b1189273ee0f0d)
2024-03-05 17:21:03 +08:00
puhui999
ea546e4831 完善文章管理 review 提到的问题
(cherry picked from commit 0730e215d89c7de7f5f5e67bffdf61074f855cd1)
2024-03-05 17:20:29 +08:00
zhangshuai
9f04b8e34b 限时折扣
(cherry picked from commit 9f77514c17cc5a45726db905d1c415948cce1a6e)
2024-03-05 17:20:00 +08:00
puhui999
139f45003d SPU: 新增完善活动优先级拖拽排序
(cherry picked from commit 1e8945de63f398fd2284843c5a70283b3ea18bf6)
2024-03-05 17:16:39 +08:00
puhui999
ccec7ad410 SPU: 完善优惠卷选择
(cherry picked from commit 01d78429cc68139d87138c66db93f85aec94dc14)
2024-03-05 17:15:16 +08:00
puhui999
de53601fcb SPU: 完善优惠卷选择
(cherry picked from commit 18df708b49ca43690622ecb12aead6d3b59e1b1d)
2024-03-05 17:14:29 +08:00
YunaiV
801ea4c176 code review:门店自提
(cherry picked from commit 2457665b55e75fa2ede8c83d551ea05d9bf08abf)
2024-03-05 17:14:23 +08:00
puhui999
e9da54b100 SPU: 新增优惠卷选择
(cherry picked from commit 3464bb9c74a0f3de9efc6ee5a4c42bac81c67485)
2024-03-05 17:12:24 +08:00
puhui999
b8b549462d OrderTableColumn: 商品信息列样式调整2
(cherry picked from commit 5b3bcecef2355e2b30f0251c0d52b07c487c74e8)
2024-03-05 17:12:20 +08:00
puhui999
a313663c99 OrderTableColumn: 商品信息列样式调整
(cherry picked from commit 094f8e16db9f09586ba359b1d9043dbc84c820d0)
2024-03-05 17:12:15 +08:00
puhui999
9dae60b597 订单列表:完善表头宽度自适应
(cherry picked from commit 5270c83876980719f3c6127d4f13bb9dd77835bf)
2024-03-05 17:11:37 +08:00
puhui999
bb18f469de 订单列表:自定义列抽离封装为组件
(cherry picked from commit 04d88ce1a61cacbf613f7d77565334bc15abfd12)
2024-03-05 17:11:17 +08:00
puhui999
432620ffec 营销文章:新增表单属性移除浏览量
(cherry picked from commit d1a3fe5d5a91ea5f782d1c83abb7b6a111ec0a14)
2024-03-05 17:10:30 +08:00
owen
d04c1f0213 统计卡片修改为全局组件
(cherry picked from commit 431fff28ce84f281b619d432eaae06df0ee54287)
2024-03-05 17:08:22 +08:00
owen
174b95fdef 交易:核销订单
(cherry picked from commit 61b3bdfd4c8d06e88341cb4f40b16f736485c1f2)
2024-03-05 17:07:35 +08:00
owen
18b7dd3b7e 交易:订单核销
(cherry picked from commit 6fc232b758f5d540389be60367b6866ded7ec5aa)
2024-03-05 17:06:12 +08:00
owen
aaead6c2b9 统计:修复错误
(cherry picked from commit e3a0cfe5e934f2d4863012821545864c845cdbf2)
2024-03-05 17:03:47 +08:00
owen
1dba566d1d 统计:trade_statistics 字段【order_wallet_pay_price】改为【wallet_pay_price】
(cherry picked from commit 6204ce6c1b70c5c878f3e21de6d286935ed8ef15)
2024-03-05 17:03:42 +08:00
owen
25a1e27a12 统计:Review修改
(cherry picked from commit cd4b4cd3228a95fcc827ddfdccaf3949d2546a7c)
2024-03-05 17:03:35 +08:00
YunaiV
e3f1c21e53 code review:文章管理
(cherry picked from commit 66ec61080171302caa77f06145d835bb6c2ba7fe)
2024-03-05 17:03:19 +08:00
xingyu
d02f5570f5 style: stylelint
(cherry picked from commit 1a1b70a350722cf25a00e5b659a71ead5be62114)
2024-03-05 16:59:51 +08:00
owen
35803ba77a 统计:会员终端统计,处理未知终端情况
(cherry picked from commit edfd03903f2c9ebff4446e3d93c0fe07e416d7e3)
2024-03-05 16:53:34 +08:00
owen
d46adb0683 统计:处理会员性别统计,存在未知的情况
(cherry picked from commit 2bfc9c3b13e40cfb8e83c06d012bd94165367648)
2024-03-05 16:53:25 +08:00
owen
eddac7c9be 统计:修复错误
(cherry picked from commit 661e72bcfda629a14b09d70eb5a2b68ad37c0e5d)
2024-03-05 16:53:16 +08:00
owen
3c51e98682 统计:Review修改
(cherry picked from commit e1a72779d4f29455a83837495317e74ec9608a84)
2024-03-05 16:53:07 +08:00
YunaiV
f0542fef06 code review:文章管理
(cherry picked from commit 99172ea088332104ded558fd12a70326e4f0bdf5)
2024-03-05 16:52:46 +08:00
owen
230d073fb8 商城:增加商城首页
(cherry picked from commit 3802fee661b59cb43f07b3b44a8f8e94a500d111)
2024-03-05 16:52:31 +08:00
puhui999
7c41ce1796 营销活动:新增文章管理。
(cherry picked from commit befffb3f7d7f94f1c4028b0dea595b43bb67d356)
2024-03-05 16:50:47 +08:00
puhui999
54e1a8843b 营销活动:新增文章分类管理
(cherry picked from commit 36bb90fbb8246fc7e40b3f0794fc4600d50cc6ff)
2024-03-05 16:50:22 +08:00
xingyu
46bce2750f fix: unocss eslint
(cherry picked from commit e04ca7aac7a651d444753ed3f44e22faae408332)
2024-03-05 16:49:25 +08:00
YunaiV
721fc5c026 code review:拼团记录列表
(cherry picked from commit 855b37c1ab2eb1191b668afc2f0dc37082713822)
2024-03-05 16:48:59 +08:00
puhui999
848e0b7023 营销活动:完善 review 提到的问题,添加拼团列表查看弹窗
(cherry picked from commit 3500a20630463947c147f8fc4b99c1abf0d785db)
2024-03-05 16:33:41 +08:00
owen
c4e6163437 统计:会员统计
(cherry picked from commit 22adab859036096793bfef0d7771a9f37af83c8f)
2024-03-05 16:32:14 +08:00
YunaiV
a06369d427 code review:拼团记录列表
(cherry picked from commit 86323f970b0a8eb466a3865ecc9d9f32f2df82eb)
2024-03-05 16:05:22 +08:00
puhui999
9f836ad25b 拼团记录:优化页面布局,添加日期快捷选项
(cherry picked from commit 5b4983a3e97fe921fae06b3fa4d7fdb8fee09f42)
2024-03-05 16:04:54 +08:00
puhui999
799ec653dd 拼团活动:表单添加虚拟成团控制按钮
(cherry picked from commit 8c347e59908327e3a2db3a49c5f55eed67dd49bf)
2024-03-05 16:04:45 +08:00
puhui999
22449ed21a 拼团记录:接口对接
(cherry picked from commit c445173855aece19a97a548bacad624c8414ad31)
2024-03-05 16:04:39 +08:00
YunaiV
edfc7e7c01 promotion:调整拼团活动的界面
(cherry picked from commit 24fc36e23a42fe83c6ecb28f40cefdc68a340660)
2024-03-05 16:04:34 +08:00
puhui999
8346717986 拼团记录: 完成 UI 部分
(cherry picked from commit eee3d0fef5e7b4cbfcd141b0835f6a0d60217a4c)
2024-03-05 16:04:27 +08:00
owen
e30e0e2d32 统计:交易统计Review修改
(cherry picked from commit 2a58b04a9835b741c61a11b849ea36fb2f4210fc)
2024-03-05 16:03:05 +08:00
YunaiV
2b4c192423 promotion:调整拼团活动的界面
(cherry picked from commit 78062dd474a9fcecbeec46b436b17d8f7f43883b)
2024-03-05 16:03:00 +08:00
YunaiV
be2f92754b promotion:新增记录记录列表
(cherry picked from commit cf7ac2cb10f2cf6196c8fb4a2a7aaf3db7b98f1c)
2024-03-05 15:58:09 +08:00
YunaiV
d9ec3f6e61 promotion:新增砍价记录列表
(cherry picked from commit 860872a8908db18fa2c87e3c5096bfc1c287f5a6)
2024-03-05 15:58:04 +08:00
YunaiV
171bf0154a promotion:优化砍价活动的管理
(cherry picked from commit 42f0bf07f000226d50f14730db972c0dde0e5a45)
2024-03-05 15:57:52 +08:00
owen
cbba91dac5 交易:核销
(cherry picked from commit 58b6b1ba578c1f869a82bfd028e86543092419e9)
2024-03-05 15:57:14 +08:00
YunaiV
e92709da70 promotion:优化秒杀活动的界面
(cherry picked from commit 7c491ff62a619854cc24c029fc36bff208527c8f)
2024-03-05 15:57:09 +08:00
YunaiV
517d4ac28e promotion:优化优惠劵的界面
(cherry picked from commit 40f44fc78e1df31c93766a4ee67805e06d655188)
2024-03-05 15:55:09 +08:00
YunaiV
72681f209b trade:优化分销界面的 width 列宽度,和一些非空判断
(cherry picked from commit 59ab6218ca950d166bca937b6a14d54b07b68565)
2024-03-05 15:55:05 +08:00