style

.gitignore

@@ -4,3 +4,4 @@ www
 *.log
 *.temp
 /vendor
+/plugins

src/pages/tabs/discover/discover.html

@@ -39,11 +39,12 @@
     <ng-container *ngFor="let item of newList">
       <div class="search-item" (click)="goToDetail(item)">
         <p class="item-info">
-          <span>{{item.source}}</span>
+          <span class="item-source">{{item.source}}</span>
           <span>{{item.publishTime | date:'yyyy-MM-dd'}}</span>
         </p>
         <div class="item-news">
           <ion-row class="news-item">
+            <ng-container *ngIf="item.imgUrl">
               <ion-col col-8 class="news-left">
                 <p class="news-title">{{item.title}}</p>
                 <p class="news-end">
@@ -58,8 +59,24 @@
                 </p>
               </ion-col>
               <ion-col col-4 class="news-right">
-              <img src="./assets/imgs/demo.png">
+                <img src="{{picture+item.imgUrl}}">
               </ion-col>
+            </ng-container>
+            <ng-container *ngIf="!item.imgUrl">
+              <ion-col col-12 class="news-left">
+                <p class="news-title">{{item.title}}</p>
+                <p class="news-end">
+                  <ion-icon style="font-size: 2.5rem;vertical-align: sub" name="eye"></ion-icon>
+                  <span>{{item.browseCount}}</span>
+                  <ion-icon name="chatboxes"></ion-icon>
+                  <span>{{item.commentCount}}</span>
+                  <ion-icon name="thumbs-up"></ion-icon>
+                  <span>{{item.likeCount}}</span>
+                  <ion-icon name="heart"></ion-icon>
+                  <span>{{item.collectionCount}}</span>
+                </p>
+              </ion-col>
+            </ng-container>
           </ion-row>
         </div>
       </div>

src/pages/tabs/discover/discover.scss

