3140 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
bentz	33b149fded	Merge branch 'develop-ecshopx' of git.ishopex.cn:onex/ecshopx-vshop into develop-ecshopx ... * 'develop-ecshopx' of git.ishopex.cn:onex/ecshopx-vshop: 修复结算页报错返回上一层 fix:增加判断 fix:修改微信支付 优化页面样式 fix:订单详情页点击立即支付有误 fix:去除point参数 fix: h5头部标题 点击头像去授权微信头像 编译问题 fix:修改付费会员点击“立即支付”，没有反应 # Conflicts: # package-lock.json # src/api/req.js # src/pages/member/index.js	2021-11-23 16:22:41 +08:00
bentz	f1f6f6af79	feat: 重构req.js，支持无痕刷新token，扩展API	2021-11-23 16:19:28 +08:00
maqian	7a3150b8bf	修复结算页报错返回上一层	2021-11-23 16:10:14 +08:00
maqian	7dc6faae35	Merge branch 'develop-ecshopx' of git.ishopex.cn:onex/ecshopx-vshop into feature/YDSC-3752	2021-11-23 16:04:23 +08:00
WJB3	af322f5412	fix:增加判断	2021-11-23 16:03:02 +08:00
WJB3	c82c1189c2	fix:修改微信支付	2021-11-23 15:36:58 +08:00
maqian	db5173481b	优化页面样式	2021-11-23 15:12:40 +08:00
WJB3	b1dedf95c2	fix:订单详情页点击立即支付有误	2021-11-23 14:39:28 +08:00
WJB3	a9979263e8	Merge branch 'develop-ecshopx' of https://git.ishopex.cn/onex/ecshopx-vshop into develop-ecshopx	2021-11-23 14:09:01 +08:00
WJB3	3d4465d71c	fix:去除point参数	2021-11-23 14:08:48 +08:00
lukaijie	e2bdbf0ad4	Merge branch 'develop-ecshopx' of git.ishopex.cn:onex/ecshopx-vshop into develop-ecshopx	2021-11-23 14:00:28 +08:00
lukaijie	dce78ff5b9	merge	2021-11-23 14:00:22 +08:00
lukaijie	fced6af12f	fix: h5头部标题	2021-11-23 13:59:21 +08:00
maqian	b81bb5cad4	点击头像去授权微信头像	2021-11-23 13:44:08 +08:00
lukaijie	1f33d632a3	Merge branch 'develop-ecshopx' of git.ishopex.cn:onex/ecshopx-vshop into develop-ecshopx	2021-11-23 12:04:30 +08:00
lukaijie	37adb5b96f	编译问题	2021-11-23 12:04:19 +08:00
WJB3	cc7215e0b0	fix:修改付费会员点击“立即支付”，没有反应	2021-11-23 11:19:30 +08:00
WJB3	84cd7bf95e	Merge branch 'develop-ecshopx' of https://git.ishopex.cn/onex/ecshopx-vshop into develop-ecshopx	2021-11-23 11:08:17 +08:00
WJB3	d87cda3f20	fix:修复部分bug	2021-11-23 11:08:03 +08:00
lukaijie	e0e524b25e	copy file	2021-11-23 11:07:47 +08:00
lukaijie	02643a85e1	添加校验文件	2021-11-23 10:50:58 +08:00
lukaijie	0f7dcaadfe	直播	2021-11-23 10:17:13 +08:00
lukaijie	dbf476b930	环境变量	2021-11-23 09:21:28 +08:00
maqian	f86839526b	Merge branch 'feature/YDSC-3752' into develop-ecshopx	2021-11-22 21:13:02 +08:00
maqian	0d49ab063d	首页样式优化	2021-11-22 21:12:44 +08:00
lukaijie	9e57b8c8d1	fix: merge	2021-11-22 20:42:13 +08:00
lukaijie	ab7eb5b379	bug修改	2021-11-22 20:38:34 +08:00
maqian	4c5a986dd9	二维码	2021-11-22 20:04:51 +08:00
maqian	b5895f9c54	Merge branch 'develop-ecshopx' of git.ishopex.cn:onex/ecshopx-vshop into feature/YDSC-3752	2021-11-22 20:03:53 +08:00
WJB3	aea16bdb91	fix:修复部分bug	2021-11-22 19:54:30 +08:00
WJB3	0460222026	fix:修复微信购物车商品样式	2021-11-22 19:53:40 +08:00
maqian	7e8e7d3be2	优惠券详细信息	2021-11-22 19:51:24 +08:00
maqian	6b99dc2380	coupon-item组件调整	2021-11-22 19:20:32 +08:00
maqian	daaa4cf319	优惠券列表样式调整	2021-11-22 19:17:14 +08:00
赵育坤	b040631c8f	fix:修改样式	2021-11-22 19:08:29 +08:00
WJB3	d290848f03	fix:增加openurl	2021-11-22 18:22:45 +08:00
maqian	c39790a97f	会员中心主题色	2021-11-22 18:22:42 +08:00
maqian	bcd0800927	设置添加navbar	2021-11-22 18:21:15 +08:00
WJB3	b252949bc6	Merge branch 'develop-ecshopx' of https://git.ishopex.cn/onex/ecshopx-vshop into develop-ecshopx	2021-11-22 17:36:28 +08:00
WJB3	b6ad20884a	fix:修改部分bug	2021-11-22 17:36:14 +08:00
maqian	43f2c63b1c	商品详情页新增收藏功能	2021-11-22 17:20:14 +08:00
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