style

config.xml

 <?xml version='1.0' encoding='utf-8'?>
-<widget id="io.ionic.partyCloud.starter.test" version="0.0.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.0.9" 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>
@@ -92,9 +92,9 @@
     <plugin name="cordova-plugin-file" spec="^6.0.1" />
     <plugin name="cordova.plugins.diagnostic" spec="^2.0.0" />
     <plugin name="cordova-plugin-tts" spec="^0.2.3" />
+    <plugin name="phonegap-plugin-mobile-accessibility" spec="~1.0.5-dev" />
+    <plugin name="cordova-plugin-camera" spec="~4.0.3" />
     <engine name="ios" spec="4.5.5" />
     <engine name="browser" spec="5.0.4" />
     <engine name="android" spec="7.0.0" />
-    <plugin name="phonegap-plugin-mobile-accessibility" spec="~1.0.5-dev" />
-    <plugin name="cordova-plugin-camera" spec="~4.0.3" />
 </widget>

package.json

@@ -93,4 +93,4 @@
       "android"
     ]
   }
-}
+}
\ No newline at end of file

platforms/android/app/build/intermediates/symbols/release/R.txt

@@ -164,5 +164,6 @@ int styleable FontFamilyFont_android_fontStyle 2
 int styleable FontFamilyFont_font 3
 int styleable FontFamilyFont_fontStyle 4
 int styleable FontFamilyFont_fontWeight 5
-int xml config 0x7f0d0000
-int xml opener_paths 0x7f0d0001
+int xml camera_provider_paths 0x7f0d0000
+int xml config 0x7f0d0001
+int xml opener_paths 0x7f0d0002

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

@@ -27,13 +27,14 @@
       <ion-option *ngFor="let item of group" [value]="item.id">{{item.groupName}}</ion-option>
     </ion-select>
   </ion-item>
-  <ion-item>
-    <button (click)="selectPicture"></button>
-  </ion-item>
+<!--  <ion-item>-->
+<!--    <button (click)="selectPicture"></button>-->
+<!--  </ion-item>-->
   <ion-item>
     <ion-input [(ngModel)]="obj.title" placeholder="请输入内容标题"></ion-input>
   </ion-item>
   <ion-item>
       <textarea [(ngModel)]="obj.content" class="content-textarea" placeholder="请在此输入发布内容"></textarea>
   </ion-item>
+<!-- <span (click)="selectPicture()">选择文件</span>-->
 </ion-content>

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

@@ -26,6 +26,7 @@ export class PublishPage {
   };
   group;  //用户组
   userid;  //当前登录人的id
