Authored by 徐炜

Merge remote-tracking branch 'origin/hotfix/jira-2081'

<template>
<div>
<cheader :title="sortName" class="list-header">
<i class="icon icon-filter" slot="right" @touchstart="openFilter"></i>
<i v-if="isiOS" class="icon icon-filter" slot="right" @touchstart="openFilter"></i>
<i v-else class="icon icon-filter" slot="right" @click="openFilter"></i>
</cheader>
<order :config="orderConfig" :val="order" v-if="enableOrder"></order>
<List :data="productList" :state="listState"></List>
... ... @@ -10,6 +11,7 @@
</template>
<script>
const $ = require('jquery');
const yoho = require('yoho');
const Vue = require('vue');
const lazyload = require('vue-lazyload');
const infinitScroll = require('vue-infinite-scroll');
... ... @@ -31,6 +33,7 @@
el: '#product-list',
data: function() {
return {
isiOS: yoho.isiOS,
sortName: locationQuery.title || locationQuery.sort_name, // 优先使用 title
orderConfig: [],
filterConfig: null,
... ...
<template>
<div>
<cheader title="新品抢先看">
<i class="icon icon-filter" slot="right" @touchstart="openFilter"></i>
<i v-if="isiOS" class="icon icon-filter" slot="right" @touchstart="openFilter"></i>
<i v-else class="icon icon-filter" slot="right" @click="openFilter"></i>
</cheader>
<List :data="productList" :state="listState"></List>
<Filter :config="filterConfig" action="/product/list.json" v-ref:filter></Filter>
... ... @@ -9,6 +10,7 @@
</template>
<script>
const $ = require('jquery');
const yoho = require('yoho');
const Vue = require('vue');
const lazyload = require('vue-lazyload');
const infinitScroll = require('vue-infinite-scroll');
... ... @@ -29,6 +31,7 @@
el: '#product-new',
data: function() {
return {
isiOS: yoho.isiOS,
sortName: locationQuery.sort_name,
filterConfig: null,
... ... @@ -152,5 +155,3 @@
};
</script>
\ No newline at end of file
<style>
</style>
... ...
... ... @@ -5,7 +5,8 @@
<span v-if="shareData.isBlkShop" v-show="shareData.isFav" class="icon" @click="collectShop()">&#xe60d;</span>
<span v-if="shareData.isBlkShop" v-show="!shareData.isFav" class="icon" @click="collectShop()">&#xe60c;</span>
<span v-if="shareData.isBlkShop" class="icon" @click="goShare()">&#xe60e;</span>
<span class="icon" @touchstart="showFilter()">&#xe60b;</span>
<span v-if="isiOS" class="icon" @touchstart="showFilter()">&#xe60b;</span>
<span v-else class="icon" @click="showFilter()">&#xe60b;</span>
</template>
</cheader>
</div>
... ... @@ -29,7 +30,9 @@
module.exports = {
data() {
return {};
return {
isiOS: yoho.isiOS
};
},
props: {
shareData: {
... ...