color

ionic.config.json

@@ -5,5 +5,9 @@
   },
   "type": "ionic-angular",
   "proxies": [
+    {
+      "path": "/wisdomgroup",
+      "proxyUrl": "http://180.168.156.212:2931/wisdomgroup"
+    }
   ]
 }
\ No newline at end of file

src/pages/contact/contract-personinfo/contract-personinfo.html

@@ -60,22 +60,33 @@
     <ion-item>
       <div class="info-item">
         <span class="info-span">房间号</span>
-        <div class="info-item-content" (click)="editFun()">
-          <label>
-            <input type="text" [(ngModel)]="abbreviation">
-            <ion-icon  ios="ios-create-outline" md="md-create-outline"></ion-icon>
-          </label>
+        <div class="info-item-content">
+
+          <ng-container *ngIf="role == 1 || role == 2 || role == 3">
+            <label  (click)="editFun()">
+              <input type="text" [(ngModel)]="abbreviation">
+              <ion-icon ios="ios-create-outline" md="md-create-outline"></ion-icon>
+            </label>
+          </ng-container>
+          <ng-container *ngIf="role == 0 || role == 4">
+            {{abbreviation}}
+          </ng-container>
         </div>
       </div>
     </ion-item>
     <ion-item>
       <div class="info-item">
         <span class="info-span">座机</span>
-        <div  class="info-item-content" (click)="editFun()">
-          <label>
-            <input type="text" [(ngModel)]="telephone">
-            <ion-icon  ios="ios-create-outline" md="md-create-outline"></ion-icon>
-          </label>
+        <div  class="info-item-content" >
+          <ng-container *ngIf="role == 1 || role == 2 || role == 3">
+            <label  (click)="editFun()">
+              <input type="text" [(ngModel)]="telephone">
+              <ion-icon ios="ios-create-outline" md="md-create-outline"></ion-icon>
+            </label>
+          </ng-container>
+          <ng-container *ngIf="role == 0 || role == 4">
+            {{telephone}}
+          </ng-container>
         </div>
       </div>
     </ion-item>
@@ -84,11 +95,17 @@
     <ion-item>
       <div class="info-item">
         <span class="info-span">邮箱</span>
-        <div  class="info-item-content" (click)="editFun()">
-          <label>
-            <input type="text" [(ngModel)]="email">
-            <ion-icon  ios="ios-create-outline" md="md-create-outline"></ion-icon>
-          </label>
+        <div  class="info-item-content">
+
+          <ng-container *ngIf="role == 1 || role == 2 || role == 3">
+            <label  (click)="editFun()">
+              <input type="text" [(ngModel)]="email">
+              <ion-icon ios="ios-create-outline" md="md-create-outline"></ion-icon>
+            </label>
+          </ng-container>
+          <ng-container *ngIf="role == 0 || role == 4">
+            {{email}}
+          </ng-container>
         </div>
       </div>
     </ion-item>

src/pages/contact/contract-personinfo/contract-personinfo.ts

@@ -28,6 +28,8 @@ export class ContractPersoninfoPage {
     telephone;
     isContact;
 
+    role;   //权限
+
     constructor(public navCtrl: NavController,
                 public navParams: NavParams,
                 public appService: AppService) {
@@ -36,6 +38,16 @@ export class ContractPersoninfoPage {
     ionViewDidLoad() {
         this.id = this.navParams.get("id");
         this.getPersonInfo();
+        this.getRole();
+    }
+
+    //获取权限
+    getRole(){
+        this.appService.ObserverHttpGet("/wisdomgroup/app/getRoles", null).subscribe((res: Response) => {
+            this.role = res.json();
+        }, error => {
+            this.appService.alert('系统错误！');
+        });
     }
 
     getPersonInfo() {

src/pages/mine/myActivityList/myActivityList.html

 <ion-header>
 	<ion-navbar>
-		<ion-title>活动订单</ion-title>
+		<ion-title>我的活动</ion-title>
 	</ion-navbar>
 </ion-header>
 <ion-content class="bgc-e7e8ed">

src/pages/mine/mySurvey/my-survey/my-survey.html

 <ion-header>
 
   <ion-navbar>
-    <ion-title>问卷调查</ion-title>
+    <ion-title>我的问卷</ion-title>
   </ion-navbar>
 
 </ion-header>

src/pages/surveyManage/item/desicr/desicr.html

 <ion-header>
 
   <ion-navbar>
-    <ion-title>编辑问卷</ion-title>
+    <ion-title>创建问卷</ion-title>
   </ion-navbar>
 
 </ion-header>

src/pages/surveyManage/item/desicr/desicr.ts

@@ -34,15 +34,22 @@ export class DesicrPage {
 
     submitOrder(){
         const toast = this.toastCtrl.create(message);
+        if( !this.desrc.title ){
+            toast.setMessage('请填写标题');
+            toast.present();
+          return false
+      }
         if(this.desrc.usergroup == null){
             this.desrc.usergroup = 'all';
         }
         this.appService.ObserverHttpPost('/wisdomgroup/modules/question/create',this.desrc)
             .subscribe(
                 (res)=>{
-                    toast.setMessage('创建成功');
-                    toast.present();
-                    this.navCtrl.pop();
+                    if(res){
+                        toast.setMessage('创建成功');
+                        toast.present();
+                        this.navCtrl.push('EditPage',{temp:res.json()});
+                    }
                 }
             )
     }

src/pages/surveyManage/item/set/set.scss

 page-set {
-
+  .submit{
+    margin-top: 20px;
+    border: 1px solid #34b4fc;
+    background-color: #34b4fc;
+  }
 }

src/pages/surveyManage/modal/person/person.html

@@ -5,7 +5,7 @@
     <ion-title>选择用户组</ion-title>
     <ion-buttons start>
       <button ion-button (click)="dismiss()">
-        <span ion-textclass="color-fff" >取消</span>
+        <span ion-text class="color-fff" >取消</span>
       </button>
     </ion-buttons>
     <ion-buttons end>

src/pages/tabs/home/home.ts

@@ -98,14 +98,15 @@ export class HomePage {
         }, error => {
             this.appService.alert('系统错误！');
         });
-
-        this.getRole();
-
     }
 
     ionViewDidEnter() {
+        //获取权限
+        this.getRole();
         //获取消息数量
         this.getNewCount();
+        //获取日历
+        this.getCalendar();
     }
 
     ionViewWillEnter() {
@@ -364,7 +365,7 @@ export class HomePage {
 
     //日历
 
-    ionViewDidLoad() {
+    getCalendar() {
         let date = new Date();
         let year = date.getFullYear();
         let month = date.getMonth() + 1;