冲突解决

@@ -6,7 +6,6 @@
 window.tmp$ = null;
 var $ = require('jquery');
 window.tmp$ = $;
-<<<<<<< HEAD
 var Swiper = require("yoho.swiper");
 require('./plugin/lazyloadImage');
 $(".lazy").lazyload();
@@ -27,13 +26,12 @@ $.fn.left = function() {
         return parseFloat($(this).css("left").replace("px", ""));
     }
 };
-=======
+
 require("lazyload");
 var Swiper = require("yoho-idangerous.swiper");
 $(".lazy").lazyload();
 
 //扩展jquery=================================================================
->>>>>>> ww_develop
 $.fn.id = function() {
     if (arguments.length > 0) {
         $(this).attr("id", arguments[0]);
@@ -46,21 +44,12 @@ $.fn.id = function() {
 //banner========================================================================================================
 if ($(".swiper-container").find(".swiper-slide").length > 1) {
     var mySwiper = new Swiper('.swiper-container', {
-<<<<<<< HEAD
         pagination: '.pagination-banner',
         loop: true,
         autoplay: 5000,
         grabCursor: true,
         paginationClickable: true,
         autoStopPlay: false
-=======
-        pagination : '.pagination-banner',
-        loop : true,
-        autoplay : 5000,
-        grabCursor : true,
-        paginationClickable : true,
-        autoStopPlay : false
->>>>>>> ww_develop
     });
     $('.arrow-left').on('click', function(e) {
         e.preventDefault();
@@ -110,15 +99,6 @@ $(".li-weixin").mouseover(function() {
 $(".li-weixin").click(function() {
     return false;
 });
-<<<<<<< HEAD
-$("#maxEnterprise").click(function() {
-    $(".bitmap").hide();
-    $(".pop").hide();
-});
-$("#minEnterprise").click(function() {
-    $(".bitmap").hide();
-    $(".pop").hide();
-});
 
 $(".content").click(function() {
     $(".bitmap").hide();
@@ -327,7 +307,6 @@ window.currentWidth = document.body.clientWidth;
 
 var isIpad = getBrowType().bIsIpad;
 
-=======
 
 $(function() {
     dealItems();
@@ -344,7 +323,6 @@ fillDetail();
 
 var isIpad = getBrowType().bIsIpad;
 
->>>>>>> ww_develop
 if (isIpad === true) {
     $(".search-loading-icon").hide();
     $(".search-area").width($(".search-area").width() - 43);
@@ -354,29 +332,17 @@ if (isIpad === true) {
     $(".search-text").show();
 }
 
-<<<<<<< HEAD
 
-=======
->>>>>>> ww_develop
 function getBrowType() {
     var info = {};
     var sUserAgent = navigator.userAgent.toLowerCase();
     info.bIsIpad = sUserAgent.match(/ipad/i) == "ipad";
-<<<<<<< HEAD
-    //		    info.bIsIphoneOs = sUserAgent.match(/iphone os/i) == "iphone os";   
-    //		    info.bIsMidp = sUserAgent.match(/midp/i) == "midp";   
-    //		    info.bIsUc7 = sUserAgent.match(/rv:1.2.3.4/i) == "rv:1.2.3.4";   
-    //		    info.bIsUc = sUserAgent.match(/ucweb/i) == "ucweb";   
-    //		    info.bIsAndroid = sUserAgent.match(/android/i) == "android";   
-    //		    info.bIsCE = sUserAgent.match(/windows ce/i) == "windows ce";   
-=======
     //		    info.bIsIphoneOs = sUserAgent.match(/iphone os/i) == "iphone os";
     //		    info.bIsMidp = sUserAgent.match(/midp/i) == "midp";
     //		    info.bIsUc7 = sUserAgent.match(/rv:1.2.3.4/i) == "rv:1.2.3.4";
     //		    info.bIsUc = sUserAgent.match(/ucweb/i) == "ucweb";
     //		    info.bIsAndroid = sUserAgent.match(/android/i) == "android";
     //		    info.bIsCE = sUserAgent.match(/windows ce/i) == "windows ce";
->>>>>>> ww_develop
     //		    info.bIsWM = sUserAgent.match(/windows mobile/i) == "windows mobile";
     return info;
 }
@@ -389,15 +355,6 @@ if (!isIpad && $(".share").size() > 0) {
         scrollTop = $(window).scrollTop();
         if (shareOffsetTop - scrollTop - navHeight <= 0) {
             $(".share").css({
-<<<<<<< HEAD
-                "position": "fixed",
-                "top": navHeight
-            });
-        } else {
-            $(".share").css({
-                "position": "absolute",
-                "top": shareOffsetTop
-=======
                 "position" : "fixed",
                 "top" : navHeight
             });
@@ -405,13 +362,11 @@ if (!isIpad && $(".share").size() > 0) {
             $(".share").css({
                 "position" : "absolute",
                 "top" : shareOffsetTop
->>>>>>> ww_develop
             });
         }
     });
 }
 
-<<<<<<< HEAD
 window.scrollWindow = function() {
     if (document.body.clientWidth >= 1190) {
         //document.body.scrollTop=850;
@@ -424,7 +379,6 @@ window.scrollWindow = function() {
         window.tmp$(window).scrollTop(600);
     }
 };
-=======
 //搜索按钮===========================================================================
 $(".search-input-box").keypress(function(event) {
     var keyCode = event.keyCode;
@@ -476,4 +430,3 @@ window.scrollWindow = function() {
         window.tmp$(window).scrollTop(600);
     }
 };
->>>>>>> ww_develop

@@ -25,7 +25,7 @@
       "yoho-tools": "~0.0.4",
       "yoho-tips": "~0.0.1",
       "jquery-ui": "~1.11.1",
-      "mustache": "2.0.0",
+      "mustache": "~2.0.0",
       "jquery.autocomplete": "~0.0.2"
     },
     "devDependencies": {