Merge remote-tracking branch 'origin/develop' into develop
Showing
4 changed files
with
7 additions
and
5 deletions
| @@ -28,11 +28,13 @@ | @@ -28,11 +28,13 @@ | ||
| 28 | 28 | ||
| 29 | module.exports = { | 29 | module.exports = { |
| 30 | data() { | 30 | data() { |
| 31 | + const detaultChannel = qs.channel || cookie.get('_Channel') || 'men'; | ||
| 32 | + | ||
| 31 | return { | 33 | return { |
| 32 | category: [], | 34 | category: [], |
| 33 | categoryResult: {}, | 35 | categoryResult: {}, |
| 34 | - gender: '1,3', | ||
| 35 | - detaultChannel: qs.channel || cookie.get('_Channel') || 'men' | 36 | + detaultChannel: detaultChannel, |
| 37 | + gender: channelTrans[detaultChannel].code, | ||
| 36 | }; | 38 | }; |
| 37 | }, | 39 | }, |
| 38 | components: { | 40 | components: { |
| 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" @click="openFilter"></i> | 4 | + <i class="icon icon-filter" slot="right" @touchstart="openFilter"></i> |
| 5 | </cheader> | 5 | </cheader> |
| 6 | <order :config="orderConfig" :val="order" v-if="enableOrder"></order> | 6 | <order :config="orderConfig" :val="order" v-if="enableOrder"></order> |
| 7 | <List :data="productList" :state="listState"></List> | 7 | <List :data="productList" :state="listState"></List> |
| 1 | <template> | 1 | <template> |
| 2 | <div> | 2 | <div> |
| 3 | <cheader title="新品抢先看"> | 3 | <cheader title="新品抢先看"> |
| 4 | - <i class="icon icon-filter" slot="right" @click="openFilter"></i> | 4 | + <i class="icon icon-filter" slot="right" @touchstart="openFilter"></i> |
| 5 | </cheader> | 5 | </cheader> |
| 6 | <List :data="productList" :state="listState"></List> | 6 | <List :data="productList" :state="listState"></List> |
| 7 | <Filter :config="filterConfig" action="/product/list.json" v-ref:filter></Filter> | 7 | <Filter :config="filterConfig" action="/product/list.json" v-ref:filter></Filter> |
| @@ -5,7 +5,7 @@ | @@ -5,7 +5,7 @@ | ||
| 5 | <span v-if="shareData.isBlkShop" v-show="shareData.isFav" class="icon" @click="collectShop()"></span> | 5 | <span v-if="shareData.isBlkShop" v-show="shareData.isFav" class="icon" @click="collectShop()"></span> |
| 6 | <span v-if="shareData.isBlkShop" v-show="!shareData.isFav" class="icon" @click="collectShop()"></span> | 6 | <span v-if="shareData.isBlkShop" v-show="!shareData.isFav" class="icon" @click="collectShop()"></span> |
| 7 | <span v-if="shareData.isBlkShop" class="icon" @click="goShare()"></span> | 7 | <span v-if="shareData.isBlkShop" class="icon" @click="goShare()"></span> |
| 8 | - <span class="icon" @click="showFilter()"></span> | 8 | + <span class="icon" @touchstart="showFilter()"></span> |
| 9 | </template> | 9 | </template> |
| 10 | </cheader> | 10 | </cheader> |
| 11 | </div> | 11 | </div> |
-
Please register or login to post a comment