+  file;  // 文件
   constructor(public navCtrl: NavController, public navParams: NavParams,public storage:Storage,
               public camera:Camera,
               public commonSer:CommonService,public tabSer:TabsService) {
@@ -49,7 +50,8 @@ export class PublishPage {
       quality: 30,
       destinationType: this.camera.DestinationType.FILE_URI,
       encodingType: this.camera.EncodingType.JPEG,
-      mediaType: this.camera.MediaType.PICTURE
+      mediaType: this.camera.MediaType.PICTURE,
+      sourceType: this.camera.PictureSourceType.CAMERA,
     }
     this.camera.getPicture(options).then((imagedata)=>{
       let base64Image = 'data:image/jpeg;base64,' + imagedata;
@@ -57,6 +59,11 @@ export class PublishPage {
     })
   }
 
+  getFile(e){
+    console.log(this.file)
+    console.log(e)
+  }
+
   //发布
   publish(){
     const data = {

src/pages/home-pages/search-new/search-new.ts

@@ -21,7 +21,7 @@ export class SearchNewPage {
               public tabs:TabsService) {
   }
 
-  ionViewDidLoad() {
+  ionViewDidEnter() {
    this.search();
   }
 

src/pages/tabs/contact/contact.html

 <ion-header>
-  <ion-toolbar>
-      <ion-title text-center>通讯录</ion-title>
-      <ion-buttons end>
-          <button ion-button (click)="search()" class="search">
-              <ion-icon ios="ios-search" md="md-search"></ion-icon>
-          </button>
-      </ion-buttons>
-  </ion-toolbar>
+    <ion-navbar>
+        <ion-title text-center>通讯录</ion-title>
+        <ion-buttons end>
+            <button ion-button (click)="search()" class="search">
+                <ion-icon ios="ios-search" md="md-search"></ion-icon>
+            </button>
+        </ion-buttons>
+    </ion-navbar>
 </ion-header>
 
-
-
 <ion-content>
     <div class="common ">
         常用联系人

src/pages/tabs/discover/discover.html

@@ -27,7 +27,7 @@
   <div class="scroll-tab">
     <div class="news-content">
       <div #tabsParent class="tabs-parent">
-        <div #tabsChildren *ngFor="let item of tabsList;" (click)="change(item.type)" class="tabs-children">
+        <div #tabsChildren *ngFor="let item of tabsList;" (click)="change(item)" class="tabs-children">
           <span #tabSpan [style.color]="index == item.type ? '#e12724':''">{{item.name}}</span>
         </div>
         <span #tips id="tips"></span>

src/pages/tabs/discover/discover.scss

@@ -62,6 +62,7 @@ page-discover {
     .search-item{
       padding: .8rem 0;
       .item-info{
+        margin: .8rem 0;
         .item-source{
           color: #d88f27;
           font-weight: 500;
@@ -83,6 +84,7 @@ page-discover {
           align-self: flex-end;
           color: #999999;
           font-size: 1.5rem;
+          margin-top: .8rem;
           span{
             margin-right: 1rem;
           }

src/pages/tabs/discover/discover.ts

@@ -21,11 +21,11 @@ export class DiscoverPage {
     @ViewChild('tabSpan') tabSpan: ElementRef;
 
     tabsList = [
-        {name: "支部风采",type:0},
-        {name: "机关党委",type:1},
-        {name: "党风廉政",type:2},
-        {name: "互动交流",type:3},
-        {name: "知识拓展",type:4},
+        {name: "支部风采",type:13,index:0},
+        {name: "机关党委",type:5,index:1},
+        {name: "党风廉政",type:9,index:2},
+        {name: "互动交流",type:-1,index:3},
+        {name: "知识拓展",type:-1,index:4},
         ];
     index = 0;
     isSign = false;
@@ -43,12 +43,13 @@ export class DiscoverPage {
     }
 
     ionViewDidEnter() {
-        this.change(0);
+        this.change(this.tabsList[0]);
     }
 
     //所属板块类型(1党规党章,2系列讲话,3中央精神,4本市部署,5通知公告,6党建动态,7工作提示,
     //      * 8党务参考,9廉政格言,10纪检提示,11风险排查,12警示教育,13支部活动,14党建联建,15结对帮扶)
-    change(index) {
+    change(item) {
+        const index = item.index;
         let itemWidth = window.screen.width / 4;
         let spanWidth = this.tabSpan.nativeElement.offsetWidth;   //文字宽度
         this.tips.nativeElement.style.width = this.tabSpan.nativeElement.offsetWidth + 'px';
@@ -59,7 +60,7 @@ export class DiscoverPage {
             pageSize: 1,
             pageCount: 100,
             obj: {
-                'plateType': index + 1,
+                'plateType': item.type,
                 resourceType: 1
             }
         }

src/pages/tabs/home/home.scss

@@ -95,7 +95,7 @@ page-home {
       -webkit-border-radius: 5px;
       -moz-border-radius: 5px;
       border-radius: 5px;
-      box-shadow: -5px 0px 5px 1px #f9f9f9, 0px -5px 5px 1px #f9f9f9, 5px 0px 5px 1px #f9f9f9, 0px 5px 5px 1px #f9f9f9;
+      box-shadow: -5px 0px 5px 1px #f4f4f4, 0px -5px 5px 1px #f4f4f4, 5px 0px 5px 1px #f4f4f4, 0px 5px 5px 1px #f4f4f4;
       background-color: #fff;
 
       .middle-left {
@@ -106,6 +106,9 @@ page-home {
           width: 2.5rem;
         }
       }
+      .middle-right{
+        line-height: 2.2rem;
+      }
     }
   }
 
@@ -141,6 +144,7 @@ page-home {
       .news-right {
         img {
           border-radius: .5rem;
+          height: 80px;
         }
       }
     }

src/pages/tabs/home/home.ts

@@ -92,6 +92,9 @@ export class HomePage {
             (res) => {
                 this.slidersItems = res.data;
                 this.slidersItems.forEach(e => {
+                    if(e.title.length > 16){
+                        e.title = e.title.substr(0,17) +'...';
+                    }
                     if (e.attachments.length > 0) {
                         e.imgUrl = e.attachments[0].path;
                     }

src/pages/tabs/mine/mine.html

@@ -29,7 +29,7 @@
                             <p class="address">{{mineInfo?.orgName}}</p>
                         </ion-col>
                         <ion-col col-4 class="text-right">
-                            <span class="red-span-round">{{mineInfo?.post}}</span>
+                            <span *ngIf="mineInfo?.post" class="red-span-round">{{mineInfo?.post}}</span>
                         </ion-col>
                     </ion-row>
                 </ion-grid>

src/pages/tabs/mine/mine.scss

@@ -37,11 +37,15 @@ page-mine {
 
   .group-box {
     background-color: #fff;
+    font-size: 1.6rem;
     .group-left{
       display: flex;
       align-items: center;
       justify-content: center;
     }
+    ion-row{
+      padding-top: .6rem;
+    }
     img{
       width: 2.5rem;
     }

src/pages/tabs/serve/serve.html

@@ -14,41 +14,40 @@
   </ion-navbar>
 </ion-header>
 <ion-content>
-  <div style="height: 160px">
-    <ion-slides #slides *ngIf="slidersItems.length>0" pager loop="true" autoplay="2000" speed="1500">
-      <ion-slide style="height:160px;width: 100%;position: relative" *ngFor="let item of slidersItems">
-        <img src="{{picture+item.pictureId}}" class="slide-image" (click)="go(item)">
-        <p class="slides-title">{{item.title}}</p>
-      </ion-slide>
-    </ion-slides>
-  </div>
+<!--  <div style="height: 160px">-->
+<!--    <ion-slides #slides *ngIf="slidersItems.length>0" pager loop="true" autoplay="2000" speed="1500">-->
+<!--      <ion-slide style="height:160px;width: 100%;position: relative" *ngFor="let item of slidersItems">-->
+<!--        <img src="{{picture+item.pictureId}}" class="slide-image" (click)="go(item)">-->
+<!--        <p class="slides-title">{{item.title}}</p>-->
+<!--      </ion-slide>-->
+<!--    </ion-slides>-->
+<!--  </div>-->
 
   <div class="item3">
     <div class="item3-2" (click)="goToNotice()">
-      <div class="card3" style="width: 20%;">
+      <ion-col col-2 class="card3">
         <span *ngIf="hasNew.message == 1" class="img-tips"></span>
         <img src="./assets/imgs/home/icon-mail.png" >
-      </div>
-      <div class="card3" style="width: 75%;">
+      </ion-col>
+      <ion-col col-9 class="card3" >
         <div class="card3-item" *ngFor="let item of noticeList;">
           <span *ngIf="noticeTips > 0" class="tips"></span>
           <span class="color-996">{{item.title}}</span>
           {{item.content}}
         </div>
-      </div>
-      <div class="card3" style="width: 5%;color: #999999;font-size: 1.6rem">
+      </ion-col>
+      <ion-col col-1 class="card3" style="color: #999999;font-size: 1.6rem">
         <ion-icon name="ios-arrow-forward" class="icon-right"></ion-icon>
-      </div>
+      </ion-col>
     </div>
   </div>
 
   <p class="p-font">我的应用</p>
   <div class="item2" style="padding: 0px;margin-top: .5rem">
     <div class="item2-2">
-      <div class="card" (click)="goTo('ActivityListPage')">
+      <div class="card" (click)="goToContact()">
         <img src="./assets/imgs/home/icon-txl.png" >
         <label class="label2-2">通讯录</label>
-        <img class="new-logo" *ngIf="hasNew.activity==1" src="./assets/imgs/new.png">
       </div>
       <div class="card" (click)="goTo('ActivityListPage')">
         <img src="./assets/imgs/home/icon-hdbm.png" >

src/pages/tabs/serve/serve.scss

@@ -87,7 +87,9 @@ page-serve {
   }
 
   .label2-2 {
-    color: #666666
+    color: #666666;
+    margin-top: 6px;
+    font-size: 1.4rem;
   }
 
   .new-logo {
@@ -120,7 +122,7 @@ page-serve {
     -webkit-border-radius: 5px;
     -moz-border-radius: 5px;
     border-radius: 5px;
-    box-shadow: -5px 0px 5px 1px #f9f9f9, 0px -5px 5px 1px #f9f9f9, 5px 0px 5px 1px #f9f9f9, 0px 5px 5px 1px #f9f9f9;
+    box-shadow: -5px 0px 5px 1px #f4f4f4, 0px -5px 5px 1px #f4f4f4, 5px 0px 5px 1px #f4f4f4, 0px 5px 5px 1px #f4f4f4;
     background-color: #fff;
   }
 
@@ -132,7 +134,6 @@ page-serve {
     padding: 3px;
     position: relative;
     font-size: 1.2rem;
-    text-align: center;
     img{
       width: 3rem;
     }
@@ -325,7 +326,7 @@ page-serve {
     border: 1px solid #ddd;
     line-height: 2rem;
     background-color: #f7f7f7;
-    border-radius: 8px;
+    border-radius: 5px;
   }
 
   .calen1,

src/pages/tabs/serve/serve.ts

@@ -19,6 +19,7 @@ import {TabsService} from "../tabs.service";
 import {TextToSpeech} from "@ionic-native/text-to-speech";
 import {CommonService} from "../../../provide/common.service";
 import {EmitService} from "../../../provide/emit.service";
+import {ContactPage} from "../contact/contact";
 
 
 @IonicPage()
@@ -191,6 +192,10 @@ export class ServePage {
         this.navCtrl.push(page);
     }
 
+    goToContact(){
+        this.navCtrl.push(ContactPage);
+    }
+
     readBook() {
         this.tts.speak({text: "你好，欢迎，向前走10米，路口右转，执行10米，在左转", locale: 'zh-CN'})
             .then(() => {