Skip to content

Commit

Permalink
优化页面
Browse files Browse the repository at this point in the history
  • Loading branch information
@weiyunpeng
weiyunpeng committed Aug 21, 2017
1 parent 01e12c6 commit f8ef50b
Show file tree
Hide file tree
Showing 10 changed files with 80 additions and 313 deletions.
147 changes: 50 additions & 97 deletions server/server/index/busData/sample.json
View file
Original file line number Diff line number Diff line change
@@ -1,123 +1,76 @@
{
"code": 200,
"msg": "success",
"code": 0,
"msg": "成功",
"data": {
"list": [{
"id": 1,
"logo": "/static/images/meal-list.png",
"tags": [
"摄影师",
"摄影师",
"摄影师",
"摄影师一对一",
"摄影师一对一",
"摄影师一对一",
"化妆师一对一"
],
"name": "旅拍海滩外景LOMO风套系旅拍海滩外景LOMO风套系旅拍海滩外景LOMO风套系旅拍海滩外景LOMO风套系"
},
{
"id": 2,
"name": "旅拍海滩外景LOMO风套系旅拍海滩外景LOMO风套系",
"logo": "/static/images/meal-list.png",
"tags": [
"摄影师一对一",
"化妆师一对一"
]
},
"list": [
{
"id": 3,
"name": "旅拍海滩外景LOMO风套系",
"logo": "/static/images/meal-list.png",
"id": 84,
"logo": "http://marriage-1251225286.image.myqcloud.com/none/cover/20170819/5997d771bc537317809642.jpg?imageMogr2/scrop/561x374",
"tags": [
"摄影师一对一",
"化妆师一对一"
]
},
{
"id": 4,
"name": "旅拍海滩外景LOMO风套系",
"logo": "/static/images/meal-list.png",
"tags": [
"摄影师一对一",
"化妆师一对一"
]
},
{
"id": 5,
"name": "旅拍海滩外景LOMO风套系",
"logo": "/static/images/meal-list.png",
"tags": [
"摄影师一对一",
"化妆师一对一"
]
},
{
"id": 6,
"name": "旅拍海滩外景LOMO风套系",
"logo": "/static/images/meal-list.png",
"tags": [
"摄影师一对一",
"化妆师一对一"
]
"简约",
"自然纪实"
],
"name": "纯色"
},
{
"id": 6,
"name": "旅拍海滩外景LOMO风套系",
"logo": "/static/images/meal-list.png",
"id": 87,
"logo": "http://marriage-1251225286.image.myqcloud.com/none/cover/20170819/5997d7f018283130331592.jpg?imageMogr2/scrop/561x374",
"tags": [
"摄影师一对一",
"化妆师一对一"
]
"时尚",
"街拍"
],
"name": "都市"
},
{
"id": 6,
"name": "旅拍海滩外景LOMO风套系",
"logo": "/static/images/meal-list.png",
"id": 88,
"logo": "http://marriage-1251225286.image.myqcloud.com/none/cover/20170819/5997d85b6b99a537461639.jpg?imageMogr2/scrop/561x374",
"tags": [
"摄影师一对一",
"化妆师一对一"
]
"唯美",
"梦幻"
],
"name": "悬浮"
},
{
"id": 6,
"name": "旅拍海滩外景LOMO风套系",
"logo": "/static/images/meal-list.png",
"id": 92,
"logo": "http://marriage-1251225286.image.myqcloud.com/none/cover/20170819/5997d8db81957830375037.jpg?imageMogr2/scrop/561x374",
"tags": [
"摄影师一对一",
"化妆师一对一"
]
"唯美",
"浪漫",
"个性定制"
],
"name": "高级定制"
},
{
"id": 6,
"name": "旅拍海滩外景LOMO风套系",
"logo": "/static/images/meal-list.png",
"id": 102,
"logo": "http://marriage-1251225286.image.myqcloud.com/none/cover/20170819/5997e10c9d97a982704612.jpg?imageMogr2/scrop/561x374",
"tags": [
"摄影师一对一",
"化妆师一对一"
]
"清新"
],
"name": "【喜宝特约】拍得够丰富"
},
{
"id": 6,
"name": "旅拍海滩外景LOMO风套系",
"logo": "/static/images/meal-list.png",
"id": 103,
"logo": "http://marriage-1251225286.image.myqcloud.com/none/cover/20170819/5997e1783a9e9428766815.jpg?imageMogr2/scrop/561x374",
"tags": [
"摄影师一对一",
"化妆师一对一"
]
"唯美",
"中国风",
"自然纪实"
],
"name": "【喜宝特约】简单且文艺"
}
],
"store": {
"store_name": "郑州艾维美婚纱摄影(国贸360店)",
"isYes": "0",
"isVip": "0",
"address": "经七路丰产路交叉口西北角二楼",
"star": 3
"id": 15,
"store_name": "乐可婚纱摄影工作室",
"isYes": 0,
"isVip": 0,
"address": "郑州市金水区二七路97号-1号商铺",
"star": 3.8
},
"page": {
"totalCount": "5",
"pageSize": "20",
"currentPage": "1"
"totalCount": 6,
"pageSize": 500,
"currentPage": 1
}
}
}
}
194 changes: 1 addition & 193 deletions server/server/site/data/photo_flow.json
View file
Original file line number Diff line number Diff line change
@@ -1,193 +1 @@
{
"code": 0,
"msg": "成功",
"data": {
"photo": [
{
"id": 16,
"img": "http://marriage-1251225286.image.myqcloud.com/none/photos/20170818/5996efc031f5b249731766.jpg?imageView2/2/w/280/h/",
"fav_num": 3,
"tag": [
"浪漫"
],
"is_fav": 0
},
{
"id": 13,
"img": "http://marriage-1251225286.image.myqcloud.com/none/photos/20170818/5996efc03715d241874902.jpg?imageView2/2/w/280/h/",
"fav_num": 2,
"tag": [
"浪漫"
],
"is_fav": 0
},
{
"id": 1112,
"img": "http://marriage-1251225286.image.myqcloud.com/none/photos/20170819/5997de2408f1a259182022.jpg?imageView2/2/w/280/h/",
"fav_num": 2,
"tag": [
"唯美"
],
"is_fav": 0
},
{
"id": 1107,
"img": "http://marriage-1251225286.image.myqcloud.com/none/photos/20170819/5997de07320cc657093169.jpg?imageView2/2/w/280/h/",
"fav_num": 2,
"tag": [
"清新"
],
"is_fav": 0
},
{
"id": 1099,
"img": "http://marriage-1251225286.image.myqcloud.com/none/photos/20170819/5997dd8c682c6586792348.jpg?imageView2/2/w/280/h/",
"fav_num": 2,
"tag": [
"清新"
],
"is_fav": 0
},
{
"id": 1079,
"img": "http://marriage-1251225286.image.myqcloud.com/none/photos/20170819/5997dcd90e720390344181.jpg?imageView2/2/w/280/h/",
"fav_num": 2,
"tag": [
"旅拍"
],
"is_fav": 0
},
{
"id": 1070,
"img": "http://marriage-1251225286.image.myqcloud.com/none/photos/20170819/5997dadcae1bb913721267.jpg?imageView2/2/w/280/h/",
"fav_num": 2,
"tag": [
"唯美"
],
"is_fav": 0
},
{
"id": 1052,
"img": "http://marriage-1251225286.image.myqcloud.com/none/photos/20170819/5997d97a68412369593052.jpg?imageView2/2/w/280/h/",
"fav_num": 2,
"tag": [
"唯美"
],
"is_fav": 0
},
{
"id": 1049,
"img": "http://marriage-1251225286.image.myqcloud.com/none/photos/20170819/5997d9525f669892750185.jpg?imageView2/2/w/280/h/",
"fav_num": 2,
"tag": [
"中国风"
],
"is_fav": 0
},
{
"id": 1150,
"img": "http://marriage-1251225286.image.myqcloud.com/none/photos/20170819/5997e0ff2a69f424551329.jpg?imageView2/2/w/280/h/",
"fav_num": 1,
"tag": [
"韩式"
],
"is_fav": 0
},
{
"id": 1149,
"img": "http://marriage-1251225286.image.myqcloud.com/none/photos/20170819/5997e0fee40a8741580351.jpg?imageView2/2/w/280/h/",
"fav_num": 1,
"tag": [
"韩式"
],
"is_fav": 0
},
{
"id": 1082,
"img": "http://marriage-1251225286.image.myqcloud.com/none/photos/20170819/5997dcd8dc637685312756.jpg?imageView2/2/w/280/h/",
"fav_num": 1,
"tag": [
"旅拍"
],
"is_fav": 0
},
{
"id": 1066,
"img": "http://marriage-1251225286.image.myqcloud.com/none/photos/20170819/5997dac229112604453964.jpg?imageView2/2/w/280/h/",
"fav_num": 1,
"tag": [
"简约"
],
"is_fav": 0
},
{
"id": 1048,
"img": "http://marriage-1251225286.image.myqcloud.com/none/photos/20170819/5997d9524abcd677009782.jpg?imageView2/2/w/280/h/",
"fav_num": 1,
"tag": [
"中国风"
],
"is_fav": 0
},
{
"id": 1047,
"img": "http://marriage-1251225286.image.myqcloud.com/none/photos/20170819/5997d91e95bfd469599689.jpg?imageView2/2/w/280/h/",
"fav_num": 1,
"tag": [
"大气"
],
"is_fav": 0
},
{
"id": 1038,
"img": "http://marriage-1251225286.image.myqcloud.com/none/photos/20170819/5997d8f8e692e280525221.jpg?imageView2/2/w/280/h/",
"fav_num": 1,
"tag": [
"森式"
],
"is_fav": 0
},
{
"id": 1037,
"img": "http://marriage-1251225286.image.myqcloud.com/none/photos/20170819/5997d8f8d7ad0770478298.jpg?imageView2/2/w/280/h/",
"fav_num": 1,
"tag": [
"森式"
],
"is_fav": 0
},
{
"id": 1025,
"img": "http://marriage-1251225286.image.myqcloud.com/none/photos/20170819/5997d8d62cee2604498763.jpg?imageView2/2/w/280/h/",
"fav_num": 1,
"tag": [
"个性定制"
],
"is_fav": 0
},
{
"id": 1022,
"img": "http://marriage-1251225286.image.myqcloud.com/none/photos/20170819/5997d8a82c6f1565614583.jpg?imageView2/2/w/280/h/",
"fav_num": 1,
"tag": [
"中国风"
],
"is_fav": 0
},
{
"id": 996,
"img": "http://marriage-1251225286.image.myqcloud.com/none/photos/20170819/5997d88f233ee447014737.jpg?imageView2/2/w/280/h/",
"fav_num": 1,
"tag": [
"唯美"
],
"is_fav": 0
}
],
"page": {
"totalcount": 728,
"pageSize": 20,
"currentPage": 1
}
}
}
{"code":0,"msg":"成功","data":{"photo":[{"id":156,"img":"http://marriage-1252045209.image.myqcloud.com/none/photos/20170818/5996c1c788c60819144524.jpg/shuiyin?imageView2/2/w/580/h/","fav_num":1,"tag":["韩式"],"is_fav":0},{"id":27,"img":"http://marriage-1252045209.image.myqcloud.com/none/photos/20170815/5992be916ee53544570815.jpg/shuiyin?imageView2/2/w/580/h/","fav_num":1,"tag":["韩式"],"is_fav":0},{"id":24,"img":"http://marriage-1252045209.image.myqcloud.com/none/photos/20170815/5992ba4aaed68335122442.jpg/shuiyin?imageView2/2/w/580/h/","fav_num":1,"tag":["韩式"],"is_fav":0},{"id":25,"img":"http://marriage-1252045209.image.myqcloud.com/none/photos/20170815/5992ba4ac8064687373954.jpg/shuiyin?imageView2/2/w/580/h/","fav_num":1,"tag":["韩式"],"is_fav":0},{"id":18,"img":"http://marriage-1252045209.image.myqcloud.com/none/photos/20170815/5992b9176c5d7886460548.jpg/shuiyin?imageView2/2/w/580/h/","fav_num":1,"tag":["韩式"],"is_fav":0},{"id":164,"img":"http://marriage-1252045209.image.myqcloud.com/none/photos/20170818/5996c1c7a0b3e353441482.jpg/shuiyin?imageView2/2/w/580/h/","fav_num":0,"tag":["韩式"],"is_fav":0},{"id":163,"img":"http://marriage-1252045209.image.myqcloud.com/none/photos/20170818/5996c1c768225758371186.jpg/shuiyin?imageView2/2/w/580/h/","fav_num":0,"tag":["韩式"],"is_fav":0},{"id":162,"img":"http://marriage-1252045209.image.myqcloud.com/none/photos/20170818/5996c1c734711494067837.jpg/shuiyin?imageView2/2/w/580/h/","fav_num":0,"tag":["韩式"],"is_fav":0},{"id":161,"img":"http://marriage-1252045209.image.myqcloud.com/none/photos/20170818/5996c1c712758142119866.jpg/shuiyin?imageView2/2/w/580/h/","fav_num":0,"tag":["韩式"],"is_fav":0},{"id":160,"img":"http://marriage-1252045209.image.myqcloud.com/none/photos/20170818/5996c1c81b095957444391.jpg/shuiyin?imageView2/2/w/580/h/","fav_num":0,"tag":["韩式"],"is_fav":0},{"id":159,"img":"http://marriage-1252045209.image.myqcloud.com/none/photos/20170818/5996c1c80a78b019034251.jpg/shuiyin?imageView2/2/w/580/h/","fav_num":0,"tag":["韩式"],"is_fav":0},{"id":158,"img":"http://marriage-1252045209.image.myqcloud.com/none/photos/20170818/5996c1c78d100098469652.jpg/shuiyin?imageView2/2/w/580/h/","fav_num":0,"tag":["韩式"],"is_fav":0},{"id":157,"img":"http://marriage-1252045209.image.myqcloud.com/none/photos/20170818/5996c1c772c1d608857404.jpg/shuiyin?imageView2/2/w/580/h/","fav_num":0,"tag":["韩式"],"is_fav":0},{"id":29,"img":"http://marriage-1252045209.image.myqcloud.com/none/photos/20170815/5992be91dea9f093382392.jpg/shuiyin?imageView2/2/w/580/h/","fav_num":0,"tag":["韩式"],"is_fav":0},{"id":28,"img":"http://marriage-1252045209.image.myqcloud.com/none/photos/20170815/5992be9239cf6433770821.jpg/shuiyin?imageView2/2/w/580/h/","fav_num":0,"tag":["韩式"],"is_fav":0},{"id":26,"img":"http://marriage-1252045209.image.myqcloud.com/none/photos/20170815/5992ba4b29289235680684.jpg/shuiyin?imageView2/2/w/580/h/","fav_num":0,"tag":["韩式"],"is_fav":0},{"id":23,"img":"http://marriage-1252045209.image.myqcloud.com/none/photos/20170815/5992ba4abf42b277213579.jpg/shuiyin?imageView2/2/w/580/h/","fav_num":0,"tag":["韩式"],"is_fav":0},{"id":22,"img":"http://marriage-1252045209.image.myqcloud.com/none/photos/20170815/5992b969d5b47495112678.jpg/shuiyin?imageView2/2/w/580/h/","fav_num":0,"tag":["韩式"],"is_fav":0},{"id":21,"img":"http://marriage-1252045209.image.myqcloud.com/none/photos/20170815/5992b917a53bc873802097.jpg/shuiyin?imageView2/2/w/580/h/","fav_num":0,"tag":["韩式"],"is_fav":0},{"id":20,"img":"http://marriage-1252045209.image.myqcloud.com/none/photos/20170815/5992b917b3f37315484845.jpg/shuiyin?imageView2/2/w/580/h/","fav_num":0,"tag":["韩式"],"is_fav":0}],"page":{"totalcount":21,"pageSize":20,"currentPage":1}}}
4 changes: 2 additions & 2 deletions server/server/user/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ function run(Request, Response)
* @param {Object} Response
*/
function get(Params, Request, Response) {
// var fileName = 'user/data/getF.json';
var fileName = 'user/data/getSucc.json';
var fileName = 'user/data/getF.json';
// var fileName = 'user/data/getSucc.json';
MAIN.responseStub(Response,fileName);
}

Expand Down
2 changes: 1 addition & 1 deletion src/assets/css/common.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1693,7 +1693,6 @@ fieldset[disabled] .btn-danger.focus {
background-color: #fff;
margin-right: 15px;
border-radius: 5px;
cursor: zoom-in;
}
.photo_box:hover .photo_box_top{
opacity: 1;
Expand Down Expand Up @@ -1823,6 +1822,7 @@ fieldset[disabled] .btn-danger.focus {
.img-hover {
width: auto;
height: auto;
cursor: zoom-in;
overflow: hidden;
}
.img-hover img {
Expand Down
Loading

0 comments on commit f8ef50b

Please sign in to comment.