将下拉刷新改成点击刷新两个字刷新

src/app/alarm/alarm.page.html

 <div class="mainCon">
     <Navbar [leftContent]="icon"
             (onLeftClick)="onLeftClick()"
-            style="background-color: #28c9bd;position: fixed;top: 0;width: 100%;"
+            style="background-color: #28c9bd;position: fixed;top: 0;width: 100%;z-index: 2;"
     >报警信息
     </Navbar>
 

src/app/east/east.page.html

-<div class="mainCon">
+<div class="mainCon" style="padding-top: 45px;">
     <Navbar [leftContent]="icon"
             (onLeftClick)="onLeftClick()"
-            style="background-color: #28c9bd"
+            [rightContent]="r"
+            style="background-color: #28c9bd;position: fixed;top: 0;width: 100%;z-index: 2;"
     >
         {{fieldRegionName}}控制
     </Navbar>
-    <PullToRefresh [direction]="state.direction"
-                   [(ngModel)]="state.refreshState"
-                   [endReachedRefresh]="state.endReachedRefresh"
-                   (onRefresh)="pullToRefresh($event)"
-                   style="min-height: calc(100% - 45px)"
-    >
+    <ng-template #r>
+        <span (click)="pullToRefresh()">刷新</span>
+    </ng-template>
     <div class="topPart">
         <ListItem multipleLine *ngIf="yewei || yewei === 0">
             当前液位:
@@ -32,10 +30,15 @@
             </ListItem>
             <ListItem multipleLine *ngIf="a.fieldDeviceName === '南水' ? nanClicked : beiClicked">
                 选择开启时间
-                <Stepper class="stepClass" [(ngModel)]="duration" [min]="1" [showNumber]="true"></Stepper>分钟
+                <Stepper class="stepClass" [(ngModel)]="duration" [min]="1" [showNumber]="true"></Stepper>
+                分钟
                 <div style="text-align: right;padding-top: 10px">
-                    <div Button style="margin-right: 10px" class="btn" (click)="cancel()" [inline]="true" [size]="'small'" [type]="'default'">取消</div>
-                    <div Button (click)="confirm(a)" class="btn" [inline]="true" [size]="'small'" [type]="'primary'">确认</div>
+                    <div Button style="margin-right: 10px" class="btn" (click)="cancel()" [inline]="true"
+                         [size]="'small'" [type]="'default'">取消
+                    </div>
+                    <div Button (click)="confirm(a)" class="btn" [inline]="true" [size]="'small'" [type]="'primary'">
+                        确认
+                    </div>
                 </div>
             </ListItem>
         </div>
@@ -46,14 +49,15 @@
             <v-switch [value]="a.value" [disabled]="true" [loading]="a.loading"></v-switch>
         </ListItem>
     </div>
-    </PullToRefresh>
 </div>
 <ng-template #icon>
     <span class="vo v-back"></span>
 </ng-template>
 <ng-template #s1>
-    <v-switch [value]="value[0]" [disabled]="beiLoading || value[1]" (click)="toggleNb(0)" [loading]="nanLoading"></v-switch>
+    <v-switch [value]="value[0]" [disabled]="beiLoading || value[1]" (click)="toggleNb(0)"
+              [loading]="nanLoading"></v-switch>
 </ng-template>
 <ng-template #s2>
-    <v-switch [value]="value[1]" [disabled]="nanLoading || value[0]" (click)="toggleNb(1)" [loading]="beiLoading"></v-switch>
+    <v-switch [value]="value[1]" [disabled]="nanLoading || value[0]" (click)="toggleNb(1)"
+              [loading]="beiLoading"></v-switch>
 </ng-template>

src/app/east/east.page.ts

@@ -26,17 +26,6 @@ export class EastPage implements OnInit {
     fieldRegionNo = '';
     fieldRegionName = '';
 
-    state = {
-        refreshState: {
-            currentState: 'deactivate',
-            drag: false
-        },
-        direction: '',
-        endReachedRefresh: false,
-        data: [],
-        directionName: 'up'
-    };
-
     constructor(private tf: Transfer, private api: Api, private load: Load, private ac: ActivatedRoute) {
     }
 
@@ -162,9 +151,7 @@ export class EastPage implements OnInit {
         }]);
     }
 
-    pullToRefresh(event) {
-        if (event === 'down') {
-            this.getData(1);
-        }
+    pullToRefresh() {
+        this.getData(1);
     }
 }

src/app/mine/mine.page.html

-<div class="mainContent">
+<div class="mainContent" style="padding-top: 45px">
   <Navbar [leftContent]="icon"
           (onLeftClick)="onLeftClick()"
-          style="background-color: #28c9bd"
+          style="background-color: #28c9bd;position: fixed;top: 0;width: 100%;z-index: 2;"
   >
     个人中心
   </Navbar>

src/app/other/other.page.html

-<div class="mainCon">
+<div class="mainCon" style="padding-top: 45px;">
     <Navbar [leftContent]="icon"
             (onLeftClick)="onLeftClick()"
-            style="background-color: #28c9bd"
+            [rightContent]="r"
+            style="background-color: #28c9bd;position: fixed;top: 0;width: 100%;z-index: 2;"
     >
         {{fieldRegionName}}控制
     </Navbar>
-    <PullToRefresh [direction]="state.direction"
-                   [(ngModel)]="state.refreshState"
-                   [endReachedRefresh]="state.endReachedRefresh"
-                   (onRefresh)="pullToRefresh($event)"
-                   style="min-height: calc(100% - 45px)"
-    >
+    <ng-template #r>
+        <span (click)="pullToRefresh()">刷新</span>
+    </ng-template>
     <div class="topPart">
         <ListItem multipleLine *ngIf="yewei || yewei === 0">
             当前液位:
@@ -39,7 +37,6 @@
             <v-switch [value]="a.value" (click)="toggle(a)" [loading]="a.loading"></v-switch>
         </ListItem>
     </div>
-    </PullToRefresh>
 </div>
 <ng-template #icon>
     <span class="vo v-back"></span>

src/app/other/other.page.ts

@@ -148,9 +148,7 @@ export class OtherPage implements OnInit {
         }]);
     }
 
-    pullToRefresh(event) {
-        if (event === 'down') {
-            this.getData(1);
-        }
+    pullToRefresh() {
+        this.getData(1);
     }
 }

src/environments/environment.prod.ts

 export const environment = {
   production: true,
-  url: 'http://pasture.witium.com/api', // 对外访问测试网地址
-  // url: 'http://172.16.1.52:8094', // 测试
+  // url: 'http://pasture.witium.com/api', // 对外访问测试网地址
+  url: 'http://172.16.1.13:8096', // 测试
 };

src/environments/environment.ts

@@ -8,7 +8,7 @@ export const environment = {
   // url: 'http://cloud-test.witium.com:8096', // 测试
   // url: 'http://172.16.1.53:8097', // cy
   url: 'http://172.16.1.52:8096', // zz
-  // url: 'http://172.16.1.13:8094', // 测试
+  // url: 'http://172.16.1.13:8096', // 测试
 };
 
 /*