fe / yohoblk-wap · Commits

Go to a project

Authored by 郝肖肖
Commit 0d232923dbdefcea9ae094ea96e019ebdaf9be37 2 parents c4ff41d0 af122af1

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

Inline Side-by-side
Showing 13 changed files with 128 additions and 24 deletions
... ... @@ -19,7 +19,8 @@ router.get('/women', channel.index); // 首页
router.get('/lifestyle', channel.index); // 首页
router.get('/resources', channel.resources); // 资源位接口
router.get('/brand', brand.index); // 店铺首页
router.get('/brandList', brand.brandList); // 店铺首页
router.get('/brand-list', brand.brandList); // 店铺首页
router.get('/cate', brand.cate); // 全部分类
module.exports = router;
... ...
<div id="brand">
<resources v-bind:content="'men'"></resources>
<letter-list></letter-list>
<div id="brand-list">
<brand-list-box></brand-list-box>
</div>
\ No newline at end of file
... ...
{{# result}}
<div class="brand-top-box" style="background: url({{brandBg}})">
<div class="brand-bottom">
{{#if brandLogo}}
<img src="{{brandLogo}}" alt="{{brandName}}">
{{^}}
<div class="brand-title">{{brandName}}</div>
{{/if}}
<hr>
<div class="brand-intro line-clamp">{{brandIntro}}</div>
<div id="brand">
<brand-box></brand-box>
{{# result}}
<div class="brand-top-box" style="background: url({{brandBg}})">
<div class="brand-bottom">
{{#if brandLogo}}
<img src="{{brandLogo}}" alt="{{brandName}}">
{{^}}
<div class="brand-title">{{brandName}}</div>
{{/if}}
<hr>
<div class="brand-intro line-clamp">{{brandIntro}}</div>
</div>
<div class="expand"></div>
<div class="collapse"></div>
</div>
<div class="expand"></div>
<div class="collapse"></div>
</div>
{{/ result}}
\ No newline at end of file
{{/ result}}
</div>
\ No newline at end of file
... ...

600 Bytes | W: | H:

2.66 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
... ... @@ -5,18 +5,15 @@
* Time: 14:13
*/
const $ = require('yoho-jquery');
const Vue = require('yoho-vue');
const resources = require('channel/resources.vue');
const letterList = require('channel/letter-list.vue');
const brandListBox = require('channel/brand-list-box.vue');
require('common/vue-filter');
new Vue({
el: '#brand',
el: '#brand-list',
components: {
resources,
letterList
brandListBox
}
});
... ...
... ... @@ -5,6 +5,16 @@
* Time: 16:05
*/
const $ = require('yoho-jquery');
const Vue = require('yoho-vue');
const brandBox = require('channel/brand-box.vue');
new Vue({
el: '#brand',
components: {
brandBox
}
});
const $expand = $('.expand'),
$collapse = $('.collapse'),
... ...
<template>
<div>
<brand-top-component v-bind:share-data="123456"></brand-top-component>
</div>
</template>
<style>
</style>
<script>
const brandTopComponent = require('channel/brand-top.vue');
module.exports = {
components: {
brandTopComponent
}
};
</script>
... ...
<template>
<div>
<resources v-bind:content="'men'"></resources>
<letter-list></letter-list>
</div>
</template>
<style>
</style>
<script>
const resources = require('channel/resources.vue');
const letterList = require('channel/letter-list.vue');
module.exports = {
components: {
resources,
letterList
}
};
</script>
... ...
<template>
<div class="top-box clearfix">
<i class="back"></i>
<div class="right">
<i class="favorite"></i>
<i class="share"><a href="{{shareData}}"></a></i>
<i class="filter"></i>
</div>
</div>
</template>
<style>
.top-box {
width: 100%;
height: 60px;
position: fixed;
top: 0;
left: 0;
z-index: 99;
.back {
width: 60px;
height: 60px;
float: left;
background: url("/channel/back.png") no-repeat;
}
.right {
height: 60px;
float: right;
i {
width: 60px;
height: 60px;
margin: 0 5px;
display: inline-block;
}
.favorite {
background: url("/channel/favorite.png") no-repeat;
}
.share {
background: url("/channel/share.png") no-repeat;
}
.filter {
background: url("/channel/filter.png") no-repeat;
}
}
}
</style>
<script>
module.exports = {
props: ['shareData']
};
</script>
... ...