color

README.md

@@ -165,5 +165,5 @@ ionic cordova plugin add cordova-plugin-badge
 
 "proxyUrl": "http://180.168.156.212:2931/wisdomgroup"
 
-"proxyUrl": "http://10.10.200.26:8080/wisdomgroup"
+"proxyUrl": "http://10.10.200.11:8080/wisdomgroup"
 

config.xml

 <?xml version='1.0' encoding='utf-8'?>
-<widget id="io.ionic.starter" version="1.1.4" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="io.ionic.starter" version="1.1.5" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <name>智汇19号</name>
     <description>An awesome Ionic/Cordova app.</description>
     <author email="hi@ionicframework" href="http://ionicframework.com/">Ionic Framework Team</author>

src/pages/home/more-app/more-app.html

@@ -25,6 +25,7 @@
       <img src="./assets/imgs/home/icon-zb.png" alt="">
       <label class="label2-2">值班情况</label>
     </div>
+    <ng-container *ngIf="role == 1 || role == 2 || role == 3">
       <div class="card"  (click)="goActivityTrack()">
         <img src="./assets/imgs/home/icon-hdgz.png" alt="">
         <label class="label2-2">活动跟踪</label>
@@ -33,10 +34,12 @@
         <img src="./assets/imgs/home/icon-bbgz.png" alt="">
         <label class="label2-2">报备跟踪</label>
       </div>
+    </ng-container>
     <div class="card" (click)="goToMySurvey()">
       <img src="./assets/imgs/home/icon-wjtc.png" alt="">
       <label class="label2-2">问卷调查</label>
     </div>
+    <ng-container *ngIf="role == 3">
       <div class="card" (click)="goToSurveyManage()">
         <img src="./assets/imgs/home/icon-wjgl.png" alt="">
         <label class="label2-2 more2-2">问卷管理</label>
@@ -45,5 +48,6 @@
         <img src="./assets/imgs/home/icon-zbhb.png" alt="">
         <label class="label2-2 more2-2">值班换班</label>
       </div>
+    </ng-container>
   </div>
 </ion-content>

src/pages/home/more-app/more-app.ts

@@ -3,6 +3,8 @@ import { IonicPage, NavController, NavParams } from 'ionic-angular';
 import {ListPage} from "../../surveyManage/list/list";
 import {ChangeApplyListPage} from "../../manageDuty/change-apply-list/change-apply-list";
 import { MySurveyPage } from "../../mine/mySurvey/my-survey/my-survey";
+import {Response} from "@angular/http";
+import {AppService} from "../../../service/appHttpService";
 
 
 @IonicPage()
@@ -12,11 +14,23 @@ import { MySurveyPage } from "../../mine/mySurvey/my-survey/my-survey";
 })
 export class MoreAppPage {
 
-  constructor(public navCtrl: NavController, public navParams: NavParams) {
+    role;
+  constructor(public navCtrl: NavController, public navParams: NavParams,
+              public appService: AppService) {
   }
 
   ionViewDidLoad() {
     console.log('ionViewDidLoad MoreAppPage');
+    this.getRole();
+  }
+
+    //获取权限
+    getRole(){
+        this.appService.ObserverHttpGet("/wisdomgroup/app/getRoles", null).subscribe((res: Response) => {
+            this.role = res.json();
+        }, error => {
+            this.appService.alert('系统错误！');
+        });
     }
 
   //问卷调查

src/pages/tabs/home/home.html

@@ -34,6 +34,7 @@
         <img src="./assets/imgs/home/icon-zb.png" alt="">
         <label class="label2-2">值班情况</label>
       </div>
+      <ng-container *ngIf="role == 2 || role == 1 || role == 3">
         <div class="card"  (click)="goActivityTrack()">
           <img src="./assets/imgs/home/icon-hdgz.png" alt="">
           <label class="label2-2">活动跟踪</label>
@@ -42,6 +43,7 @@
           <img src="./assets/imgs/home/icon-bbgz.png" alt="">
           <label class="label2-2">报备跟踪</label>
         </div>
+      </ng-container>
       <div class="card" (click)="goToMySurvey()">
         <img src="./assets/imgs/home/icon-wjtc.png" alt="">
         <label class="label2-2 more2-2">问卷调查</label>

src/pages/tabs/home/home.ts

@@ -68,6 +68,7 @@ export class HomePage {
     //当前第几周
     weekNo;
 
+     role;
 
     constructor(public navCtrl: NavController, public activityStatisticService: ActivityStatisticService,
                 public appService: AppService, public http: Http, private calendar: Calendar, public storage: Storage,
@@ -97,6 +98,7 @@ export class HomePage {
             this.appService.alert('系统错误！');
         });
 
+        this.getRole();
 
     }
 
@@ -134,6 +136,15 @@ export class HomePage {
         //初始化操作记录
     }
 
+    //获取权限
+    getRole(){
+        this.appService.ObserverHttpGet("/wisdomgroup/app/getRoles", null).subscribe((res: Response) => {
+           this.role = res.json();
+        }, error => {
+            this.appService.alert('系统错误！');
+        });
+    }
+
     goMyActivity() {
         this.navCtrl.push("MyActivityListPage");
     }