155 Commits

Author SHA1 Message Date
owen
6c96749d18 营销:适配商城装修组件【用户资产】
(cherry picked from commit c058048face364b0e84d9bb076144bf86dfc3e87)
2024-03-06 21:33:15 +08:00
owen
848091ea6f 营销:适配商城装修组件【用户订单】
(cherry picked from commit 2c1edfa781c549742a014213c6840f00dd432fe3)
2024-03-06 21:33:02 +08:00
owen
adfb2469de 营销:适配商城装修组件【用户卡片】
(cherry picked from commit af67db577d8348e0fb0a743de07da856cf3aea6b)
2024-03-06 21:32:58 +08:00
owen
1fa79f9d9e 营销:适配商城装修组件【拼团】(待重写)
(cherry picked from commit d5f9d31d327b361089e987fe247a57534d3a9531)
2024-03-06 21:32:47 +08:00
owen
b0300865f3 营销:适配商城装修组件【秒杀】(待重写)
(cherry picked from commit 7e44b621a5785878416367cd4e29404be243f4c1)
2024-03-06 21:32:40 +08:00
owen
20382bdb8e eslint
(cherry picked from commit b4ba1043d6d8d65b63df1c4d08188d9bab9a13a9)
2024-03-06 21:32:28 +08:00
owen
a8f9fa152a 营销:商城装修增加控件【APP 链接选择】
(cherry picked from commit 23a6bf5ef5aaca20bc83cfe12313f3adb0a46c3b)
2024-03-06 21:24:11 +08:00
owen
687ec00343 营销:适配商城装修组件【营销文章】
(cherry picked from commit d4dc105b4f4341cbfa0357a6c90bf30ff32aad50)
2024-03-06 21:03:53 +08:00
Marvin
0921704a4b feat: 菜单右上角加一个搜索图标
(cherry picked from commit b95b8008f7356aac7c57a0548e1e7d6c605bf987)
2024-03-06 21:02:10 +08:00
owen
42b78d1411 商城:修复会员统计时间范围选择昨天时, 会强制查询两天的问题
(cherry picked from commit c3cad3f3ee4f23e5caabea83d08d42eaf955cc1d)
2024-03-06 21:01:57 +08:00
owen
a494d2723b 营销:适配商城装修组件【优惠券】
(cherry picked from commit 253401ace3578ed3118b912b039304e40ee95399)
2024-03-06 20:55:51 +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
柯杨
9449829fd3 【bugfix】:修复滑块验证码无任何滑动直接点击验证时,x坐标空,导致后端NPE的问题
Signed-off-by: 柯杨 <key5230@163.com>
(cherry picked from commit 8bb9dec32867881f0555a81268b8f096b2251863)
2024-03-06 20:33:44 +08:00
YunaiV
26e6d287f5 代码生成:增加 one 情况下的示例代码
(cherry picked from commit 72c5eaae31fd37dcfcd016224351237a9e2004d7)
2024-03-06 20:33:14 +08:00
owen
d176271313 营销:适配商城装修组件【广告魔方】
(cherry picked from commit 49ebadd748157cb814a7a203f449a0feb2ed23c3)
2024-03-06 20:33:03 +08:00
YunaiV
e7886a1224 主子表:确认列表编辑的支持组件情况
(cherry picked from commit 55f6e4ca25eb246d6c49327e0b23b6839d187c19)
2024-03-06 20:32:39 +08:00
owen
e8ec61a280 营销:适配商城装修组件【菜单导航】
(cherry picked from commit 82aed175ab31296666a317e81e0e2bb7744b4f5d)
2024-03-06 20:30:40 +08:00
owen
2d838325c9 营销:适配商城装修组件【宫格导航】
(cherry picked from commit ac42493659cd79b4ae7b451386b229dc293221fa)
2024-03-06 20:30:15 +08:00
owen
9bf49b4d38 营销:适配商城装修组件【列表导航】
(cherry picked from commit 325e2e4ff20b23d8b1a64902bb19bb24c4f0190f)
2024-03-06 20:30:10 +08:00
shizhong
800c6c83d9 BUG 2024-03-05 20:40:16 +08:00
owen
8f70c7f299 营销:适配商城装修组件【轮播图】
(cherry picked from commit 4253173a2a9c9e716c7ebfcfb9ac25e93bbd1171)
2024-03-05 17:52:32 +08:00
dhb52
fa174ba54e perf: 优化.env配置
(cherry picked from commit 89dbb8c9e8b5a4b280967d73cadbde8ad6b1dc20)
2024-03-05 17:52:24 +08:00
owen
8c2b96afc9 营销:增加商城装修组件【视频播放】
(cherry picked from commit bb2b7ffd034fc8abab9041be02f35d6284ebebc4)
2024-03-05 17:52:08 +08:00
owen
11a28eb196 营销:增加商城装修组件【图片展示】
(cherry picked from commit fa710b560d9a146c49bfc5f24dff7df3d6373c8c)
2024-03-05 17:51:08 +08:00
owen
ce5314ab41 营销:优化装修编辑器
(cherry picked from commit 434aa864da30e4a35a093099e09fb620302ab944)
2024-03-05 17:50:00 +08:00
owen
cf9691f993 营销:优化装修编辑器样式
(cherry picked from commit 0b0ba1f31367011c18fbb47e939bc6b4d7f30e61)
2024-03-05 17:49:53 +08:00
owen
8cb041b57a 营销:装修页面适配搜索框
(cherry picked from commit aedf0144072ddd2696a0c29e32e59dc9a2a643eb)
2024-03-05 17:49:29 +08:00
owen
2c485504e7 营销:装修模板,底部导航适配APP
(cherry picked from commit 3c0f3ceed5f5e3c32d92fc7e4a6970990bc83358)
2024-03-05 17:41:50 +08:00
owen
0d5e6c4098 营销:装修编辑器样式优化
(cherry picked from commit 9bd33355e281276fcead1cc8429396e87da30e15)
2024-03-05 17:41:26 +08:00
owen
97a94cd29f 营销:完善商城装修
1. 拆分页面设计用的属性修改接口
2. 增加模板的页面保存
3. 增加唯一名称校验
4. 增加页面编辑器,默认选中组件判断

