use Girldayc

@@ -9,6 +9,8 @@ var $ = require('jquery'),
 
 var diaLog = require('./dialog');
 
+var tip = require('../plugin/tip');
+
 var $navLi = $('#fav-tab > li'),
     $favContainer = $('.fav-content > .fav-type'),
     swiperObj = {},
@@ -90,11 +92,13 @@ function loadData($parent, url, page) {
             if (data === ' ') {
                 $loadingMask.addClass('hide');
                 $parent.closest('.fav-type').find('.fav-null-box').removeClass('hide');
+                window.rePosFooter();
             } else if (data === 'end') {
 
                 //处理data等于end时如果loadingMask存在且没有hide样式的情况
                 if ($loadingMask && !$loadingMask.hasClass('hide')) {
                     $loadingMask.addClass('hide');
+
                     //$parent.closest('.fav-type').find('.fav-null-box').removeClass('hide');
                 }
 
@@ -257,7 +261,7 @@ $(document).on('touchend', '.swiper-header', function() {
     }
 });
 
-$('.invalidGoods').on('touchstart touchend', function() {
+$('.invalidGoods').on('touchstart touchend', function(e) {
     var $this = $(e.target).closest('span');
 
     if ($this.hasClass('del-fav')) {
@@ -265,4 +269,4 @@ $('.invalidGoods').on('touchstart touchend', function() {
     }
     tip.show('商品已下架');
     return false;
-});
\ No newline at end of file
+});

@@ -14,8 +14,13 @@ use Plugin\Helpers;
  */
 class GirldayController extends HuodongAction
 {
+<<<<<<< HEAD
     // const STATIC_VERSION = 'http://localhost:2222/1.0.1';
     const STATIC_FILE = 'http://cdn.yoho.cn/huodong/2016xinshili-2/1.0.1';
+=======
+    // const STATIC_VERSION = 'http://localhost:2222/1.0.2';
+    const STATIC_FILE = 'http://cdn.yoho.cn/huodong/2016xinshili-2/1.0.2';
+>>>>>>> 89ce101806024ff1d9da2d1507e6bef093cc26b1
 
     /**
      * 检测登录状态

@@ -15,7 +15,7 @@ use WebPlugin\Helpers;
 class GirldayController extends HuodongAction
 {
     // const STATIC_FILE = 'http://localhost:2222/1.0.0';
-    const STATIC_FILE = 'http://cdn.yoho.cn/huodong/2016xinshili-2-web/1.0.0';
+    const STATIC_FILE = 'http://cdn.yoho.cn/huodong/2016xinshili-2-web/1.0.1';
     /**
      * 检测登录状态
      *