235 Commits

Author	SHA1	Message	Date
koogua	c62a1b6d42	Merge branch 'koogua/I39Y6L' into demo	2021-03-07 15:34:20 +08:00
koogua	13db91fdda	Merge branch 'koogua/I39Y6Y' into demo	2021-03-07 15:34:10 +08:00
koogua	64dc731b23	会员期限价格等可设置	2021-03-04 20:44:56 +08:00
koogua	b0112cafce	增加不可退款选项	2021-03-04 16:35:01 +08:00
koogua	75f32b0b12	Merge branch 'koogua/I399X5' into demo	2021-03-03 19:26:40 +08:00
koogua	4ce06d9a23	修复商品发货通知参数问题	2021-03-03 19:24:59 +08:00
koogua	599e54f745	Merge branch 'koogua/I399X5' into demo ... # Conflicts: # app/Services/Auth/Api.php # app/Services/Auth/Home.php	2021-03-03 18:07:51 +08:00
koogua	da1d35399d	整理通知相关以及deleted字段相关	2021-03-03 10:25:05 +08:00
koogua	86c66baece	整理通知相关以及deleted字段相关	2021-03-02 19:57:57 +08:00
koogua	7dec651548	后台敏感数据过滤优化	2021-02-27 14:59:40 +08:00
koogua	a091ff541e	Merge branch 'koogua/v1.2.7' into demo	2021-02-26 15:22:21 +08:00
koogua	55401cf451	版本发布信息改用ajax异步获取	2021-02-26 15:06:38 +08:00
koogua	e576cdefe1	前台首页部件显示增加非空判断，后台角色管理要不可编辑	2021-02-26 11:08:52 +08:00
koogua	156b28b79e	查漏补缺	2021-02-25 20:57:39 +08:00
koogua	2a0a039da6	合并dingtalk	2021-02-23 20:36:37 +08:00
koogua	603ece55ce	合并dingtalk	2021-02-23 20:35:37 +08:00
koogua	90581c4119	Merge branch 'koogua/dingtalk-notice' into demo ... # Conflicts: # scheduler.php	2021-02-23 20:29:26 +08:00
koogua	1e1fed67fb	Merge branch 'koogua/dingtalk-notice' into develop	2021-02-23 20:27:19 +08:00
koogua	1196b5138b	替换layui-verify为lay-verify	2021-02-23 15:38:10 +08:00
koogua	054bccadfb	替换layui-verify为lay-verify	2021-02-23 15:37:55 +08:00
koogua	c4f218ea84	dingtalk通知阶段提交	2021-02-22 11:40:16 +08:00
koogua	7acfaf17a9	dingtalk通知阶段提交	2021-02-22 11:38:19 +08:00
koogua	d798a5b609	dingtalk通知阶段提交	2021-02-22 11:31:21 +08:00
koogua	6abca790bc	修复file_transcode	2021-02-18 21:20:23 +08:00
koogua	30515a2663	去除退款延迟	2021-02-15 21:13:01 +08:00
koogua	bb38d90d53	去除退款延迟	2021-02-15 21:12:03 +08:00
koogua	d4939f9c61	Merge branch 'koogua/v1.2.6-preview' into demo	2021-02-14 21:43:23 +08:00
koogua	122b4adfa8	v1.2.6预览版01	2021-02-14 21:41:38 +08:00
winzer	f24eef065b	修正合并错误	2021-02-13 20:51:08 +08:00
winzer	62964bbd95	Merge branch 'winzer/I2EJH8' into demo ... # Conflicts: # app/Console/Tasks/CleanLogTask.php # app/Console/Tasks/DeliverTask.php # app/Console/Tasks/NoticeTask.php # app/Http/Admin/Services/AuthNode.php # app/Http/Admin/Services/Setting.php # app/Http/Api/Services/Account.php # app/Library/Utils/Lock.php # app/Listeners/Trade.php # app/Listeners/User.php # app/Models/Course.php # app/Models/Online.php # app/Models/UserSession.php # app/Models/UserToken.php # app/Services/Auth/Api.php # app/Services/Auth/Home.php	2021-02-13 19:09:30 +08:00
winzer	bc48169ff9	更新价格验证 ... (cherry picked from commit 3d286baf91e1c6130ebb1db7831d4bb01c8b06e8)	2021-02-13 18:35:04 +08:00
winzer	7f7636b953	增加原始价格，市场价改名为优惠价	2021-02-13 18:33:57 +08:00
winzer	8eef6035a8	阶段性提交积分机制-0213	2021-02-13 18:21:42 +08:00
winzer	f47091991d	阶段性提交积分机制-0204	2021-02-04 15:39:53 +08:00
winzer	d1502d74a1	更新价格验证	2021-02-03 16:00:56 +08:00
winzer	4f3b2ea322	增加原始价格，市场价改名为优惠价	2021-02-03 13:09:38 +08:00
winzer	1deb2c5e08	后台接入产品动态，相关链接指向官网	2021-01-14 19:12:58 +08:00
winzer	df3b317e44	后台接入产品动态，相关链接指向官网	2021-01-14 19:11:32 +08:00
xiaochong0302	f58a45a981	v1.2.4优化	2021-01-09 17:31:52 +08:00
xiaochong0302	d292e8cead	v1.2.4优化	2021-01-09 17:30:48 +08:00
xiaochong0302	197e4a62af	增加公众号自定义菜单	2021-01-07 15:15:27 +08:00
xiaochong0302	13ff8d0041	后台增加上传logo和favicon	2021-01-07 15:15:27 +08:00
xiaochong0302	0902fa35a7	增加公众号自定义菜单	2021-01-07 15:10:43 +08:00
xiaochong0302	9db288c406	后台增加上传logo和favicon	2021-01-07 15:10:43 +08:00
xiaochong0302	f3f0ca4e5f	调整公众号模板消息	2020-12-29 15:25:45 +08:00
xiaochong0302	fce9ab311a	调整公众号模板消息	2020-12-29 15:24:12 +08:00
xiaochong0302	9974430f18	增加后台刷新首页缓存小工具	2020-12-28 13:06:59 +08:00
xiaochong0302	0642d430ff	增加课程推荐	2020-12-28 13:06:53 +08:00
xiaochong0302	9337c3824b	增加后台刷新首页缓存小工具	2020-12-28 13:04:49 +08:00
xiaochong0302	906e458ed0	增加课程推荐	2020-12-28 13:04:40 +08:00