Commit Graph

6928 Commits

Author SHA1 Message Date
lukaijie
37db1693c3 fix(custom): 修复购物车数量问题 2025-09-02 21:07:26 +08:00
jerry
d2391481a3 merge(custom): 修复一些问题,去除多余的内容 2025-09-02 15:24:29 +08:00
jerry
3e752ec1f9 merge(custom): m 2025-09-01 18:07:49 +08:00
lukaijie
ad26c779c6 Merge branch 'master' of https://git.ishopex.cn/ecshopx/ecshopx-vshop 2025-09-01 18:00:17 +08:00
lukaijie
8ecb02c0cc fix(custom): merge 2025-09-01 17:59:32 +08:00
jerry
49bfef8072 merge(custom): m 2025-09-01 17:11:41 +08:00
jerry
d6aaa9f0d5 merge(custom): m 2025-09-01 17:06:47 +08:00
lukaijie
6c0eedbf14 Merge branch 'master' of https://git.ishopex.cn/ecshopx/ecshopx-vshop 2025-09-01 16:50:12 +08:00
lukaijie
f91f69e39c fix(custom): bug修复 2025-09-01 16:48:42 +08:00
jerry
0e7903f711 merge(custom): 多语言内容 2025-09-01 16:36:14 +08:00
lukaijie
22c90f1d3c merge(custom): merge 2025-09-01 10:14:08 +08:00
maqian
000061064f fix(custom): 修复分类页-搜索 2025-08-31 17:09:41 +08:00
lukaijie
356385387b fix(custom): call 2025-08-29 17:13:25 +08:00
lukaijie
4191e86b46 fix(custom): m 2025-08-29 16:59:50 +08:00
lukaijie
24d7e92002 fix(custom): 导购物料下单结算页店铺id 2025-08-29 16:50:52 +08:00
lukaijie
8a9cdef8c8 fix(custom): 修改回到我的店铺 2025-08-29 16:45:09 +08:00
lukaijie
d2b8248a37 fix(custom): 进店规则取消联系店铺后重新弹出联系店铺 2025-08-29 16:30:38 +08:00
lukaijie
c8e387fee3 fix(custom): m 2025-08-29 16:13:01 +08:00
lukaijie
0a9199ee5f fix(custom): merge 2025-08-28 18:28:35 +08:00
lukaijie
5a4b73a99c fix(custom): 进店白名单规则,先判断当前缓存中是否存在店铺 2025-08-28 18:20:23 +08:00
jerry
da463ca75b merge(custom): 修复修改双语静态的内容问题 2025-08-28 18:17:01 +08:00
lukaijie
4e1dbf3a3f fix(custom): 店铺变量错误 2025-08-28 17:42:24 +08:00
lukaijie
b21717cc9a fix(custom): 白名单店铺ID 2025-08-28 17:36:37 +08:00
lukaijie
bc33361d83 fix(custom): 修改获取用户白名店铺优先返回店铺码对应店铺 2025-08-28 16:54:16 +08:00
jerry
90114c9f7f merge(custom): m 2025-08-28 15:42:26 +08:00
jerry
da55ffa143 merge(custom): m 2025-08-28 15:24:06 +08:00
lukaijie
bdde074f36 fix(custom): 解决进店规则自定义页面后先跳转到默认店铺 2025-08-28 15:23:21 +08:00
jerry
c19820d548 merge(custom): 创建切换语言监听函数,兼容需要重新调用接口的地方 2025-08-28 15:20:36 +08:00
lukaijie
0a342780f4 fix(custom): 进店规则修改无店铺访问权限提示文案 2025-08-28 15:01:25 +08:00
lukaijie
b9198c3a29 feature(custom): 添加微信业务域名校验文件 2025-08-28 14:53:15 +08:00
jerry
87415372b9 fix(custom): 修复一些问题,解决静态文件翻译的问题 2025-08-28 14:49:30 +08:00
lukaijie
1d12492ad7 style(custom): style 2025-08-28 14:35:50 +08:00
lukaijie
d816e1256b fix(custom): 修复店铺码进店后回我的店铺白屏 2025-08-28 14:27:45 +08:00
chenxin
1fd0eff4fc fix(custom): eCX-7116 2025-08-28 10:41:03 +08:00
chenxin
2ef4d2ca99 fix(custom): ecx-7112 2025-08-25 18:17:31 +08:00
chenxin
efdec2cded fix(custom): eCX-7112 2025-08-25 16:43:54 +08:00
jerry
2728f1ee8b merge(custom): m 2025-08-22 19:05:26 +08:00
jerry
d15b38ec69 merge(custom): m 2025-08-22 19:03:47 +08:00
曲高
c3d17c5465 Merge branch 'feature/huiqi-merge' into 'master'
Feature/huiqi merge

See merge request ecshopx/ecshopx-vshop!146
2025-08-22 18:27:10 +08:00
qugao
87cbf2dd27 merge(custom): 去除千人千码 2025-08-22 18:23:35 +08:00
qugao
c70cc35420 Merge remote-tracking branch 'origin/master' into feature/huiqi-merge 2025-08-22 18:05:41 +08:00
qugao
2fb7f413e5 Merge remote-tracking branch 'fv/develop' into feature/huiqi-merge 2025-08-22 18:04:07 +08:00
qugao
901be7c781 Merge branch 'feature/huiqiyd-173' into 'develop'
feat: 修改sp模板视图

See merge request huiqi/ecshopx-vshop!62
2025-08-22 17:54:28 +08:00
qugao
4ce3e965ea feat: 修改sp模板视图 2025-08-22 17:53:49 +08:00
lukaijie
534c7b9e23 feature(custom): 店铺隔离 2025-08-22 16:58:28 +08:00
陆凯杰
a0a7e50fbb Update Dockerfile 2025-08-22 13:50:56 +08:00
qugao
ac634f1a7a Merge branch 'dev-fix' into 'develop'
fix: 修复取消开发票报错

See merge request huiqi/ecshopx-vshop!60
2025-08-21 19:20:50 +08:00
qg
9219ee3378 fix: 修复取消开发票报错 2025-08-21 19:21:37 +08:00
jerry
107d2d2536 merge(custom): 修复语言包打包问题 2025-08-21 18:49:55 +08:00
jerry
e5dd1fc416 merge(custom): m 2025-08-21 18:35:11 +08:00