Merge branch 'beta/wap' of http://git.dev.yoho.cn/web/yohobuy into beta/wap

@@ -8276,8 +8276,7 @@ define("js/me/index", ["jquery","swiper","index"], function(require, exports, mo
  * @author: bikai<kai.bi@yoho.cn>
  * @author: bikai<kai.bi@yoho.cn>
  * @date: 2015/11/12
  * @date: 2015/11/12
  */
  */
-var $ = require("jquery"),
-    noticeScroll = require("js/plugin/notice-scroll");
+var $ = require("jquery");
 var $userAvatar = $('.user-avatar'),
 var $userAvatar = $('.user-avatar'),
     $listItem = $('.list-item');
     $listItem = $('.list-item');
 var myImage = new Image(),
 var myImage = new Image(),
@@ -8293,8 +8292,6 @@ myImage.onload = function() {
     $userAvatar.css('background-image', 'url(' + avatar + ')');
     $userAvatar.css('background-image', 'url(' + avatar + ')');
 };
 };
 
 
-noticeScroll('.notice');
-
 $('.yoho-page').on('touchstart', '.list-item, .type-item, .order-title', function() {
 $('.yoho-page').on('touchstart', '.list-item, .type-item, .order-title', function() {
     $listItem.removeClass('highlight');
     $listItem.removeClass('highlight');
     $(this).addClass('highlight');
     $(this).addClass('highlight');
@@ -8303,38 +8300,6 @@ $('.yoho-page').on('touchstart', '.list-item, .type-item, .order-title', functio
 });
 });
 
 
 });
 });
-define("js/plugin/notice-scroll", ["jquery"], function(require, exports, module){
-/**
- * 公告栏目滚动
- * bikai kai.bi@yoho.cn
- */
-
-var $ = require("jquery");
-
-function noticeScroll(selecter, time) {
-    var $notice = $(selecter),
-        $noticeItem = $notice.find('.notice-item'),
-        count = $noticeItem.length,
-        i = 1;
-
-    selecter = selecter || '.notice';
-    time = time || 3000;
-
-    if (count > 1) {
-        setInterval(function() {
-            if (i >= count) {
-                i = 0;
-            }
-            $noticeItem.fadeOut();
-            $notice.find('.item-' + i).fadeIn();
-            i++;
-        }, time);
-    }
-}
-
-module.exports = noticeScroll;
-
-});
 define("js/product/recommend-for-you", ["swiper","jquery","index"], function(require, exports, module){
 define("js/product/recommend-for-you", ["swiper","jquery","index"], function(require, exports, module){
 /**
 /**
  * 为您优选
  * 为您优选
@@ -8658,6 +8623,13 @@ $page.on('touchstart', '.del-icon', function() {
         });
         });
     });
     });
 });
 });
+
+$('.deps').on('touchstart', 'span', function() {
+    $(this).css('background', '#eee');
+}).on('touchend touchcancel', 'span', function() {
+    $(this).css('background', 'transparent');
+});
+
 });
 });
 define("js/me/address-act", ["jquery","hammer"], function(require, exports, module){
 define("js/me/address-act", ["jquery","hammer"], function(require, exports, module){
 /**
 /**
@@ -9385,8 +9357,8 @@ $('.btn-balance').on('touchend', function() {
     }
     }
 });
 });
 
 
-$('.off-shell-goods .shopping-cart-good').on('touchend', function() {
-    tip.show('商品已下架');
+$('.off-shell-goods').on('touchstart touchend', function() {
+    return false;
 });
 });
 
 
 $('.chose').on('touchend', function() {
 $('.chose').on('touchend', function() {
@@ -9533,6 +9505,11 @@ $('.icon-edit').on('touchstart', function(e) {
         count,
         count,
         canEditNum;
         canEditNum;
 
 
+    if ($this.parents('.off-shell-goods').length) {
+        tip.show('商品已下架');
+        return false;
+    }
+
     //如果点击的是上次编辑的商品,直接显示chose-pannel
     //如果点击的是上次编辑的商品,直接显示chose-pannel
     if (skn === previousEditSkn) {
     if (skn === previousEditSkn) {
         chosePanel.show();
         chosePanel.show();
@@ -9578,6 +9555,11 @@ $('.icon-edit').on('touchstart', function(e) {
 $('.icon-del').on('touchstart', function(e) {
 $('.icon-del').on('touchstart', function(e) {
     var $this = $(this);
     var $this = $(this);
 
 
+    if ($this.parents('.off-shell-goods').length) {
+        tip.show('商品已下架');
+        return false;
+    }
+
     e.stopPropagation();
     e.stopPropagation();
 
 
     dialog.showDialog({
     dialog.showDialog({