Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

version2.0 #2

Open
wants to merge 109 commits into
base: XinSomeone
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
109 commits
Select commit Hold shift + click to select a range
a84dd82
这是一个测试文件
Jack-WangZhe Jul 12, 2018
eeede53
Merge branch 'master' into MrJack
Jack-WangZhe Jul 12, 2018
d52b28a
delete test.md
Jack-WangZhe Jul 12, 2018
1738724
delete test.md
Jack-WangZhe Jul 12, 2018
2fcdbc4
version2.0
HondaTypeR Jul 12, 2018
5a173e7
version
Jack-WangZhe Jul 13, 2018
c69f841
Merge branch 'master' of github.com:SLLearningTeam/SLLearning
Jack-WangZhe Jul 13, 2018
f36475a
Merge branch 'master' into MrJack
Jack-WangZhe Jul 13, 2018
795feef
version3
Chenlihua1 Jul 13, 2018
5d2dc26
Add files via upload
ISheenSomeOne Jul 13, 2018
2093abe
Version3.0
Chenlihua1 Jul 13, 2018
a2fba40
version1.6 添加注册验证
Jack-WangZhe Jul 13, 2018
6ae3bf2
Merge branch 'MrJack'
Jack-WangZhe Jul 14, 2018
048ed83
version1.6 登录与注册功能已完善
Jack-WangZhe Jul 14, 2018
d9c8879
Merge branch 'MrJack'
Jack-WangZhe Jul 14, 2018
f2bfb61
version2.1 添加管理员操作主要界面及对应后台跳转接口
Jack-WangZhe Jul 17, 2018
5018425
Merge branch 'master' into MrJack
Jack-WangZhe Jul 17, 2018
5a5e72c
version2.1 添加admin操作前端界面及服务端跳转接口
Jack-WangZhe Jul 17, 2018
2795634
添加数据库文件
Jack-WangZhe Jul 17, 2018
7b8db73
version2.2
bing0331 Jul 18, 2018
d4af8c5
version2.2 添加用户使用界面
Jack-WangZhe Jul 19, 2018
5f7f063
Merge branch 'master' into MrJack
Jack-WangZhe Jul 19, 2018
3e64433
version-3.0
HondaTypeR Jul 20, 2018
923f482
Merge branch 'master' of https://github.com/SLLearningTeam/SLLearning
ISheenSomeOne Jul 23, 2018
3750cf6
Add files via upload
ISheenSomeOne Jul 25, 2018
61e31f5
version2.3 添加对应功能文件
Jack-WangZhe Jul 26, 2018
91f4a61
version
HondaTypeR Jul 27, 2018
f0bc38c
version_4.0
HondaTypeR Jul 27, 2018
2a92d08
课程类修改
Chenlihua1 Aug 2, 2018
d11cf5e
Add files via upload
ISheenSomeOne Aug 2, 2018
c0ade39
Add files via upload
ISheenSomeOne Aug 2, 2018
2765ded
Add files via upload
ISheenSomeOne Aug 2, 2018
21c144a
Add files via upload
ISheenSomeOne Aug 8, 2018
6f9012e
Add files via upload
ISheenSomeOne Aug 8, 2018
8b3d098
React版前端开发重构
Jack-WangZhe Aug 9, 2018
aca97af
Merge branch 'MrJack'
Jack-WangZhe Aug 10, 2018
1d38cc0
Add files via upload
ISheenSomeOne Aug 10, 2018
f3163de
利用immutableJS管理store数据;利用combineReducers对数据进行拆分;避免无意义的请求发送提升组件性能
Jack-WangZhe Aug 10, 2018
feca5a7
Merge branch 'MrJack'
Jack-WangZhe Aug 10, 2018
a12d6c2
version-3.0
HondaTypeR Aug 11, 2018
44dc7f8
添加首页与详情的路由
Jack-WangZhe Aug 11, 2018
8a3c2b8
Merge branch 'MrJack'
Jack-WangZhe Aug 11, 2018
104149c
version-3.0
HondaTypeR Aug 12, 2018
3dcfdeb
version2.2
bing0331 Aug 13, 2018
3827d75
Add files via upload
ISheenSomeOne Aug 17, 2018
9d55220
添加对应跳转接口
Jack-WangZhe Aug 20, 2018
1ea77ee
version2.2
bing0331 Aug 20, 2018
d56e8ac
添加语言类别的增删改查
Jack-WangZhe Aug 20, 2018
56434a3
对language显示进行修改
Jack-WangZhe Aug 23, 2018
181f355
对显示图标进行调整
Jack-WangZhe Aug 23, 2018
d05d6d7
添加类型类别管理接口
Jack-WangZhe Aug 23, 2018
3c6bad8
修改RateType相关接口内容,增加听力、口语、阅读课程添加相关接口
Jack-WangZhe Aug 23, 2018
49cbf5d
添加返回pageNumber和pageNum内容
Jack-WangZhe Aug 24, 2018
bbf81e7
添加课程删除接口
Jack-WangZhe Aug 24, 2018
3547cc8
添加课程修改页面及接口
Jack-WangZhe Aug 24, 2018
f690425
添加综合列表显示页面
Jack-WangZhe Aug 24, 2018
4212397
添加查询所有课程、听力课程的管理员页面接口和用户接口
Jack-WangZhe Aug 25, 2018
9e86c75
添加听力课程按下载量排序、按语言类别排序、按种类类别排序管理端与用户端接口
Jack-WangZhe Aug 25, 2018
c04e40e
添加阅读、口语的直接查找、根据下载量查找、根据语言类别查找和根据种类类别查找
Jack-WangZhe Aug 25, 2018
3db8d9d
添加服务器备份文件
Jack-WangZhe Aug 26, 2018
b1aec16
添加语言类别与种类类别查重接口
Jack-WangZhe Aug 26, 2018
e6fbe30
添加轮播图相关操作
Jack-WangZhe Aug 26, 2018
daef7e9
添加对管理端对轮播图的增删改查、用户端的查看
Jack-WangZhe Aug 26, 2018
108c9ba
添加用户下载听力资源、查看下载记录、删除下载记录;管理员查看下载记录、删除下载记录接口
Jack-WangZhe Aug 27, 2018
0d75f7a
Add files via upload
ISheenSomeOne Aug 31, 2018
6ab546f
添加课程问题的增删改查
Jack-WangZhe Aug 31, 2018
caafb63
添加意见反馈相关接口
Jack-WangZhe Sep 1, 2018
db47f46
添加评论操作相关接口
Jack-WangZhe Sep 1, 2018
4ac4bd7
version2.2
bing0331 Sep 1, 2018
1ef4cf7
添加历史记录相关接口
Jack-WangZhe Sep 1, 2018
3223dd0
Merge branch 'master' of github.com:SLLearningTeam/SLLearning
Jack-WangZhe Sep 1, 2018
6a52263
version2.2
bing0331 Sep 1, 2018
40d865a
添加签到及口语评测相关接口
Jack-WangZhe Sep 1, 2018
25ff114
Merge branch 'MrJack'
Jack-WangZhe Sep 1, 2018
c258dfe
Add files via upload
ISheenSomeOne Sep 2, 2018
114a0c2
添加订阅操作相关接口
Jack-WangZhe Sep 2, 2018
1ca95ab
Merge branch 'master' of github.com:SLLearningTeam/SLLearning
Jack-WangZhe Sep 2, 2018
92425c9
添加订阅相关接口
Jack-WangZhe Sep 2, 2018
38f8926
Merge branch 'MrJack'
Jack-WangZhe Sep 2, 2018
5b167ff
修改添加样式
Chenlihua1 Sep 3, 2018
ad0ac85
接口文档更新
Jack-WangZhe Sep 3, 2018
9af567c
添加模拟测试相关接口
Jack-WangZhe Sep 3, 2018
4c6a66a
version2.2
bing0331 Sep 3, 2018
58529b1
所有接口及文档提交完毕吧
Jack-WangZhe Sep 3, 2018
c58b506
Add files via upload
ISheenSomeOne Sep 3, 2018
f0b99b5
Merge branch 'master' of github.com:SLLearningTeam/SLLearning
Jack-WangZhe Sep 3, 2018
08c61b6
添加所有接口及文档内容
Jack-WangZhe Sep 3, 2018
7653d03
修复页号问题bug
Jack-WangZhe Sep 3, 2018
cda3c13
Add files via upload
ISheenSomeOne Sep 4, 2018
ea26fd8
添加404页面和500页面
Jack-WangZhe Sep 4, 2018
11354c1
提交数据库文件
Jack-WangZhe Sep 4, 2018
eeff37d
修改用户接口2的错误
Jack-WangZhe Sep 4, 2018
24583f2
用户
bing0331 Sep 5, 2018
5853aef
添加管理员操作用户浏览历史、用户签到、用户意见反馈和用户订阅记录
Jack-WangZhe Sep 5, 2018
4d67f45
修改问题获取接口错误
Jack-WangZhe Sep 5, 2018
527245b
Add files via upload
HondaTypeR Sep 5, 2018
5c2a0d5
version2.3
bing0331 Sep 6, 2018
9ae371c
version2.4
bing0331 Sep 6, 2018
1721458
version2.5
bing0331 Sep 6, 2018
9ba8e40
添加模拟套题所有页面及各种课程的添加、查看、修改与删除
Jack-WangZhe Sep 6, 2018
4232cce
Merge branch 'MrJack'
Jack-WangZhe Sep 6, 2018
cfa4da1
version2.6
bing0331 Sep 6, 2018
ae6f01e
Add files via upload
ISheenSomeOne Sep 7, 2018
9702750
Add files via upload
HondaTypeR Sep 7, 2018
b21a2a7
最终上传版本
Jack-WangZhe Sep 7, 2018
f938fac
Merge branch 'master' of github.com:SLLearningTeam/SLLearning
Jack-WangZhe Sep 7, 2018
c65206f
最终版本
Jack-WangZhe Sep 7, 2018
7ed18d7
Merge branch 'MrJack'
Jack-WangZhe Sep 7, 2018
4b9b42c
项目最终版本
Jack-WangZhe Sep 7, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
75 changes: 56 additions & 19 deletions Browser Folder/TingShuo/css/mycss.css
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
.logo {
height: 50px;
height: 60px;
border-radius: 200px;
}
.logo-footer{
height: 30px;
border-radius: 200px;
margin-top: 0px;
margin-left: 100px;
}

