232 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
sonjinyon	c58893d335	Merge branch 'master' of http://101.43.112.107:3000/root/allLikeMall into sjy-two	2024-10-25 16:05:47 +08:00
sonjinyon	aa3d6de962	调整积分商城，我的积分数据显示，兑换记录详情	2024-10-25 15:51:43 +08:00
root	45b6bf142e	Merge pull request '支付bug' (#79) from khy1 into master ... Reviewed-on: #79	2024-10-25 14:48:48 +08:00
khy	6beabe3478	支付bug	2024-10-25 14:38:59 +08:00
root	94d29f3cad	Merge pull request '后台-客服页面调整和客服转接功能（前端刷新功能未实现）' (#78) from cxw into master ... Reviewed-on: #78	2024-10-25 13:59:19 +08:00
XinWei	69201dd39f	注释	2024-10-25 11:53:27 +08:00
XinWei	ade1a54439	Merge branch 'master' of http://101.43.112.107:3000/root/allLikeMall into cxw	2024-10-25 11:28:29 +08:00
root	eac7fc313d	Merge pull request 'khy1' (#75) from khy1 into master ... Reviewed-on: #75	2024-10-25 11:27:44 +08:00
khy	e650bab63b	会员支付	2024-10-25 11:26:32 +08:00
XinWei	0e37da8584	后台-客服页面调整和客服转接功能	2024-10-25 11:23:22 +08:00
khy	32a1f6b109	会员支付	2024-10-25 11:23:03 +08:00
root	6b5ba72b0a	Merge pull request '修改预约模块添加预约时间段bug' (#74) from sjy-two into master ... Reviewed-on: #74	2024-10-25 09:58:23 +08:00
sonjinyon	f6b2ffb401	Merge branch 'master' of http://101.43.112.107:3000/root/allLikeMall into sjy-two	2024-10-25 09:18:11 +08:00
sonjinyon	01b75abc2d	修改预约模块添加预约时间段bug	2024-10-25 09:13:27 +08:00
root	a7135b440a	Merge pull request '微信支付（日志）' (#73) from khy1 into master ... Reviewed-on: #73	2024-10-24 19:03:19 +08:00
khy	dcff7fc4a5	微信支付（日志）	2024-10-24 18:57:03 +08:00
root	3e7ba69963	Merge pull request '会员（微信支付）' (#72) from khy1 into master ... Reviewed-on: #72	2024-10-24 18:39:35 +08:00
khy	734af91921	会员（微信支付）	2024-10-24 18:35:52 +08:00
root	e0b7148121	Merge pull request '付费会员配置' (#71) from khy1 into master ... Reviewed-on: #71	2024-10-24 16:43:31 +08:00
khy	1bf166aa0f	会员支付bug	2024-10-24 16:30:24 +08:00
khy	017aea38da	付费会员配置	2024-10-24 13:59:45 +08:00
XinWei	8ab64a909a	Merge branch 'master' of http://101.43.112.107:3000/root/allLikeMall into cxw	2024-10-24 10:50:46 +08:00
XinWei	81be16bd6c	后台-客服跳转	2024-10-24 10:50:29 +08:00
root	f67342d318	Merge pull request '预约模块修改' (#69) from sjy-two into master ... Reviewed-on: #69	2024-10-24 09:49:48 +08:00
root	044668a7c7	Merge pull request '会员记录（后台）' (#70) from khy1 into master ... Reviewed-on: #70	2024-10-24 09:43:12 +08:00
khy	e90d9dd5ca	会员记录（后台）	2024-10-24 09:33:51 +08:00
sonjinyon	1603d9d525	预约模块修改	2024-10-23 23:13:47 +08:00
root	314cc090ee	Merge pull request '会员余额支付' (#68) from khy1 into master ... Reviewed-on: #68	2024-10-23 21:35:12 +08:00
khy	41bcb2c9ea	会员余额支付	2024-10-23 21:34:18 +08:00
root	c613b2e3c1	Merge pull request '会员回显' (#67) from khy1 into master ... Reviewed-on: #67	2024-10-23 21:12:23 +08:00
khy	a35f333ec2	会员回显	2024-10-23 21:10:42 +08:00
root	dbf38c1aa4	Merge pull request '支付订单状态变更' (#66) from khy1 into master ... Reviewed-on: #66	2024-10-23 18:16:17 +08:00
khy	a4cc10ccb9	支付订单状态变更	2024-10-23 18:11:40 +08:00
root	9fcf547417	Merge pull request '创建订单' (#65) from khy1 into master ... Reviewed-on: #65	2024-10-23 14:09:53 +08:00
root	28ce473568	Merge pull request '客服-最近浏览-字段缺失补充' (#64) from cxw into master ... Reviewed-on: #64	2024-10-23 14:09:44 +08:00
khy	e0bac9998e	创建订单	2024-10-23 14:07:18 +08:00
XinWei	8f6e7e168a	客服-最近浏览-字段缺失补充	2024-10-23 12:53:21 +08:00
root	505aa43c36	Merge pull request '支付方式接口调整' (#63) from cxw into master ... Reviewed-on: #63	2024-10-23 11:01:58 +08:00
XinWei	2f62a01f02	支付方式接口调整	2024-10-23 10:53:38 +08:00
root	1b70fdd086	Merge pull request '会员类型列表' (#62) from khy1 into master ... Reviewed-on: #62	2024-10-23 10:27:40 +08:00
khy	9465085136	会员类型列表	2024-10-23 10:25:48 +08:00
root	6f5f3dd8b2	Merge pull request '重复充值余额处理' (#61) from cxw into master ... Reviewed-on: #61	2024-10-23 10:06:38 +08:00
XinWei	1d50394776	Merge branch 'master' of http://101.43.112.107:3000/root/allLikeMall into cxw	2024-10-22 22:56:13 +08:00
XinWei	e9609ce7d5	余额充值微信未支付时，重复增加余额处理	2024-10-22 22:55:57 +08:00
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