Authored by 陈轩

Merge remote-tracking branch 'origin/release/5.1' into release/5.1

@@ -12,7 +12,6 @@ var windowHeight = $(window).height(); @@ -12,7 +12,6 @@ var windowHeight = $(window).height();
12 var scrollFn, 12 var scrollFn,
13 scrollTop, 13 scrollTop,
14 RECPOSE, 14 RECPOSE,
15 - CID,  
16 isApp, 15 isApp,
17 speckParamApp = { 16 speckParamApp = {
18 udid: '', 17 udid: '',
@@ -66,7 +65,6 @@ plusstar = { @@ -66,7 +65,6 @@ plusstar = {
66 window._yas.sendCustomInfo({ 65 window._yas.sendCustomInfo({
67 op: 'YB_FASHION_TAB_C', 66 op: 'YB_FASHION_TAB_C',
68 param: JSON.stringify($.extend(speckParamApp, { 67 param: JSON.stringify($.extend(speckParamApp, {
69 - C_ID: CID,  
70 TAB_ID: $liDom.index() + 1 68 TAB_ID: $liDom.index() + 1
71 })) 69 }))
72 }, true); 70 }, true);
@@ -74,7 +72,6 @@ plusstar = { @@ -74,7 +72,6 @@ plusstar = {
74 window._yas.sendCustomInfo({ 72 window._yas.sendCustomInfo({
75 op: 'YB_FASHION_HOME_L', 73 op: 'YB_FASHION_HOME_L',
76 param: JSON.stringify($.extend(speckParamApp, { 74 param: JSON.stringify($.extend(speckParamApp, {
77 - C_ID: CID,  
78 TAB_ID: that.ParentLiDom.index() + 1 75 TAB_ID: that.ParentLiDom.index() + 1
79 })) 76 }))
80 }, true); 77 }, true);
@@ -128,7 +125,6 @@ plusstar = { @@ -128,7 +125,6 @@ plusstar = {
128 window._yas.sendCustomInfo({ 125 window._yas.sendCustomInfo({
129 op: 'YB_FASHION_FLR_C', 126 op: 'YB_FASHION_FLR_C',
130 param: JSON.stringify($.extend(speckParamApp, { 127 param: JSON.stringify($.extend(speckParamApp, {
131 - C_ID: CID,  
132 TAB_ID: that.ParentLiDom.index() + 1, 128 TAB_ID: that.ParentLiDom.index() + 1,
133 F_ID: $dom.closest('ul').data('id'), 129 F_ID: $dom.closest('ul').data('id'),
134 F_NAME: '焦点图', 130 F_NAME: '焦点图',
@@ -145,7 +141,6 @@ plusstar = { @@ -145,7 +141,6 @@ plusstar = {
145 window._yas.sendCustomInfo({ 141 window._yas.sendCustomInfo({
146 op: 'YB_FASHION_FLR_C', 142 op: 'YB_FASHION_FLR_C',
147 param: JSON.stringify($.extend(speckParamApp, { 143 param: JSON.stringify($.extend(speckParamApp, {
148 - C_ID: CID,  
149 TAB_ID: that.ParentLiDom.index() + 1, 144 TAB_ID: that.ParentLiDom.index() + 1,
150 F_ID: $dom.data('fid'), 145 F_ID: $dom.data('fid'),
151 F_NAME: $dom.data('name'), 146 F_NAME: $dom.data('name'),
@@ -161,7 +156,6 @@ plusstar = { @@ -161,7 +156,6 @@ plusstar = {
161 window._yas.sendCustomInfo({ 156 window._yas.sendCustomInfo({
162 op: 'YB_FASHION_HOME_L', 157 op: 'YB_FASHION_HOME_L',
163 param: JSON.stringify($.extend(speckParamApp, { 158 param: JSON.stringify($.extend(speckParamApp, {
164 - C_ID: CID,  
165 TAB_ID: that.ParentLiDom.index() + 1 159 TAB_ID: that.ParentLiDom.index() + 1
166 })) 160 }))
167 }, true); 161 }, true);
@@ -321,7 +315,7 @@ $(function() { @@ -321,7 +315,7 @@ $(function() {
321 } 315 }
322 316
323 // 男:1,女:2,潮童:3,创意生活:4 317 // 男:1,女:2,潮童:3,创意生活:4
324 - CID = window._ChannelVary[window.cookie('_Channel')] || 1; 318 + speckParamApp.CID = window.queryString.yh_channel || window._ChannelVary[window.cookie('_Channel')] || 1;
325 319
326 if (!(window.queryString.app_version || window.queryString.appVersion)) { 320 if (!(window.queryString.app_version || window.queryString.appVersion)) {
327 $('.tab-nav').css({ 321 $('.tab-nav').css({