From 7f5a56a3fb1728e5d815502022eee04e868e7605 Mon Sep 17 00:00:00 2001 From: yun <153967808@qq.com> Date: Mon, 21 Aug 2017 17:05:53 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/server/site/data/view_photo.json | 66 ++---------------------- src/assets/css/busDetails.scss | 50 ++++++++++++------ src/assets/css/common.css | 5 ++ src/assets/css/mealDetails.scss | 16 ++++-- src/components/bigImg.vue | 22 +++++++- src/components/photoModal.vue | 12 ++--- src/components/user/userHead.vue | 1 - src/page/comment.vue | 9 ++-- src/page/index.vue | 5 -- src/page/meal.vue | 2 +- src/store/actions.js | 2 +- src/store/modules/viewPhoto.js | 3 +- static/images/arrow-hover.png | Bin 0 -> 1746 bytes 13 files changed, 90 insertions(+), 103 deletions(-) create mode 100644 static/images/arrow-hover.png diff --git a/server/server/site/data/view_photo.json b/server/server/site/data/view_photo.json index 01df116..373cf57 100644 --- a/server/server/site/data/view_photo.json +++ b/server/server/site/data/view_photo.json @@ -1,65 +1,5 @@ { - "code": 0, - "msg": "success", - "data": { - "id": 1, - "img": "http://marriage-1252045209.image.myqcloud.com/none/photos/20170805/59858d13dd743510153737.jpg", - "fav_num": 3, - "tag": "欧美大气", - "desc": "", - "time": "2017.04.06", - "comment": "拍摄于 蒙娜丽莎婚纱摄影 所属风格 旅拍【清水湾】风格任拍+6000超值礼包", - "comment_url": "http://www.baidu.com", - "list": [ - { - "id": 1, - "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": 2, - "img": "http://marriage-1252045209.image.myqcloud.com/none/photos/20170815/59926e56c3757097728578.jpg?imageView2/2/w//h/", - "fav_num": 1, - "tag": "欧美大气", - "is_fav": 1 - }, - { - "id": 3, - "img": "http://marriage-1252045209.image.myqcloud.com/none/photos/20170816/5993a8ef57b67410329589.jpg?imageView2/2/w//h/", - "fav_num": 1, - "tag": "欧美大气", - "is_fav": 1 - }, - { - "id": 4, - "img": "http://marriage-1252045209.image.myqcloud.com/none/photos/20170815/5992b1111a7bd407866841.png?imageView2/2/w//h/", - "fav_num": 3, - "tag": "小清新", - "is_fav": 0 - }, - { - "id": 5, - "img": "http://marriage-1252045209.image.myqcloud.com/none/photos/20170816/5993ef632e651907595346.jpg?imageView2/2/w//h/", - "fav_num": 1, - "tag": "小清新", - "is_fav": 0 - }, - { - "id": 6, - "img": "http://marriage-1252045209.image.myqcloud.com/none/photos/20170816/5993ef63a9ecd993906222.jpg?imageView2/2/w//h/", - "fav_num": 1, - "tag": "小清新", - "is_fav": 0 - }, - { - "id": 6, - "img": "http://marriage-1252045209.image.myqcloud.com/none/photos/20170815/59926e55d47f9148376014.jpg?imageView2/2/w//h/", - "fav_num": 1, - "tag": "小清新", - "is_fav": 0 - } - ] - } + "code": -1, + "msg": "图片不存在或已删除", + "data": "" } \ No newline at end of file diff --git a/src/assets/css/busDetails.scss b/src/assets/css/busDetails.scss index d8d4483..2d37f24 100644 --- a/src/assets/css/busDetails.scss +++ b/src/assets/css/busDetails.scss @@ -148,6 +148,11 @@ background-color: #fff; color: #fff; font-size: 18px; } + a:hover{ + background-color: #d9344f; + -webkit-transition: all .3s ease; + transition: all .3s ease; + } .erweima { position: absolute; left: 50%; @@ -193,19 +198,25 @@ background-color: #fff; color: #ff506d; } } + .more { + margin-bottom: 12px; + .more_a { + font-size: 16px; + color: #808080; + } + .more_a:hover { + color: #fd4040; + -webkit-transition: all .3s ease; + transition: all .3s ease; + } + } .case { .tit { width: 1200px; height: 42px; margin-top: 50px; } - .more { - margin-bottom: 12px; - .more_a { - font-size: 16px; - color: #808080; - } - } + .list { margin-right: -42px; >ul>li { @@ -255,13 +266,6 @@ background-color: #fff; height: 42px; margin: 10px 0; } - .more { - margin-bottom: 12px; - .more_a { - font-size: 16px; - color: #808080; - } - } .list { margin-right: -42px; >ul>li { @@ -323,14 +327,22 @@ background-color: #fff; display: inline-block; width: 46px; height: 20px; - background: url("/static/images/arrow.png"); + background: url("/static/images/arrow.png") no-repeat; } .prev { background-position: left top; } + .prev:hover { + background: url("/static/images/arrow-hover.png") no-repeat; + background-position: -6px -6px; + } .next { background-position: right top; } + .next:hover { + background: url("/static/images/arrow-hover.png") no-repeat; + background-position: -58px -6px; + } } .list { margin-right: -25px; @@ -461,9 +473,17 @@ background-color: #fff; .prev { background-position: left top; } + .prev:hover { + background: url("/static/images/arrow-hover.png") no-repeat; + background-position: -6px -6px; + } .next { background-position: right top; } + .next:hover { + background: url("/static/images/arrow-hover.png") no-repeat; + background-position: -58px -6px; + } } ul { margin-right: -30px; diff --git a/src/assets/css/common.css b/src/assets/css/common.css index f2de154..19c2e63 100644 --- a/src/assets/css/common.css +++ b/src/assets/css/common.css @@ -1837,4 +1837,9 @@ fieldset[disabled] .btn-danger.focus { position: relative; top:80px; text-align: center; +} +.u-index-nav:hover { + color: #fd4040; + -webkit-transition: all .3s ease; + transition: all .3s ease; } \ No newline at end of file diff --git a/src/assets/css/mealDetails.scss b/src/assets/css/mealDetails.scss index 5035bec..9142bc7 100644 --- a/src/assets/css/mealDetails.scss +++ b/src/assets/css/mealDetails.scss @@ -93,6 +93,11 @@ color: #fff; font-size: 18px; } + a:hover{ + background-color: #d9344f; + -webkit-transition: all .3s ease; + transition: all .3s ease; + } .erweima { position: absolute; left: 50%; @@ -137,6 +142,9 @@ } .item { position: relative; + padding-top: 25px; + padding-bottom: 25px; + border-bottom: 1px solid #e6e6e6; .strategy { z-index: 99; position: absolute; @@ -152,9 +160,11 @@ line-height: 30px; text-align: center; } - padding-top: 25px; - padding-bottom: 25px; - border-bottom: 1px solid #e6e6e6; + .strategy:hover{ + background-color: #d9344f; + -webkit-transition: all .3s ease; + transition: all .3s ease; + } dl { margin-top: 20px; font-size: 16px; diff --git a/src/components/bigImg.vue b/src/components/bigImg.vue index f6297a1..cd4badc 100644 --- a/src/components/bigImg.vue +++ b/src/components/bigImg.vue @@ -103,7 +103,7 @@ export default { top: 8px; } ul{ - width: 100%; + width: 99%; height: 100%; white-space: nowrap; overflow: hidden; @@ -125,10 +125,30 @@ export default { .prev { background-position: top left; left: 0; + filter: alpha(Opacity=60); + -moz-opacity: 0.6; + opacity: 0.6; + } + .prev:hover{ + filter: alpha(Opacity=100); + -moz-opacity: 1; + opacity: 1; + -webkit-transition: all .3s ease; + transition: all .3s ease; } .next { right: 8px; background-position: top right; + filter: alpha(Opacity=60); + -moz-opacity: 0.6; + opacity: 0.6; + } + .next:hover{ + filter: alpha(Opacity=100); + -moz-opacity: 1; + opacity: 1; + -webkit-transition: all .3s ease; + transition: all .3s ease; } } } diff --git a/src/components/photoModal.vue b/src/components/photoModal.vue index 84c1881..9eea06c 100644 --- a/src/components/photoModal.vue +++ b/src/components/photoModal.vue @@ -23,8 +23,10 @@ +

