日历

src/app/app.scss

@@ -153,4 +153,11 @@ ion-icon {
 .space{
   background-color: #ebedf2;
   height: 10px;
+}
+
+
+//toast
+.toast-ios .toast-wrapper.toast-middle{
+  width: 50%;
+  text-align: center;
 }
\ No newline at end of file

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

@@ -99,9 +99,9 @@
 
   <button class="call-btn" (click)="call(contactPersonInfo.mobile)">拨打手机</button>
 
-  <button class="call-btn" (click)="addcontactPersons()" *ngIf="!contactPersonInfo.hasgeneralpersonsflag">添加常用联系人</button>
+  <button class="call-btn" (click)="addcontactPersons()" *ngIf="isContact == 0">添加常用联系人</button>
 
-  <button class="call-btn" (click)="cancelGenaralPersons()" *ngIf="contactPersonInfo.hasgeneralpersonsflag">移除常用联系人</button>
+  <button class="call-btn" (click)="cancelGenaralPersons()" *ngIf="isContact == 1">移除常用联系人</button>
 
   <button class="call-btn" (click)="usualContactSet()">设置分组</button>
 

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

@@ -21,14 +21,12 @@ export class ContractPersoninfoPage {
     };
     id;
 
-    userRelEntity = {
-        relUserId: '',
-        moduleName: 'appcontact',
-    };
+
     edit = false;
     email;
     abbreviation;
     telephone;
+    isContact;
 
     constructor(public navCtrl: NavController,
                 public navParams: NavParams,
@@ -47,6 +45,7 @@ export class ContractPersoninfoPage {
         this.appService.ObserverHttpGet("/wisdomgroup/modules/telpBookPerson", data)
             .subscribe((res: Response) => {
                     this.contactPersonInfo = res.json().data.user;
+                    this.isContact = res.json().data.isContact;
                     this.email = this.contactPersonInfo.email;
                     this.abbreviation = this.contactPersonInfo.abbreviation;
                     this.telephone = this.contactPersonInfo.telephone;
@@ -70,8 +69,9 @@ export class ContractPersoninfoPage {
                     } else if (data["result"] == '3') {
                         this.appService.popToastView('添加常用联系人失败！', 'top', 2000);
                     } else {
-                        //this.appService.popToastView('添加常用联系人成功！','top',2000);
-                        this.navCtrl.push("ContactListPage");
+                        this.appService.popToastView('添加常用联系人成功！','middle',2000);
+                        this.getPersonInfo();
+                        // this.navCtrl.push("ContactListPage");
                     }
                     //this.navCtrl.pop();
                 }, error => {
@@ -83,10 +83,15 @@ export class ContractPersoninfoPage {
 
     //移除常用联系人
     cancelGenaralPersons() {
-        this.appService.ObserverHttpPost("/wisdomgroup/app/contact/deleteGeneralContactPersons", this.userRelEntity)
+        const data = {
+            relUserId: this.id,
+            moduleName: 'appcontact',
+        };
+        this.appService.ObserverHttpPost("/wisdomgroup/app/contact/deleteGeneralContactPersons", data)
             .subscribe((res: Response) => {
                     let data = res.json();
-                    this.navCtrl.push("ContactListPage");
+                    this.getPersonInfo();
+                    this.appService.popToastView('移除常用联系人成功！', 'middle', 2000);
                 }, error => {
                     this.appService.alert('网络异常！');
                 }

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

@@ -10,25 +10,27 @@
 <ion-content class="bgc-e7e8ed">
   <ion-list>
     <ng-container *ngIf="list.length > 0">
-      <ion-item class="item-list margin-bottom-10" *ngFor="let item of list">
-        <div class="item" >
-          <div class="item-header padding-15-0">
-            <div class="item-header-style">
-              <span class="item-title">{{item.title}}</span>
-              <span   float-right  class="done" *ngIf="item.state==1 ">未发布</span>
-              <span  float-right class="done" *ngIf="item.state==2 ">已发布</span>
-              <span  float-right class="done" *ngIf="item.state==3 ">已过期</span>
+      <ng-container *ngIf="item?.isAnsNum != 0">
+        <ion-item class="item-list margin-bottom-10" *ngFor="let item of list">
+          <div class="item" >
+            <div class="item-header padding-15-0">
+              <div class="item-header-style">
+                <span class="item-title">{{item.title}}</span>
+                <!--<span   float-right  class="done" *ngIf="item.state==1 ">未发布</span>-->
+                <span  float-right class="done">已完成</span>
+                <!--<span  float-right class="done" *ngIf="item.state==3 ">已过期</span>-->
+              </div>
+            </div>
+            <div class="content-button padding-15-0">
+              <span>参与人员:</span>
+              <span *ngIf="item.groupName">{{item.groupName}}</span>
+              <span *ngIf="!item.groupName">全体人员</span>
+              <!--<span *ngIf="item?.isAnsNum == 0" float-right class="join" (click)="geToWrite(item)">参与</span>-->
+              <span float-right class="look" (click)="goToResult(item)">查看</span>
             </div>
           </div>
-          <div class="content-button padding-15-0">
-            <span>参与人员:</span>
-            <span *ngIf="item.groupName">{{item.groupName}}</span>
-            <span *ngIf="!item.groupName">全体人员</span>
-            <span *ngIf="item?.isAnsNum == 0" float-right class="join" (click)="geToWrite(item)">参与</span>
-            <span *ngIf="item?.isAnsNum != 0" float-right class="look" (click)="goToResult(item)">查看</span>
-          </div>
-        </div>
-      </ion-item>
+        </ion-item>
+      </ng-container>
     </ng-container>
     <ng-container *ngIf="list.length == 0">
       <div text-center style="margin-top: 10rem" *ngIf="list.length == 0">