Skip to content

Commit

Permalink
更新
Browse files Browse the repository at this point in the history 
前后台
  • Loading branch information
@ccccccxh
ccccccxh committed Sep 23, 2017
1 parent 05a53cc commit 19b860f
Show file tree
Hide file tree
Showing 24 changed files with 471 additions and 216 deletions.
405 changes: 266 additions & 139 deletions .idea/workspace.xml
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion admin/addArea.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
</button>
</div>
</div>
<div class="layui-form-item">
<div class="layui-form-item buts">
<div class="layui-input-block">
<button class="layui-btn committour" type="button">确定</button>
<button type="reset" class="layui-btn layui-btn-primary">重置</button>
Expand Down
11 changes: 11 additions & 0 deletions admin/area.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,17 @@
</form>
<!--地区信息-->
<div id="items" style="text-align:center">
<div class="list">
<div>西江千户苗寨</div>
<div>贵州</div>
<div>苗族</div>
<div>10</div>
<div>12:00 17-01-01</div>
<div class="layui-btn-group">
<button class="layui-btn">修改</button>
<button class="layui-btn">删除</button>
</div>
</div>
</div>

</div>
Expand Down
2 changes: 1 addition & 1 deletion admin/backstage.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
<!--</div>-->
<!--</div>-->
<div id="hotTopic" style="width:100%;height:100%">
<div>热点详情</div>
<div id="hotDetail">热点详情</div>
<div class="layui-collapse" style="width:100%;height:100%">
<div class="layui-colla-item" style="width:100%;height:100%">
<h2 class="layui-colla-title">热门地区</h2>
Expand Down
27 changes: 21 additions & 6 deletions admin/css/addArea.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#sign div:nth-child(1){
border-top: 5px solid #3366FF;
height: 50px;
width: 250px;
width: 20%;
line-height: 50px;
text-align: center;
font-size: 1.5em;
Expand All @@ -21,13 +21,13 @@
#sign div:nth-child(n+2){
border-top: 5px solid #3366FF;
height: 50px;
width: 100px;
width: 15%;
line-height: 50px;
text-align: center;
font-size: 1.2em;
font-weight: bold;
float: left;
margin-left: 50px;
margin-left: 5%;
}

#sign div:nth-child(n+3){
Expand Down Expand Up @@ -84,11 +84,11 @@
float: left;
}

.layui-colla-item button{
.madd{
float: left;
position: relative;
top: -36px;
left: 95%;
left: 94%;
}

.layui-colla-item .layui-btn-group button{
Expand Down Expand Up @@ -128,4 +128,19 @@
/*.layui-colla-item .layui-table table tr td .layui-btn{*/
/*margin-bottom: 5px;*/
/*margin-left: 0px;*/
/*}*/
/*}*/

.buts .layui-btn{
width: 30%;
padding: 0px;
}

td .layui-btn-group{
width: 100%;
}

td .layui-btn-group .layui-btn{
width: 50%;
padding: 0px;
margin: 0px;
}
5 changes: 5 additions & 0 deletions admin/css/area.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,9 @@

.list div:nth-child(1){
cursor: pointer;
}

#items .layui-btn-group .layui-btn{
width: 45%;
padding: 0px;
}
18 changes: 10 additions & 8 deletions admin/css/backstage.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ body{
/*border: 2px solid #999999;*/
float: left;
margin-top: 50px;
margin-left: 80px;
margin-left: 6%;
box-shadow: 5px 5px 5px #999999;
font-size: 1.2em;
font-weight: bold;
Expand Down Expand Up @@ -67,9 +67,17 @@ body{
/*margin-left: 80px;*/
/*}*/

#hotTopic div:nth-child(1){

#hotTopic{
width: 80%;
min-height: 300px;
margin: 0px auto;
}

#hotDetail{
font-weight: bold;
font-size: 1.5em;
text-align: center;
}

/*#weekView,#monthView,#yearView{*/
Expand All @@ -83,12 +91,6 @@ body{
/*color: #FFFFFF;*/
/*}*/

#hotTopic{
width: 80%;
min-height: 300px;
margin: 0px auto;
}

/*#hotArea,#hotTravelNote{*/
/*width: 100%;*/
/*height: 50px;*/
Expand Down
8 changes: 5 additions & 3 deletions admin/css/dataList.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#sign div{
border-top: 5px solid #3366FF;
height: 50px;
width: 250px;
width: 20%;
line-height: 50px;
text-align: center;
font-size: 1.5em;
Expand All @@ -18,7 +18,7 @@
#sign input{
border: 2px solid #000000;
height: 50px;
width: 400px;
width: 30%;
line-height: 50px;
text-align: center;
float: left;
Expand All @@ -40,6 +40,7 @@
width: 100%;
min-height: 492px;
background-color: #666666;
position: relative;
}

