Merge remote-tracking branch 'origin/develop' into develop

@@ -28,11 +28,13 @@
 
     module.exports = {
         data() {
+            const detaultChannel = qs.channel || cookie.get('_Channel') || 'men';
+            
             return {
                 category: [],
                 categoryResult: {},
-                gender: '1,3',
-                detaultChannel: qs.channel || cookie.get('_Channel') || 'men'
+                detaultChannel: detaultChannel,
+                gender: channelTrans[detaultChannel].code,
             };
         },
         components: {

 <template>
     <div>
         <cheader :title="sortName" class="list-header">
-            <i class="icon icon-filter" slot="right" @click="openFilter"></i>
+            <i class="icon icon-filter" slot="right" @touchstart="openFilter"></i>
         </cheader>
         <order :config="orderConfig" :val="order" v-if="enableOrder"></order>
         <List :data="productList" :state="listState"></List>

 <template>
     <div>
         <cheader title="新品抢先看">
-            <i class="icon icon-filter" slot="right" @click="openFilter"></i>
+            <i class="icon icon-filter" slot="right" @touchstart="openFilter"></i>
         </cheader>
         <List :data="productList"  :state="listState"></List>
         <Filter :config="filterConfig" action="/product/list.json" v-ref:filter></Filter>

@@ -5,7 +5,7 @@
                 <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" @click="showFilter()">&#xe60b;</span>
+                <span class="icon" @touchstart="showFilter()">&#xe60b;</span>
             </template>
         </cheader>
     </div>