发现页面分页

ionic.config.json

@@ -7,11 +7,11 @@
   "proxies": [
   {
     "path": "/wisdomgroup",
-    "proxyUrl": "http://47.103.33.196:8080/wisdomgroup"
+    "proxyUrl": "http://218.78.19.169:8081/wisdomgroup"
   },
   {
     "path": "/logistics",
-    "proxyUrl": "http://47.103.33.196:8080/logistics"
+    "proxyUrl": "http://218.78.19.169:8081/logistics"
   }
 ]
 }

src/app/app.component.ts

@@ -9,7 +9,7 @@ import {AppUpdateService} from "../service/appUpdate.service";
 import {Keyboard} from '@ionic-native/keyboard';
 import {Response} from "@angular/http";
 import {TabsPage} from "../pages/tabs/tabs";
-import {AppService} from "../service/http.service";
+import {AppGlobal, AppService} from "../service/http.service";
 import {EmitService} from "../provide/emit.service";
 import {MobileAccessibility} from "@ionic-native/mobile-accessibility";
 import {timer} from "rxjs/observable/timer";
@@ -34,7 +34,7 @@ export class MyApp {
     @ViewChild(Content) content: Content;
     rootPage;
     showSplash = false;
-    nowVersion = "4.6.0";
+    nowVersion = AppGlobal.defaultVersion;
 
     user;
 

src/pages/login/login.ts

@@ -5,7 +5,7 @@ import {TabsPage} from '../tabs/tabs';
 import {Http, Response} from '@angular/http';
 import {Storage} from '@ionic/storage';
 
-import {AppService} from '../../service/http.service';
+import {AppGlobal, AppService} from '../../service/http.service';
 import {LoginService} from "./login.service";
 import {TabsService} from "../tabs/tabs.service";
 import {AppVersion} from "@ionic-native/app-version";
@@ -26,7 +26,7 @@ export class LoginPage {
         mobile: '',
         password: '',
         rememberMe: true,
-        newestVersion: "4.6.0"
+        newestVersion: AppGlobal.defaultVersion
     };
     tabflag: any;
 

src/pages/serve-pages/meet-room/room-apply/room-apply.ts

@@ -346,18 +346,9 @@ export class RoomApplyPage {
 
     //校验时间
     checkTime() {
-        const clock12 = new Date(this.datePipe.transform(new Date(), 'yyyy-MM-dd 12:00')).getTime();
         const startTime = new Date(this.obj.startTime).getTime();
         const endTime = new Date(this.obj.endTime).getTime();
         const nowDate = new Date(this.datePipe.transform(new Date(), 'yyyy-MM-dd HH:mm:ss')).getTime();
-        console.log("clock12:" + clock12);
-        console.log("startTime:" + startTime);
-        console.log("startTime:" + this.datePipe.transform(startTime, 'yyyy-MM-dd HH:mm'));
-        console.log("endTime:" + this.datePipe.transform(endTime, 'yyyy-MM-dd HH:mm'));
-        if (startTime < clock12 && clock12 < endTime) {
-            this.commonSer.toast('时间选择错误');
-            return
-        }
         if (startTime == endTime || nowDate > startTime) {
             this.commonSer.toast('时间选择错误');
             return

src/pages/tabs/discover/discover.ts

@@ -433,7 +433,6 @@ export class DiscoverPage {
 
     //父级选择
     changeParent(item) {
-        console.log(item)
         if (this.indexParent === item.indexParent) return;
 
         this.obj.parentName = item.name;
@@ -475,7 +474,7 @@ export class DiscoverPage {
         }
 
         if (item.name != "支部风采") this.obj.branchId = null;
-
+        this.pageNum = 1;
         const data = {
             pageNum: 1,
             pageSize: this.pageSize,
@@ -502,8 +501,6 @@ export class DiscoverPage {
                         }
                     }
                 });
-                console.log(this.indexParent)
-                console.log(this.slides.realIndex)
                 this.slides.slideTo(this.indexParent, 500);
                 this.slideList[this.indexParent] = this.newList;
             }
@@ -516,7 +513,6 @@ export class DiscoverPage {
         this.obj.childrenName = item.name;
         if (!this.obj.branchId) this.obj.branchId = this.mineInfo.branchId;
 
-        console.log(item);
         if (item.name == "支部列表") {
             this.moreParty();
             this.indexChildren = 34;
@@ -548,6 +544,7 @@ export class DiscoverPage {
             return false;
         }
 
+        this.pageNum = 1;
         const data = {
             pageNum: 1,
             pageSize: this.pageSize,
@@ -636,9 +633,11 @@ export class DiscoverPage {
             return;
         }
         if (this.totalNum == this.slideList[this.indexParent].length || this.totalNum < this.slideList[this.indexParent].length) {
-            return false;
+            e.complete();
+            return;
         }
         this.pageNum++;
+        console.log(this.pageNum);
         const data = {
             pageNum: this.pageNum,
             pageSize: this.pageSize,
@@ -684,7 +683,6 @@ export class DiscoverPage {
 
     //回答题目
     goToResponse(item) {
-        console.log(item);
         if (item.userId == this.userId) {
             this.navCtrl.push('AcceptPage', {id: item.id})
         } else {
@@ -706,7 +704,6 @@ export class DiscoverPage {
         modal.onDidDismiss(data => {
             if (data) {
                 this.changeParent(data);
-                console.log(data);
             }
         });
         modal.present();
@@ -794,9 +791,9 @@ export class DiscoverPage {
     }
 
     goToPayment(e) {
-        if(this.mineInfo.branchId == this.obj.branchId){
+        if (this.mineInfo.branchId == this.obj.branchId) {
             this.navCtrl.push(PaymentPage);
-        }else{
+        } else {
             this.commonSer.toast('只可查看本处室缴纳情况');
         }
     }

src/service/http.service.ts

@@ -29,6 +29,10 @@ export class AppGlobal {
     //  static pictureNotice = AppGlobal.domain;    //正式地址
     static pictureNotice = AppGlobal.domain;  //测试
 
+    //默认版本
+    static defaultVersion = "4.6.0";  //dev
+    // static defaultVersion;  //prrod
+
     //接口地址
     static API: any = {
         getCategories: '/api/ionic3/getCategories',