fe / yohoblk-wap · Commits

Go to a project

Authored by 徐炜
Commit f44c4a4c63189afc4a70d9e2f44975ef10a367ab 2 parents d1b760d4 1f6b988e

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

Inline Side-by-side
Showing 3 changed files with 14 additions and 7 deletions
1 <template> 1 <template>
2 <div> 2 <div>
3 <cheader :title="sortName" class="list-header"> 3 <cheader :title="sortName" class="list-header">
4 - <i class="icon icon-filter" slot="right" @touchstart="openFilter"></i> 4 + <i v-if="isiOS" class="icon icon-filter" slot="right" @touchstart="openFilter"></i>
  5 + <i v-else class="icon icon-filter" slot="right" @click="openFilter"></i>
5 </cheader> 6 </cheader>
6 <order :config="orderConfig" :val="order" v-if="enableOrder"></order> 7 <order :config="orderConfig" :val="order" v-if="enableOrder"></order>
7 <List :data="productList" :state="listState"></List> 8 <List :data="productList" :state="listState"></List>
@@ -10,6 +11,7 @@ @@ -10,6 +11,7 @@
10 </template> 11 </template>
11 <script> 12 <script>
12 const $ = require('jquery'); 13 const $ = require('jquery');
  14 + const yoho = require('yoho');
13 const Vue = require('vue'); 15 const Vue = require('vue');
14 const lazyload = require('vue-lazyload'); 16 const lazyload = require('vue-lazyload');
15 const infinitScroll = require('vue-infinite-scroll'); 17 const infinitScroll = require('vue-infinite-scroll');
@@ -31,6 +33,7 @@ @@ -31,6 +33,7 @@
31 el: '#product-list', 33 el: '#product-list',
32 data: function() { 34 data: function() {
33 return { 35 return {
  36 + isiOS: yoho.isiOS,
34 sortName: locationQuery.title || locationQuery.sort_name, // 优先使用 title 37 sortName: locationQuery.title || locationQuery.sort_name, // 优先使用 title
35 orderConfig: [], 38 orderConfig: [],
36 filterConfig: null, 39 filterConfig: null,
1 <template> 1 <template>
2 <div> 2 <div>
3 <cheader title="新品抢先看"> 3 <cheader title="新品抢先看">
4 - <i class="icon icon-filter" slot="right" @touchstart="openFilter"></i> 4 + <i v-if="isiOS" class="icon icon-filter" slot="right" @touchstart="openFilter"></i>
  5 + <i v-else class="icon icon-filter" slot="right" @click="openFilter"></i>
5 </cheader> 6 </cheader>
6 <List :data="productList" :state="listState"></List> 7 <List :data="productList" :state="listState"></List>
7 <Filter :config="filterConfig" action="/product/list.json" v-ref:filter></Filter> 8 <Filter :config="filterConfig" action="/product/list.json" v-ref:filter></Filter>
@@ -9,6 +10,7 @@ @@ -9,6 +10,7 @@
9 </template> 10 </template>
10 <script> 11 <script>
11 const $ = require('jquery'); 12 const $ = require('jquery');
  13 + const yoho = require('yoho');
12 const Vue = require('vue'); 14 const Vue = require('vue');
13 const lazyload = require('vue-lazyload'); 15 const lazyload = require('vue-lazyload');
14 const infinitScroll = require('vue-infinite-scroll'); 16 const infinitScroll = require('vue-infinite-scroll');
@@ -29,6 +31,7 @@ @@ -29,6 +31,7 @@
29 el: '#product-new', 31 el: '#product-new',
30 data: function() { 32 data: function() {
31 return { 33 return {
  34 + isiOS: yoho.isiOS,
32 sortName: locationQuery.sort_name, 35 sortName: locationQuery.sort_name,
33 filterConfig: null, 36 filterConfig: null,
34 37
@@ -151,6 +154,4 @@ @@ -151,6 +154,4 @@
151 } 154 }
152 }; 155 };
153 156
154 -</script>  
155 -<style>  
156 -</style> 157 +</script>
@@ -5,7 +5,8 @@ @@ -5,7 +5,8 @@
5 <span v-if="shareData.isBlkShop" v-show="shareData.isFav" class="icon" @click="collectShop()">&#xe60d;</span> 5 <span v-if="shareData.isBlkShop" v-show="shareData.isFav" class="icon" @click="collectShop()">&#xe60d;</span>
6 <span v-if="shareData.isBlkShop" v-show="!shareData.isFav" class="icon" @click="collectShop()">&#xe60c;</span> 6 <span v-if="shareData.isBlkShop" v-show="!shareData.isFav" class="icon" @click="collectShop()">&#xe60c;</span>
7 <span v-if="shareData.isBlkShop" class="icon" @click="goShare()">&#xe60e;</span> 7 <span v-if="shareData.isBlkShop" class="icon" @click="goShare()">&#xe60e;</span>
8 - <span class="icon" @touchstart="showFilter()">&#xe60b;</span> 8 + <span v-if="isiOS" class="icon" @touchstart="showFilter()">&#xe60b;</span>
  9 + <span v-else class="icon" @click="showFilter()">&#xe60b;</span>
9 </template> 10 </template>
10 </cheader> 11 </cheader>
11 </div> 12 </div>
@@ -29,7 +30,9 @@ @@ -29,7 +30,9 @@
29 30
30 module.exports = { 31 module.exports = {
31 data() { 32 data() {
32 - return {}; 33 + return {
  34 + isiOS: yoho.isiOS
  35 + };
33 }, 36 },
34 props: { 37 props: {
35 shareData: { 38 shareData: {