#mark{
Expand Down Expand Up @@ -67,8 +68,9 @@
float: right;
position: absolute;
color: #FFFFFF;
top: 14%;
top: 0px;
right: 1%;
/*bottom: 1%;*/
}

.layui-form-item{
Expand Down
4 changes: 2 additions & 2 deletions admin/css/popup.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
width: 250px;
position: relative;
top:10px;
left: 30%;
left: 40%;
}


Expand Down Expand Up @@ -97,5 +97,5 @@
width: 250px;
position: relative;
top:10px;
left: 30%;
left: 40%;
}
10 changes: 10 additions & 0 deletions admin/css/user.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,13 @@
.list div:nth-child(2){
cursor: pointer;
}

.list .layui-btn-group{
width: 28%;
}

.list .layui-btn-group .layui-btn{
width: 30%;
padding: 0px;
text-align: center;
}
2 changes: 1 addition & 1 deletion admin/user.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
<title>数据分析-用户</title>
<link rel="stylesheet" href="layui/css/layui.css">
<link rel="stylesheet" href="css/top.css">
<link rel="stylesheet" href="css/user.css">
<link rel="stylesheet" href="css/dataList.css">
<link rel="stylesheet" href="css/user.css">
</head>
<body>
<div class="layui-layout layui-layout-admin">
Expand Down
4 changes: 2 additions & 2 deletions area-admin/addArea.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<!-- 左侧导航区域（可配合layui已有的垂直导航） -->
<ul class="layui-nav layui-nav-tree" lay-filter="test">
<li class="layui-nav-item layui-nav-itemed"><a href="backstage.html?t_id=1">景区管理</a></li>
<li class="layui-nav-item"><a href="checkin.html?t_id=1">检票</a></li>
<li class="layui-nav-item"><a href="checkin.html?t_id=1">检票队列</a></li>
<li class="layui-nav-item"><a href="addArea.html?t_id=1">地区信息</a></li>
<li class="layui-nav-item"><a href="newSupplement.html?t_id=1">新补充</a></li>
</ul>
Expand Down Expand Up @@ -87,7 +87,7 @@
</button>
</div>
</div>
<div class="layui-form-item">
<div class="layui-form-item buts">
<div class="layui-input-block">
<button class="layui-btn committour" type="button">确定</button>
<button type="reset" class="layui-btn layui-btn-primary">重置</button>
Expand Down
2 changes: 1 addition & 1 deletion area-admin/backstage.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<!-- 左侧导航区域（可配合layui已有的垂直导航） -->
<ul class="layui-nav layui-nav-tree" lay-filter="test">
<li class="layui-nav-item layui-nav-itemed"><a href="backstage.html?t_id=1">景区管理</a></li>
<li class="layui-nav-item"><a href="checkin.html?t_id=1">检票</a></li>
<li class="layui-nav-item"><a href="checkin.html?t_id=1">检票队列</a></li>
<li class="layui-nav-item"><a href="addArea.html?t_id=1">地区信息</a></li>
<li class="layui-nav-item"><a href="newSupplement.html?t_id=1">新补充</a></li>
</ul>
Expand Down
2 changes: 1 addition & 1 deletion area-admin/checkin.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<!-- 左侧导航区域（可配合layui已有的垂直导航） -->
<ul class="layui-nav layui-nav-tree" lay-filter="test">
<li class="layui-nav-item layui-nav-itemed"><a href="backstage.html?t_id=1">景区管理</a></li>
<li class="layui-nav-item"><a href="checkin.html?t_id=1">检票</a></li>
<li class="layui-nav-item"><a href="checkin.html?t_id=1">检票队列</a></li>
<li class="layui-nav-item"><a href="addArea.html?t_id=1">地区信息</a></li>
<li class="layui-nav-item"><a href="newSupplement.html?t_id=1">新补充</a></li>
</ul>
Expand Down
46 changes: 32 additions & 14 deletions area-admin/css/addArea.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,14 @@
height: 80px;
}

