你问我答 update

config.xml

 <?xml version='1.0' encoding='utf-8'?>
-<widget id="io.ionic.smart19.starter" version="4.2.7" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="io.ionic.smart19.starter" version="4.2.8" 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>

ionic.config.json

@@ -7,7 +7,7 @@
   "proxies": [
     {
       "path": "/wisdomgroup",
-      "proxyUrl": "http://47.103.33.196:8080/wisdomgroup"
+      "proxyUrl": "http://47.103.35.216:8080/wisdomgroup"
     }
   ]
 }

platforms/android/app/build/generated/source/buildConfig/release/io/ionic/smart19/starter/BuildConfig.java

@@ -8,6 +8,6 @@ public final class BuildConfig {
   public static final String APPLICATION_ID = "io.ionic.smart19.starter";
   public static final String BUILD_TYPE = "release";
   public static final String FLAVOR = "";
-  public static final int VERSION_CODE = 40206;
-  public static final String VERSION_NAME = "4.2.6";
+  public static final int VERSION_CODE = 40208;
+  public static final String VERSION_NAME = "4.2.8";
 }

platforms/android/app/build/intermediates/incremental/mergeReleaseResources/compile-file-map.properties

-#Sun Jun 16 23:25:26 CST 2019
+#Tue Jun 18 21:14:16 CST 2019
 /Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/drawable-xhdpi-v4/notification_bg_normal.9.png=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/drawable-xhdpi-v4_notification_bg_normal.9.png.flat
 /Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/drawable-hdpi-v4/notification_bg_low_pressed.9.png=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/drawable-hdpi-v4_notification_bg_low_pressed.9.png.flat
 /Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/layout/notification_action_tombstone.xml=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/layout_notification_action_tombstone.xml.flat

platforms/android/app/build/intermediates/incremental/packageRelease/release/dex-renamer-state.txt

-#Mon Jun 17 01:25:09 CST 2019
+#Tue Jun 18 21:14:33 CST 2019
 base.0=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/transforms/dex/release/0
 renamed.0=classes.dex
 file.0=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/transforms/dex/release/0/classes.dex

platforms/android/app/build/intermediates/incremental/packageRelease/release/file-input-save-data.txt

 #Internal package file, do not edit.
-#Mon Jun 17 01:25:09 CST 2019
+#Tue Jun 18 21:14:33 CST 2019
 20.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/release/resources-release.ap_
 143.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/release
 340.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/release/www/build/64.js

platforms/android/app/build/intermediates/manifests/full/release/AndroidManifest.xml

@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="io.ionic.smart19.starter"
     android:hardwareAccelerated="true"
-    android:versionCode="40206"
-    android:versionName="4.2.6" >
+    android:versionCode="40208"
+    android:versionName="4.2.8" >
 
     <uses-sdk
         android:minSdkVersion="16"

platforms/android/app/build/intermediates/manifests/full/release/output.json

