Skip to content

Commit

Permalink
add mysqldata
Browse files Browse the repository at this point in the history
  • Loading branch information
Ericyhy committed Apr 30, 2017
1 parent f916930 commit 13309ad
Show file tree
Hide file tree
Showing 129 changed files with 41,103 additions and 40,807 deletions.
38 changes: 19 additions & 19 deletions build.js
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
({
baseUrl:"js",
name:"app",
paths:{
'jquery':'jquery-1.12.3',
'template':'template',
'cookiebase':'cookiebase',
'reg':'reg',
'login':'login',
'index':'index',
'top':'./index/top',
'banner':'./index/banner',
'floor':'./index/floor',
'list':'list',
'detail':'detail',
'aside':'aside',
'car':'car'
},
out:"built.js"
({
baseUrl:"js",
name:"app",
paths:{
'jquery':'jquery-1.12.3',
'template':'template',
'cookiebase':'cookiebase',
'reg':'reg',
'login':'login',
'index':'index',
'top':'./index/top',
'banner':'./index/banner',
'floor':'./index/floor',
'list':'list',
'detail':'detail',
'aside':'aside',
'car':'car'
},
out:"built.js"
})
12 changes: 6 additions & 6 deletions built.js

Large diffs are not rendered by default.

40 changes: 20 additions & 20 deletions car/css/reset.css
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
@charset "utf-8";
/*reset*/
body,h1,h2,h3,h4,h5,h6,p,dl,dd,ul,ol,pre,form,input,textarea,th,td,select{margin: 0;padding: 0;}
em{font-style: normal;}
li{list-style: none;}
a{text-decoration: none;color:blue;}
img{border:none;}
table{border-collapse: collapse;}
textarea{resize: none;overflow: hidden;}

/*public*/
body{font-family: '微软雅黑';color: #666;
}
.clear{
zoom:1;
}
.clear:after{
content: '';
display: block;
clear: both;
@charset "utf-8";
/*reset*/
body,h1,h2,h3,h4,h5,h6,p,dl,dd,ul,ol,pre,form,input,textarea,th,td,select{margin: 0;padding: 0;}
em{font-style: normal;}
li{list-style: none;}
a{text-decoration: none;color:blue;}
img{border:none;}
table{border-collapse: collapse;}
textarea{resize: none;overflow: hidden;}

/*public*/
body{font-family: '微软雅黑';color: #666;
}
.clear{
zoom:1;
}
.clear:after{
content: '';
display: block;
clear: both;
}
6 changes: 3 additions & 3 deletions car/css/style.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
@import url(./reset.css);
#footer { width: 1000px; margin: 50px auto; height: 400px; }
#footer img { width: 100%; height: 100%; }
@import url(./reset.css);
#footer { width: 1000px; margin: 50px auto; height: 400px; }
#footer img { width: 100%; height: 100%; }
40 changes: 20 additions & 20 deletions car/index.html
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>Document</title>
<link rel="stylesheet" href="css/style.css">
<script src="../js/require.js" data-main="../js/app.js"></script>
</head>
<body>

<div id="top"></div>

<div id="main">

</div>
<div id="footer">
<img src="img/footer.png" alt="">
</div>

</body>
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>Document</title>
<link rel="stylesheet" href="css/style.css">
<script src="../js/require.js" data-main="../js/app.js"></script>
</head>
<body>

<div id="top"></div>

<div id="main">

</div>
<div id="footer">
<img src="img/footer.png" alt="">
</div>

</body>
</html>
20 changes: 10 additions & 10 deletions car/sass/style.scss
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
@import './reset.css';

#footer{
width: 1000px;
margin: 50px auto;
height: 400px;
img{
width: 100%;
height: 100%;
}
@import './reset.css';

#footer{
width: 1000px;
margin: 50px auto;
height: 400px;
img{
width: 100%;
height: 100%;
}
}
48 changes: 24 additions & 24 deletions detail/css/main.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

40 changes: 20 additions & 20 deletions detail/css/reset.css
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
@charset "utf-8";
/*reset*/
body,h1,h2,h3,h4,h5,h6,p,dl,dd,ul,ol,pre,form,input,textarea,th,td,select{margin: 0;padding: 0;}
em{font-style: normal;}
li{list-style: none;}
a{text-decoration: none;color:blue;}
img{border:none;}
table{border-collapse: collapse;}
textarea{resize: none;overflow: hidden;}

/*public*/
body{font-family: '微软雅黑';color: #666;
}
.clear{
zoom:1;
}
.clear:after{
content: '';
display: block;
clear: both;
@charset "utf-8";
/*reset*/
body,h1,h2,h3,h4,h5,h6,p,dl,dd,ul,ol,pre,form,input,textarea,th,td,select{margin: 0;padding: 0;}
em{font-style: normal;}
li{list-style: none;}
a{text-decoration: none;color:blue;}
img{border:none;}
table{border-collapse: collapse;}
textarea{resize: none;overflow: hidden;}

/*public*/
body{font-family: '微软雅黑';color: #666;
}
.clear{
zoom:1;
}
.clear:after{
content: '';
display: block;
clear: both;
}
60 changes: 30 additions & 30 deletions detail/css/style.css
Original file line number Diff line number Diff line change
@@ -1,30 +1,30 @@
@import url(./reset.css);
@import url(./top.css);
@import url(./main.css);
body { min-width: 1000px; width: 100%; position: relative; }

#top { height: 168px; }

#main { margin-top: 50px; }

.right_aside { width: 36px; height: 100%; background-color: #262626; color: #fff; position: absolute; top: 0; right: 0; z-index: 10000; }
.right_aside .car_goods { position: fixed; padding: 0px 14px; width: 246px; height: 100%; right: -274px; top: 0; background: #fff; z-index: 11111; color: #000; border: 1px solid #cecece; box-shadow: -5px 1px 8px rgba(0, 0, 0, 0.15); }
.right_aside .car_goods h3 { font-weight: 500; cursor: pointer; color: #333; font-size: 16px; padding: 10px 0; border-bottom: 1px solid #dedcdc; }
.right_aside .car_goods h3:hover { color: #f10180; }
.right_aside .car_goods ul li { padding: 20px 0; border-bottom: 1px dotted #eaeaea; overflow: hidden; }
.right_aside .car_goods ul li img { float: left; margin-right: 10px; width: 49px; height: 61px; }
.right_aside .car_goods ul li p { float: right; width: 187px; height: 61px; overflow: hidden; }
.right_aside .car_goods ul li p .car_text, .right_aside .car_goods ul li p .car_number, .right_aside .car_goods ul li p .car_good_price { display: block; height: 61px; float: left; line-height: 14px; width: 50px; font-size: 12px; text-align: center; color: #333; }
.right_aside .car_goods ul li p .car_text { text-overflow: ellipsis; white-space: pre-line; text-align: left; width: 70px; overflow: hidden; }
.right_aside .car_goods ul li p .car_text:hover { color: #f10180; }
.right_aside .car_goods ul li p .car_number { line-height: 60px; }
.right_aside .car_goods ul li p .car_good_price { line-height: 60px; font-size: 14px; font-weight: 100; color: #f10180; }
.right_aside .car_goods .goods_all { line-height: 18px; color: #333; text-align: center; padding: 6px 0 9px; }
.right_aside .car_goods .goods_all em { font-size: 20px; margin-left: 20px; font-weight: 100; color: #f10180; }
.right_aside .car_goods .pray { display: block; margin: 0 auto; background-color: #f10180; border-radius: 3px; color: #fff; text-align: center; cursor: pointer; margin-top: 0; width: 100%; height: 36px; line-height: 34px; font-size: 16px; border: none; }
.right_aside .car_shopping { text-align: center; cursor: pointer; background-color: #df147f; height: 150px; width: 36px; position: fixed; top: 100px; right: 0; }
.right_aside .car_shopping p { line-height: 18px; word-wrap: break-word; font-size: 14px; width: 14px; padding: 20px 0 10px 0; margin: 0 auto; }
.right_aside .car_shopping span { margin: 5px auto 0; text-align: center; display: block; width: 20px; height: 20px; border-radius: 50%; background-color: #fff; color: #df147f; font-size: 12px; }

#footer { width: 1000px; margin: 50px auto; height: 400px; }
#footer img { width: 100%; height: 100%; }
@import url(./reset.css);
@import url(./top.css);
@import url(./main.css);
body { min-width: 1000px; width: 100%; position: relative; }

#top { height: 168px; }

#main { margin-top: 50px; }

.right_aside { width: 36px; height: 100%; background-color: #262626; color: #fff; position: absolute; top: 0; right: 0; z-index: 10000; }
.right_aside .car_goods { position: fixed; padding: 0px 14px; width: 246px; height: 100%; right: -274px; top: 0; background: #fff; z-index: 11111; color: #000; border: 1px solid #cecece; box-shadow: -5px 1px 8px rgba(0, 0, 0, 0.15); }
.right_aside .car_goods h3 { font-weight: 500; cursor: pointer; color: #333; font-size: 16px; padding: 10px 0; border-bottom: 1px solid #dedcdc; }
.right_aside .car_goods h3:hover { color: #f10180; }
.right_aside .car_goods ul li { padding: 20px 0; border-bottom: 1px dotted #eaeaea; overflow: hidden; }
.right_aside .car_goods ul li img { float: left; margin-right: 10px; width: 49px; height: 61px; }
.right_aside .car_goods ul li p { float: right; width: 187px; height: 61px; overflow: hidden; }
.right_aside .car_goods ul li p .car_text, .right_aside .car_goods ul li p .car_number, .right_aside .car_goods ul li p .car_good_price { display: block; height: 61px; float: left; line-height: 14px; width: 50px; font-size: 12px; text-align: center; color: #333; }
.right_aside .car_goods ul li p .car_text { text-overflow: ellipsis; white-space: pre-line; text-align: left; width: 70px; overflow: hidden; }
.right_aside .car_goods ul li p .car_text:hover { color: #f10180; }
.right_aside .car_goods ul li p .car_number { line-height: 60px; }
.right_aside .car_goods ul li p .car_good_price { line-height: 60px; font-size: 14px; font-weight: 100; color: #f10180; }
.right_aside .car_goods .goods_all { line-height: 18px; color: #333; text-align: center; padding: 6px 0 9px; }
.right_aside .car_goods .goods_all em { font-size: 20px; margin-left: 20px; font-weight: 100; color: #f10180; }
.right_aside .car_goods .pray { display: block; margin: 0 auto; background-color: #f10180; border-radius: 3px; color: #fff; text-align: center; cursor: pointer; margin-top: 0; width: 100%; height: 36px; line-height: 34px; font-size: 16px; border: none; }
.right_aside .car_shopping { text-align: center; cursor: pointer; background-color: #df147f; height: 150px; width: 36px; position: fixed; top: 100px; right: 0; }
.right_aside .car_shopping p { line-height: 18px; word-wrap: break-word; font-size: 14px; width: 14px; padding: 20px 0 10px 0; margin: 0 auto; }
.right_aside .car_shopping span { margin: 5px auto 0; text-align: center; display: block; width: 20px; height: 20px; border-radius: 50%; background-color: #fff; color: #df147f; font-size: 12px; }

#footer { width: 1000px; margin: 50px auto; height: 400px; }
#footer img { width: 100%; height: 100%; }
Loading

0 comments on commit 13309ad

Please sign in to comment.