积分

src/app/app.component.ts

@@ -51,7 +51,7 @@ export class MyApp {
             this.statusBar.backgroundColorByHexString('#e12724');
             this.statusBar.styleLightContent();
 
-            timer(5000).subscribe((res) =>{
+            timer(1000).subscribe((res) =>{
                 this.showSplash = false
                 this.checkVersion();
             });

src/pages/discover-pages/issue/issue.html

+<!--
+  Generated template for the IssuePage page.
+
+  See http://ionicframework.com/docs/components/#navigation for more info on
+  Ionic pages and navigation.
+-->
+<ion-header>
+
+  <ion-navbar>
+    <ion-title>issue</ion-title>
+  </ion-navbar>
+
+</ion-header>
+
+
+<ion-content padding>
+
+</ion-content>

src/pages/discover-pages/issue/issue.module.ts

+import { NgModule } from '@angular/core';
+import { IonicPageModule } from 'ionic-angular';
+import { IssuePage } from './issue';
+
+@NgModule({
+  declarations: [
+    IssuePage,
+  ],
+  imports: [
+    IonicPageModule.forChild(IssuePage),
+  ],
+})
+export class IssuePageModule {}

src/pages/discover-pages/issue/issue.scss

+page-issue {
+
+}

src/pages/discover-pages/issue/issue.ts

+import { Component } from '@angular/core';
+import { IonicPage, NavController, NavParams } from 'ionic-angular';
+
+/**
+ * Generated class for the IssuePage page.
+ *
+ * See https://ionicframework.com/docs/components/#navigation for more info on
+ * Ionic pages and navigation.
+ */
+
+@IonicPage()
+@Component({
+  selector: 'page-issue',
+  templateUrl: 'issue.html',
+})
+export class IssuePage {
+
+  constructor(public navCtrl: NavController, public navParams: NavParams) {
+  }
+
+  ionViewDidLoad() {
+    console.log('ionViewDidLoad IssuePage');
+  }
+
+}

src/pages/home/surveyManage/item/desicr/desicr.scss

 page-desicr {
-    .submit{
-      background-color: #24bafc;
-    }
   .list-ios .item-block .item-inner,
   .list-ios > .item-block:first-child,
   .list-ios > .item-block:last-child, .list-ios > .item-wrapper:last-child .item-block{

src/pages/mine-pages/appraisals/appraisals.html

@@ -7,6 +7,54 @@
 </ion-header>
 
 
-<ion-content>
-
+<ion-content class="bgc-e7e8ed">
+    <ion-refresher (ionRefresh)="doRefresh($event)">
+        <ion-refresher-content pullingText="下拉刷新"
+                               refreshingSpinner="bubbles">
+        </ion-refresher-content>
+    </ion-refresher>
+    <div class="appraisals">
+        <div class="appraisalsItem" (click)="change(1)">
+            <span class="{{changeType == 1?'appraisals-title':''}}">支部top 5</span>
+        </div>
+        <div class="appraisalsItem" (click)="change(2)">
+            <span class="{{changeType == 2?'appraisals-title':''}}">个人top 10</span>
+        </div>
+    </div>
+    <ng-container *ngIf="changeType == 1">
+        <div class="duty-content">
+            <ion-list *ngIf="orgList.length > 0">
+                <ion-grid>
+                    <ion-row class="top-col" *ngFor="let item of orgList;let i = index;">
+                        <ion-col col-2>
+                            <img *ngIf="i == 0" src="./assets/imgs/learn/one.png">
+                            <img *ngIf="i == 1" src="./assets/imgs/learn/two.png">
+                            <img *ngIf="i == 2" src="./assets/imgs/learn/three.png">
+                            <span *ngIf="i > 2" class="span-rank">{{i + 1}}</span>
+                        </ion-col>
+                        <ion-col col-7>{{item.orgName}}</ion-col>
+                        <ion-col col-3>{{item.total}}</ion-col>
+                    </ion-row>
+                </ion-grid>
+            </ion-list>
+        </div>
+    </ng-container>
+    <ng-container *ngIf="changeType == 2">
+        <div class="duty-content">
+            <ion-list *ngIf="personList.length > 0">
+                <ion-grid>
+                    <ion-row class="top-col" *ngFor="let item of personList;let i = index;">
+                        <ion-col col-2>
+                            <img *ngIf="i == 0" src="./assets/imgs/learn/one.png">
+                            <img *ngIf="i == 1" src="./assets/imgs/learn/two.png">
+                            <img *ngIf="i == 2" src="./assets/imgs/learn/three.png">
+                            <span *ngIf="i > 2" class="span-rank">{{i + 1}}</span>
+                        </ion-col>
+                        <ion-col col-7>{{item.userName}}</ion-col>
+                        <ion-col col-3>{{item.total}}</ion-col>
+                    </ion-row>
+                </ion-grid>
+            </ion-list>
+        </div>
+    </ng-container>
 </ion-content>

src/pages/mine-pages/appraisals/appraisals.scss

 page-appraisals {
-
+  .appraisals{
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    justify-content: center;
+    height: 36px;
+    background-color: #fff;
+  }
+  .appraisals div{
+    width: 50%;
+    text-align: center;
+    position: relative;
+  }
+  .appraisalsItem > div{
+    margin-bottom: 10px;
+  }
+  .appraisals-title{
+    position: relative;
+    color: #e42417;
+  }
+  .appraisals-title::after{
+    content: '';
+    position: absolute;
+    width: 100%;
+    height: 2px;
+    background-color: #e42417;
+    bottom: -10px;
+    left: 0px;
+  }
+  .top-row{
+    color: #577ab9;
+    font-size: 1.6rem;
+  }
+  .top-col{
+    background-color: #fff;
+    margin: .5rem;
+    height: 3rem;
+    line-height: 2rem;
+    font-size: 1.5rem;
+    border-radius: 4px;
+    [col-2]{
+      display: flex;
+      align-items: center;
+      justify-content: center;
+    }
+    img{
+      width: 2rem;
+    }
+  }
 }

src/pages/mine-pages/appraisals/appraisals.ts

-import { Component } from '@angular/core';
-import { IonicPage, NavController, NavParams } from 'ionic-angular';
+import {Component, ViewChild} from '@angular/core';
+import {InfiniteScrollContent, IonicPage, NavController, NavParams} from 'ionic-angular';
+import {AppGlobal} from "../../../service/http.service";
+import {MineService} from "../mine.service";
+import {CommonService} from "../../../provide/common.service";
+import {timer} from "rxjs/observable/timer";
 
 @IonicPage()
 @Component({
@@ -7,12 +11,66 @@ import { IonicPage, NavController, NavParams } from 'ionic-angular';
     templateUrl: 'appraisals.html',
 })
 export class AppraisalsPage {
+    @ViewChild(InfiniteScrollContent) infiniteScrollContent: InfiniteScrollContent;
 
-  constructor(public navCtrl: NavController, public navParams: NavParams) {
+    pageNum = 1;
+    pageCount = 10;
+    collectionList = [];
+    picture: string = AppGlobal.domain + '/wisdomgroup';
+
+    isLoad = true;
+
+    loadMore = true;
+    totalNum;  //总条数
+    changeType = 1;
+
+    orgList = [];
+    personList = [];
+
+    constructor(public navCtrl: NavController, public navParams: NavParams,
+                public mineSer: MineService, public commonSer: CommonService) {
     }
 
-  ionViewDidLoad() {
-    console.log('ionViewDidLoad AppraisalsPage');
+    ionViewDidEnter() {
+        this.getOrgList();
+        this.getPersonList();
     }
 
+    change(type){
+       this.changeType = type;
+    }
+
+    //组织积分top5
+    getOrgList() {
+        const data = {
+            pageNum: this.pageNum,
+            pageSize: 5
+        };
+        this.mineSer.orgPointList(data).subscribe(
+            (res) => {
+                this.orgList = res.data.list;
+            }
+        )
+    }
+
+    //个人积分top10
+    getPersonList(){
+        const data = {
+            pageNum: this.pageNum,
+            pageSize: 10
+        };
+        this.mineSer.personPointList(data).subscribe(
+            (res) => {
+                this.personList = res.data.list;
+            }
+        )
+    }
+
+    doRefresh(e){
+        timer(1000).subscribe(()=>{
+            e.complete();
+            this.getOrgList();
+            this.getPersonList();
+        })
+    }
 }

src/pages/mine-pages/integral/integral.html

@@ -8,5 +8,35 @@
 
 
 <ion-content>
-
+  <ion-refresher (ionRefresh)="doRefresh($event)">
+    <ion-refresher-content pullingText="下拉刷新"
+                           refreshingSpinner="bubbles">
+    </ion-refresher-content>
+  </ion-refresher>
+  <div class="padding-15-30">
+    <ng-container *ngFor="let item of integraList;let i = index;">
+      <div class="inteItem">
+        <p class="inteTime">{{item.datetime | date:'yyyy-MM-dd HH:mm:ss'}}</p>
+        <ion-row>
+          <ion-col col-8 class="iterType">
+            <span *ngIf="item.type == 1">签到</span>
+            <span *ngIf="item.type == 2">阅读文章</span>
+            <span *ngIf="item.type == 3">评论</span>
+            <span *ngIf="item.type == 4">亮评</span>
+            <span *ngIf="item.type == 5">内容发布</span>
+            <span *ngIf="item.type == 6">高质量内容</span>
+            <span *ngIf="item.type == 7">学习测试</span>
+            <span *ngIf="item.type == 8">不良评论内容</span>
+          </ion-col>
+          <ion-col col-4 class="inteScore"> <span>+{{item.integral}}</span> <span>分</span></ion-col>
+        </ion-row>
+      </div>
+    </ng-container>
+  </div>
+  <ion-infinite-scroll (ionInfinite)="doInfinite($event)">
+    <ion-infinite-scroll-content
+            loadingSpinner="bubbles"
+            loadingText="加载中"></ion-infinite-scroll-content>
+  </ion-infinite-scroll>
+  <p class="noData" *ngIf="!loadMore">你已经看到我的底线了</p>
 </ion-content>

src/pages/mine-pages/integral/integral.scss

 page-integral {
-
+  .inteItem{
+    margin-bottom: 5px;
+    .inteTime{
+      color: #999999;
+      position: relative;
+      height: 1.6rem;
+    }
+    .inteTime:after{
+      content: '';
+      position: absolute;
+      top: 6px;
+      left: -16px;
+      width: 6px;
+      height: 6px;
+      background-color: #eeeeee;
+      border-radius: 50%;
+    }
+    .inteTime:before{
+      content: '';
+      position: absolute;
+      top: 6px;
+      left: -14px;
+      width: 2px;
+      height: 60px;
+      background-color: #eeeeee;
+    }
+    .iterType{
+      color: #333333;
+      font-size: 1.5rem;
+      padding-left: 0;
+    }
+    .inteScore{
+      text-align: right;
+      color: #e12724;
+      font-size: 0;
+      span:first-child{
+        font-weight: bold;
+        font-size: 1.8rem;
+      }
+      span:last-child{
+        font-size: 1.4rem;
+      }
+    }
+  }
 }

src/pages/mine-pages/integral/integral.ts

-import { Component } from '@angular/core';
-import { IonicPage, NavController, NavParams } from 'ionic-angular';
+import {Component, ViewChild} from '@angular/core';
+import {InfiniteScrollContent, IonicPage, NavController, NavParams} from 'ionic-angular';
+import {AppGlobal} from "../../../service/http.service";
+import {MineService} from "../mine.service";
+import {CommonService} from "../../../provide/common.service";
+import {timer} from "rxjs/observable/timer";
 
 
 @IonicPage()
@@ -8,12 +12,81 @@ import { IonicPage, NavController, NavParams } from 'ionic-angular';
     templateUrl: 'integral.html',
 })
 export class IntegralPage {
+    @ViewChild(InfiniteScrollContent) infiniteScrollContent: InfiniteScrollContent;
 
-  constructor(public navCtrl: NavController, public navParams: NavParams) {
+    pageNum = 1;
+    pageCount = 10;
+    integraList = [];
+    picture: string = AppGlobal.domain + '/wisdomgroup';
+
+    isLoad = true;
+
+    loadMore = true;
+    totalNum;  //总条数
+    constructor(public navCtrl: NavController, public navParams: NavParams,
+                public mineSer: MineService, public commonSer: CommonService) {
+    }
+
+    ionViewDidEnter() {
+        this.getList();
     }
 
-  ionViewDidLoad() {
-    console.log('ionViewDidLoad IntegralPage');
+    getList() {
+        const data = {
+            pageNum: this.pageNum,
+            pageSize: this.pageCount
+        };
+        this.mineSer.personPointDetail(data).subscribe(
+            (res) => {
+                this.integraList = res.list;
+                this.isLoad = false;
+                this.totalNum = res.total;
+            }
+        )
     }
 
+    //下拉刷新
+    doRefresh(e) {
+        this.loadMore = true;
+        this.infiniteScrollContent.inf.enable(true);
+        const data = {
+            pageNum: 1,
+            pageSize: this.pageCount
+        };
+        this.mineSer.personPointDetail(data).subscribe(
+            (res) => {
+                this.integraList = res.list;
+                this.totalNum = res.total;
+                timer(800).subscribe(() => {
+                    this.commonSer.toast('刷新成功');
+                    e.complete()
+                });
+            }
+        )
+    }
+
+    //加载更多
+    doInfinite(e) {
+        console.log("doInfinite")
+        if (this.totalNum == this.integraList.length) {
+            console.log("没有更多了")
+            this.loadMore = false;
+            e.enable(false);
+            return false;
+        }
+        this.pageNum++;
+        const data = {
+            pageNum: this.pageNum,
+            pageSize: this.pageCount
+        };
+        this.mineSer.personPointDetail(data).subscribe(
+            (res) => {
+                this.totalNum = res.total;
+                res.list.forEach(e => {
+                    this.integraList.push(e);
+                });
+                timer(800).subscribe(() => e.complete());
+            }
+        )
+    }
 }

src/pages/mine-pages/mine.service.ts

-import {Injectable} from "@angular/core";import {HttpClient} from "@angular/common/http";import {Http} from "@angular/http";import {Observable} from "rxjs/Observable";import {AppGlobal} from "../../service/http.service";import {CommonService} from "../../provide/common.service";
@Injectable()export class MineService {
    constructor(
        private http: HttpClient,   //该请求 将结果转为json
        private commonSer: CommonService,
        private https: Http,    //该请求不转json
    ) {
    }

    //我的发布
    myPublish(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/stuff/myPublish', data);
    }

    //我的收藏
    myCollection(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/stuff/myCollection', data);
    }

    //上传头像
    imageUpload(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/common/file/image/upload', data);
    }

    //获取个人头像
    showImgByFileid(data): Observable<any> {
        return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/common/file/showImgByFileid/' + data);
    }



}
+import {Injectable} from "@angular/core";import {HttpClient} from "@angular/common/http";import {Http} from "@angular/http";import {Observable} from "rxjs/Observable";import {AppGlobal} from "../../service/http.service";import {CommonService} from "../../provide/common.service";
@Injectable()export class MineService {
    constructor(
        private http: HttpClient,   //该请求 将结果转为json
        private commonSer: CommonService,
        private https: Http,    //该请求不转json
    ) {
    }

    //我的发布
    myPublish(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/stuff/myPublish', data);
    }

    //我的收藏
    myCollection(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/stuff/myCollection', data);
    }

    //上传头像
    imageUpload(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/common/file/image/upload', data);
    }

    //获取个人头像
    showImgByFileid(data): Observable<any> {
        return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/common/file/showImgByFileid/' + data);
    }

    //支部积分
    orgPointList(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/twissignhistory/orgPointList', this.commonSer.toFormData(data));
    }

    //个人排行榜
    personPointList(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/twissignhistory/personPointList', this.commonSer.toFormData(data) );
    }

    //个人积分信息
    personPointDetail(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/twissignhistory/personPointDetail', this.commonSer.toFormData(data) );
    }

}
\ No newline at end of file

src/pages/mine-pages/my-collection/my-collection.ts

@@ -56,7 +56,7 @@ export class MyCollectionPage {
                 this.collectionList = res.data.list;
                 this.totalNum = res.data.total;
                 setTimeout(()=>{
-                    this.commonSer.toast('刷新成功')
+                    this.commonSer.toast('刷新成功');
                     e.complete()
                 },800);
             }

src/pages/mine/my-duty/my-duty.scss

@@ -24,14 +24,14 @@ page-my-duty {
   }
   .duty-title{
     position: relative;
-    color: #24bafc;
+    color: #e42417;
   }
   .duty-title::after{
     content: '';
     position: absolute;
     width: 100%;
     height: 2px;
-    background-color: #24bafc;
+    background-color: #e42417;
     bottom: -10px;
     left: 0px;
   }

src/pages/tabs/discover/discover.html

@@ -119,6 +119,9 @@
 
   <p class="noData" *ngIf="!loadMore">你已经看到我的底线了</p>
 
+  <ion-fab right bottom>
+    <button ion-fab color="light">我要出题</button>
+  </ion-fab>
 </ion-content>
 
 <div class="publishMisk" *ngIf="isPublish" (click)="close()">

src/pages/tabs/discover/discover.ts

@@ -226,6 +226,10 @@ export class DiscoverPage {
 
     //子级选择
     changeChildren(item) {
+        if(item.name == '我要出题'){
+            this.navCtrl.push('SelectTypePage');
+            return false;
+        }
         this.indexChildren = item.indexChildren;
         this.infiniteScrollContent.inf.enable(true);
 

src/pages/tabs/home/home.ts

@@ -127,7 +127,7 @@ export class HomePage {
     ionViewDidLoad() {
         this.initSwiper();
         this.itemWidth = window.screen.width / 4;
-        console.log(this.tabsParent.nativeElement.children[0].children[0].offsetWidth)
+        console.log(this.tabsParent.nativeElement.children[0].children[0].offsetWidth);
         this.spanWidth = this.tabsParent.nativeElement.children[0].children[0].offsetWidth;   //文字宽度
         this.tips.nativeElement.style.width = this.spanWidth + 'px';
         this.tips1.nativeElement.style.width = this.spanWidth + 'px';
@@ -228,7 +228,6 @@ export class HomePage {
                     this.slideList[this.index] = arr;
                 }
                 if (this.swiperArticle) this.swiperArticle.slideTo(this.index, 500);
-                this.content.resize();
             }
         )
     }
@@ -254,7 +253,7 @@ export class HomePage {
                 (res) => {
                     this.partyObj = res.apiResult.data;
                     //获取是否展示过政治生日
-                    const nowDay = this.datePipe.transform(new Date(), 'yyyy-MM-dd HH');
+                    const nowDay = this.datePipe.transform(new Date(), 'yyyy-MM-dd');
                     const partyBir = localStorage.getItem('partyBir');
                     if (nowDay == partyBir) {
                         setTimeout(() => {

src/pages/tabs/mine/mine.html

@@ -44,7 +44,7 @@
         <ion-grid class="padding-0-10">
             <ion-row (click)="goTo('MyActivityListPage')">
                 <ion-col class="group-left" col-2>
-                    <img src="./assets/imgs/mine/wdhd.png" alt="">
+                    <img src="./assets/imgs/mine/wdhd.png" >
                 </ion-col>
                 <ion-col class="group-right" col-10>
                     <span>我的活动</span>
@@ -53,7 +53,7 @@
             </ion-row>
             <ion-row (click)="goTo('MyReportPage')">
                 <ion-col class="group-left" col-2>
-                    <img src="./assets/imgs/mine/wdbb.png" alt="">
+                    <img src="./assets/imgs/mine/wdbb.png" >
                 </ion-col>
                 <ion-col class="group-right" col-10>
                     <span>我的报备</span>
@@ -62,7 +62,7 @@
             </ion-row>
             <ion-row (click)="goTo('MySurveyPage')">
                 <ion-col class="group-left" col-2>
-                    <img src="./assets/imgs/mine/wdwj.png" alt="">
+                    <img src="./assets/imgs/mine/wdwj.png" >
                 </ion-col>
                 <ion-col class="group-right" col-10>
                     <span>我的问卷</span>
@@ -71,7 +71,7 @@
             </ion-row>
             <ion-row (click)="goTo('MyDutyPage')">
                 <ion-col class="group-left" col-2>
-                    <img src="./assets/imgs/mine/wdzb.png" alt="">
+                    <img src="./assets/imgs/mine/wdzb.png" >
                 </ion-col>
                 <ion-col class="group-right" col-10>
                     <span>我的值班</span>
@@ -80,7 +80,7 @@
             </ion-row>
             <ion-row (click)="goTo('MyPublishPage')">
                 <ion-col class="group-left" col-2>
-                    <img src="./assets/imgs/mine/wdfb.png" alt="">
+                    <img src="./assets/imgs/mine/wdfb.png" >
                 </ion-col>
                 <ion-col class="group-right" col-10>
                     <span>我的发布</span>
@@ -89,7 +89,7 @@
             </ion-row>
             <ion-row (click)="goTo('MyCollectionPage')">
                 <ion-col class="group-left" col-2>
-                    <img src="./assets/imgs/mine/wdsc.png" alt="">
+                    <img src="./assets/imgs/mine/wdsc.png" >
                 </ion-col>
                 <ion-col class="group-right" col-10>
                     <span>我的收藏</span>
@@ -98,7 +98,7 @@
             </ion-row>
             <ion-row (click)="goTo('AppraisalsPage')">
                 <ion-col class="group-left" col-2>
-                    <img src="./assets/imgs/mine/wdsc.png" alt="">
+                    <img src="./assets/imgs/mine/jxkh.png" >
                 </ion-col>
                 <ion-col class="group-right" col-10>
                     <span>绩效考核</span>
@@ -110,7 +110,7 @@
         <ion-grid class="padding-0-10">
             <ion-row (click)="goTo('VersionPage')">
                 <ion-col class="group-left" col-2>
-                    <img src="./assets/imgs/mine/xtsz.png" alt="">
+                    <img src="./assets/imgs/mine/xtsz.png" >
                 </ion-col>
                 <ion-col class="group-right" style="border-bottom: 0px" col-10>
                     <span>设置</span>