(cherry picked from commit 881c4f3a2932ff4892bf09e6de9f790d5f93d9c6)
2024-03-05 17:41:01 +08:00
xingyu
d172595f14 fix: types
(cherry picked from commit 10483577b70bd013af80458c85e6bf0b6fdd0d04)
2024-03-05 17:40:50 +08:00
xingyu
de9e45ba43 fix: props
(cherry picked from commit 52755b38a96fd59d90da4929c5d4a3ee4798477f)
2024-03-05 17:40:33 +08:00
shizhong
b0e4735936 fix: title name 2024-03-05 17:40:03 +08:00
xingyu
28485eaf61 fix: name warn
(cherry picked from commit ce93c8d4e959a835a43410b58f532cc6dac563da)
2024-03-05 17:35:30 +08:00
xingyu
1d518c2826 chore: wh-full
(cherry picked from commit 7321ff21361e3527b5ccb3db3bac1d1cc0e7d96a)
2024-03-05 17:35:17 +08:00
xingyu
8b8d7451e0 feat: unocss add shortcuts
(cherry picked from commit f26a4cae10a3a2dc6591be642ff7d8bebf6fc943)
2024-03-05 17:33:45 +08:00
owen
d12dcde81d 商城装修
(cherry picked from commit e9ff8d323752dd0df8bebbb71b8c3fe4f6e8caff)
2024-03-05 17:31:22 +08:00
owen
d04c1f0213 统计卡片修改为全局组件
(cherry picked from commit 431fff28ce84f281b619d432eaae06df0ee54287)
2024-03-05 17:08:22 +08:00
xingyu
d02f5570f5 style: stylelint
(cherry picked from commit 1a1b70a350722cf25a00e5b659a71ead5be62114)
2024-03-05 16:59:51 +08:00
owen
230d073fb8 商城:增加商城首页
(cherry picked from commit 3802fee661b59cb43f07b3b44a8f8e94a500d111)
2024-03-05 16:52:31 +08:00
shizhong
f0cdee8e9a fix: 【工作流】--加签减签 2024-03-05 16:31:04 +08:00
owen
d4a9f844dc 对齐面包屑的图标和文字
(cherry picked from commit 4c077711a191dd64738bd54c54e4e4aa36ff37e9)
2024-03-05 15:54:04 +08:00
owen
9b4bb4025b 统计:交易统计
(cherry picked from commit c322fb3d0d6624907fca85a2454a10e7bcc87083)
2024-03-05 15:50:37 +08:00
YunaiV
d46b9deb18 code review:驳回逻辑
(cherry picked from commit 245147223f5943164f30211bb3fe94fe2f818824)
2023-09-25 13:32:48 +08:00
kehaiyou
0bef9924fe fix: 【工作流】--回退的高亮和api地址更换
(cherry picked from commit f40d1de62a7cee36fd36afd8dcb210ef84bcb684)
2023-09-25 13:30:17 +08:00
kehaiyou
6888fd90d1 feat: 支持回退按钮
(cherry picked from commit de79e79d91f4949df9314f2238a30c9bd319eafe)
2023-09-25 13:15:55 +08:00
shizhong
969155c6cf style: unocss eslint 2023-09-25 13:14:05 +08:00
shizhong
b6e6b2c49d chore: stylelint(use pnpm lint:style) 2023-09-22 14:43:10 +08:00