上拉刷新 发现页面取消

config.xml

 <?xml version='1.0' encoding='utf-8'?>
-<widget id="io.ionic.partyCloud.starter.test" version="0.2.8" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="io.ionic.partyCloud.starter.test" version="0.3.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <name>部机关党建云(测试)</name>
     <description>An awesome Ionic/Cordova app.</description>
     <author email="hi@ionicframework" href="http://ionicframework.com/">Ionic Framework Team</author>

src/pages/discover-pages/publish/publish.html

@@ -20,7 +20,7 @@
   </ion-item>
   <ion-item>
     <ion-label class="main-color">发布范围</ion-label>
-    <ion-select [(ngModel)]="obj.publishRange" cancelText="取消" okText="确定" placeholder="请选择发布范围">
+    <ion-select [(ngModel)]="obj.publishRange" cancelText="取消" okText="确定" placeholder="全体人员">
       <ion-option *ngFor="let item of group" [value]="item.id">{{item.groupName}}</ion-option>
     </ion-select>
   </ion-item>

src/pages/discover-pages/publish/publish.scss

@@ -21,4 +21,7 @@ page-publish {
   .label-ios{
     margin-right: 0px;
   }
+  .select-ios .select-placeholder {
+    color: #333;
+  }
 }

src/pages/discover-pages/publish/publish.ts

@@ -22,7 +22,7 @@ export class PublishPage {
     type:'1',
     title:'',
     content:'',
-    publishRange:''
+    publishRange:'',
   };
   group;  //用户组
   userid;  //当前登录人的id
@@ -82,7 +82,7 @@ export class PublishPage {
             this.commonSer.toast('已提交审核')
             setTimeout(()=>{
               this.navCtrl.pop()
-            },1000)
+            },800)
           }
       )
 

src/pages/tabs/discover/discover.html

@@ -107,11 +107,11 @@
     </ion-slides>
 
 
-  <ion-infinite-scroll #infiniteScrollContentEle (ionInfinite)="doInfinite($event)">
-    <ion-infinite-scroll-content
-            loadingSpinner="bubbles"
-            loadingText="加载中"></ion-infinite-scroll-content>
-  </ion-infinite-scroll>
+<!--  <ion-infinite-scroll #infiniteScrollContentEle (ionInfinite)="doInfinite($event)">-->
+<!--    <ion-infinite-scroll-content-->
+<!--            loadingSpinner="bubbles"-->
+<!--            loadingText="加载中"></ion-infinite-scroll-content>-->
+<!--  </ion-infinite-scroll>-->
 
   <p class="noData" *ngIf="!loadMore">你已经看到我的底线了</p>
 

src/pages/tabs/discover/discover.ts

@@ -150,7 +150,7 @@ export class DiscoverPage {
     toIndex;
 
     //分页
-    pageCount = AppGlobal.pageCount;
+    pageCount = 100;
 
     loadMore = true;
     totalNum;
@@ -177,7 +177,7 @@ export class DiscoverPage {
     //父级选择
     changeParent(item) {
         this.newsContent.nativeElement.scrollLeft = 0;   //二级菜单滑动重置
-        this.infiniteScrollContent.inf.enable(true);
+        // this.infiniteScrollContent.inf.enable(true);
         this.loadMore = true;
 
         const index = item.indexParent;
@@ -217,7 +217,8 @@ export class DiscoverPage {
     //子级选择
     changeChildren(item) {
         this.indexChildren = item.indexChildren;
-        this.infiniteScrollContent.inf.enable(true);
+        // this.infiniteScrollContent.inf.enable(true);
+
         this.loadMore = true;
 
         const data = {

src/pages/tabs/serve/serve.scss

@@ -327,7 +327,7 @@ page-serve {
   .calen-tab {
     margin: 10px 10px 0px 10px;
     font-size: 1.3rem;
-    border: 1px solid #ebebeb;
+    border: 1px solid #f1f1f1;
     line-height: 2rem;
     border-radius: 5px;
     padding: .5rem;

src/service/http.service.ts

@@ -15,8 +15,8 @@ export class AppGlobal {
     //接口基地址
     //  static domain = "http://101.89.112.92:80";       //正式环境
     // static domain = "http://180.168.156.212:2931";   //测试环境
-    // static domain = "http://47.103.35.216:8080";    //阿里云地址
-    static domain = "";   //本地环境
+    static domain = "http://47.103.35.216:8080";    //阿里云地址
+    // static domain = "";   //本地环境
 
     //图片地址
     //  static picture = AppGlobal.domain + "/wisdomgroup/manager/getIcon/";     //正式地址