fe / yohobuywap-node · Commits

Go to a project

Authored by ccbikai(👎🏻🍜)
Commit d94709879b9c9623cd6d8515deb7045c0cbe1d34 2 parents afb81e08 8de9b7fb

Merge remote-tracking branch 'origin/feature/codebetter' into release/5.4.1

Inline Side-by-side
Showing 3 changed files with 43 additions and 60 deletions
... ... @@ -7,9 +7,9 @@
data() {
return {
msg: 'app'
}
};
}
}
};
</script>
<style>
... ...
<template>
<header class="yoho-header">
<a :href="headerBack" class="iconfont nav-back">&#xe610;</a>
<span v-if="showBtn" class="iconfont nav-home">&#xe638;</span>
<p class="nav-title">{{headerText}}</p>
</header>
</template>
<script>
module.exports = {
props: {
headerBack: String,
headerText: String,
showBtn: Boolean
},
data() {
return {};
}
};
</script>
... ... @@ -13,22 +13,22 @@
<ul v-if="province.showList" class="address-ul">
<li v-for="pprovince in provinces"
@click="switchAddress(pprovince.id, pprovince.caption)">{{pprovince.caption}}
<span v-if="pprovince.id === province.id" class="iconfont icon-V"></span></li>
<span v-if="pprovince.id === province.id" class="iconfont icon-v"></span></li>
</ul>
<ul v-if="city.showList" class="address-ul">
<li v-for="pcity in citys"
@click="switchAddress(pcity.id, pcity.caption)">{{pcity.caption}}
<span v-if="pcity.id === city.id" class="iconfont icon-V"></span></li>
<span v-if="pcity.id === city.id" class="iconfont icon-v"></span></li>
</ul>
<ul v-if="area.showList" class="address-ul">
<li v-for="parea in areas"
@click="switchAddress(parea.id, parea.caption)">{{parea.caption}}
<span v-if="parea.id === area.id" class="iconfont icon-V"></span></li>
<span v-if="parea.id === area.id" class="iconfont icon-v"></span></li>
</ul>
<ul v-if="street.showList" class="address-ul">
<li v-for="pstreet in streets"
@click="switchAddress(pstreet.id, pstreet.caption, true)">{{pstreet.caption}}
<span v-if="pstreet.id === street.id" class="iconfont icon-V"></span></li>
<span v-if="pstreet.id === street.id" class="iconfont icon-v"></span></li>
</ul>
</div>
</div>
... ... @@ -36,7 +36,9 @@
</div>
</template>
<style>
.icon-V:before { content: "\e6ea"; }
.icon-v:before {
content: "\e6ea";
}
.address-select-component {
position: fixed;
... ... @@ -120,41 +122,41 @@
.address-content {
transform: translate(0, 0) translateZ(0);
height: 620px;
}
}
.address-ul {
padding: 0;
margin: 0;
list-style: none;
height: 100%;
overflow: auto;
font-size: 24px;
color: #232326;
li {
height: 80px;
line-height: 80px;
padding-left: 30px;
position: relative;
overflow: hidden;
span {
color: #f23030;
font-size: 14px;
}
}
.address-ul {
padding: 0;
margin: 0;
list-style: none;
height: 100%;
overflow: auto;
font-size: 24px;
color: #232326;
li:after {
content: "";
width: 100%;
height: 1px;
position: absolute;
left: 0;
bottom: 0;
transform: scaleY(0.5);
-webkit-transform: scaleY(0.5);
}
li {
height: 80px;
line-height: 80px;
padding-left: 30px;
position: relative;
overflow: hidden;
span {
color: #f23030;
font-size: 14px;
}
}
li:after {
content: "";
width: 100%;
height: 1px;
position: absolute;
left: 0;
bottom: 0;
transform: scaleY(0.5);
-webkit-transform: scaleY(0.5);
}
}
}
}
... ... @@ -246,7 +248,8 @@
this.city.title = '请选择';
this.city.showList = this.province.titleActive = true;
this.province.showList = this.area.showList = this.street.showList = false;
this.common.titleActive = this.city.titleActive = this.area.titleActive = this.street.titleActive = false;
this.common.titleActive = this.city.titleActive =
this.area.titleActive = this.street.titleActive = false;
break;
case 4:
this.city.id = id;
... ... @@ -376,7 +379,7 @@
this.street.title = '';
break;
default:
break
break;
}
},
},
... ...