ecshop/ECShopX_mobile-frontend
1
0
Fork 0
mirror of https://gitee.com/ShopeX/ECShopX_mobile-frontend synced 2026-08-14 17:41:45 +08:00
Code Issues Packages Projects Releases Wiki Activity
6,902 Commits 1 Branch 45 Tags
395fea0ac2572f0ecb79fd84f6a0aeae7e95ad19
Commit Graph

6902 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
jerry
639f965296 Merge branch 'master' of https://git.ishopex.cn/ecshopx/ecshopx-vshop 
# Conflicts:
#	.env
#	src/app.js
#	src/ext.json
#	src/subpages/member/index.js
#	src/utils/entryLaunch.js
 2025-08-11 11:47:15 +08:00
qugao
a636689e00 Merge branch 'feature/huiqiyd-173' into 'develop' 
feat: 更新订单金额展示和支付参数调整

See merge request huiqi/ecshopx-vshop!42
 2025-08-08 18:36:57 +08:00
qugao
de78734815 feat: 更新订单金额展示和支付参数调整 2025-08-08 18:36:25 +08:00
qugao
61723c6da0 Merge branch 'feature/huiqiyd-173' into 'develop' 
feat: 更新售后退运费展示

See merge request huiqi/ecshopx-vshop!41
 2025-08-08 16:11:24 +08:00
qugao
cc035910de feat: 更新售后退运费展示 2025-08-08 15:09:48 +08:00
qugao
90a91d9ba5 Merge branch 'feature/huiqiyd-invoice' into 'develop' 
Feature/huiqiyd invoice

See merge request huiqi/ecshopx-vshop!39
 2025-08-08 10:01:25 +08:00
XuYong
2291d5165b 纳税人识别号应为18位 2025-08-08 09:59:14 +08:00
XuYong
91165ff961 fix:填写发票信息展示调整 2025-08-07 17:34:34 +08:00
lukaijie
7672b7358d Merge branch 'master' of https://git.ishopex.cn/ecshopx/ecshopx-vshop 2025-08-07 17:31:02 +08:00
lukaijie
18c1a47d2e fix(custom): h5端兼容bug 2025-08-07 17:30:21 +08:00
qg
42c5915f50 fix: 修复积分订单实付展示错误 2025-08-07 13:23:11 +08:00
qugao
4469f322e2 Merge branch 'feature/huiqiyd-173' into 'develop' 
fix: 修复积分订单实付展示错误

See merge request huiqi/ecshopx-vshop!37
 2025-08-07 13:22:21 +08:00
chenxin
76090cc659 fix(custom): 商品挂件样式更改 2025-08-06 17:22:24 +08:00
qugao
99eb2d14b1 Merge branch 'feature/huiqiyd-173' into 'develop' 
导购分享携带店铺id

See merge request huiqi/ecshopx-vshop!35
 2025-08-06 14:33:17 +08:00
qugao
ca0c71e4b1 导购分享携带店铺id 2025-08-06 14:32:47 +08:00
chenxin
57e1e48b2d perf(custom): sppage锁定屏幕导致抖动问题 2025-08-06 14:07:41 +08:00
qugao
b14932c254 Merge branch 'feature/huiqiyd-173' into 'develop' 
feat: 积分创建订单不需要调支付接口

See merge request huiqi/ecshopx-vshop!33
 2025-08-05 18:35:56 +08:00
qugao
1a63ce3b31 feat: 积分创建订单不需要调支付接口 2025-08-05 18:35:25 +08:00
qugao
7b95437582 Merge branch 'feature/huiqiyd-173' into 'develop' 
fix: 修复售后订单部分退款金额不对

See merge request huiqi/ecshopx-vshop!32
 2025-08-05 18:17:23 +08:00
qugao
424a21216c fix: 修复售后订单部分退款金额不对 2025-08-05 18:17:01 +08:00
qugao
bcfd6d417d Merge branch 'feature/huiqiyd-173' into 'develop' 
feat: 更新订单显示

See merge request huiqi/ecshopx-vshop!31
 2025-08-05 17:57:18 +08:00
qugao
fc6a61e2f7 feat: 更新订单显示 2025-08-05 17:56:55 +08:00
qugao
b99fba31ad Merge branch 'feature/huiqiyd-173' into 'develop' 
style: 更新文案

See merge request huiqi/ecshopx-vshop!30
 2025-08-05 09:34:42 +08:00
qugao
a1f2857983 style: 更新文案 2025-08-05 09:34:22 +08:00
qg
6870cc5ecc fix: 修复订单列表积分不显示现金 2025-08-04 22:45:00 +08:00
qugao
36c3849583 Merge branch 'feature/huiqiyd-173' into 'develop' 
fix: 修复订单列表积分不显示现金

See merge request huiqi/ecshopx-vshop!29
 2025-08-04 22:44:25 +08:00
qg
fa8e94b5dc fix: 修复小程序购物车店铺展示 2025-08-04 20:43:34 +08:00
qugao
74cd8fb9b8 Merge branch 'feature/huiqiyd-173' into 'develop' 
fix: 修复小程序购物车店铺展示

See merge request huiqi/ecshopx-vshop!28
 2025-08-04 20:42:42 +08:00
qugao
fb3182d375 Merge branch 'feature/huiqiyd-173' into 'develop' 
fix: 修复售后订单详情和列表字段展示错误

See merge request huiqi/ecshopx-vshop!27
 2025-08-04 20:08:18 +08:00
qg
47554e8ae1 fix: 修复售后订单详情和列表字段展示错误 2025-08-04 20:07:26 +08:00
qugao
8c204355ec Merge branch 'feature/huiqiyd-173' into 'develop' 
fix: 修复积分商品进入详情不对

See merge request huiqi/ecshopx-vshop!26
 2025-08-04 15:22:22 +08:00
qugao
9d242d7a05 fix: 修复积分商品进入详情不对 2025-08-04 15:21:55 +08:00
lukaijie
8c36373fff merge(custom): merge 2025-08-04 13:19:29 +08:00
lukaijie
8702561f3e merge(custom): merge 2025-08-04 11:35:57 +08:00
qugao
ef5664e404 Merge branch 'feature/huiqiyd-173' into 'develop' 
Feature/huiqiyd 173

See merge request huiqi/ecshopx-vshop!25
 2025-08-04 10:37:25 +08:00
qugao
616155457d feat: 开启达摩配置禁止修改手机号 2025-08-04 10:36:40 +08:00
qugao
b0790ede3c feat: 更新newLogin参数 2025-08-04 10:29:15 +08:00
qugao
93c98d21c5 增加测试小程序配置 2025-08-04 10:10:41 +08:00
曲高
3be3df883a Merge branch 'feature/huiqi-merge' into 'master-davild-3' 
Feature/huiqi merge

See merge request ecshopx/ecshopx-vshop!141
 2025-08-01 18:28:51 +08:00