fe / yohoblk-wap · Commits

Go to a project

Authored by 沈志敏
Commit e65cfc8b6f81d9c9321c98d694a8618683f220fa 2 parents c0f910ec c813ae6d

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

Inline Side-by-side
Showing 4 changed files with 16 additions and 6 deletions
@@ -44,7 +44,7 @@ module.exports = (Vue) => { @@ -44,7 +44,7 @@ module.exports = (Vue) => {
44 let url = `/product/shop/${value}`; 44 let url = `/product/shop/${value}`;
45 45
46 if (kind === 'shop') { 46 if (kind === 'shop') {
47 - url = `/product/shop/favorite?id=${value}`; 47 + url = `/product/shop/favorite?id=${value || ''}`;
48 } 48 }
49 return url; 49 return url;
50 }); 50 });
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 <swipe class="swipe swipe-{{floor.length}}"> 3 <swipe class="swipe swipe-{{floor.length}}">
4 <swipe-item v-for="item in floor" v-bind:style="{backgroundColor: item.bgColor}"> 4 <swipe-item v-for="item in floor" v-bind:style="{backgroundColor: item.bgColor}">
5 <a href="{{item.url}}" title="{{item.title}}"> 5 <a href="{{item.url}}" title="{{item.title}}">
6 - <img v-lazy="item.src | resize 750 365"> 6 + <img v-bind:src="item.src | resize 750 365">
7 </a> 7 </a>
8 </swipe-item> 8 </swipe-item>
9 </swipe> 9 </swipe>
@@ -18,10 +18,11 @@ @@ -18,10 +18,11 @@
18 <img :src="entity.brand.brandIco | resize 110 68"/> 18 <img :src="entity.brand.brandIco | resize 110 68"/>
19 19
20 <h2>{{entity.brand.brandName}}</h2> 20 <h2>{{entity.brand.brandName}}</h2>
21 - <a :href="entity.brand.brandDomain | brandUrl">  
22 - 进入店铺 21 + <div class="brand-go">
  22 + <span>进入店铺</span>
23 <span class="icon icon-right"></span> 23 <span class="icon icon-right"></span>
24 - </a> 24 + </div>
  25 + <a :href="entity.brand.brandDomain | brandUrl"></a>
25 </show-box> 26 </show-box>
26 27
27 <show-box v-if="intro.productDescBo"> 28 <show-box v-if="intro.productDescBo">
@@ -217,7 +218,7 @@ @@ -217,7 +218,7 @@
217 line-height: $lh; 218 line-height: $lh;
218 } 219 }
219 220
220 - a { 221 + .brand-go {
221 float: right; 222 float: right;
222 font-size: 28px; 223 font-size: 28px;
223 line-height: $lh; 224 line-height: $lh;
@@ -227,6 +228,14 @@ @@ -227,6 +228,14 @@
227 .icon-right { 228 .icon-right {
228 margin-left: 30px; 229 margin-left: 30px;
229 } 230 }
  231 +
  232 + a {
  233 + position: absolute;
  234 + top: 0;
  235 + right: 0;
  236 + bottom: 0;
  237 + left: 0;
  238 + }
230 } 239 }
231 240
232 .product-detail-desc { 241 .product-detail-desc {
@@ -5,6 +5,7 @@ @@ -5,6 +5,7 @@
5 </template> 5 </template>
6 <style> 6 <style>
7 .show-box { 7 .show-box {
  8 + position: relative;
8 margin-top: 20px; 9 margin-top: 20px;
9 background: #fff; 10 background: #fff;
10 border-top: 1px solid #eee; 11 border-top: 1px solid #eee;