样式

config.xml

 <?xml version='1.0' encoding='utf-8'?>
-<widget id="io.ionic.partyCloud.starter.test" version="0.3.5" 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.3.6" 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>

platforms/android/app/build/generated/source/buildConfig/debug/io/ionic/partyCloud/starter/test/BuildConfig.java

@@ -8,6 +8,6 @@ public final class BuildConfig {
   public static final String APPLICATION_ID = "io.ionic.partyCloud.starter.test";
   public static final String BUILD_TYPE = "debug";
   public static final String FLAVOR = "";
-  public static final int VERSION_CODE = 305;
-  public static final String VERSION_NAME = "0.3.5";
+  public static final int VERSION_CODE = 306;
+  public static final String VERSION_NAME = "0.3.6";
 }

platforms/android/app/build/intermediates/blame/res/debug/single/debug.json

@@ -16,14 +16,14 @@
         "source": "/Users/ben/gitLab-project/wisdom-ces/platforms/android/app/src/main/res/drawable-land-hdpi/screen.png"
     },
     {
-        "merged": "/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/xml_provider_paths.xml.flat",
-        "source": "/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/res/xml/provider_paths.xml"
-    },
-    {
         "merged": "/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/mipmap-mdpi_icon.png.flat",
         "source": "/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/res/mipmap-mdpi/icon.png"
     },
     {
+        "merged": "/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/xml_provider_paths.xml.flat",
+        "source": "/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/res/xml/provider_paths.xml"
+    },
+    {
         "merged": "/Users/ben/gitLab-project/wisdom-ces/platforms/android/app/build/intermediates/res/merged/debug/drawable-mdpi-v4_notification_bg_normal_pressed.9.png.flat",
         "source": "/Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/drawable-mdpi-v4/notification_bg_normal_pressed.9.png"
     },
@@ -56,14 +56,14 @@
         "source": "/Users/ben/.gradle/caches/transforms-1/files-1.1/support-media-compat-27.1.0.aar/9e0e60c653d210b584d1ee2c4867f4b8/res/layout/notification_template_big_media_narrow.xml"
     },
     {
-        "merged": "/Users/ben/gitLab-project/wisdom-ces/platforms/android/app/build/intermediates/res/merged/debug/layout-v21_notification_action.xml.flat",
-        "source": "/Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/layout-v21/notification_action.xml"
-    },
-    {
         "merged": "/Users/ben/gitLab-project/wisdom-ces/platforms/android/app/build/intermediates/res/merged/debug/drawable-hdpi-v4_notify_panel_notification_icon_bg.png.flat",
         "source": "/Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/drawable-hdpi-v4/notify_panel_notification_icon_bg.png"
     },
     {
+        "merged": "/Users/ben/gitLab-project/wisdom-ces/platforms/android/app/build/intermediates/res/merged/debug/layout-v21_notification_action.xml.flat",
+        "source": "/Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/layout-v21/notification_action.xml"
+    },
+    {
         "merged": "/Users/ben/gitLab-project/wisdom-ces/platforms/android/app/build/intermediates/res/merged/debug/drawable-mdpi-v4_notification_bg_low_normal.9.png.flat",
         "source": "/Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/drawable-mdpi-v4/notification_bg_low_normal.9.png"
     },
@@ -140,14 +140,14 @@
         "source": "/Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/drawable/notification_tile_bg.xml"
     },
     {
-        "merged": "/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/layout_notification_template_big_media.xml.flat",
-        "source": "/Users/ben/.gradle/caches/transforms-1/files-1.1/support-media-compat-27.1.0.aar/9e0e60c653d210b584d1ee2c4867f4b8/res/layout/notification_template_big_media.xml"
-    },
-    {
         "merged": "/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/layout_notification_template_media_custom.xml.flat",
         "source": "/Users/ben/.gradle/caches/transforms-1/files-1.1/support-media-compat-27.1.0.aar/9e0e60c653d210b584d1ee2c4867f4b8/res/layout/notification_template_media_custom.xml"
     },
     {
+        "merged": "/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/layout_notification_template_big_media.xml.flat",
+        "source": "/Users/ben/.gradle/caches/transforms-1/files-1.1/support-media-compat-27.1.0.aar/9e0e60c653d210b584d1ee2c4867f4b8/res/layout/notification_template_big_media.xml"
+    },
+    {
         "merged": "/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/layout_notification_template_lines_media.xml.flat",
         "source": "/Users/ben/.gradle/caches/transforms-1/files-1.1/support-media-compat-27.1.0.aar/9e0e60c653d210b584d1ee2c4867f4b8/res/layout/notification_template_lines_media.xml"
     },

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

