wangshusheng / YOHOBUYPC · Commits

Go to a project

Authored by youfu
Commit 3c23a4c616f25c6811dcf65d2f3a8f6813f42373 2 parents d5e4dc9e 89ce1018

use Girldayc

Inline Side-by-side
Showing 3 changed files with 11 additions and 2 deletions
@@ -9,6 +9,8 @@ var $ = require('jquery'), @@ -9,6 +9,8 @@ var $ = require('jquery'),
9 9
10 var diaLog = require('./dialog'); 10 var diaLog = require('./dialog');
11 11
  12 +var tip = require('../plugin/tip');
  13 +
12 var $navLi = $('#fav-tab > li'), 14 var $navLi = $('#fav-tab > li'),
13 $favContainer = $('.fav-content > .fav-type'), 15 $favContainer = $('.fav-content > .fav-type'),
14 swiperObj = {}, 16 swiperObj = {},
@@ -90,11 +92,13 @@ function loadData($parent, url, page) { @@ -90,11 +92,13 @@ function loadData($parent, url, page) {
90 if (data === ' ') { 92 if (data === ' ') {
91 $loadingMask.addClass('hide'); 93 $loadingMask.addClass('hide');
92 $parent.closest('.fav-type').find('.fav-null-box').removeClass('hide'); 94 $parent.closest('.fav-type').find('.fav-null-box').removeClass('hide');
  95 + window.rePosFooter();
93 } else if (data === 'end') { 96 } else if (data === 'end') {
94 97
95 //处理data等于end时如果loadingMask存在且没有hide样式的情况 98 //处理data等于end时如果loadingMask存在且没有hide样式的情况
96 if ($loadingMask && !$loadingMask.hasClass('hide')) { 99 if ($loadingMask && !$loadingMask.hasClass('hide')) {
97 $loadingMask.addClass('hide'); 100 $loadingMask.addClass('hide');
  101 +
98 //$parent.closest('.fav-type').find('.fav-null-box').removeClass('hide'); 102 //$parent.closest('.fav-type').find('.fav-null-box').removeClass('hide');
99 } 103 }
100 104
@@ -257,7 +261,7 @@ $(document).on('touchend', '.swiper-header', function() { @@ -257,7 +261,7 @@ $(document).on('touchend', '.swiper-header', function() {
257 } 261 }
258 }); 262 });
259 263
260 -$('.invalidGoods').on('touchstart touchend', function() { 264 +$('.invalidGoods').on('touchstart touchend', function(e) {
261 var $this = $(e.target).closest('span'); 265 var $this = $(e.target).closest('span');
262 266
263 if ($this.hasClass('del-fav')) { 267 if ($this.hasClass('del-fav')) {
@@ -14,8 +14,13 @@ use Plugin\Helpers; @@ -14,8 +14,13 @@ use Plugin\Helpers;
14 */ 14 */
15 class GirldayController extends HuodongAction 15 class GirldayController extends HuodongAction
16 { 16 {
  17 +<<<<<<< HEAD
17 // const STATIC_VERSION = 'http://localhost:2222/1.0.1'; 18 // const STATIC_VERSION = 'http://localhost:2222/1.0.1';
18 const STATIC_FILE = 'http://cdn.yoho.cn/huodong/2016xinshili-2/1.0.1'; 19 const STATIC_FILE = 'http://cdn.yoho.cn/huodong/2016xinshili-2/1.0.1';
  20 +=======
  21 + // const STATIC_VERSION = 'http://localhost:2222/1.0.2';
  22 + const STATIC_FILE = 'http://cdn.yoho.cn/huodong/2016xinshili-2/1.0.2';
  23 +>>>>>>> 89ce101806024ff1d9da2d1507e6bef093cc26b1
19 24
20 /** 25 /**
21 * 检测登录状态 26 * 检测登录状态
@@ -15,7 +15,7 @@ use WebPlugin\Helpers; @@ -15,7 +15,7 @@ use WebPlugin\Helpers;
15 class GirldayController extends HuodongAction 15 class GirldayController extends HuodongAction
16 { 16 {
17 // const STATIC_FILE = 'http://localhost:2222/1.0.0'; 17 // const STATIC_FILE = 'http://localhost:2222/1.0.0';
18 - const STATIC_FILE = 'http://cdn.yoho.cn/huodong/2016xinshili-2-web/1.0.0'; 18 + const STATIC_FILE = 'http://cdn.yoho.cn/huodong/2016xinshili-2-web/1.0.1';
19 /** 19 /**
20 * 检测登录状态 20 * 检测登录状态
21 * 21 *