Commit Graph

6902 Commits

Author SHA1 Message Date
lukaijie
40464535d0 merge(custom): update package.json 2025-07-23 18:38:17 +08:00
lukaijie
cecd36107e Merge branch 'master-davild' of https://git.ishopex.cn/ecshopx/ecshopx-vshop into master-davild 2025-07-23 18:26:37 +08:00
lukaijie
1b0e50ba7a fix(custom): 移除无效依赖 2025-07-23 18:20:49 +08:00
XuYong
964295da19 发票切换不清除信息 2025-07-23 18:17:35 +08:00
qugao
eb92021130 style: 修改小程序样式 2025-07-23 17:54:51 +08:00
chenxin
f3feef3c98 Merge branch 'master-davild' of https://git.ishopex.cn/ecshopx/ecshopx-vshop into master-davild 2025-07-23 17:42:25 +08:00
chenxin
6935616c4d Merge branch 'master' into master-davild 2025-07-23 17:40:45 +08:00
lukaijie
259ecc7511 style(custom): style 2025-07-23 17:40:08 +08:00
chenxin
08ebda01c0 chore(release): 3.22.3 2025-07-23 17:26:33 +08:00
chenxin
b264a2d8c7 兼容单规格数据 2025-07-23 17:26:00 +08:00
lukaijie
6970c99334 merge(custom): 合并代码 2025-07-23 17:12:57 +08:00
lukaijie
4e912b1a16 feature(custom): merge 店铺隔离 2025-07-23 16:56:51 +08:00
chenxin
69004e1ad9 chore(release): 3.22.2 2025-07-23 16:03:22 +08:00
chenxin
e8c015a778 ECX-7025 2025-07-23 16:00:08 +08:00
chenxin
543fce74d6 ECX-7025 2025-07-23 15:57:48 +08:00
chenxin
4843ddf9d1 chore(release): 3.22.1 2025-07-22 14:23:06 +08:00
XuYong
b7b75c9955 发票优化 2025-07-22 14:20:45 +08:00
lukaijie
052de0e28c style(custom): style 2025-07-22 14:05:01 +08:00
lukaijie
6bda183051 style(custom): style 2025-07-22 13:58:19 +08:00
chenxin
09bd807999 起订量bug修改 2025-07-22 13:57:29 +08:00
qugao
e418133c67 Merge remote-tracking branch 'ecshopx/feature/huiqiyd-173' into feature/huiqiyd-173 2025-07-21 17:38:59 +08:00
qugao
fb27983bbc style: 修改商品底部图片样式 2025-07-21 17:06:59 +08:00
maqian
fe1e6a43c6 发票 2025-07-21 16:59:54 +08:00
jerry
5da215d03c 增加修改标记 2025-07-21 11:15:09 +08:00
maqian
bcb63feebf 头像 2025-07-19 12:26:36 +08:00
maqian
23a10d590c huigui 2025-07-19 12:24:32 +08:00
maqian
ebf3c8882d 辉绮项目回归标品 2025-07-19 12:24:07 +08:00
lukaijie
0db9bff493 Merge remote-tracking branch 'origin/master' into master-davild 2025-07-17 21:53:35 +08:00
qugao
7e0e0e30c8 Merge branch 'feature/huiqiyd-173' into 'develop'
feat: 全屏滚动挂件增加查看跳转更多

See merge request huiqi/ecshopx-vshop!10
2025-07-17 18:32:58 +08:00
qugao
e01e1e8f9b feat: 全屏滚动挂件增加查看跳转更多 2025-07-17 18:32:22 +08:00
qugao
52afba029e Merge branch 'feature/huiqiyd-173' into 'develop'
feat: 增加sit环境配置,积分商城样式错误

See merge request huiqi/ecshopx-vshop!9
2025-07-17 16:47:33 +08:00
qugao
9838fca992 feat: 增加sit环境配置,积分商城样式错误 2025-07-17 16:47:12 +08:00
qugao
6084fe451f Merge branch 'feature/huiqiyd-173' into 'develop'
Feature/huiqiyd 173

See merge request huiqi/ecshopx-vshop!8
2025-07-17 16:08:19 +08:00
qugao
213120cc3c feat: 分类页加粗,积分商城增加积分详情入口 2025-07-17 16:07:56 +08:00
qugao
de9b5ea632 Merge remote-tracking branch 'ecshopx/feature/huiqiyd-173' into feature/huiqiyd-173 2025-07-17 15:49:18 +08:00
qugao
87689a5078 feat: 添加客服热区 2025-07-17 15:48:49 +08:00
jerry
0ccfd446fe 切换语言功能增加 2025-07-17 15:37:29 +08:00
qugao
a1be48e3e1 Merge branch 'feature/huiqiyd-173' into 'develop'
feat: 商品详情增加热区图

See merge request huiqi/ecshopx-vshop!6
2025-07-16 14:29:58 +08:00
qugao
3cb6523e61 feat: 商品详情增加热区图 2025-07-16 14:28:46 +08:00
qugao
cafad81bd2 feat: 商品详情增加热区图 2025-07-16 14:26:41 +08:00
qugao
fdb37103bb Merge branch 'feature/huiqiyd-173' into 'develop'
Feature/huiqiyd 173

See merge request huiqi/ecshopx-vshop!5
2025-07-16 13:47:21 +08:00
qugao
49af253699 Merge remote-tracking branch 'ecshopx/feature/huiqiyd-173' into feature/huiqiyd-173 2025-07-16 13:46:43 +08:00
qugao
6986b1f297 fix: 修复售后单列表查询订单参数 2025-07-16 13:45:56 +08:00
qg
f1dafd3292 Merge remote-tracking branch 'ecshopx/feature/huiqiyd-173' into feature/huiqiyd-173 2025-07-15 19:50:41 +08:00
qugao
28c38d97ac Merge branch 'feature/huiqiyd-173' into 'develop'
Feature/huiqiyd 173

See merge request huiqi/ecshopx-vshop!4
2025-07-15 19:50:40 +08:00
qg
98b19f4db5 feat: 订单列表查询 2025-07-15 19:42:12 +08:00
qugao
2b2d81a9a2 style: 更新配色 2025-07-15 15:38:18 +08:00
qugao
0c6238a3c6 style: 会员等级列表和分类页ui 2025-07-14 18:12:12 +08:00
XuYong
4ee71d38f9 发票补全 2025-07-14 16:30:26 +08:00
lukaijie
89e3338c2c chore(release): 3.22.0 2025-07-11 22:35:14 +08:00