Skip to content

Commit

Permalink
优化体验
Browse files Browse the repository at this point in the history
  • Loading branch information
wei authored and wei committed Aug 19, 2017
1 parent edf9021 commit efe22cf
Show file tree
Hide file tree
Showing 5 changed files with 46 additions and 20 deletions.
2 changes: 1 addition & 1 deletion server/server/site/data/view_photo.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"code": 200,
"code": 0,
"msg": "success",
"data": {
"id": 1,
Expand Down
6 changes: 4 additions & 2 deletions src/components/photoModal.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,8 @@ export default {
uid: token.uid,
index:flowNum,
order:this.order,
is_fav:fav
is_fav:fav,
isFill:this.photoModal.isFill
}
this.$store.dispatch('collectPhoto', ajaxdata)
} else if (fav == 1) {
Expand All @@ -140,7 +141,8 @@ export default {
uid: token.uid,
index:flowNum,
order:this.order,
is_fav:fav
is_fav:fav,
isFill:this.photoModal.isFill
}
this.$store.dispatch('cancelCollectPhoto', ajaxdata)
} else {
Expand Down
17 changes: 11 additions & 6 deletions src/page/user.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,11 @@
<waterfall :line="line" :watch="getPhotoListFill" :line-gap="300" style="margin-top:60px">
<waterfall-slot v-for="(item, flowNum) in getPhotoListFill" :width="item.width" :height="item.height" :order="flowNum" :key="flowNum" move-class="photo_move">
<div class="panel photo_box hover_sh">
<div class="img-hover" @click="showPhotoModal(item, flowNum)">
<div class="img-hover" @click="showPhotoModal(item, flowNum,true)">
<img :src="item.img" :width="300">
</div>
<div class="photo_info">
<span class="photo_like" @click="photoLikeBtn(item.id,item.is_fav,flowNum)">
<span class="photo_like" @click="photoLikeBtn(item.id,item.is_fav,flowNum,true)">
<i v-if="item.is_fav" class="icon_like_act"></i>
<i v-if="!item.is_fav" class="icon_like"></i>
{{item.fav_num}}
Expand Down Expand Up @@ -152,7 +152,7 @@ export default {
}
},
methods: {
photoLikeBtn(id, fav, flowNum) {
photoLikeBtn(id, fav, flowNum,isFill) {
if (this.isAuth) {
// let obj = this.getPhotoList[flowNum]
// obj.is_fav = !obj.is_fav
Expand All @@ -163,7 +163,8 @@ export default {
id: id,
uid: this.uid,
order:flowNum,
is_fav:fav
is_fav:fav,
isFill:isFill
}
this.$store.dispatch('collectPhoto', ajaxdata)
} else if (fav == 1) {
Expand All @@ -172,7 +173,8 @@ export default {
id: id,
uid: this.uid,
order:flowNum,
is_fav:fav
is_fav:fav,
isFill:isFill
}
this.$store.dispatch('cancelCollectPhoto', ajaxdata)
} else {
Expand All @@ -189,8 +191,11 @@ export default {
this.$store.dispatch('showModal', data);
}
},
showPhotoModal(item, index) {
showPhotoModal(item, index,isFill) {
this.photoModal = item;
if(isFill){
this.photoModal.isFill = isFill;
}
this.orderNum = index;
this.show = true;
const ajaxdata = {
Expand Down
5 changes: 4 additions & 1 deletion src/store/actions.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,10 @@ export const qryViewPhoto = ({ commit },data) => {
}
})
.catch(function (error) {
console.log(error)
showMsg({commit}, {
content: error.response.data.errorMsg,
type: 'danger'
})
});
};
//----------------------------------------------------------------------------------------------
Expand Down
36 changes: 26 additions & 10 deletions src/store/modules/viewPhoto.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,19 @@ const mutations = {
},
[PHOTO_LIKE_USER](state, data){
if(state.photoList[data.order]){
const obj = state.photoList[data.order]
obj.is_fav = !obj.is_fav
state.photoList[data.order].is_fav = obj.is_fav
state.photoList[data.order].fav_num++
state.photoList.splice(data.order, 1, obj)
if(data.isFill){
const obj = state.photoListFill[data.order]
obj.is_fav = !obj.is_fav
state.photoListFill[data.order].is_fav = obj.is_fav
state.photoListFill[data.order].fav_num++
state.photoListFill.splice(data.order, 1, obj)
}else{
const obj = state.photoList[data.order]
obj.is_fav = !obj.is_fav
state.photoList[data.order].is_fav = obj.is_fav
state.photoList[data.order].fav_num++
state.photoList.splice(data.order, 1, obj)
}
}

if(state.list[data.index]){
Expand All @@ -48,11 +56,19 @@ const mutations = {
},
[CANCEL_PHOTO_LIKE_USER](state, data){
if(state.photoList[data.order]){
const obj = state.photoList[data.order]
obj.is_fav = !obj.is_fav
state.photoList[data.order].is_fav = obj.is_fav
state.photoList[data.order].fav_num--
state.photoList.splice(data.order, 1, obj)
if(data.isFill){
const obj = state.photoListFill[data.order]
obj.is_fav = !obj.is_fav
state.photoListFill[data.order].is_fav = obj.is_fav
state.photoListFill[data.order].fav_num--
state.photoListFill.splice(data.order, 1, obj)
}else{
const obj = state.photoList[data.order]
obj.is_fav = !obj.is_fav
state.photoList[data.order].is_fav = obj.is_fav
state.photoList[data.order].fav_num--
state.photoList.splice(data.order, 1, obj)
}
}

if(state.list[data.index]){
Expand Down

0 comments on commit efe22cf

Please sign in to comment.