fe / yohoblk-wap · Commits

Go to a project

Authored by 李奇
Commit f09a856d8201a411595bcc63a5cc6bba21faccef 2 parents 3a121a51 3abe4b4f

Merge branch 'release/4.0' into gray

Inline Side-by-side
Showing 5 changed files with 20 additions and 51 deletions
... ... @@ -18,17 +18,17 @@ module.exports = {
app_type: 1
},
domains: {
api: 'http://api-test3.yohops.com:9999/',
service: 'http://service-test3.yohops.com:9999/',
singleApi: 'http://api-test3.yohops.com:9999/'
// api: 'http://api-test3.yohops.com:9999/',
// service: 'http://service-test3.yohops.com:9999/',
// singleApi: 'http://api-test3.yohops.com:9999/'
// api: 'http://dev-api.yohops.com:9999/',
// service: 'http://dev-service.yohops.com:9999/',
// singleApi: 'http://192.168.102.27:8092/'
// //
// api: 'http://api.yoho.cn/',
// service: 'http://service.yoho.cn/',
// singleApi: 'http://single.yoho.cn/'
api: 'http://api.yoho.cn/',
service: 'http://service.yoho.cn/',
singleApi: 'http://single.yoho.cn/'
},
subDomains: {
host: '.m.yohoblk.com',
... ...
... ... @@ -47,27 +47,20 @@
}
.mint-swipe-indicators {
left: initial;
right: 30px;
transform: none;
text-align: center;
}
.mint-swipe-indicator {
width: 16px;
height: 16px;
background: #ccc;
width: 10px;
height: 10px;
background: #e0e0e0;
opacity: 1;
vertical-align: middle;
border-radius: 50%;
transform: scale(0.5, 0.5);
margin-left: -4px;
border-radius: 0;
&.active {
width: 24px;
height: 24px;
background: #fff;
border-radius: 50%;
transform: scale(0.5, 0.5);
&.is-active {
width: 20px;
background: #fff;
}
}
}
... ...
... ... @@ -2,7 +2,7 @@
<div class="resource-category">
<a-link class="cate-label" :href="brandLink">品牌<i class="icon icon-right"></i></a-link>
<div v-for="(item, index) in sort" v-if="item.sub">
<p class="cate-label" @click="toggle(index)" :name="`item_${index}`">{{item.category_name
<p class="cate-label" @click="toggle(index)">{{item.category_name
}}<i class="icon" :class="sortClass[index]"></i></p>
<div class="cate-items" v-if="show[index]">
<a-link class="cate-item"
... ... @@ -48,36 +48,12 @@ export default {
},
methods: {
toggle(idx) {
this.topCurrent(idx);
for (let i = 0; i < this.show.length; i++) {
if (i !== idx) {
this.$set(this.show, i, false);
this.$set(this.sortClass, i, {
'icon-sort-up': false,
'icon-sort-down': true
});
} else {
this.$set(this.show, i, !this.show[idx]);
this.$set(this.sortClass, i, {
'icon-sort-up': true,
'icon-sort-down': false
});
}
}
this.$set(this.show, idx, !this.show[idx]);
this.$set(this.sortClass, idx, {
'icon-sort-up': this.show[idx],
'icon-sort-down': !this.show[idx]
});
},
topCurrent(idx) {
let $el = document.querySelector(`p[name=item_${idx}]`);
if ($el) {
let top = $el.offsetTop;
document.querySelector('.scroller-box').scrollTop = top;
}
},
getAllSortId(idx) {
return this.value.sort[idx].sub.map(sort=>sort.relation_parameter.sort).join(',') + ',';
}
... ...
... ... @@ -3,7 +3,7 @@
<ul class="resource-blk-new-products" v-if="value.showType == 1">
<li class="product-item" v-for="(item, index) in value.list" :key="index">
<product-link :value="item" class="link"></product-link>
<img-format :src="item.default_images" :w="94" :h="125"></img-format>
<img-format :src="item.default_images" :w="188" :h="250"></img-format>
<div class="ellipsis">
<p class="title" v-if="item.brand_name">{{item.brand_name}}</p>
<p class="title" v-if="item.product_name">{{item.product_name}}</p>
... ... @@ -15,7 +15,7 @@
<div class="one">
<li class="product-item" v-for="(item, index) in value.list" :key="index" v-if="index % 2 == 0">
<product-link :value="item" class="link"></product-link>
<img-format :src="item.default_images" :w="94" :h="125"></img-format>
<img-format :src="item.default_images" :w="188" :h="250"></img-format>
<div class="ellipsis">
<p class="title" v-if="item.brand_name">{{item.brand_name}}</p>
<p class="title" v-if="item.product_name">{{item.product_name}}</p>
... ... @@ -26,7 +26,7 @@
<div class="two">
<li class="product-item" v-for="(item, index) in value.list" :key="index" v-if="index % 2 == 1">
<product-link :value="item" class="link"></product-link>
<img-format :src="item.default_images" :w="94" :h="125"></img-format>
<img-format :src="item.default_images" :w="188" :h="250"></img-format>
<div class="ellipsis">
<p class="title" v-if="item.brand_name">{{item.brand_name}}</p>
<p class="title" v-if="item.product_name">{{item.product_name}}</p>
... ...
... ... @@ -3,7 +3,7 @@
<ul class="resource-tf-goods">
<li class="product-item" v-for="(item, index) in value.list" :key="index">
<product-link :value="item" class="link"></product-link>
<img-format :src="item.default_images" :w="94" :h="125"></img-format>
<img-format :src="item.default_images" :w="188" :h="250"></img-format>
<div class="ellipsis">
<p class="title">{{item.product_name}}</p>
<p class="price">￥{{item.sales_price}}</p>
... ...