.logo-div{
Expand All @@ -11,12 +13,15 @@
}

.search{
float: right;
margin-top: 30px;
border:0px;
color: #d3d3d3;
border-bottom:#d3d3d3 1px solid;
width: 300px;
font-size: 14px;
}

.head{
box-shadow: 2px 2px 300px #66CCFF;
box-shadow: 2px 5px 300px #66CCFF;
}

@keyframes top{
Expand All @@ -30,7 +35,7 @@


.top{
animation: top 15s infinite;
animation: top 25s infinite;
background: #fff;
}

Expand All @@ -39,9 +44,16 @@ body{
}

.daohang {
margin-left: 30px;
font-size: 18px;
font-size: 16px;
text-align: center;
color: #525252;
text-decoration: none;
margin-left: 50px;
font-weight: 400;
}
.daohang:hover{
color: #000000;
text-decoration: none;
}

.header-button-shi {
Expand All @@ -61,8 +73,8 @@ body{

.header-button-kong {
background-color: #fff;
border: 1px solid #b3b3b3;
color: #b3b3b3;
border: 1px solid #adadad;
color: #adadad;
text-align: center;
-webkit-transition-duration: 0.4s;
transition-duration: 0.4s;
Expand All @@ -71,40 +83,65 @@ body{

.header-button-sousuo{
border-radius: 5px;
width: 70px;
height: 30px;
width: 30px;
height: 25px;
font-size: 14px;
}

.header-button-kong:hover{
background-color: #b3b3b3;
background-color: #adadad;
color: white;
}

.header-button-login {
border-radius: 0px;
height: 30px;
width: 40px;
margin-left: 10px;
font-size: 11px;
}

.lunbo{
width: 100%;
height: 400px;
border-radius: 10px;
box-shadow: 0px 10px 30px #adadad;
box-shadow: 0px 10px 30px #8f8f8f;
}

.row-margin{
margin-top: 30px;
margin-top: 40px;
}

.course{
border-radius: 10px;
box-shadow: 0px 1px 15px #d3d3d3
box-shadow: 0px 1px 15px #b8b8b8;
}
.course:hover{
box-shadow: 0px 1px 15px #929292;
}

.tuijian{
height: 40px;
height: 30px;
}

.text-a-black{
color: black;
text-decoration:none;

}
.text-a-black:hover{
color: black;
text-decoration:none;

}

#erweima div{
display: none;
}
#erweima:hover div{
display: block;
}
.erweima{
height: 100px;
width: 100px;
border: none;
}
Loading