-[{"outputType":{"type":"MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40206},"path":"AndroidManifest.xml","properties":{"packageId":"io.ionic.smart19.starter","split":"","minSdkVersion":"16"}}]
+[{"outputType":{"type":"MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40208},"path":"AndroidManifest.xml","properties":{"packageId":"io.ionic.smart19.starter","split":"","minSdkVersion":"16"}}]
\ No newline at end of file

platforms/android/app/build/intermediates/manifests/instant-run/release/output.json

-[{"outputType":{"type":"INSTANT_RUN_MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40206},"path":"AndroidManifest.xml","properties":{"packageId":"io.ionic.smart19.starter","split":"","minSdkVersion":"16"}}]
+[{"outputType":{"type":"INSTANT_RUN_MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40208},"path":"AndroidManifest.xml","properties":{"packageId":"io.ionic.smart19.starter","split":"","minSdkVersion":"16"}}]
\ No newline at end of file

platforms/android/app/build/intermediates/res/release/output.json

-[{"outputType":{"type":"PROCESSED_RES"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40206},"path":"resources-release.ap_","properties":{"packageId":"io.ionic.smart19.starter","split":"","minSdkVersion":"16"}}]
+[{"outputType":{"type":"PROCESSED_RES"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40208},"path":"resources-release.ap_","properties":{"packageId":"io.ionic.smart19.starter","split":"","minSdkVersion":"16"}}]
\ No newline at end of file

platforms/android/app/build/outputs/apk/release/output.json

-[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40206},"path":"app-release-unsigned.apk","properties":{"packageId":"io.ionic.smart19.starter","split":"","minSdkVersion":"16"}}]
+[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40208},"path":"app-release-unsigned.apk","properties":{"packageId":"io.ionic.smart19.starter","split":"","minSdkVersion":"16"}}]
\ No newline at end of file

platforms/android/app/build/reports/lint-results-release-fatal.html

@@ -176,7 +176,7 @@ document.getElementById(id).style.display = 'none';
       <span class="mdl-layout-title">Lint Report: 1 error</span>
       <div class="mdl-layout-spacer"></div>
       <nav class="mdl-navigation mdl-layout--large-screen-only">
-Check performed at Mon Jun 17 01:25:11 CST 2019      </nav>
+Check performed at Tue Jun 18 21:14:40 CST 2019      </nav>
     </div>
   </header>
   <div class="mdl-layout__drawer">

platforms/android/app/src/main/AndroidManifest.xml

 <?xml version='1.0' encoding='utf-8'?>
-<manifest android:hardwareAccelerated="true" android:versionCode="40206" android:versionName="4.2.6" package="io.ionic.smart19.starter" xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest android:hardwareAccelerated="true" android:versionCode="40208" android:versionName="4.2.8" package="io.ionic.smart19.starter" xmlns:android="http://schemas.android.com/apk/res/android">
     <supports-screens android:anyDensity="true" android:largeScreens="true" android:normalScreens="true" android:resizeable="true" android:smallScreens="true" android:xlargeScreens="true" />
     <application android:hardwareAccelerated="true" android:icon="@mipmap/icon" android:label="@string/app_name" android:supportsRtl="true">
         <activity android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale" android:label="@string/activity_name" android:launchMode="singleTop" android:name="MainActivity" android:theme="@android:style/Theme.DeviceDefault.NoActionBar" android:windowSoftInputMode="adjustResize">

platforms/android/app/src/main/res/xml/config.xml

 <?xml version='1.0' encoding='utf-8'?>
-<widget id="io.ionic.smart19.starter" version="4.2.6" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="io.ionic.smart19.starter" version="4.2.8" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <feature name="Keyboard">
         <param name="android-package" onload="true" value="io.ionic.keyboard.IonicKeyboard" />
     </feature>

platforms/browser/config.xml

 <?xml version='1.0' encoding='utf-8'?>
-<widget id="io.ionic.smart19.starter" version="4.2.6" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="io.ionic.smart19.starter" version="4.2.8" 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>

src/pages/discover-pages/response/response.html

@@ -15,6 +15,7 @@
                     <span *ngIf="item?.type == 1">(判断)</span>
                     <span *ngIf="item?.type == 2">(单选)</span>
                     <span *ngIf="item?.type == 3">(多选)</span>
+                    <span *ngIf="item?.type == 3">(问答)</span>
                     {{item?.stem}}
                 </p>
             </div>
@@ -63,6 +64,10 @@
                             </p>
                         </ng-container>
                     </ng-container>
+                    <!--问答-->
+                    <ng-container *ngIf="item?.type == 4">
+                        <textarea [(ngModel)]="answer" class="content-textarea"></textarea>
+                    </ng-container>
                 </div>
             </div>
         </div>

src/pages/discover-pages/response/response.ts

@@ -22,6 +22,10 @@ export class ResponsePage {
         this.item = this.navParams.get('item');
     }
 
+    ionViewWillLeave(){
+        this.answer = null;
+    }
+
     //多选
     mutiSelect(i, option) {
         if (this.answer.includes(option)) {
@@ -33,6 +37,10 @@ export class ResponsePage {
 
     //提交答案
     submit() {
+        if(!this.answer){
+            this.commonSer.toast("请输入您的答案!");
+            return false;
+        }
         const data = {
             questionId: this.item.id,
             answer: this.answer

src/pages/home/more-app/more-app.html

@@ -25,7 +25,7 @@
             <img src="./assets/imgs/home/icon-zbqk.png" alt="">
             <label class="label2-2">值班情况</label>
         </div>
-        <ng-container *ngIf="(role == 1 && role == 5) || role == 2 || role == 3">
+        <ng-container *ngIf="role == 1 || role == 5 || role == 2 || role == 3">
             <div class="card" (click)="goActivityTrack()">
                 <img src="./assets/imgs/home/icon-hdgz.png" alt="">
                 <label class="label2-2">活动跟踪</label>

src/pages/home/more-app/more-app.ts

@@ -73,7 +73,7 @@ export class MoreAppPage {
     }
 
     //获取权限
-    // 返回值int :3-管理员，2-处室领导，1-内勤人员，0-普通用户
+    // 返回值int :3-管理员，2-处室领导，1-内勤人员，0-普通用户 5-审核
     getRole() {
         this.appService.ObserverHttpGet("/wisdomgroup/app/getRoles", null).subscribe((res: Response) => {
             this.role = res.json();

src/pages/home/surveyManage/item/select-type/select-type.html

@@ -19,7 +19,7 @@
     <p><button class="submit-btn submit" (click)="select(3)">
       <img src="./assets/imgs/survey/multi.png" >
       <span>多选题</span></button></p>
-    <p *ngIf="!type"><button class="submit-btn submit" (click)="select(4)">
+    <p><button class="submit-btn submit" (click)="select(4)">
       <img src="./assets/imgs/survey/qa.png" >
       <span>问答题</span></button></p>
   </div>

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);
    }

    //我的审核
    appCheckList(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/stuff/appCheckList', 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) );
    }

    //查询待审核数量
    waitCheckNum(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/stuff/waitCheckNum' , data);
    }

    //查询我的草稿
    myDraft(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/stuff/myDraft',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);
    }

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

    //退回已审核文章
    stuffRecall(params): Observable<any> {
        return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/stuff/recall/' + params);
    }

    //上传头像
    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) );
    }

    //查询待审核数量
    waitCheckNum(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/stuff/waitCheckNum' , data);
    }

    //查询我的草稿
    myDraft(data): Observable<any> {
        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/stuff/myDraft',data);
    }

}
\ No newline at end of file

src/pages/mine-pages/verify/verify.html

@@ -13,6 +13,14 @@
                                refreshingSpinner="bubbles">
         </ion-refresher-content>
     </ion-refresher>
+    <div class="duty">
+        <div class="dutyItem" (click)="getList(2)">
+            <span class="{{publishStatus == 2?'duty-title':''}}">未审核</span>
+        </div>
+        <div class="dutyItem" (click)="getList(3)">
+            <span class="{{publishStatus == 3?'duty-title':''}}">已审核</span>
+        </div>
+    </div>
     <div class="main-news">
         <ng-container *ngFor="let new of checkList;">
             <ng-container *ngIf="new.imgUrl">
@@ -22,7 +30,10 @@
                             {{new.title}}
                         </p>
                         <p class="news-end">
-                            <!--              <span>收藏时间：</span><span>{{new.publishTime | date:'yyyy-MM-dd'}}</span>-->
+                            <span>提交人：</span><span class="margin-right-10">{{new.submitterName }}</span>
+                            <span>提交时间：</span><span>{{new.createTime | date:'yyyy-MM-dd'}}</span>
+                            <span (click)="recall(new,$event)">退回</span>
+
                         </p>
                     </ion-col>
                     <ion-col col-4 class="news-right">
@@ -39,6 +50,7 @@
                         <p class="news-end">
                             <span>提交人：</span><span class="margin-right-10">{{new.submitterName }}</span>
                             <span>提交时间：</span><span>{{new.createTime | date:'yyyy-MM-dd'}}</span>
+                            <span (click)="recall(new,$event)">退回</span>
                         </p>
                     </ion-col>
                 </ion-row>

src/pages/mine-pages/verify/verify.scss

@@ -50,4 +50,31 @@ page-verify {
       border-top: 1px solid #eeeeee;
     }
   }
+
+  .duty{
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    justify-content: center;
+    height: 36px;
+    background-color: #fff;
+  }
+  .duty div{
+    width: 50%;
+    text-align: center;
+    position: relative;
+  }
+  .duty-title{
+    position: relative;
+    color: #e42417;
+  }
+  .duty-title::after{
+    content: '';
+    position: absolute;
+    width: 100%;
+    height: 2px;
+    background-color: #e42417;
+    bottom: -10px;
+    left: 0px;
+  }
 }

src/pages/mine-pages/verify/verify.ts

@@ -22,23 +22,29 @@ export class VerifyPage {
     isLoad = true;
 
     loadMore = true;
+    publishStatus = 2;
     totalNum;  //总条数
     constructor(public navCtrl: NavController, public navParams: NavParams,
                 public mineSer: MineService, public commonSer: CommonService) {
     }
 
     ionViewDidEnter() {
-        this.getList();
+        this.getList(2);
     }
 
     change(type) {
 
     }
 
-    getList() {
+    //获取文章
+    getList(status) {
+        this.publishStatus = status;
         const data = {
             pageNum: this.pageNum,
-            pageCount: this.pageCount
+            pageCount: this.pageCount,
+            obj: {
+                publishStatus: this.publishStatus  //2  待审核 ，3  已审核
+            }
         };
         this.mineSer.appCheckList(data).subscribe(
             (res) => {
@@ -49,24 +55,28 @@ export class VerifyPage {
         )
     }
 
+    //退回已审核文章
+    recall(item,e) {
+        e.stopPropagation();
+        this.commonSer.alert('确认退回当前文章', () => {
+            this.mineSer.stuffRecall(item.id).subscribe(
+                (res) => {
+                    this.getList(this.publishStatus);
+                }
+            )
+        });
+
+    }
+
     //下拉刷新
     doRefresh(e) {
         this.loadMore = true;
         this.infiniteScrollContent.inf.enable(true);
-        const data = {
-            pageNum: 1,
-            pageCount: this.pageCount
-        };
-        this.mineSer.appCheckList(data).subscribe(
-            (res) => {
-                this.checkList = res.data.list;
-                this.totalNum = res.data.total;
-                setTimeout(() => {
-                    this.commonSer.toast('刷新成功');
-                    e.complete()
-                }, 800);
-            }
-        )
+        this.getList(this.publishStatus);
+        setTimeout(() => {
+            this.commonSer.toast('刷新成功');
+            e.complete()
+        }, 800);
     }
 
     //加载更多
@@ -79,7 +89,10 @@ export class VerifyPage {
         this.pageNum++;
         const data = {
             pageNum: this.pageNum,
-            pageCount: this.pageCount
+            pageCount: this.pageCount,
+            obj: {
+                publishStatus: this.publishStatus  //2  待审核 ，3  已审核
+            }
         };
         this.mineSer.appCheckList(data).subscribe(
             (res) => {

src/pages/tabs/discover/discover.html

@@ -210,7 +210,9 @@
                                                 <p style="margin: 0;" class="news-title">
                                                     <span *ngIf="item.type == 1">(判断)</span>
                                                     <span *ngIf="item.type == 2">(单选)</span>
-                                                    <span *ngIf="item.type == 3">(多选)</span>{{item.stem}}
+                                                    <span *ngIf="item.type == 3">(多选)</span>
+                                                    <span *ngIf="item.type == 4">(问答)</span>
+                                                    {{item.stem}}
                                                 </p>
                                             </ion-col>
                                             <ion-col col-4 class="news-right">

src/pages/tabs/discover/discover.ts

@@ -131,14 +131,9 @@ export class DiscoverPage {
                     "indexChildren": '42'
                 },
                 {
-                    "name": "风险排查",
-                    "type": 11,
-                    "indexChildren": '43'
-                },
-                {
                     "name": "警示教育",
                     "type": 12,
-                    "indexChildren": '44'
+                    "indexChildren": '43'
                 }
             ]
         },
@@ -372,6 +367,7 @@ export class DiscoverPage {
         };
         this.tabsSer.stuffPage(data).subscribe(
             (res) => {
+                this.slidersItems = [];
                 if (res.data.list.length > 0) {
                     res.data.list.forEach(e => {
                         if (e.attachments.length > 0) {

src/service/http.service.ts

@@ -15,9 +15,9 @@ export class AppGlobal {
     //接口基地址
     // static domain = "http://101.89.112.92:80";     //正式环境
     // static domain = "http://192.168.2.235:8080";   //测试环境
-    static domain = "http://47.103.33.196:8080";   //阿里云测试地址
+    // static domain = "http://47.103.33.196:8080";   //阿里云测试地址
     // static domain = "http://47.103.35.216:8080";   //阿里云正式地址
-    // static domain = "";   //本地环境
+    static domain = "";   //本地环境
 
 
     //图片地址