lyn7568 6 years ago
parent
commit
d4329649ad
1 changed files with 19 additions and 3 deletions
  1. 19 3
      src/pages/h5/views/search/search.vue

+ 19 - 3
src/pages/h5/views/search/search.vue

@ -273,13 +273,13 @@ export default {
273 273
      this.pageNo++;
274 274
      setTimeout(() => {
275 275
        that.tabTofun()
276
        that.scrollData.noFlag = true;
277 276
        done();
278 277
      }, 2000);
279 278
    },
280 279
    contentListFun() {
281 280
      var that = this
282 281
      that.scrollData.loading = true
282
      that.scrollData.noFlag = false
283 283
      this.$axios.get('/ajax/article/pq', {
284 284
        title: that.searchText,
285 285
        catalog: that.activeColumn,
@ -290,6 +290,7 @@ export default {
290 290
        if (res.success && res.data) {
291 291
          if (res.data.pageNo !== that.pageNo) {
292 292
            that.scrollData.loading = false
293
            that.scrollData.noFlag = true
293 294
            return;
294 295
          }
295 296
          var $info = res.data.data;
@ -308,6 +309,7 @@ export default {
308 309
    expertListFun() {
309 310
      var that = this
310 311
      that.scrollData.loading = true
312
      that.scrollData.noFlag = false
311 313
      that.$axios.get('/ajax/professor/list', {}, (res) => {
312 314
        if (res.success) {
313 315
          var $data = res.data;
@ -352,6 +354,7 @@ export default {
352 354
                      })
353 355
                      that.expertList = obj
354 356
                      that.scrollData.loading = false
357
                      that.scrollData.noFlag = true
355 358
                    }, 1000)
356 359
                  }
357 360
                }
@ -366,6 +369,7 @@ export default {
366 369
    orgListFun() {
367 370
      var that = this
368 371
      that.scrollData.loading = true
372
      that.scrollData.noFlag = false
369 373
      that.$axios.get('/ajax/org/list', {}, (res) => {
370 374
        if (res.success) {
371 375
          var $data = res.data;
@ -411,6 +415,7 @@ export default {
411 415
                      })
412 416
                      that.orgList = obj
413 417
                      that.scrollData.loading = false
418
                      that.scrollData.noFlag = true
414 419
                    }, 1000);
415 420
                  }
416 421
                }
@ -425,6 +430,7 @@ export default {
425 430
    companyListFun() {
426 431
      var that = this
427 432
      that.scrollData.loading = true
433
      that.scrollData.noFlag = false
428 434
      this.$axios.get('/ajax/company/pq', {
429 435
        name: that.searchText,
430 436
        pageSize: that.rows,
@ -433,6 +439,7 @@ export default {
433 439
        if (res.success) {
434 440
          if (res.data.pageNo !== that.pageNo) {
435 441
            that.scrollData.loading = false
442
            that.scrollData.noFlag = true
436 443
            return;
437 444
          }
438 445
          var $info = res.data.data;
@ -471,6 +478,7 @@ export default {
471 478
    resourceListFun() {
472 479
      var that = this
473 480
      that.scrollData.loading = true
481
      that.scrollData.noFlag = false
474 482
      this.$axios.getk('/ajax/resource/index/search', {
475 483
        key: that.searchText,
476 484
        sortNum: that.dataO.resSortNum,
@ -485,6 +493,8 @@ export default {
485 493
            that.dataO.resTime = $info[$info.length - 1].publishTime;
486 494
            that.dataO.resId = $info[$info.length - 1].resourceId;
487 495
            that.resourceList = that.resourceList.concat($info);
496
          } else {
497
            that.scrollData.noFlag = true;
488 498
          }
489 499
        };
490 500
        that.scrollData.loading = false
@ -493,6 +503,7 @@ export default {
493 503
    resultListFun() {
494 504
      var that = this
495 505
      that.scrollData.loading = true
506
      that.scrollData.noFlag = false
496 507
      this.$axios.getk('/ajax/ppatent/index/search', {
497 508
        key: that.searchText,
498 509
        sortNum: that.dataO.patSortNum,
@ -507,7 +518,9 @@ export default {
507 518
            that.dataO.patCreateTime = $info[$info.length - 1].createTime;
508 519
            that.dataO.patId = $info[$info.length - 1].id;
509 520
            that.resultList = that.resultList.concat($info);
510
          };
521
          } else {
522
            that.scrollData.noFlag = true;
523
          }
511 524
        };
512 525
        that.scrollData.loading = false
513 526
      });
@ -515,6 +528,7 @@ export default {
515 528
    serviceListFun() {
516 529
      var that = this
517 530
      that.scrollData.loading = true
531
      that.scrollData.noFlag = false
518 532
      this.$axios.getk('/ajax/ware/index/search', {
519 533
          key: that.searchText,
520 534
          sortFirst: that.dataO.serSortFirst,
@ -529,7 +543,9 @@ export default {
529 543
            that.dataO.serTime = $info[$info.length - 1].modifyTime;
530 544
            that.dataO.serId = $info[$info.length - 1].id;
531 545
            that.serviceList = that.serviceList.concat($info);
532
          };
546
          } else {
547
            that.scrollData.noFlag = true;
548
          }
533 549
        };
534 550
        that.scrollData.loading = false
535 551
      });