-#Mon May 20 10:43:25 CST 2019
+#Tue May 21 12:56:04 CST 2019
 /Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/layout-v21/notification_action.xml=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/layout-v21_notification_action.xml.flat
 /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/res/drawable-port-xxhdpi/screen.png=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/drawable-port-xxhdpi_screen.png.flat
 /Users/ben/.gradle/caches/transforms-1/files-1.1/support-media-compat-27.1.0.aar/9e0e60c653d210b584d1ee2c4867f4b8/res/layout/notification_template_lines_media.xml=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/layout_notification_template_lines_media.xml.flat
@@ -77,6 +77,6 @@
 /Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/layout/notification_action.xml=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/layout_notification_action.xml.flat
 /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/res/mipmap-ldpi/icon.png=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/mipmap-ldpi_icon.png.flat
 /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/res/drawable-port-xhdpi/screen.png=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/drawable-port-xhdpi_screen.png.flat
-/Users/ben/gitLab-project/wisdom-ces/platforms/android/app/src/main/res/xml/config.xml=/Users/ben/gitLab-project/wisdom-ces/platforms/android/app/build/intermediates/res/merged/debug/xml_config.xml.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/debug/drawable-hdpi-v4_notification_bg_low_pressed.9.png.flat
+/Users/ben/gitLab-project/wisdom-ces/platforms/android/app/src/main/res/xml/config.xml=/Users/ben/gitLab-project/wisdom-ces/platforms/android/app/build/intermediates/res/merged/debug/xml_config.xml.flat
 /Users/ben/gitLab-project/wisdom-ces/platforms/android/app/src/main/res/mipmap-mdpi/icon.png=/Users/ben/gitLab-project/wisdom-ces/platforms/android/app/build/intermediates/res/merged/debug/mipmap-mdpi_icon.png.flat

platforms/android/app/build/intermediates/incremental/packageDebug/debug/dex-renamer-state.txt

-#Mon May 20 13:52:57 CST 2019
+#Tue May 21 13:01:41 CST 2019
 base.0=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/transforms/dexMerger/debug/0
 renamed.0=classes.dex
 file.0=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/transforms/dexMerger/debug/0/classes.dex

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

-#Mon May 20 10:39:08 CST 2019
+#Tue May 21 11:47:14 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/manifests/full/debug/AndroidManifest.xml

@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="io.ionic.partyCloud.starter.test"
     android:hardwareAccelerated="true"
-    android:versionCode="305"
-    android:versionName="0.3.5" >
+    android:versionCode="306"
+    android:versionName="0.3.6" >
 
     <uses-sdk
         android:minSdkVersion="16"

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

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

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

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

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