TA的套系

+
-

TA的套系

+ @@ -182,12 +184,6 @@ export default { self.photoInfo = this.getViewPhotoInfo } }, - getViewPhotoStatus(){ - const self = this; - if(this.getViewPhotoStatus == -1){ - setTimeout(() => self.close(), 2000) - } - }, photoModal(){ if(this.photoModal.src){ this.isCase = false @@ -260,6 +256,8 @@ export default { font-size: 16px; color: #4c4c4c; line-height: 28px; + position: relative; + left: 50px; } .close_btn { diff --git a/src/components/user/userHead.vue b/src/components/user/userHead.vue index fb3c848..0ff2bcb 100644 --- a/src/components/user/userHead.vue +++ b/src/components/user/userHead.vue @@ -411,7 +411,6 @@ export default { margin-right: 0; } .nav_a:hover { - border-bottom: 3px solid #ff4e6b; color: #ff4e6b; } .nav_active { diff --git a/src/page/comment.vue b/src/page/comment.vue index 33b1d25..d35b480 100644 --- a/src/page/comment.vue +++ b/src/page/comment.vue @@ -92,15 +92,14 @@
  • -
    - + -
    - +
    + 展示全部 diff --git a/src/page/index.vue b/src/page/index.vue index 59402e0..95535c2 100644 --- a/src/page/index.vue +++ b/src/page/index.vue @@ -213,9 +213,4 @@ export default { diff --git a/src/page/meal.vue b/src/page/meal.vue index 2520ad9..d87b0da 100644 --- a/src/page/meal.vue +++ b/src/page/meal.vue @@ -139,7 +139,7 @@ export default { .list_con { display: inline-block; width: 374px; - height: 319px; + height: 346px; overflow: hidden; margin: { right: 28px; diff --git a/src/store/actions.js b/src/store/actions.js index 538d39c..0cc9c8e 100644 --- a/src/store/actions.js +++ b/src/store/actions.js @@ -7,7 +7,7 @@ export const showMsg = ({ commit }, data) => { const id = new Date().getTime(); data.id = id; commit(types.SHOW_MSG, data); - setTimeout(() => commit(types.HIDE_MSG, id), 2000) + setTimeout(() => commit(types.HIDE_MSG, id), 1000) }; export const hideMsg = ({ commit }, id) => { diff --git a/src/store/modules/viewPhoto.js b/src/store/modules/viewPhoto.js index bfa6e69..fcc7be0 100644 --- a/src/store/modules/viewPhoto.js +++ b/src/store/modules/viewPhoto.js @@ -11,11 +11,12 @@ const state = { const mutations = { [VIEW_PHOTO_MODAL](state, data) { + state.photoModelStatus = 0; state.list = data.data.list; state.photoInfo = data.data; }, [HIDE_PHOTO_MODAL](state, data) { - state.list = null; + state.list = []; state.photoInfo = null; state.photoModelStatus = -1; }, diff --git a/static/images/arrow-hover.png b/static/images/arrow-hover.png new file mode 100644 index 0000000000000000000000000000000000000000..76342da29794c5107a8100f63c894bb9bd80ec54 GIT binary patch literal 1746 zcmbVNc~BE)6ptccQM4dLM1(aAh+?wY9E6Pth*`j>pYN^+MrVBL($Cbd;vVe?MkV&|PG%5`!ElQ22qkvSa%s>-S zrP{o;3l-65PI*|ef>g-X301h3rF6)!OjNJ0Zp>RC95piDp<{ki~vL?A*Dczl1jj&&CwA;lbA8CS4iz0*B}EJ z7a_C7j0sW-Sv(-Y4Jg28@tG<%!~+B{3*tk(aA-NeVMAPy%>^MY6XFQjun^({lMjQk zW>9N{iAc<(E$Sp@WRj#_2!ckVk!9qva6<+N!7vQ6IUt9_q$HSxSw|{OOdSz8r2#<+ zl>yU}7_I{x8kOmIE-7YEOeb8>>SeN5igm7O+)3m6C&o@uu{=4j%*YI2;7#g@^GZ5ELy4mqbG` zh#(q{mLP047oNgObp)x@sn99g7-f4B%Y7qOC^4W)5;r8{c+ON6#Ao6pPGsVGKq7Hu zoezY_F`XJW5=$Lvn(!Jy4Okwkjxpd`U_8!3>@^(zoBtDd_5Y0@NRa{^#qzJ>nYyAX z(y@Kj3e@3MGod=FgA7!wAoLAUG}?5#6p2bUT_37kk?ED-wew}JyzcFQ^7FAng^HA? zH0Q-d>8jhoP18by3X3|Ibe1saF0;GnF2!_uRR4@p_mdtAXE_Iy$4N7gsM&522iB+b zbPcTh(L7Kg9@V%G&)w0oB7bxn@#l-t%iWq~pSV?BJ?cH|)m9Imatvx>mKolE?l{~LeOe>=)ylQWZCmX#P7USTI^(@!Ev7>!kg$h4T1#B5vWrig8kanZkBF)X zHtxURxwkCUzuMG&VC>o!8ULVX+C``J?}nWpOzf%S_BNF^`z+;_PCIs{ZS$AM*FH88 zBF=8xu1d@~umFC(xYe)r%G|Yubl%?5yYST^$abRMSHAixZ&L~WQCSPIg8hqoRc-4I zS+&jjfybvaQ);f|`a89-OFO2U&sFAC4TNl1^}WlHmPHT5b94ID(+#1gF8TJ@oFQB-=ECda$Dd)q*nl%rnbqP^)0XvF^S60(Omnu>;&1I+C?Y%^uDB+HeE!?KyS?AIB1wlSL!~19L zkyY;PKH%+tCdBXX6Q6s&bOoX4%^Yjd&rglr}!4lAM3bR zKn1|YpbuZPc_dgD?Cx&-ro);h2Vr}Vy@OxV*SvD8!lJ?cKyI+_$Ib7mz7y1SjvlC~ z5cS;62v$WLj2*nPPGFwd+Sq?AX5-PC*aobFI1>6pQTydy{)`K)BY$Q4$X3lWH`QJ*%1c$OKOR3TP!i`Pa X6VuITJa#hA@t2WC$01FtwiNyinv0_P literal 0 HcmV?d00001