owen
|
e2fb9df663
|
商品中心：修复商品表格选择对话框，在多选时表头内的多选框不显示选中效果的问题
(cherry picked from commit 1bb9df7b3c6b7fd8b91195664a36afe151141f4c)
|
2024-03-06 20:50:08 +08:00 |
|
owen
|
f0991ddedb
|
商品评论、优惠券模板复用组件【商品橱窗】
(cherry picked from commit e0a731dd86f76292a4b6a7aef3cad1f188c1ff0c)
|
2024-03-06 20:49:53 +08:00 |
|
owen
|
a616b019b8
|
营销：适配商城装修组件【商品栏】
(cherry picked from commit 3198688eb53ae39f76472643c8ee80db903e7ab2)
|
2024-03-06 20:49:48 +08:00 |
|
owen
|
d492186d3e
|
营销：适配商城装修组件【商品卡片】
(cherry picked from commit b4a177258467e3a08c33524e50c80b46eaca5215)
|
2024-03-06 20:44:34 +08:00 |
|
xingyu
|
9d52790910
|
fix: stylelint
(cherry picked from commit 821c804189ffc81b8d8f8444076ab8948dcd3615)
|
2024-03-06 20:41:49 +08:00 |
|
owen
|
d176271313
|
营销：适配商城装修组件【广告魔方】
(cherry picked from commit 49ebadd748157cb814a7a203f449a0feb2ed23c3)
|
2024-03-06 20:33:03 +08:00 |
|
owen
|
11a28eb196
|
营销：增加商城装修组件【图片展示】
(cherry picked from commit fa710b560d9a146c49bfc5f24dff7df3d6373c8c)
|
2024-03-05 17:51:08 +08:00 |
|
YunaiV
|
f575ddacea
|
code review：满减送活动
(cherry picked from commit f79d31a64a3a56ddcfb53608384151b3a84abd33)
|
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 bf418653e431bf290b89591deca96e6098b1dfeb)
|
2024-03-05 17:41:43 +08:00 |
|
owen
|
97a94cd29f
|
营销：完善商城装修
1. 拆分页面设计用的属性修改接口
2. 增加模板的页面保存
3. 增加唯一名称校验
4. 增加页面编辑器，默认选中组件判断
(cherry picked from commit 881c4f3a2932ff4892bf09e6de9f790d5f93d9c6)
|
2024-03-05 17:41:01 +08:00 |
|
owen
|
d12dcde81d
|
商城装修
(cherry picked from commit e9ff8d323752dd0df8bebbb71b8c3fe4f6e8caff)
|
2024-03-05 17:31:22 +08:00 |
|
puhui999
|
5359c4c862
|
解决列数据中的 table#header 数据不刷新的问题
(cherry picked from commit ca385bc08e10bde121423aa9e422dad03ab81c14)
|
2024-03-05 17:24:50 +08:00 |
|
YunaiV
|
9bc0638598
|
修复 banner 返回字段不对
(cherry picked from commit 539352f598503dfe35f04c66ba9f0cfb7ea482e3)
|
2024-03-05 17:22:51 +08:00 |
|
YunaiV
|
6ca92b9251
|
code review：banner 逻辑
(cherry picked from commit e5d6a9dae1caa66053f1a98fb0373bccf4fe98e8)
|
2024-03-05 17:22:30 +08:00 |
|
puhui999
|
11bc949309
|
优惠卷模版样式调整
(cherry picked from commit 95d7d1eb426151e70f0bc41a8b2b129c5ebd0ebe)
|
2024-03-05 17:22:21 +08:00 |
|
puhui999
|
8c5cdd0ea5
|
商品 spu 脱离优惠卷模块
(cherry picked from commit 75135e1e4f8bc44aa9cadb81f1acce3093cf931b)
|
2024-03-05 17:22:16 +08:00 |
|
puhui999
|
1298c3dd52
|
完善 banner 管理
(cherry picked from commit a7439ee08b59d47ef1162e0b1db93e94d2f3cb45)
|
2024-03-05 17:22:09 +08:00 |
|
KONGDY-PC\Kongdy
|
5a67f1c051
|
满减页面布局
(cherry picked from commit 7c8f7d570f4e5027f604dd15a561525891ac0378)
|
2024-03-05 17:22:06 +08:00 |
|
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 |
|