fe / YOHO-ACTIVITY-PHP · Commits

Go to a project

Authored by ccbikai
Commit 49f2b8e158e5c8d487f85bcdc7ae142dd7715d63 2 parents 5d2f7e18 a10f340b

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

Inline Side-by-side
Showing 4 changed files with 4 additions and 3 deletions
framework @ 119c247f
1 -Subproject commit 75bbc3b075de19f239532f60c5995d06c5f814e2 1 +Subproject commit 119c247f5cf929aa1e059e40609bb16dd6b58f05
@@ -80,7 +80,7 @@ function search() { @@ -80,7 +80,7 @@ function search() {
80 }, 80 },
81 success: function(data) { 81 success: function(data) {
82 if (data === ' ') { 82 if (data === ' ') {
83 - loading = true; 83 + loading = false;
84 if (gender) { 84 if (gender) {
85 if (gender === '1,3') { 85 if (gender === '1,3') {
86 url = '/boys/bottomBanner'; 86 url = '/boys/bottomBanner';
@@ -196,6 +196,7 @@ function search(opt) { @@ -196,6 +196,7 @@ function search(opt) {
196 } 196 }
197 197
198 if (data === ' ') { 198 if (data === ' ') {
  199 + searching = false;
199 nav.end = true; 200 nav.end = true;
200 201
201 if (nav.reload) { 202 if (nav.reload) {
@@ -225,8 +225,8 @@ function search(opt) { @@ -225,8 +225,8 @@ function search(opt) {
225 } 225 }
226 226
227 if (data === ' ') { 227 if (data === ' ') {
  228 + searching = false;
228 nav.end = true; 229 nav.end = true;
229 -  
230 if (nav.reload) { 230 if (nav.reload) {
231 $container.html(noResult); 231 $container.html(noResult);
232 } 232 }