Authored by 沈志敏

Merge branch 'develop' of git.yoho.cn:fe/yohoblk-wap into develop

... ... @@ -44,7 +44,7 @@ module.exports = (Vue) => {
let url = `/product/shop/${value}`;
if (kind === 'shop') {
url = `/product/shop/favorite?id=${value}`;
url = `/product/shop/favorite?id=${value || ''}`;
}
return url;
});
... ...
... ... @@ -3,7 +3,7 @@
<swipe class="swipe swipe-{{floor.length}}">
<swipe-item v-for="item in floor" v-bind:style="{backgroundColor: item.bgColor}">
<a href="{{item.url}}" title="{{item.title}}">
<img v-lazy="item.src | resize 750 365">
<img v-bind:src="item.src | resize 750 365">
</a>
</swipe-item>
</swipe>
... ...
... ... @@ -18,10 +18,11 @@
<img :src="entity.brand.brandIco | resize 110 68"/>
<h2>{{entity.brand.brandName}}</h2>
<a :href="entity.brand.brandDomain | brandUrl">
进入店铺
<div class="brand-go">
<span>进入店铺</span>
<span class="icon icon-right"></span>
</a>
</div>
<a :href="entity.brand.brandDomain | brandUrl"></a>
</show-box>
<show-box v-if="intro.productDescBo">
... ... @@ -217,7 +218,7 @@
line-height: $lh;
}
a {
.brand-go {
float: right;
font-size: 28px;
line-height: $lh;
... ... @@ -227,6 +228,14 @@
.icon-right {
margin-left: 30px;
}
a {
position: absolute;
top: 0;
right: 0;
bottom: 0;
left: 0;
}
}
.product-detail-desc {
... ...
... ... @@ -5,6 +5,7 @@
</template>
<style>
.show-box {
position: relative;
margin-top: 20px;
background: #fff;
border-top: 1px solid #eee;
... ...