#sign div{
cursor: pointer;
}

#sign div:nth-child(1){
border-top: 5px solid #3366FF;
height: 50px;
width: 250px;
width: 20%;
line-height: 50px;
text-align: center;
font-size: 1.5em;
Expand All @@ -17,14 +21,13 @@
#sign div:nth-child(n+2){
border-top: 5px solid #3366FF;
height: 50px;
width: 100px;
width: 15%;
line-height: 50px;
text-align: center;
font-size: 1.2em;
font-weight: bold;
float: left;
margin-left: 50px;
cursor: pointer;
margin-left: 5%;
}

#sign div:nth-child(n+3){
Expand Down Expand Up @@ -81,11 +84,11 @@
float: left;
}

.layui-colla-item button{
.madd{
float: left;
position: relative;
top: -36px;
left: 95%;
left: 94%;
}

.layui-colla-item .layui-btn-group button{
Expand All @@ -102,9 +105,9 @@
}

/*.layui-colla-content button{*/
/*position: relative;*/
/*top: 40px;*/
/*left: 45%;*/
/*position: relative;*/
/*top: 40px;*/
/*left: 45%;*/
/*}*/

.layui-collapse .layui-colla-item .layui-input-block{
Expand All @@ -118,11 +121,26 @@
}

/*.layui-colla-item .layui-table table tr td img{*/
/*width: 100%;*/
/*height: 100%;*/
/*width: 100%;*/
/*height: 100%;*/
/*}*/

/*.layui-colla-item .layui-table table tr td .layui-btn{*/
/*margin-bottom: 5px;*/
/*margin-left: 0px;*/
/*}*/
/*margin-bottom: 5px;*/
/*margin-left: 0px;*/
/*}*/

.buts .layui-btn{
width: 30%;
padding: 0px;
}

td .layui-btn-group{
width: 100%;
}

td .layui-btn-group .layui-btn{
width: 50%;
padding: 0px;
margin: 0px;
}
4 changes: 2 additions & 2 deletions area-admin/css/popup.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
width: 250px;
position: relative;
top:10px;
left: 30%;
left: 40%;
}


Expand Down Expand Up @@ -97,5 +97,5 @@
width: 250px;
position: relative;
top:10px;
left: 30%;
left: 40%;
}
2 changes: 1 addition & 1 deletion area-admin/newSupplement.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<!-- 左侧导航区域（可配合layui已有的垂直导航） -->
<ul class="layui-nav layui-nav-tree" lay-filter="test">
<li class="layui-nav-item layui-nav-itemed"><a href="backstage.html?t_id=1">景区管理</a></li>
<li class="layui-nav-item"><a href="checkin.html?t_id=1">检票</a></li>
<li class="layui-nav-item"><a href="checkin.html?t_id=1">检票队列</a></li>
<li class="layui-nav-item"><a href="addArea.html?t_id=1">地区信息</a></li>
<li class="layui-nav-item"><a href="newSupplement.html?t_id=1">新补充</a></li>
</ul>
Expand Down
Loading

0 comments on commit 19b860f

Please sign in to comment.