@@ -61,6 +61,13 @@ page-discover {
     padding: 0 1rem;
     .search-item{
       padding: .8rem 0;
+      .item-info{
+        .item-source{
+          color: #d88f27;
+          font-weight: 500;
+          margin-right: 1rem;
+        }
+      }
       .news-left{
         display: flex;
         flex-flow: row wrap;
@@ -70,6 +77,7 @@ page-discover {
           align-self: flex-start;
           font-weight: bold;
           width: 100%;
+          margin-bottom: 1rem;
         }
         .news-end{
           align-self: flex-end;

src/pages/tabs/discover/discover.ts

@@ -6,6 +6,7 @@ import {StuffDetailPage} from "../../home-pages/stuff-detail/stuff-detail";
 import {PublishPage} from "../../discover-pages/publish/publish";
 import {EmitService} from "../../../provide/emit.service";
 import {NoticePage} from "../notice/notice";
+import {AppGlobal} from "../../../service/http.service";
 
 
 @IonicPage()
@@ -30,6 +31,7 @@ export class DiscoverPage {
     isSign = false;
     newList;   //新闻列表
     noReadNum;
+    picture: string = AppGlobal.domain +'/wisdomgroup';
     constructor(public navCtrl: NavController, public navParams: NavParams,
                 public tabsSer:TabsService,public emitSer:EmitService) {
         // 接收发射过来的数据
@@ -57,12 +59,18 @@ export class DiscoverPage {
             pageSize: 1,
             pageCount: 100,
             obj: {
-                'plateType': index + 1
+                'plateType': index + 1,
+                resourceType: 1
             }
         }
         this.tabsSer.stuffPage(data).subscribe(
             (res) => {
                 this.newList = res.data;
+                this.newList.forEach(e => {
+                    if (e.attachments.length > 0) {
+                        e.imgUrl = e.attachments[0].path;
+                    }
+                })
             }
         )
     }

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 #f2f2f2, 0px -5px 5px 1px #f2f2f2, 5px 0px 5px 1px #f2f2f2, 0px 5px 5px 1px #f2f2f2;
+      box-shadow: -5px 0px 5px 1px #f9f9f9, 0px -5px 5px 1px #f9f9f9, 5px 0px 5px 1px #f9f9f9, 0px 5px 5px 1px #f9f9f9;
       background-color: #fff;
 
       .middle-left {

src/pages/tabs/home/home.ts

@@ -145,7 +145,6 @@ export class HomePage {
                         e.imgUrl = e.attachments[0].path;
                     }
                 })
-                console.log(this.newList);
             }
         )
     }

src/pages/tabs/serve/serve.html

@@ -23,6 +23,26 @@
     </ion-slides>
   </div>
 
+  <div class="item3">
+    <div class="item3-2" (click)="goToNotice()">
+      <div class="card3" style="width: 20%;">
+        <span *ngIf="hasNew.message == 1" class="img-tips"></span>
+        <img src="./assets/imgs/home/icon-mail.png" >
+      </div>
+      <div class="card3" style="width: 75%;">
+        <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-icon name="ios-arrow-forward" class="icon-right"></ion-icon>
+      </div>
+    </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')">
@@ -64,26 +84,10 @@
       </div>
     </div>
   </div>
-  <div class="item3" style="padding-top: 0px;">
-    <div class="item3-2" style="background-color:#f8f8f8;" (click)="goToNotice()">
-      <div class="card3" style="width: 15%;">
-        <span *ngIf="hasNew.message == 1" class="img-tips"></span>
-        <img src="./assets/imgs/home/icon-mail.png" >
-      </div>
-      <div class="card3" style="width: 75%;">
-        <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: 10%;color: #999999;font-size: 1.6rem">
-        <ion-icon name="ios-arrow-forward" class="icon-right"></ion-icon>
-      </div>
-    </div>
-  </div>
+
+  <p class="p-font">日程表</p>
   <div class="calen-tab">
-    日程表:<span class="calen1">休息日</span> <span class="calen2">参加活动</span>
+    <span class="calen1">休息日</span> <span class="calen2">参加活动</span>
     <span class="calen3">值班</span><span class="calen4">离沪</span>
   </div>
   <ion-calendar #calendar

src/pages/tabs/serve/serve.scss

@@ -14,11 +14,15 @@ page-serve {
     width: 100%;
   }
 
+
   .item2, .item3, .item4, .item5 {
     background-color: #f1f1f1;
     padding: 5px 0px;
   }
-
+  .item3{
+    padding: 1rem;
+    background-color: #fff;
+  }
   .item2-1, .item3-1, .item4-1, .item5-1 {
     font-size: 10px;
     background-color: #ffffff;
@@ -65,12 +69,12 @@ page-serve {
     width: 20%;
     display: inline-flex;
     flex-direction: column;
-    // flex-direction: center;
     align-items: center;
     justify-content: space-between;
     box-sizing: border-box;
     margin: 2.5%;
     position: relative;
+
   }
 
   .card img:first-child {
@@ -112,18 +116,26 @@ page-serve {
   }
 
   .item3-2 {
-    padding-top: 8px;
+    padding: .5rem 0;
+    -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;
+    background-color: #fff;
   }
 
   .card3 {
-    display: inline-flex;
-    flex-direction: column;
-    align-items: flex-start;
+    display: flex;
+    align-items: center;
     justify-content: center;
-    box-sizing: border-box;
+    flex-flow: row wrap;
     padding: 3px;
     position: relative;
     font-size: 1.2rem;
+    text-align: center;
+    img{
+      width: 3rem;
+    }
   }
 
   .img-tips {
@@ -308,10 +320,12 @@ page-serve {
   }
 
   .calen-tab {
-    margin: 16px 16px 0px 16px;
-    padding-bottom: 10px;
-    border-bottom: 1px solid #dddddd;
+    margin: 10px 10px 0px 10px;
     font-size: 1.3rem;
+    border: 1px solid #ddd;
+    line-height: 2rem;
+    background-color: #f7f7f7;
+    border-radius: 8px;
   }
 
   .calen1,
@@ -329,7 +343,7 @@ page-serve {
     content: '';
     position: absolute;
     top: 23%;
-    left: -13px;
+    left: -14px;
     width: 8px;
     height: 8px;
     border-radius: 50%;
@@ -391,5 +405,10 @@ page-serve {
       line-height: .1;
     }
   }
+  .p-font{
+    padding: .2rem 1rem;
+    font-size: 1.5rem;
+    color: #444;
+  }
 
 }

src/provide/backButton.service.ts

@@ -38,7 +38,7 @@ export class BackButtonService {
             } else {
                 if (tabRef == null || tabRef._selectHistory[tabRef._selectHistory.length - 1] === tabRef.getByIndex(0).id) {
                     //执行退出
-                    this.showExit();
+                    // this.showExit();
                 } else {
                     //选择首页第一个的标签
                     tabRef.select(0);