冲突合并

-<<<<<<< HEAD
 
 
 require('./channel/detail');
 require('./channel/detail');
 require('./channel/magazine')
 require('./channel/magazine')
-=======
-<<<<<<< HEAD
-require('./channel/detail');
-require('./channel/magazine')
-=======
->>>>>>> develop
+
 var $=require("jquery");
 var $=require("jquery");
 var tips=require("yoho-tips");
 var tips=require("yoho-tips");
 var box=require("yoho-box");
 var box=require("yoho-box");
@@ -98,9 +92,3 @@ dealItems();
             $(".followus-button").trigger("click");
             $(".followus-button").trigger("click");
         }
         }
     });
     });
-<<<<<<< HEAD
-//===================================================================================================================
-=======
-    //===================================================================================================================
->>>>>>> ww_develop
->>>>>>> develop

@@ -7,14 +7,11 @@
 var $ = require('jquery'),
 var $ = require('jquery'),
     share = require('../plugin/share'),
     share = require('../plugin/share'),
     box = require('../plugin/box'),
     box = require('../plugin/box'),
-<<<<<<< HEAD
-    imgZoom = require('../plugin/imgzoom'),
-    tools = require('yoho-tools');
-=======
+
     imgZoom = require('../plugin/imgZoom'),
     imgZoom = require('../plugin/imgZoom'),
     tools = require('yoho-tools'),
     tools = require('yoho-tools'),
     mulLine = require('mlellipsis');
     mulLine = require('mlellipsis');
->>>>>>> develop
+
 
 
 require('lazyload');
 require('lazyload');
 require('../plugin/slider');
 require('../plugin/slider');
@@ -26,12 +23,6 @@ exports.init = function() {
         detailTitle = $(".detail-title").find("h1"),
         detailTitle = $(".detail-title").find("h1"),
         detailSubtitle = $(".detail-title").find("h2"),
         detailSubtitle = $(".detail-title").find("h2"),
         ajaxParam,
         ajaxParam,
-<<<<<<< HEAD
-        cidNum;
-
-    //底部数据相关变量
-
-=======
         i,
         i,
         data,
         data,
         cidNum;
         cidNum;
@@ -67,7 +58,7 @@ exports.init = function() {
 
 
     //初始化截行插件
     //初始化截行插件
     mulLine.init();
     mulLine.init();
->>>>>>> develop
+
     //分享
     //分享
     share.init({
     share.init({
         shareUrl: shareUrl,
         shareUrl: shareUrl,
@@ -102,7 +93,7 @@ exports.init = function() {
             //box.alert(tips.getTips("emailError"),5);
             //box.alert(tips.getTips("emailError"),5);
             box.alert(22);
             box.alert(22);
             return;
             return;
-<<<<<<< HEAD
+
         }
         }
         window.open('/passport/subscribe/index?email=' + input.val());
         window.open('/passport/subscribe/index?email=' + input.val());
     });
     });
@@ -320,7 +311,7 @@ exports.init = function() {
 
 
 
 
             });
             });
-=======
+
         }
         }
         window.open('/passport/subscribe/index?email=' + input.val());
         window.open('/passport/subscribe/index?email=' + input.val());
     });
     });
@@ -582,7 +573,6 @@ exports.init = function() {
             } else {
             } else {
                 $(".comment-num").html('<img src="' + YohoConfig.resUrl + '/res/new/boys/images/mobile/comment-mobile.png">');
                 $(".comment-num").html('<img src="' + YohoConfig.resUrl + '/res/new/boys/images/mobile/comment-mobile.png">');
             }
             }
->>>>>>> develop
         }
         }
     });
     });
 }
 }

@@ -9,13 +9,10 @@ var $ = require('jquery'),
     swiper = require('yoho-idangerous.swiper');
     swiper = require('yoho-idangerous.swiper');
 
 
 require('lazyload');
 require('lazyload');
-<<<<<<< HEAD
-require('../plugin/imgslider');
-require('../plugin/imgzoom');
-=======
+
 require('../plugin/imgSlider');
 require('../plugin/imgSlider');
 require('../plugin/imgZoom');
 require('../plugin/imgZoom');
->>>>>>> develop
+
 
 
 exports.init = function() {
 exports.init = function() {
     var shareUrl = $('.share').attr('data-link'),
     var shareUrl = $('.share').attr('data-link'),
@@ -94,7 +91,7 @@ exports.init = function() {
         clearTimeout(magazineTimer);
         clearTimeout(magazineTimer);
         magazineTimer = setTimeout(function() {
         magazineTimer = setTimeout(function() {
             $('.column-slide.magazine-list').imgSlider('resize');
             $('.column-slide.magazine-list').imgSlider('resize');
-        }, 0)
+        }, 0);
     });
     });
 
 
     $.ajax({
     $.ajax({
@@ -224,4 +221,4 @@ exports.init = function() {
             isContainer: true
             isContainer: true
         });
         });
     });
     });
-}
+};

@@ -19,19 +19,15 @@
       "jquery": "~1.8.3",
       "jquery": "~1.8.3",
       "lazyload": "~1.9.6",
       "lazyload": "~1.9.6",
       "yoho.swiper": "~2.7.0",
       "yoho.swiper": "~2.7.0",
-      "yoho-idangerous.swiper": "~0.0.2",
+      "yoho-idangerous.swiper": "0.0.2",
       "box": "~0.0.0",
       "box": "~0.0.0",
       "yoho-box": "~0.0.1",
       "yoho-box": "~0.0.1",
       "yoho-tools": "~0.0.4",
       "yoho-tools": "~0.0.4",
       "yoho-tips": "~0.0.1",
       "yoho-tips": "~0.0.1",
       "jquery-ui": "~1.11.1",
       "jquery-ui": "~1.11.1",
-
       "mustache": "2.0.0",
       "mustache": "2.0.0",
-      "yoho-idangerous.swiper": "0.0.2",
-      "jquery.autocomplete": "0.0.2",
-      "mlellipsis": "0.0.2",
-
-      "jquery.autocomplete": "~0.0.2"
+      "jquery.autocomplete": "~0.0.2",
+      "mlellipsis": "~0.0.2"
     },
     },
     "devDependencies": {
     "devDependencies": {
       "expect.js": "0.3.1"
       "expect.js": "0.3.1"