Skip to content

Commit

Permalink
优化体验
Browse files Browse the repository at this point in the history
  • Loading branch information
@weiyunpeng
weiyunpeng committed Nov 24, 2017
1 parent 7dedf63 commit a576352
Show file tree
Hide file tree
Showing 10 changed files with 137 additions and 114 deletions.
92 changes: 41 additions & 51 deletions server/server/man/data/makeup.json
View file
Original file line number Diff line number Diff line change
@@ -1,76 +1,66 @@
{
"code": 200,
"msg": "success",
"code": 0,
"msg": "成功",
"data": {
"bus_info": {
"id":1,
"store_name": "郑州艾维美婚纱摄影(国贸360店)",
"isYes": true,
"isVip": true,
"address": "宇宙银河皮皮虾星系lake星球",
"star": 3
"store_id": 6,
"store_name": "韩国艺匠ARTIZ STUDIO",
"address": "农业东路与如意西路交叉口向北200米 建业总部港B座",
"star": "4.5",
"isYes": 0,
"isVip": 0
},
"makeup": {
"name": "安东尼",
"nick": "阿萨德发送到分",
"intro": "",
"tags": [],
"astro": "摩羯座",
"head": "/static/images/14.png",
"photos": [
"http://marriage-1252045209.image.myqcloud.com/default.jpg?imageView2/0/w//h/"
],
"birthYear": 2015,
"workYears": 3,
"specialty": "浪漫唯美、幽默风趣、甜美风格,浪漫唯美、幽默风趣、甜美风格,浪漫唯美、幽默风趣、甜美风格,浪漫唯美、幽默风趣、甜美风格",
"id": 12,
"name": "时珍珍",
"nick": "",
"intro":
"2010-2012年剧组担任化妆师，2013-2016南京艺匠担任化妆师，2016年赴韩进修学习， 2017年郑州艺匠化妆师",
"tags": ["韩式兼容", "清新淡雅"],
"astro": "双子",
"head":
"http://marriage-1251225286.image.myqcloud.com/none/head/20170915/59bb9fb971a93867540247.jpg/ys?imageView2/2/w/300/h/",
"birthYear": 1097,
"workYears": 7,
"specialty": "韩式兼容,清新淡雅",
"info_details": [
{
"tag": "化妆师简介",
"detail": "进入7月，虽说是进入了结婚的淡季，但下半年及明年要结婚的小伙伴们可得加了个油了，结婚筹备一定要趁早。也为了大家更好的筹婚备婚，大豫新娘帮携手艾唯婚礼策划团队及中洲皇冠假日酒店潮鲜厅为大家带来一场不容错过的婚礼秀。进入7月，虽说是进入了结婚的淡季，但下半年及明年要结婚的小伙伴们可得加了个油了，结婚筹备一定要趁早。也为了大家更好的筹婚备婚，大豫新娘帮携手艾唯婚礼策划团队及中洲皇冠假日酒店潮鲜厅为大家带来一场不容错过的婚礼秀。",
"imgs": []
},
{
"tag": "化妆特点",
"detail": "浪漫唯美、幽默风趣、甜美风格,浪漫唯美、幽默风趣、甜美风格,浪漫唯美、幽默风趣、甜美风格,浪漫唯美、幽默风趣、甜美风格",
"imgs": []
"detail":
"2010-2012年剧组担任化妆师，2013-2016南京艺匠担任化妆师，2016年赴韩进修学习， 2017年郑州艺匠化妆师"
},
{ "tag": "专业特点", "detail": "擅长清新淡雅、简约大气的韩式妆面" },
{
"tag": "作品展示",
"detail": "",
"imgs": [
"/static/images/15.png",
"/static/images/15.png",
"/static/images/15.png"
"http://marriage-1251225286.image.myqcloud.com/none/photos/20170819/5997ba0880adb229025155.jpg/shuiyin?imageView2/2/w/640/h/",
"http://marriage-1251225286.image.myqcloud.com/none/photos/20170819/5997ba0891f9f371279375.jpg/shuiyin?imageView2/2/w/640/h/",
"http://marriage-1251225286.image.myqcloud.com/none/photos/20170819/5997ba08b8495878002591.jpg/shuiyin?imageView2/2/w/640/h/",
"http://marriage-1251225286.image.myqcloud.com/none/photos/20170819/5997ba08a3725805203127.jpg/shuiyin?imageView2/2/w/640/h/",
"http://marriage-1251225286.image.myqcloud.com/none/photos/20170819/5997ba08c772e004632797.jpg/shuiyin?imageView2/2/w/640/h/",
"http://marriage-1251225286.image.myqcloud.com/none/photos/20170819/5997ba08d9e9b304626398.jpg/shuiyin?imageView2/2/w/640/h/"
]
}
]
},
"packages": [
{
"id": 1,
"cover": "/static/images/5.png",
"name": "唯美韩式海滩外景套系",
"tag": [
"adf"
],
"price": 12000
},
{
"id": 1,
"cover": "/static/images/2.png",
"name": "韩式花海奢华内外双景套系",
"tag": [
"sd"
],
"price": 12000
"id": 12,
"cover":
"http://marriage-1251225286.image.myqcloud.com/none/cover/20170819/5997aa3edb691961733119.jpg/ys?imageView2/2/w/300/h/",
"name": "樱花",
"tag": [],
"price": 10980
},
{
"id": 1,
"cover": "/static/images/15.png",
"name": "欧式复古唯美教堂外景套系",
"id": 15,
"cover":
"http://marriage-1251225286.image.myqcloud.com/none/cover/20170819/5997b1147a458111291262.jpg/ys?imageView2/2/w/300/h/",
"name": "丽姿",
"tag": [],
"price": 2000
"price": 15980
}
]
}
}
}
17 changes: 11 additions & 6 deletions src/assets/css/filter.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,17 @@
position: relative;
display: inline-block;
float: left;
line-height: 40px;
padding-left: 20px;
padding: 7px 0;
margin-left: 20px;
width: 248px;
height: 46px;
.input_price{
position: relative;
width: 80px;
height: 28px;
line-height: 28px;
color: #a6a6a6;
text-align: center;
padding-left: 15px;
border:1px solid #d9d9d9;
border-radius: 5px;
}
Expand All @@ -60,21 +64,22 @@
span{
position: relative;
left: 20px;
top: 1px;
color: #a6a6a6;
font-size: 14px;
line-height: 40px;
z-index: 999;
}
.queryPrice{
height: 28px;
line-height: 28px;
float: right;
margin-left: 20px;
background: #d9d9d9;
color: #666666;
font-size: 14px;
border-radius: 10px;
padding: 0 8px;
margin-top: 6px;
position: relative;
left: 10px;
}
}
}
67 changes: 33 additions & 34 deletions src/components/business/busFilter.vue
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
<template>
<div class="filter">
<div class="filter">
<div class="container">
<div class="filter-con">
<a href="javascript:void(0)" v-bind:class="{tag_active:method == 0}" @click="tagChange(0)">默认</a>
<a href="javascript:void(0)" v-bind:class="{tag_active:method == 1}" @click="tagChange(1)">总体评分</a>
<a href="javascript:void(0)" v-bind:class="{tag_active:method == 2}" @click="tagChange(2)">价格<i class="price_icon" v-bind:class="{price_position:isHigh}"></i></a>
<a href="javascript:void(0)" v-bind:class="{tag_active:method == 2}" @click="tagChange(2)">价格
<i class="price_icon" v-bind:class="{price_position:isHigh}"></i>
</a>
<div class="fil_input">
<span>¥</span>
<input type="number" class="input_price" v-model.number="minPrice">
Expand All @@ -15,62 +17,59 @@
</div>
</div>
</div>
</div>
</div>
</template>

