6891 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
qugao	fa0baf9fe7	Merge branch 'feature/huiqiyd-invoice' into 'develop' ... Feature/huiqiyd invoice See merge request huiqi/ecshopx-vshop!51	2025-08-15 21:06:27 +08:00
XuYong	34a5e26c96	发票优化	2025-08-15 18:32:05 +08:00
XuYong	0827d6cf8d	发票撤销申请	2025-08-15 18:30:07 +08:00
jerry	f43f563ea8	修复支付的一些问题	2025-08-15 17:46:48 +08:00
jerry	05f7738dff	修复一些问题	2025-08-15 14:15:43 +08:00
jerry	49f2c79aea	修复一些问题	2025-08-15 10:28:54 +08:00
jerry	eca9ae6db5	feat: 更新内容	2025-08-14 10:05:03 +08:00
qugao	fd277b4256	Merge remote-tracking branch 'origin/feature/huiqiyd-173' into develop	2025-08-13 17:24:52 +08:00
qugao	a255f065cd	feat: 更新配置	2025-08-13 17:24:45 +08:00
qugao	32c8bf17e7	Merge remote-tracking branch 'origin/feature/huiqiyd-173' into develop	2025-08-13 17:22:42 +08:00
qugao	5d541c61c5	feat: 更新测试小程序配置	2025-08-13 17:22:26 +08:00
qugao	646153ad8b	Merge branch 'feature/huiqiyd-173' into 'develop' ... feat: 更新配置 See merge request huiqi/ecshopx-vshop!47	2025-08-13 15:55:11 +08:00
qugao	9a331ed0a7	feat: 更新配置	2025-08-13 15:54:44 +08:00
jerry	2e7dcdbb53	merge(custom): m	2025-08-13 15:14:45 +08:00
qugao	0c0c159cdb	Merge branch 'feature/huiqiyd-173' into 'develop' ... 修改积分调整地址 See merge request huiqi/ecshopx-vshop!46	2025-08-12 13:48:27 +08:00
qugao	2e9a9ec802	修改积分调整地址	2025-08-12 13:48:02 +08:00
qugao	41c4ce8a4c	Merge branch 'feature/huiqiyd-invoice' into 'develop' ... style: 发票详情样式错误 See merge request huiqi/ecshopx-vshop!44	2025-08-11 18:16:17 +08:00
qugao	3b9193a19f	style: 发票详情样式错误	2025-08-11 18:15:28 +08:00
jerry	cd654f9efd	兼容斗拱支付内容	2025-08-11 17:09:41 +08:00