515 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
koogua	75481f09a1	更新phinx默认环境配置项	2021-03-09 17:27:38 +08:00
koogua	81c134346c	Merge branch 'develop' v1.2.8	2021-03-09 11:10:34 +08:00
koogua	448a53cfb6	v1.2.8	2021-03-09 11:08:36 +08:00
koogua	563d53d9e2	Merge branch 'koogua/I3A937' into develop	2021-03-07 15:31:24 +08:00
koogua	0ea1e84003	Merge branch 'koogua/I39Y7V' into develop	2021-03-07 15:30:46 +08:00
koogua	e51d44f5ea	Merge branch 'koogua/I39Y6L' into develop	2021-03-07 15:30:12 +08:00
koogua	d7d47e6c8f	增加手续费逻辑	2021-03-06 18:28:21 +08:00
koogua	64dc731b23	会员期限价格等可设置	2021-03-04 20:44:56 +08:00
koogua	b0112cafce	增加不可退款选项	2021-03-04 16:35:01 +08:00
koogua	6acc168338	wechat.oa相关路由重命名	2021-03-04 11:30:21 +08:00
koogua	b8d2523435	WechatOfficialAccountController.php重命名	2021-03-04 11:12:34 +08:00
koogua	24f94088c3	WechatOfficialAccountController.php重命名	2021-03-04 11:04:06 +08:00
koogua	62aa639d9f	Merge branch 'koogua/I399X5'	2021-03-04 10:51:56 +08:00
koogua	4d4685d798	Merge branch 'koogua/I399X5' into develop	2021-03-03 20:22:32 +08:00
koogua	0fc11134ca	修复获取通知模板ID问题	2021-03-03 20:22:07 +08:00
koogua	c2d0316281	Merge branch 'koogua/I399X5' into develop	2021-03-03 19:47:28 +08:00
koogua	dffa813b0a	修复登录通知问题	2021-03-03 19:46:23 +08:00
koogua	a6d6806629	Merge branch 'koogua/I399X5' into develop	2021-03-03 19:26:03 +08:00
koogua	4ce06d9a23	修复商品发货通知参数问题	2021-03-03 19:24:59 +08:00
koogua	6b75756d97	Merge branch 'koogua/I399X5' into develop	2021-03-03 17:53:31 +08:00
koogua	9d4225f663	整理migration	2021-03-03 17:29:27 +08:00
koogua	c0eb16f850	Merge branch 'koogua/hotfix-user-cache'	2021-03-03 11:34:56 +08:00
koogua	cb09e62649	１．修正购买vip时没有设置vip=1的错误 ... ２．getCurrentUser,getLoginUser增加缓存选项	2021-03-03 11:33:48 +08:00
koogua	da1d35399d	整理通知相关以及deleted字段相关	2021-03-03 10:25:05 +08:00
koogua	3838d95dc4	整理通知相关以及deleted字段相关	2021-03-02 20:14:47 +08:00
koogua	86c66baece	整理通知相关以及deleted字段相关	2021-03-02 19:57:57 +08:00
koogua	08b0cd0c71	Merge branch 'develop' v1.2.7	2021-02-26 19:19:17 +08:00
koogua	92a9dfb7af	Merge branch 'develop' of https://github.com/xiaochong0302/course-tencent-cloud into develop	2021-02-26 15:34:48 +08:00
koogua	55401cf451	版本发布信息改用ajax异步获取	2021-02-26 15:06:38 +08:00
koogua	ab3e04c8a2	Merge branch 'koogua/v1.2.7' of https://gitee.com/koogua/course-tencent-cloud into koogua/v1.2.7	2021-02-26 11:23:35 +08:00
koogua	e576cdefe1	前台首页部件显示增加非空判断，后台角色管理要不可编辑	2021-02-26 11:08:52 +08:00
koogua	7f3717094e	前台首页部件显示增加非空判断	2021-02-26 10:35:43 +08:00
koogua	156b28b79e	查漏补缺	2021-02-25 20:57:39 +08:00
koogua	2a0a039da6	合并dingtalk	2021-02-23 20:36:37 +08:00
koogua	1e1fed67fb	Merge branch 'koogua/dingtalk-notice' into develop	2021-02-23 20:27:19 +08:00
koogua	054bccadfb	替换layui-verify为lay-verify	2021-02-23 15:37:55 +08:00
koogua	7acfaf17a9	dingtalk通知阶段提交	2021-02-22 11:38:19 +08:00
koogua	d798a5b609	dingtalk通知阶段提交	2021-02-22 11:31:21 +08:00
jacky huang	cb8684fbe0	Merge branch 'master' into develop	2021-02-18 21:43:29 +08:00
koogua	c4f1adb27f	Merge branch 'develop' ... # Conflicts: # app/Models/Course.php # db/migrations/schema.php v1.2.6	2021-02-18 21:24:31 +08:00
koogua	6abca790bc	修复file_transcode	2021-02-18 21:20:23 +08:00
koogua	179f27c20a	修复file_transcode	2021-02-16 16:47:26 +08:00
koogua	41dc730651	去除beforeCreate方法中的status状态	2021-02-15 21:38:54 +08:00
koogua	bb38d90d53	去除退款延迟	2021-02-15 21:12:03 +08:00
koogua	122b4adfa8	v1.2.6预览版01	2021-02-14 21:41:38 +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	a5cca0e899	使用ttl方法来取代exist判断键值是否存在	2021-02-13 18:29:46 +08:00
winzer	5d96cd0f8c	修复教师直播页面推流按钮无反应 ... (cherry picked from commit 098595b98178528bed674197e3feeb59a52deb95)	2021-02-13 18:28:46 +08:00
winzer	685bef5050	course和chapter增加resource_count字段 ... (cherry picked from commit 840457e5afcdcaf8af804f3a2e2e9c245aba8579)	2021-02-13 18:28:30 +08:00