238 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
root	5177793676	Merge pull request '修改支付状态' (#60) from khy1 into master ... Reviewed-on: #60	2024-10-22 18:25:50 +08:00
khy	9d92e8c7f0	修改支付状态	2024-10-22 18:04:01 +08:00
root	334c3efbc0	Merge pull request '会员支付(试用)' (#59) from khy1 into master ... Reviewed-on: #59	2024-10-21 19:23:19 +08:00
khy	89b94e856b	会员支付(试用)	2024-10-21 19:19:44 +08:00
root	0beaed16ba	Merge pull request '会员支付' (#58) from khy1 into master ... Reviewed-on: #58	2024-10-21 16:03:45 +08:00
khy	bdbcae287c	会员支付	2024-10-21 16:01:06 +08:00
root	9d57571165	Merge pull request '预约模块添加预约项目管理' (#57) from sjy-two into master ... Reviewed-on: #57	2024-10-21 15:52:50 +08:00
sonjinyon	208d0a6e97	预约模块添加预约项目管理	2024-10-21 15:51:14 +08:00
root	8ecd53d92a	Merge pull request '提交客服话术图片' (#56) from sjy-two into master ... Reviewed-on: #56	2024-10-21 15:19:58 +08:00
sonjinyon	f94a161b2f	提交客服话术图片	2024-10-21 15:12:15 +08:00
root	a194b00ee8	Merge pull request 'khy1' (#55) from khy1 into master ... Reviewed-on: #55	2024-10-21 11:38:03 +08:00
khy	caaca7b318	会员支付	2024-10-21 11:34:53 +08:00
khy	3329093c88	会员支付	2024-10-21 11:18:46 +08:00
khy	5cb71e0889	会员支付	2024-10-21 10:59:45 +08:00
root	6d8c8b4b83	Merge pull request '后台添加客服人员，话术，留言，自动回复' (#54) from sjy-two into master ... Reviewed-on: #54	2024-10-21 10:35:48 +08:00
root	eb477862fc	Merge pull request 'bug修复和商品品牌信息返回' (#53) from cxw into master ... Reviewed-on: #53	2024-10-21 10:35:34 +08:00
sonjinyon	85a0e9a9b1	后台添加客服人员，话术，留言，自动回复	2024-10-21 10:09:16 +08:00
khy	11dd5f7f6f	会员支付	2024-10-21 08:49:23 +08:00
XinWei	aed2d035c1	Merge branch 'master' of http://101.43.112.107:3000/root/allLikeMall into cxw	2024-10-18 14:34:38 +08:00
XinWei	1316b41df7	支付订单中merchant_order_id重复处理	2024-10-18 13:42:20 +08:00
root	8cc065e598	Merge pull request '添加预约信息' (#52) from sjy-two into master ... Reviewed-on: #52	2024-10-18 09:33:42 +08:00
sonjinyon	3bc97951e5	添加预约信息	2024-10-18 09:30:19 +08:00
XinWei	e3d554da42	退款空指针处理	2024-10-17 16:30:07 +08:00
XinWei	6ffa6d1af4	Merge branch 'master' of http://101.43.112.107:3000/root/allLikeMall into cxw	2024-10-17 15:27:30 +08:00
XinWei	38ddb26051	商品详情接口中添加品牌信息字段	2024-10-17 15:17:16 +08:00
root	b9f0591578	Merge pull request '修改积分商城订单记录时间排序' (#51) from sjy-two into master ... Reviewed-on: #51	2024-10-17 11:24:41 +08:00
root	2f7ffb4032	Merge pull request '会员权益列表' (#50) from khy1 into master ... Reviewed-on: #50	2024-10-17 11:24:09 +08:00
sonjinyon	138ddc13bb	修改积分商城订单记录时间排序	2024-10-17 11:22:54 +08:00
khy	d2c735ac18	会员权益列表	2024-10-17 11:19:48 +08:00
root	2c875571ee	Merge pull request '会员类型列表' (#49) from khy into master ... Reviewed-on: #49	2024-10-17 09:28:44 +08:00
khy	228fe0cc82	会员类型列表	2024-10-17 09:19:31 +08:00
root	a6a1ab163d	Merge pull request 'cxw' (#48) from cxw into master ... Reviewed-on: #48	2024-10-16 15:06:54 +08:00
XinWei	9860ff79d5	Merge branch 'master' of http://101.43.112.107:3000/root/allLikeMall into cxw	2024-10-16 15:03:29 +08:00
root	3eead082f8	Merge pull request '修改积分商城订单提交报错,增加后台积分订单记录' (#47) from sjy-two into master ... Reviewed-on: #47	2024-10-16 15:03:12 +08:00
XinWei	8b801be4f3	构建脚本调整	2024-10-16 15:00:14 +08:00
XinWei	df69d98073	挂载本地图片路径	2024-10-16 14:48:58 +08:00
sonjinyon	6de437634c	修改积分商城订单提交报错,增加后台积分订单记录	2024-10-16 14:35:09 +08:00
root	af92c1ca00	Merge pull request '1.后台前端-隐藏优惠券折扣选项2.后台前端-优惠券有效期显示调整' (#46) from cxw into master ... Reviewed-on: #46	2024-10-16 13:57:33 +08:00
root	53128f0685	Merge pull request 'khy' (#45) from khy into master ... Reviewed-on: #45	2024-10-16 13:57:22 +08:00
XinWei	13eb6a75a9	1.后台前端-隐藏优惠券折扣选项 ... 2.后台前端-优惠券有效期显示调整	2024-10-16 13:41:12 +08:00
khy	78d3175151	Merge remote-tracking branch 'origin/master'	2024-10-15 19:51:27 +08:00
root	b7f71f6018	Merge pull request 'Branch_csl' (#44) from Branch_csl into master ... Reviewed-on: #44	2024-10-15 19:50:53 +08:00
khy	da363831e8	付费会员类型，权益	2024-10-15 19:49:01 +08:00
77	02cc14d9f6	替换图标与宫格导航添加一排五个的按钮	2024-10-15 09:38:32 +08:00
root	00551ec8fe	Merge pull request '秒杀列表改回获取全部商品' (#43) from cxw into master ... Reviewed-on: #43	2024-10-14 18:45:01 +08:00
XinWei	0da862a180	秒杀列表改回获取全部商品	2024-10-14 18:20:13 +08:00
root	8fc219ad38	Merge pull request '修改预约提交接口' (#42) from sjy-two into master ... Reviewed-on: #42	2024-10-14 13:52:08 +08:00
sonjinyon	6f2f58fbe9	修改预约提交接口	2024-10-14 13:19:30 +08:00
77	d13cfad70c	个人中心装修页面优化与组件图标替换	2024-10-12 15:20:19 +08:00
root	ad20ae2c4b	Merge pull request '拼团和秒杀次数整合到get-detail接口' (#41) from cxw into master ... Reviewed-on: #41	2024-10-12 14:50:00 +08:00