-[{"outputType":{"type":"PROCESSED_RES"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":305},"path":"resources-debug.ap_","properties":{"packageId":"io.ionic.partyCloud.starter.test","split":"","minSdkVersion":"16"}}]
+[{"outputType":{"type":"PROCESSED_RES"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":306},"path":"resources-debug.ap_","properties":{"packageId":"io.ionic.partyCloud.starter.test","split":"","minSdkVersion":"16"}}]
\ No newline at end of file

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

-[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":305},"path":"app-debug.apk","properties":{"packageId":"io.ionic.partyCloud.starter.test","split":"","minSdkVersion":"16"}}]
+[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":306},"path":"app-debug.apk","properties":{"packageId":"io.ionic.partyCloud.starter.test","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":305},"path":"app-release-unsigned.apk","properties":{"packageId":"io.ionic.partyCloud.starter.test","split":"","minSdkVersion":"16"}}]
+[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":306},"path":"app-release-unsigned.apk","properties":{"packageId":"io.ionic.partyCloud.starter.test","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 May 20 10:39:15 CST 2019      </nav>
+Check performed at Tue May 21 11:47:17 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="305" android:versionName="0.3.5" package="io.ionic.partyCloud.starter.test" xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest android:hardwareAccelerated="true" android:versionCode="306" android:versionName="0.3.6" package="io.ionic.partyCloud.starter.test" 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">

src/app/app.scss

@@ -414,7 +414,7 @@ a[disabled], button[disabled], [ion-button][disabled],
         border-radius: 0px;
         .action-sheet-button{
           color: #444444;
-          min-height: 4.5rem;
+          min-height: 5rem;
           padding: 10px;
           font-size: 1.8rem;
         }

src/components/slide/slide.ts

@@ -3,6 +3,7 @@ import {TabsService} from "../../pages/tabs/tabs.service";
 import {AppGlobal} from "../../service/http.service";
 import {App, NavController, Slides} from "ionic-angular";
 import {StuffDetailPage} from "../../pages/home-pages/stuff-detail/stuff-detail";
+import {createLoop} from "ionic-angular/components/slides/swiper/swiper";
 
 @Component({
     selector: 'slide',
@@ -28,6 +29,7 @@ export class SlideComponent implements AfterViewInit {
 
     //获取轮播图
     getBanner() {
+        console.log('getBanner')
         const data = {
             isRecent: 0,
             obj: {
@@ -37,18 +39,28 @@ export class SlideComponent implements AfterViewInit {
         };
         this.tabsSer.stuffPage(data).subscribe(
             (res) => {
-                this.slidersItems = res.data.list;
-                if (this.slidersItems.length > 0) {
-                    this.slidersItems.forEach(e => {
+                if (res.data.list.length > 0) {
+                    res.data.list.forEach(e => {
                         if (e.attachments.length > 0) {
                             e.imgUrl = e.attachments[0].path;
                         }
                     })
                 }
+                if(this.slidersItems.length > 0){
+                    this.slidersItems = [];
+                }else{
+                    this.slidersItems = res.data.list;
+                }
+                console.log(this.slidersItems);
             }
         )
     }
 
+    setBlank(){
+        this.slidersItems = [];
+        console.log('setBlank')
+    }
+
     //轮播图变动
     slideChange(e) {
         this.slideIndex = this.slides.realIndex + 1;

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

@@ -28,6 +28,19 @@
     <ion-input [(ngModel)]="obj.title" placeholder="请输入内容标题"></ion-input>
   </ion-item>
   <ion-item>
+    <ion-label style="margin-top: -10px" class="main-color">推荐轮播图</ion-label>
+    <ion-label>
+      <div *ngIf="!caroul" class="selectDiv" (click)="tackePic(2)" style="height: 50px;width: 50px" float-end>
+        <div class="height"></div>
+        <div class="width"></div>
+      </div>
+      <div *ngIf="caroul" class="selectDiv" (click)="tackePic(2)" style="height: 50px;width: 50px" float-end>
+        <ion-icon (click)="deleteCarousel()" class="main-color" name="close-circle"></ion-icon>
+        <img [src]="pictrue + caroul.path" alt="标题图片">
+      </div>
+    </ion-label>
+  </ion-item>
+  <ion-item>
       <textarea [(ngModel)]="obj.content" class="content-textarea" placeholder="请在此输入发布内容"></textarea>
   </ion-item>
   <ion-item *ngIf="type == 'image'">
@@ -38,7 +51,7 @@
         <img [src]="pictrue + img.path" alt="标题图片">
       </ion-col>
       <ion-col col-4 *ngIf="fileList.length < 9">
-        <div class="selectDiv" (click)="tackePic()">
+        <div class="selectDiv" (click)="tackePic(1)">
           <div class="height"></div>
           <div class="width"></div>
         </div>
@@ -54,7 +67,7 @@
         </video>
       </ion-col>
       <ion-col col-4 *ngIf="fileList.length < 3">
-        <div class="selectDiv" (click)="selectVideo()">
+        <div class="selectDiv" (click)="selectVideo(3)">
           <div class="height"></div>
           <div class="width"></div>
         </div>

src/pages/discover-pages/publish/publish.scss

@@ -51,6 +51,13 @@ page-publish {
       -moz-border-radius: 2px;
       border-radius: 2px;
     }
+    ion-icon{
+      position: absolute;
+      top: 2px;
+      right: 2px;
+      font-size: 1.8rem;
+      color: #999999;
+    }
   }
   .imgList{
     text-align: center;
@@ -83,7 +90,7 @@ page-publish {
         border-radius: 0px;
         .action-sheet-button{
           color: #e42417;
-          min-height: 4rem;
+          min-height: 5rem;
           padding: 10px;
           font-size: 1.8rem;
         }

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

@@ -44,6 +44,8 @@ export class PublishPage {
 
     type;   //视频文章or图片文章
 
+    caroul;  //轮播图
+
     constructor(public navCtrl: NavController, public navParams: NavParams, public storage: Storage,
                 public camera: Camera, public actionSheetCtrl: ActionSheetController,
                 public loadingCtrl: LoadingController, public transfer: FileTransfer,
@@ -64,7 +66,7 @@ export class PublishPage {
     }
 
 
-    tackePic() {
+    tackePic(resourceType) {
         const actionSheet = this.actionSheetCtrl.create({
             cssClass:'cameraAction',
             buttons: [
@@ -73,14 +75,14 @@ export class PublishPage {
                     role: 'fromCamera',
                     handler: () => {
                         console.log('fromCamera');
-                        this.selectPicture(1);
+                        this.selectPicture(1,resourceType);
                     }
                 }, {
                     text: '从相册中选',
                     role: 'fromPhoto',
                     handler: () => {
                         console.log('fromPhoto');
-                        this.selectPicture(0);
+                        this.selectPicture(0,resourceType);
                     }
                 }, {
                     text: '取消',
@@ -95,7 +97,7 @@ export class PublishPage {
     }
 
     //选择图片
-    selectPicture(srcType) {
+    selectPicture(srcType,resourceType) {
         if(this.fileList.length > 8){
             this.commonSer.toast('一批文章最多上传9个图片');
             return false;
@@ -122,12 +124,12 @@ export class PublishPage {
             }
             let arr = filePath.split('/');
             option.fileName = arr[arr.length -1];
-            this.upload(imagedata, option);
+            this.upload(imagedata, option,resourceType);
         })
     }
 
     //选择视频
-    selectVideo() {
+    selectVideo(resourceType) {
         if(this.fileList.length > 2){
             this.commonSer.toast('一批文章最多上传3个视频');
             return false;
@@ -153,7 +155,7 @@ export class PublishPage {
             }
             let arr = filePath.split('/');
             option.fileName = arr[arr.length -1];
-            this.upload(videoData, option);
+            this.upload(videoData, option,resourceType);
         })
 
     }
@@ -173,7 +175,7 @@ export class PublishPage {
     //     } ],
     //     "error" : [ ]
     // }
-    upload(file, options) {
+    upload(file, options,resourceType) {
         this.commonSer.log(file);
         const uploadLoading = this.loadingCtrl.create({
             content: '上传中...',
@@ -188,12 +190,13 @@ export class PublishPage {
                 this.commonSer.toast('上传成功');
                 const data = JSON.parse(res.response);
                 const obj = {
-                    // resourceType: this.type === 'image'?1:2,  //1  标题图片  2 轮播图 3  视频
+                    resourceType: resourceType,  //1  标题图片  2 轮播图 3  视频
                     path: data.data[0].filePath,
                     name: data.data[0].showName,
                 };
+                if(resourceType == 2) this.caroul = obj;
+                if(resourceType != 2) this.fileList.push(obj);
                 this.commonSer.log(data);
-                this.fileList.push(obj);
             }, err => {
                 uploadLoading.dismiss();
                 this.commonSer.toast('上传错误');
@@ -206,25 +209,27 @@ export class PublishPage {
     }
 
     //发布
-    publish() {
+    publish(status) {
+        let message;
+        if(status == 2) message='确定提交审核当前内容?';
+        if(status == 3) message='确定直接发布当前内容?';
         if(!this.check()){
             return false;
         }
-        let attachmentsArr = [];   //标题附件
+        let attachmentsArr = [];   //附件
         let content = this.obj.content;
         if(this.fileList.length > 0){
-            if(this.type == 'image'){    //将第一张图片作为标题图片  ,后面的图片 作为文章里面的图片
-                const obj = {
-                    resourceType:1,
-                    path: this.fileList[0].path,
-                    name: this.fileList[0].name,
-                };
-                attachmentsArr.push(obj);
+            if(this.type == 'image'){
+                attachmentsArr.push(this.fileList[0]); //将第一张图片作为标题图片，放在附件中 ,后面的图片 作为文章里面的图片
+                if(this.caroul) attachmentsArr.push(this.caroul);  //轮播图放进附件
                 let arr = this.fileList.slice(1);  //2.....
                 arr.forEach(e=>{
                     content += `<br><img src="/wisdomgroup/${e.path} " alt="图片">`;
                 });
             }
+            if(this.type == 'video'){
+                attachmentsArr = this.fileList.filter(e=>e.resourceType == 2)
+            }
         }
         if(this.type == 'video'){
             this.fileList.forEach(e=>{
@@ -232,20 +237,20 @@ export class PublishPage {
             })
         }
         const data = {
-            title: this.obj.title,
-            plateType: this.obj.type,
-            source: '上海市委组织部',
-            publishStatus: '2',  //已提交
-            content: `&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;` + content,
-            publishRange: this.obj.publishRange,
-            submitter: this.userid,
+            title: this.obj.title,   //标题
+            plateType: this.obj.type,  //分类
+            source: '上海市委组织部',   //来源
+            publishStatus: status,  //已提交
+            content: `&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;` + content,  //内容
+            publishRange: this.obj.publishRange,   //范围
+            submitter: this.userid,  //提交者
             stuffType: this.type === 'image'?1:2,   //图片 1  视频 2
             attachments: attachmentsArr,   //标题附件
         };
-        this.commonSer.alert('确定提交审核当前内容?', () => {
+        this.commonSer.alert(message, () => {
             this.tabSer.stuffSave(data).subscribe(
                 (res) => {
-                    this.commonSer.toast('已提交审核');
+                    this.commonSer.toast('已提交');
                     setTimeout(() => {
                         this.navCtrl.pop()
                     }, 800)
@@ -275,12 +280,11 @@ export class PublishPage {
                 {
                     text: '预览',
                     handler: () => {
-                        let attachmentsArr = [];
                         let content = this.obj.content;
                         if(this.fileList.length > 0){
                             if(this.type == 'image'){    //将第一张图片作为标题图片  ,后面的图片 作为文章里面的图片
-                                attachmentsArr = this.fileList.slice(1);
-                                attachmentsArr.forEach(e=>{
+                                let arr = this.fileList.slice(1);  //2.....
+                                arr.forEach(e=>{
                                     content += `<br><img src="${this.pictrue}${e.path} " alt="图片">`;
                                 });
                             }
@@ -302,10 +306,16 @@ export class PublishPage {
                         });
                     }
                 }, {
-                    text: '发布',
+                    text: '直接发布',
+                    role: 'fromPhoto',
+                    handler: () => {
+                        this.publish(3);
+                    }
+                },{
+                    text: '提交审核',
                     role: 'fromPhoto',
                     handler: () => {
-                        this.publish();
+                        this.publish(2);
                     }
                 }, {
                     text: '取消',
@@ -324,4 +334,8 @@ export class PublishPage {
         this.fileList.splice(i,1);
     }
 
+    // 清空轮播
+    deleteCarousel(){
+        this.caroul = null;
+    }
 }

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

@@ -37,7 +37,8 @@ export class SearchNewPage {
   search(){
     const data = {
       pageNum:'1',
-      pageCount:'100',
+      pageCount:'1000',
+      isRecent: 0,
       obj:this.searchObj,
     }
     this.tabs.stuffPage(data).subscribe(

src/pages/home-pages/stuff-detail/stuff-detail.html

@@ -46,7 +46,8 @@
               {{comment.content}}
             </p>
             <p class="comment-time">
-              {{comment.createTime | date:'yyyy-MM-dd'}}
+              {{comment.createTime | date:'yyyy-MM-dd'}} <span>·</span>
+              <span class="repear" (click)="openMask(comment)">回复</span>
             </p>
           </ion-col>
         </ion-row>
@@ -77,7 +78,7 @@
 <div class="error-text" *ngIf="comment">
   <div class="error-flex">
     <div class="padding-10">
-      <textarea [(ngModel)]="content" class="content-textarea"></textarea>
+      <textarea [(ngModel)]="content" class="content-textarea" placeholder="{{replyText}}"></textarea>
     </div>
     <div class="error-footer">
       <ion-row>

src/pages/home-pages/stuff-detail/stuff-detail.scss

@@ -165,17 +165,26 @@ page-stuff-detail {
       }
       .comment-info {
         color: #d88f27;
-        font-size: 1.6rem;
+        font-size: 1.4rem;
+        line-height: 1.8rem;
+        font-weight: 500;
+        margin-bottom: 5px;
       }
 
       .commnet-content {
         padding: .1rem 0;
-        font-size: 1.5rem;
+        font-size: 1.4rem;
         color: #333333;
+        line-height: 1.4rem;
       }
       .comment-time{
         font-size: 1.4rem;
         color: #888888;
+        .repear{
+          color: #333;
+          font-size: 1.3rem;
+          cursor: pointer;
+        }
       }
     }
 

src/pages/home-pages/stuff-detail/stuff-detail.ts

@@ -30,6 +30,7 @@ export class StuffDetailPage {
     url = AppGlobal.domain + '/wisdomgroup';
 
     attachments;   //附件
+    replyText = '';
 
     constructor(public navCtrl: NavController, public navParams: NavParams, public sanitizer: DomSanitizer,
                 public renderer: Renderer2,
@@ -159,22 +160,29 @@ export class StuffDetailPage {
             num: 1,
             type: 4,
             username: this.username
-        }
+        };
         this.tabSer.updateNumByType(data).subscribe(
             (res) => {
                 if (res.errcode == '1000') {
                     this.getStuff();
                     this.comment = false;
                     this.commonSer.toast('发布成功');
+                    this.replyText = '';
                 }
             }
         )
     }
 
+    openMask(item){
+        this.replyText = '回复' +item.username;
+    }
+
     //取消发布
     cancel() {
         this.content = '';
         this.comment = false;
     }
 
+    //
+
 }

src/pages/tabs/discover/discover.ts

@@ -217,6 +217,7 @@ export class DiscoverPage {
         const data = {
             pageSize: 1,
             pageCount: this.pageCount,
+            isRecent: 0,
             obj: {
                 'plateType': this.plateType,
                 'resourceType': 1
@@ -246,6 +247,7 @@ export class DiscoverPage {
         const data = {
             pageSize: 1,
             pageCount: this.pageCount,
+            isRecent: 0,
             obj: {
                 'plateType': item.type,
                 'resourceType': 1
@@ -269,6 +271,7 @@ export class DiscoverPage {
         const data = {
             pageNum: 1,
             pageCount: this.pageCount,
+            isRecent: 0,
             obj: {
                 'plateType': this.plateType,
                 'resourceType': 1
@@ -304,6 +307,7 @@ export class DiscoverPage {
         const data = {
             pageNum: this.pageNum,
             pageCount: this.pageCount,
+            isRecent: 0,
             obj: {
                 'plateType': this.plateType,
                 'resourceType': 1

src/pages/tabs/home/home.html

@@ -61,7 +61,7 @@
     </div>
     <!--true 隐藏 false 显示-->
     <div [hidden]="isScroll" class="news-content parent">
-        <div class="tabs-parent parent">
+        <div #tabsParent class="tabs-parent parent">
             <div *ngFor="let item of tabsList;let i = index" (click)="change(item)" class="tabs-children">
                 <span #tabSpan [ngClass]="{'selectTab':index == i}">{{item.name}}</span>
             </div>

src/pages/tabs/home/home.ts

@@ -27,8 +27,7 @@ export class HomePage {
     @ViewChild('tips') tips: ElementRef;
     @ViewChild('tips1') tips1: ElementRef;
     @ViewChild('verticaLamp') verticaLamp: ElementRef;
-    @ViewChild('tabSpan') tabSpan: ElementRef;
-    @ViewChild('tabSpan1') tabSpan1: ElementRef;
+    @ViewChild('tabsParent') tabsParent: ElementRef;
     @ViewChild('topHeight') topHeight: ElementRef;
     @ViewChild('headerTag') headerTag: ElementRef;
     @ViewChild('homeMiddleTips') homeMiddleTips: ElementRef;
@@ -117,13 +116,14 @@ export class HomePage {
 
 
     ionViewDidLoad() {
-        this.change(this.tabsList[0]);
         this.itemWidth = window.screen.width / 4;
-        this.spanWidth = this.tabSpan.nativeElement.offsetWidth;   //文字宽度
-        this.tips.nativeElement.style.width = this.tabSpan.nativeElement.offsetWidth + 'px';
-        this.tips1.nativeElement.style.width = this.tabSpan.nativeElement.offsetWidth + 'px';
+        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';
         this.getInfo();
         this.scrollHeight();
+        this.change(this.tabsList[0]);
     }