Commit Graph

6902 Commits

Author SHA1 Message Date
qugao
e855557754 Merge remote-tracking branch 'fv/feature/huiqiyd-173' into feature/huiqi-merge 2025-08-01 18:27:09 +08:00
qugao
f0b91eed6e Merge branch 'feature/huiqiyd-173' into 'develop'
feat:更新首屏获取门店

See merge request huiqi/ecshopx-vshop!24
2025-08-01 18:20:47 +08:00
qugao
824bf37db1 feat:更新首屏获取门店 2025-08-01 18:19:56 +08:00
qugao
6d56efd2c0 Merge branch 'feature/huiqiyd-173' into 'develop'
Feature/huiqiyd 173

See merge request huiqi/ecshopx-vshop!23
2025-08-01 11:34:11 +08:00
qugao
dc0d5d9bfb fix: 修复bug 2025-08-01 11:33:47 +08:00
lukaijie
03dddd7b6d fix(custom): 修复小程序启动导购入参 2025-07-31 19:34:06 +08:00
陆凯杰
7e5a318b0c Update useWhiteShop.js 2025-07-31 17:58:57 +08:00
lukaijie
e129466d1f fix(custom): 默认进店规则 2025-07-31 17:40:02 +08:00
lukaijie
f8908efa28 fix(custom): 未授权情况下进默认兜底策略 2025-07-31 16:29:20 +08:00
lukaijie
455603d37d fix(custom): 修改进店逻辑 2025-07-31 16:18:05 +08:00
lukaijie
3e0adf6980 fix(custom): 进店规则接口字段匹配 2025-07-31 12:06:21 +08:00
lukaijie
ed551427db fix(custom): 修复进店逻辑bug 2025-07-30 15:49:37 +08:00
qugao
bd5add88e1 feat: 创建订单失败提示 2025-07-30 14:27:34 +08:00
qugao
3f2410f21b Merge branch 'feature/huiqiyd-173' into 'develop'
Feature/huiqiyd 173

See merge request huiqi/ecshopx-vshop!20
2025-07-29 19:59:24 +08:00
qugao
d072b1b182 fix: 修复bug 2025-07-29 19:58:17 +08:00
lukaijie
bed36375c9 fix(custom): davild3 2025-07-29 18:54:58 +08:00
jerry
bf143a1bc0 merge(custom): 注释转译代码 2025-07-29 17:52:44 +08:00
lukaijie
0ffd6fda23 fix(custom): test5 2025-07-29 15:27:52 +08:00
lukaijie
82aadd1805 fix(custom): 多语言 2025-07-29 14:58:20 +08:00
qugao
f6df47acdc Merge branch 'feature/huiqiyd-invoice' into 'develop'
Feature/huiqiyd invoice

See merge request huiqi/ecshopx-vshop!19
2025-07-29 14:29:09 +08:00
XuYong
fbd0425011 开票成功移除手机号 2025-07-29 14:22:44 +08:00
XuYong
44082fd492 发票恩替修复 2025-07-29 14:01:53 +08:00
lukaijie
e031c8c95d feature(custom): 多语言分包异步化 2025-07-28 19:39:24 +08:00
jerry
ac2969fd25 merge(custom): 修复一些合并问题 2025-07-27 11:35:09 +08:00
jerry
2caeadfde6 merge(custom): 合并lang代码 2025-07-27 11:21:33 +08:00
jerry
a374188938 env 2025-07-27 11:02:32 +08:00
maqian
bfb248a4eb ui(custom): tabbar兼容 2025-07-25 15:16:20 +08:00
maqian
19439fff83 fix(custom): 调整 2025-07-25 14:39:05 +08:00
qugao
d56129ceb9 Merge branch 'feature/huiqiyd-0725' into 'develop'
feat: 小程序千人千码改动

See merge request huiqi/ecshopx-vshop!18
2025-07-25 14:13:45 +08:00
qg
d8692f4816 feat: 小程序千人千码改动 2025-07-25 14:05:55 +08:00
maqian
4ba42084ed 合并master-devild 2025-07-25 14:03:42 +08:00
maqian
b93a43d143 合并 2025-07-25 14:00:57 +08:00
maqian
cd78cb4abc Merge remote-tracking branch 'origin/feature/huiqiyd-173' into master-huiqi 2025-07-25 13:57:39 +08:00
lukaijie
aea2ba257f fix(custom): 小程序扫店铺码进店,清除导购参数 2025-07-25 10:03:55 +08:00
qugao
e9dd6c6d10 fix: 购物车加购数量 2025-07-24 18:28:22 +08:00
qugao
1309070de6 fix: 购物车加购数量 2025-07-24 18:27:43 +08:00
XuYong
b557e5bd37 发票移除手机号 2025-07-24 17:32:12 +08:00
qugao
793d3d3a6b Merge branch 'feature/huiqiyd-173' into 'develop'
Feature/huiqiyd 173

See merge request huiqi/ecshopx-vshop!17
2025-07-24 16:42:56 +08:00
qugao
135641057b fix: 修复积分详情展示 2025-07-24 15:55:53 +08:00
qugao
85944c799b feat: 更新商品详情封面图和底部图片 2025-07-24 14:56:56 +08:00
qugao
8e58c24a0d Merge branch 'feature/huiqiyd-invoice' into 'develop'
fix:标品个人中心待收货待评价数量问题

See merge request huiqi/ecshopx-vshop!15
2025-07-24 13:45:34 +08:00
XuYong
fc5d3182df fix:标品个人中心待收货待评价数量问题 2025-07-24 11:48:47 +08:00
lukaijie
33df346119 fix(custom): 恢复stylus依赖包 2025-07-24 11:13:35 +08:00
lukaijie
bd01272cef fix(custom): 修改进店规则 2025-07-24 11:05:41 +08:00
qugao
6ee765a832 Merge branch 'feature/huiqiyd-173' into 'develop'
Feature/huiqiyd 173

See merge request huiqi/ecshopx-vshop!14
2025-07-24 10:31:14 +08:00
qugao
e6acc457ca Merge branch 'feature/huiqiyd-invoice' into 'develop'
Feature/huiqiyd invoice

See merge request huiqi/ecshopx-vshop!13
2025-07-24 10:30:47 +08:00
XuYong
34b8c4b087 发票数据类型兼容 2025-07-24 10:08:47 +08:00
lukaijie
f006f9e014 fix(custom): stylus 版本0.64.0 2025-07-23 21:49:29 +08:00
lukaijie
4c734f2bca fix(custom): 临时解决stylus依赖包版本问题 2025-07-23 21:37:11 +08:00
XuYong
55c55f6a79 开发票 入口优化 2025-07-23 18:44:48 +08:00