6910 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
maqian	a80d363810	fix(custom): eCX-7109页面不能滚动	2025-08-21 17:19:36 +08:00
qg	6b5fbde06c	style: 优化优惠券展开问题	2025-08-21 16:12:09 +08:00
qugao	66b050e39d	Merge branch 'dev-fix' into 'develop' ... style: 优化优惠券展开问题 See merge request huiqi/ecshopx-vshop!58	2025-08-21 16:11:57 +08:00
chenxin	2b863f80c8	fix(custom): eCX-7116	2025-08-21 15:24:06 +08:00
qugao	511489830c	Merge branch 'feature/huiqiyd-173' into 'develop' ... fix: 更新获取默认门店取值 See merge request huiqi/ecshopx-vshop!56	2025-08-20 14:15:03 +08:00
qugao	17a55e9950	fix: 更新获取默认门店取值	2025-08-20 14:14:15 +08:00
qugao	7555259df2	Merge branch 'feature/huiqiyd-173' into 'develop' ... fix: 修复导购分享小程序加购商品门店id不对 See merge request huiqi/ecshopx-vshop!54	2025-08-19 17:40:34 +08:00
qugao	fd2ac57900	fix: 修复导购分享小程序加购商品门店id不对	2025-08-19 17:40:24 +08:00
qugao	55b41d5f1d	Merge branch 'feature/huiqiyd-invoice' into 'develop' ... 结算页申请开票显示错误 See merge request huiqi/ecshopx-vshop!53	2025-08-19 17:05:50 +08:00
qugao	3c4436884b	结算页申请开票显示错误	2025-08-19 17:05:24 +08:00
jerry	d6d37bf879	增加source传入	2025-08-19 10:16:31 +08:00
jerry	042b42097b	修复一些支付问题	2025-08-18 20:04:47 +08:00
jerry	5922a96d4f	修复一些问题	2025-08-18 18:12:52 +08:00
jerry	3caa933e75	兼容pc扫码的场景	2025-08-18 18:00:42 +08:00
qugao	e8647fb75d	Merge branch 'feature/huiqiyd-173' into 'develop' ... style: 商品详情加购弹窗样式修改 See merge request huiqi/ecshopx-vshop!52	2025-08-18 14:37:20 +08:00
qugao	5efcfda630	style: 商品详情加购弹窗样式修改	2025-08-18 14:37:02 +08:00
jerry	11c49a0ff8	fix: 修复一些问题	2025-08-18 10:00:36 +08:00
qg	14af18eef5	Merge remote-tracking branch 'ecshopx/feature/huiqiyd-invoice' into feature/huiqiyd-invoice	2025-08-15 21:06:53 +08:00