Merge branch 'develop' into release/1.0

@@ -11,13 +11,13 @@ const _ = require('lodash');
 
 const yhChannel = {
     men: {
-        channel: '1'
+        channel: '301'
     },
     women: {
-        channel: '2'
+        channel: '302'
     },
     lifestyle: {
-        channel: '4'
+        channel: '303'
     }
 };
 

@@ -7,6 +7,8 @@ const parse = require('yoho-qs/parse'); // 提供解析函数
 
 const origin = location.origin;
 
+console.log('定义拦截跳转');
+
 /**
  * TODO: 结构优化
  */

@@ -22,6 +22,9 @@ const util = require('common/util');
 const interceptClick = require('common/intercept-click');
 const bus = require('common/vue-bus');
 
+
+console.log('index 依赖拦截跳转');
+
 /**
  * iOS 7 不支持 Promise, vue-lazyload 有用到，所以全局申明
  */

@@ -33,13 +33,13 @@
         text-align: center;
 
         a.modal-button {
-            width: 45%;
+            width: 49%;
+            height: 100%;
             display: inline-block;
-            margin-top: 0.5rem;
-            align-self: center;
             text-align: center;
             color: $blue;
             font-size: 30px;
+            line-height: 88px;
         }
 
         :not(:first-child) {

@@ -3,19 +3,19 @@
         <div class="cate-container clearfix">
             <div class="content" style="height: 522px;">
                 <ul class="primary-level">
-                    <li v-for="(index, ca) in cateNavLeftData" v-bind:class="{focus: index === leftcurrent}" class="p-level-item" v-on:click='cateNavLeftFun(index, ca.relationParameter.sort, ca.categoryName)'>
+                    <li v-for="(index, ca) in cateNavLeftData" class="ellipsis" v-bind:class="{focus: index === leftcurrent}" class="p-level-item" v-on:click='cateNavLeftFun(index, ca.relationParameter.sort, ca.categoryName)'>
                         {{ca.categoryName}}
                     </li>
                 </ul>
                 <div class="sub-level-container">
                     <ul class="sub-level">
-                        <li >
+                        <li class="ellipsis">
                             <a v-if="jump" href="/product/list?sort={{rightAll.sortId}}&sort_name=全部{{rightAll.categoryName}}&gender={{gender}}">全部{{rightAll.categoryName}}</a>
                             <a v-else @click="noJumpReturn(rightAll.sortId, '全部' + rightAll.categoryName)">全部{{rightAll.categoryName}}</a>
                         </li>
                     </ul>
                     <ul class="sub-level">
-                        <li v-for="sub in cateNavRightData">
+                        <li v-for="sub in cateNavRightData" class="ellipsis">
                             <a v-if="jump" href="/product/list?sort={{sub.relationParameter.sort}}&sort_name={{sub.categoryName}}&gender={{gender}}">{{sub.categoryName}}</a>
                             <a v-else @click="noJumpReturn(sub.relationParameter.sort, sub.categoryName)">{{sub.categoryName}}</a>
                         </li>
@@ -130,9 +130,6 @@
             height: 120px;
             line-height: 120px;
             padding: 0 32px;
-            white-space: nowrap;
-            overflow: hidden;
-            text-overflow: ellipsis;
             border-bottom: 1px solid #e6e6e6;
             user-select: none;
 
@@ -195,9 +192,7 @@
         }
 
         a {
-            display: block;
-            height: 100%;
-            width: 100%;
+            display: inline;
             color: #000;
         }
     }
@@ -255,7 +250,8 @@
                 this.$set('cateNavLeftData', this.category);
                 this.$set('cateNavRightData', this.cateNavLeftData ? this.cateNavLeftData[0].sub : []);
 
-                let allSorts = this.cateNavLeftData[0].sub ? this.cateNavLeftData[0].sub.map(sort=>sort.relationParameter.sort).join(',') : '';
+                let allSorts = this.cateNavLeftData[0].sub ?
+                    this.cateNavLeftData[0].sub.map(sort=>sort.relationParameter.sort).join(',') : '';
 
                 this.$set('rightAll', this.cateNavLeftData ? {
                     sortId: allSorts,

@@ -26,7 +26,7 @@
         <h2 class="editorial-relate-title">相关品牌</h2>
         <ul>
             <li v-for="item in brands">
-                <a :href="item.url | brandUrl">
+                <a :href="'/product/shop/' + item.brandDomain">
                     <img :src="item.thumb">
                     <span class="brand-name line-clamp-1"> {{item.name}}</span>
                 </a>
@@ -163,10 +163,10 @@
                 }
             }
 
-            .brand-name{
+            .brand-name {
                 font-size: 18px;
                 line-height: 25px;
-                color: #B0B0B0;
+                color: #b0b0b0;
             }
         }
     }

@@ -27,12 +27,12 @@
     .editorial-box {
         background: #f6f6f6;
         border-bottom: #eee 1px solid;
+        padding-top: 30px;
 
         .img {
             width: 100%;
             height: 470px;
             overflow: hidden;
-            padding-top: 30px;
 
             img {
                 width: 100%;

@@ -78,6 +78,8 @@
     const interceptClick = require('common/intercept-click');
     const cheader = require('component/header.vue');
 
+    console.log('业务代码 依赖拦截跳转');
+
     module.exports = {
         data() {
             return {