<script>
import { mapGetters, mapActions } from 'vuex'
import { mapGetters, mapActions } from 'vuex';
export default {
data() {
return {
method:0,
isHigh:0,
minPrice:null,
maxPrice:null,
flag:/^\d+$/
}
method: 0,
isHigh: 0,
minPrice: null,
maxPrice: null,
flag: /^\d+$/
};
},
computed: {
...mapGetters({
}),
...mapGetters({}),
...mapActions({
showModal:'showModal'
showModal: 'showModal'
})
},
mounted(){
mounted() {
let self = this;
},
methods: {
tagChange(index){
tagChange(index) {
let self = this;
self.method = index;
if(index == 2){
if (index == 2) {
//需要价格箭头的切换
if(this.isHigh){
this.isHigh = 0
}else{
this.isHigh = 1
if (this.isHigh) {
this.isHigh = 0;
} else {
this.isHigh = 1;
}
}
this.$emit('ajaxfilter',index,this.isHigh);
this.$emit('ajaxfilter', index, this.isHigh);
},
qryPrice(){
if(!this.flag.test(this.minPrice) || !this.flag.test(this.maxPrice) || this.minPrice >= this.maxPrice){
const data = {
name: '提示',
info: {
text: '请输入正确的价格'
}
};
this.$store.dispatch('showModal',data);
}else{
this.$emit('ajaxPrice',this.minPrice,this.maxPrice);
qryPrice() {
if (
!this.flag.test(this.minPrice) ||
!this.flag.test(this.maxPrice) ||
this.minPrice >= this.maxPrice
) {
this.$emit('ajaxPrice', this.minPrice, this.maxPrice, false);
} else {
this.$emit('ajaxPrice', this.minPrice, this.maxPrice, true);
}
}
}
}
};
</script>
<style rel="stylesheet/scss" lang="scss">
@import "./../../assets/css/filter.scss";
@import './../../assets/css/filter.scss';
</style>
13 changes: 8 additions & 5 deletions src/components/header.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<img :src="header" class="circle" width="30" height="30" @click="userLogin" v-on="{ mouseover: showHeader ,mouseout:hideHeader}">
<ul class="nav_user_ul" v-show="isLogin">
<li>
<router-link :to="{ name: 'collect', params: {type:0}}" target="_blank">
<router-link :to="{ name: 'collect', params: {type:0}}">
<i class="icon_collage"></i>我的收藏
</router-link>
</li>
Expand Down Expand Up @@ -65,7 +65,8 @@ export default {
header: '/static/images/icon-user.png',
uid: null,
isLogin: null,
bus: this.$route.params.cid
bus: this.$route.params.cid,
type: this.$route.params.type,
};
},
computed: {
Expand Down Expand Up @@ -96,10 +97,13 @@ export default {
this.$store.dispatch('qryStoreList', data);
},
logout() {
this.$store.dispatch('loginOut');
if(this.type == 0){
this.$store.dispatch('loginOut', { toIndex: 1 });
}else{
this.$store.dispatch('loginOut', { toIndex: 0 });
}
this.isLogin = false;
this.header = '/static/images/icon-user-hover.png';
window.location.reload();
},
userLogin() {
if (!this.isLogin) {
Expand Down Expand Up @@ -205,7 +209,6 @@ export default {
top: 0;
outline: none;
height: 30px;
line-height: 30px;
z-index: 10;
padding-left: 10px;
color: #808080;
Expand Down
2 changes: 1 addition & 1 deletion src/page/cameraman.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
</p>
<ul>
<li v-for="(item,s) in camaramanPackages" :key="s">
<router-link :to="{ name: 'packageDetails',params: {busId:camaramanBusinfo.id, mealId:item.id}}" target="_blank">
<router-link :to="{ name: 'packageDetails',params: {busId:camaramanBusinfo.store_id, mealId:item.id}}" target="_blank">
<img v-lazy="item.cover" width="300" height="200">
<div class="p_info clearfix">
<div class="name fl">{{item.name}}</div>
Expand Down
17 changes: 12 additions & 5 deletions src/page/collect.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
</ul>
</div>
<div class="clearfix c-type-list">
<ul>
<ul v-if="getCollectList && getCollectList.length>0">
<li v-for="(item,ln) in getCollectList" :key="ln">
<div class="c-type-header">
<div class="fl c-type-header-name">{{item.name}}</div>
Expand Down Expand Up @@ -60,7 +60,7 @@
</div>
</li>
</ul>
<div v-if="getCollectList && getCollectList.length==0" class="no-data">
<div v-if="noData && getCollectList.length==0" class="no-data">
<img src="/static/images/icon-no-data-2.png">
</div>
</div>
Expand Down Expand Up @@ -94,7 +94,8 @@ export default {
isTag: 0,
userInfo: {},
category: {},
index: 0
index: 0,
noData:false,
};
},
mounted() {
Expand Down Expand Up @@ -129,14 +130,20 @@ export default {
this.$store.dispatch('collectListChange', ln);
},
logout() {
this.$store.dispatch('loginOut');
this.$router.push({ name: 'index' });
this.$store.dispatch('loginOut', { toIndex: 1 });
}
},
watch: {
getCollectUserInfo() {
this.userInfo = this.getCollectUserInfo;
this.category = this.getCollectUserInfo.category;
},
getCollectList(){
if(this.getCollectList && this.getCollectList.length > 0){
this.noData = false;
}else{
this.noData = true;
}
}
},
beforeDestroy() {}
Expand Down
Loading

0 comments on commit a576352

Please sign in to comment.