Commit Graph

3099 Commits

Author SHA1 Message Date
maqian
fa0a708bd2 结算页报错调整 2021-11-22 16:13:09 +08:00
maqian
dea21337d7 Merge branch 'feature/YDSC-3752' into develop-ecshopx 2021-11-22 15:09:44 +08:00
maqian
9543e90730 会员中心页功能调整、设置功能h5、小程序同步 2021-11-22 15:09:04 +08:00
WJB3
d4d8ce25e0 fix:修复隐私协议看不见 2021-11-22 15:06:22 +08:00
WJB3
92e5b0895b fix:修改会员 2021-11-22 13:32:05 +08:00
WJB3
c661ed2ef8 fix:去除首页组件上面三个点 2021-11-22 11:01:43 +08:00
WJB3
e00ee17b59 fix:修改navbar样式 2021-11-22 10:50:16 +08:00
WJB3
a73dbd9165 fix:修复首页报错 2021-11-22 10:21:33 +08:00
WJB3
c753af4c75 fix:修改 2021-11-22 10:08:16 +08:00
WJB3
6f6c87ef1a fix:修改部分bug 2021-11-22 09:48:15 +08:00
maqian
f78b453c1e 购物车不显示商品 2021-11-19 19:22:07 +08:00
maqian
3ba4bc71b2 购物车不显示商品 2021-11-19 19:20:51 +08:00
maqian
5c7d4c223c Merge branch 'develop-ecshopx' of git.ishopex.cn:onex/ecshopx-vshop into develop-ecshopx 2021-11-19 18:58:51 +08:00
maqian
91d5139ed7 修改热区title 2021-11-19 18:58:22 +08:00
WJB3
37d97ce44b fix:后台设置了基础设置中字段数据是不可修改的,但小程序仍可修改 2021-11-19 17:20:35 +08:00
maqian
16a4e4c083 Merge branch 'feature/YDSC-3752' into develop-ecshopx 2021-11-19 16:52:30 +08:00
maqian
6429ac6d15 平台版-结算页隐藏积分抵扣 2021-11-19 16:52:01 +08:00
WJB3
6cc31125f0 fix:修改个人中心,选择爱好弹框下含有email和地址 2021-11-19 16:18:09 +08:00
WJB3
b220a35adc fix:修改点击再次请求bug 2021-11-19 15:34:46 +08:00
WJB3
95b034bf61 fix:修改购物车样式 2021-11-19 15:07:50 +08:00
WJB3
b19cc98657 fix:修改 2021-11-19 15:06:27 +08:00
WJB3
9ed7913225 Merge branch 'develop-ecshopx' of https://git.ishopex.cn/onex/ecshopx-vshop into develop-ecshopx 2021-11-19 14:28:16 +08:00
maqian
ded30d16e8 购物车结算页接口报错返回购物车页面 2021-11-19 14:04:23 +08:00
WJB3
03b8aa72ab fix:修改注释 2021-11-19 13:58:55 +08:00
WJB3
1a154188be Merge branch 'develop-ecshopx' of https://git.ishopex.cn/onex/ecshopx-vshop into develop-ecshopx 2021-11-18 20:31:56 +08:00
WJB3
51aed6f26d fix:去除微信余额支付 2021-11-18 20:31:28 +08:00
maqian
15b53582e0 Merge branch 'feature/YDSC-3752' into develop-ecshopx 2021-11-18 20:11:56 +08:00
maqian
e172b43562 分包 2021-11-18 20:11:37 +08:00
lukaijie
cbea8c96c3 merge 2021-11-18 19:59:06 +08:00
lukaijie
0925aba3c8 fix: 修改req错误码逻辑 2021-11-18 19:58:16 +08:00
WJB3
89c885f8b3 Merge branch 'develop-ecshopx' of https://git.ishopex.cn/onex/ecshopx-vshop into develop-ecshopx 2021-11-18 19:04:36 +08:00
WJB3
5a0367df14 fix:修改售后页面样式问题 2021-11-18 19:04:20 +08:00
maqian
21fea266fb Merge branch 'feature/YDSC-3752' into develop-ecshopx 2021-11-18 18:49:31 +08:00
WJB3
9b66478a04 fix:去除售后页面总金额 2021-11-18 18:26:09 +08:00
WJB3
b8f7fe057d fix:小程序修复bbug 2021-11-18 16:41:09 +08:00
maqian
7f58b5c465 样式多出 2021-11-18 15:57:23 +08:00
WJB3
36c0b483ff fix:修改订单列表页显示积字错误 2021-11-18 15:43:48 +08:00
WJB3
4c678a1bc2 fix:修改小程序bug 2021-11-18 15:19:43 +08:00
maqian
7c31360ecc Merge branch 'develop-ecshopx' of git.ishopex.cn:onex/ecshopx-vshop into feature/YDSC-3752 2021-11-18 14:15:18 +08:00
WJB3
9aaf3f6e2b fix:修复结算页报错 2021-11-18 13:52:45 +08:00
maqian
39a5ce877d 与老平台版同步代码 2021-11-18 13:39:16 +08:00
WJB3
9725f93f71 fix:修改支付 2021-11-18 11:13:48 +08:00
lukaijie
3a4d23cb05 fix: req.js 2021-11-17 18:15:24 +08:00
lukaijie
e361ebf6df 修改req 2021-11-17 17:35:59 +08:00
WJB3
acaafa6310 fix:修改req.js 2021-11-17 17:34:33 +08:00
WJB3
8c2c20ec56 fix:修改req 2021-11-17 17:33:58 +08:00
WJB3
e9d77df7dd fix:修改req 2021-11-17 17:32:59 +08:00
maqian
064de3b90a 合并 2021-11-17 17:02:33 +08:00
maqian
7203e97d5c 图标优化 2021-11-17 17:00:06 +08:00
lukaijie
baefd84317 时间格式 2021-11-17 16:54:18 +08:00