版本 0.3.5

config.xml

 <?xml version='1.0' encoding='utf-8'?>
-<widget id="io.ionic.partyCloud.starter.test" version="0.3.3" 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.5" 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/intermediates/incremental/packageDebug/debug/dex-renamer-state.txt

-#Wed May 15 13:05:04 CST 2019
+#Wed May 15 17:06:14 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/packageDebug/debug/file-input-save-data.txt

 #Internal package file, do not edit.
-#Wed May 15 13:05:05 CST 2019
+#Wed May 15 17:06:15 CST 2019
 20.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
 143.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
 439.set=ASSET

src/app/app.scss

@@ -301,19 +301,27 @@ ion-navbar .header-ios .toolbar-ios:last-child .toolbar-background-ios {
     top: 20%;
     left: 10%;
     width: 80%;
-    height: 45%;
+    height: 300px;
     border-radius: 5px;
     background: url(../assets/imgs/home/signBgc.png) repeat;
     background-size: cover;
     .record-conten{
-      margin-left: 18%;
-      margin-top: 30%;
       color: #333333;
       font-size: 1.4rem;
       line-height: 2rem;
       padding-right: 1rem;
-      height: 50%;
+      height: 240px;
       overflow: scroll;
+      position: relative;
+      .content{
+        position: absolute;
+        bottom: 2px;
+        right: 10px;
+        height: 150px;
+        width: 80%;
+        display: flex;
+        align-items: center;
+      }
     }
     .close{
       position: absolute;
@@ -321,6 +329,7 @@ ion-navbar .header-ios .toolbar-ios:last-child .toolbar-background-ios {
       right: 10px;
       color: #666666;
       font-size: 2.5rem;
+      z-index: 1;
     }
   }
   .mask-content-bir{
@@ -406,7 +415,7 @@ a[disabled], button[disabled], [ion-button][disabled],
         border-radius: 0px;
         .action-sheet-button{
           color: #444444;
-          min-height: 4rem;
+          min-height: 4.5rem;
           padding: 10px;
           font-size: 1.8rem;
         }

src/components/slide/slide.scss

@@ -43,6 +43,7 @@ slide {
     padding: 0 1rem;
     font-size: 1.4rem;
     font-weight: 500;
+    font-family: "Microsoft YaHei";
     .slide-index{
       color: #e42417;
       font-weight: 400;

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

@@ -214,7 +214,7 @@ export class PublishPage {
                     path: this.fileList[0].path,
                     name: this.fileList[0].name,
                 };
-                attachmentsArr = this.fileList.splice(1,this.fileList.length -1);
+                attachmentsArr = this.fileList.slice(1);
                 attachmentsArr.forEach(e=>{
                     content += `<br><img src="/wisdomgroup/${e.path} " alt="图片">`;
                 });
@@ -275,16 +275,10 @@ export class PublishPage {
                         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 = this.fileList.splice(1,this.fileList.length -1);
+                                attachmentsArr = this.fileList.slice(1);
                                 attachmentsArr.forEach(e=>{
-                                    content += `<br><img src="/wisdomgroup/${e.path} " alt="图片">`;
+                                    content += `<br><img src="${this.pictrue}${e.path} " alt="图片">`;
                                 });
-                                this.fileList = [obj];
                             }
                         }
                         if(this.type == 'video'){

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

@@ -5,13 +5,6 @@ import {MineService} from "../mine.service";
 import {StuffDetailPage} from "../../home-pages/stuff-detail/stuff-detail";
 import {CommonService} from "../../../provide/common.service";
 
-/**
- * Generated class for the MyPublishPage page.
- *
- * See https://ionicframework.com/docs/components/#navigation for more info on
- * Ionic pages and navigation.
- */
-
 @IonicPage()
 @Component({
   selector: 'page-my-publish',
@@ -21,7 +14,7 @@ export class MyPublishPage {
 @ViewChild(InfiniteScrollContent) infiniteScrollContent:InfiniteScrollContent;
 
   pageNum = 1;
-  pageCount = AppGlobal.pageCount;
+  pageCount = 10;
   publicList = [];
   picture: string = AppGlobal.domain + '/wisdomgroup';
 

src/pages/mine/person/editPersonInfo/editPersonInfo.html

@@ -4,44 +4,6 @@
   </ion-navbar>
 </ion-header>
 <ion-content class="content">
-
-  <div class="content-title">
-    基础信息（如需修改请联系人事处）
-  </div>
-  <ion-list>
-    <ion-item>
-      <div class="info-item">
-        <span class="info-span">头像</span>
-        <img src="./assets/imgs/head.png" class="img">
-      </div>
-    </ion-item>
-    <ion-item>
-      <div class="info-item">
-        <span class="info-span">姓名/性别</span>
-        <div>
-          <span class="info">{{user?.userName}}</span>
-          <ion-icon name="male" class="sex" *ngIf="gender == null || gender == '1'"></ion-icon>
-          <ion-icon name="female" class="sex" *ngIf="gender == 0"></ion-icon>
-        </div>
-      </div>
-    </ion-item>
-    <ion-item>
-      <div class="info-item">
-        <span class="info-span">部门</span>
-        <div>
-          <span class="info">{{orgName}}</span>
-        </div>
-      </div>
-    </ion-item>
-    <ion-item class="info-item">
-      <div class="info-item">
-        <span class="info-span">手机（已绑定）</span>
-        <div>
-          <span class="info">{{user?.userDetail?.user.mobile}}</span>
-        </div>
-      </div>
-    </ion-item>
-  </ion-list>
   <div class="content-title">
     补充信息（可编辑）
   </div>

src/pages/mine/person/personInfo/personInfo.html

@@ -13,8 +13,8 @@
       <div class="info-item">
         <span class="info-span">头像</span>
         <div class="photo-box" (click)="tackePic()">
-          <img *ngIf="user?.userDetail?.user?.picUrl == ''" src="./assets/imgs/head.png" class="img">
-          <img *ngIf="user?.userDetail?.user?.picUrl != ''" src="{{picture+user?.userDetail?.user?.picUrl}}" class="img">
+          <img *ngIf="mineInfo?.picUrl == ''" src="./assets/imgs/head.png" class="img">
+          <img *ngIf="mineInfo?.picUrl != ''" [src]="picUrl + mineInfo?.picUrl" class="img">
           <ion-icon name="ios-arrow-forward"></ion-icon>
         </div>
       </div>
@@ -33,7 +33,7 @@
       <div class="info-item">
         <span class="info-span">部门</span>
         <div>
-          <span class="info">{{orgName}}</span>
+          <span class="info">{{mineInfo?.orgName}}</span>
           <!-- <ion-icon name="ios-arrow-forward" class="icon-more"></ion-icon> -->
         </div>
       </div>

src/pages/mine/person/personInfo/personInfo.ts

@@ -21,49 +21,38 @@ export class PersonInfoPage {
     orgName = '';
     user: any;
     gender: object;
-    //userInfo: object ;
     userid: '';
-    picture: string = AppGlobal.picture;
+
+    picUrl = AppGlobal.domain + '/wisdomgroup/modules/common/file/showImgByFileid/';
+    mineInfo;
 
     constructor(public navCtrl: NavController,public camera:Camera,public commonSer:CommonService,
                 public storage: Storage,public actionSheetCtrl:ActionSheetController,public tabSer:TabsService,
-                public mineSer:MineService,
                 public appService: AppService,public loadingCtrl:LoadingController,
                 public toast: ToastController,public transfer: FileTransfer,) {
 
     }
 
     ionViewWillEnter(): void {
+        this.getUserInfo();
         this.user = this.storage.get("user").then((value) => {
             this.user = value;
             this.gender = this.user.userDetail.user.gender;
-            this.getOrgName(this.user.id, result => {
-                let data = result;
-                this.orgName = data["orgName"];
         });
-            this.mineSer.showImgByFileid(this.user.userDetail.user.picUrl).subscribe(
-                (res)=>{
+    }
 
+    getUserInfo(){
+        this.tabSer.getUserIntegral().subscribe(
+            (res) => {
+                this.mineInfo = res.data;
             }
         )
-        });
     }
 
     modifyPwd() {
         this.navCtrl.push("ModifyPasswordPage")
     }
 
-    getOrgName(id, callback?): any {
-        this.appService.ObserverHttpPost("/wisdomgroup/app/getOrgName", {"userid": id})
-            .toPromise()
-            .then(res => {
-                var data = res.json();
-                callback(data == null ? "[]" : data);
-            })
-            .catch(error => {
-            });
-    }
-
     //不同的code代表修改不同的数据，1房间，2座机，3邮箱
     edit(code) {
         this.navCtrl.push("EditPersonInfoPage", {code: code});
@@ -110,7 +99,7 @@ export class PersonInfoPage {
             saveToPhotoAlbum: false
         };
         const option: FileUploadOptions = {
-            httpMethod: 'POST',
+            httpMethod: 'post',
             headers: {
                 'Accept': 'application/json', //不加入 发生错误！！
             },
@@ -135,12 +124,11 @@ export class PersonInfoPage {
         });
         uploadLoading.present();
         const fileTransfer: FileTransferObject = this.transfer.create();
-        fileTransfer.upload(file, AppGlobal.domain + '/wisdomgroup/modules/common/file/image/upload', options).then(
+        fileTransfer.upload(file, AppGlobal.domain + '/wisdomgroup/modules/common/file/icon/upload', options).then(
             (res) => {
                 uploadLoading.dismiss();
                 this.commonSer.toast('上传成功');
-                const data = JSON.parse(res.response);
-                this.commonSer.log(data);
+                this.getUserInfo();
             }, err => {
                 uploadLoading.dismiss();
                 this.commonSer.toast('上传错误');

src/pages/tabs/discover/discover.html

@@ -33,7 +33,7 @@
       </div>
     </div>
   </ion-toolbar>
-  <ion-toolbar class="fixed-toolbar">
+  <ion-toolbar class="fixed-toolbar margin-top-6">
     <div class="tabs-fixed">
       <div class="scroll-tab">
         <div class="news-content" #newsContent>

src/pages/tabs/discover/discover.scss

@@ -13,7 +13,7 @@ page-discover {
   }
 
   #tips{
-    bottom: 5px;
+    bottom: 1px;
   }
   .search-button {
     position: relative;
@@ -153,6 +153,7 @@ page-discover {
     background-color: #ffffff;
     border-bottom: 1px solid #ffffff;
     .tabs-parent{
+      margin-bottom: 0px;
       background-color: #ffffff;
     }
     .parent.tabs-parent{

src/pages/tabs/home/home.html

@@ -132,8 +132,10 @@
     <div class="mask-content" (click)="stop($event)">
         <ion-icon class="close" (click)="isSign = false" name="close"></ion-icon>
         <div class="record-conten">
+            <div class="content">
                 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{{signObj.text}}
             </div>
+        </div>
         <div class="mask-button">
             <button *ngIf="signObj.isSign == 'no'" [disabled]="disabledClick" class="submit-btn submit"
                     (click)="signUp()">签到{{signText}}</button>

src/pages/tabs/home/home.scss

@@ -169,7 +169,8 @@ page-home {
   .mask-button {
     border-top: 1px solid #eeeeee;
     text-align: center;
-
+    height: 60px;
+    line-height: 60px;
     .submit-btn {
       margin-top: 10px;
       width: 50%;

src/pages/tabs/mine/mine.html

@@ -21,8 +21,8 @@
                 <ion-grid>
                     <ion-row>
                         <ion-col col-3>
-                            <img *ngIf="picUrl == ''" src="./assets/imgs/head.png" class="head-photo">
-                            <img *ngIf="picUrl != ''" src="{{picture+picUrl}}" class="head-photo">
+                            <img *ngIf="picture == ''" src="./assets/imgs/head.png" class="head-photo">
+                            <img *ngIf="picture != ''" src="{{picUrl + picture}}" class="head-photo">
                         </ion-col>
                         <ion-col class="mine-info" col-5>
                             <p class="mine-name">{{user?.userName}}</p>

src/pages/tabs/mine/mine.ts

@@ -29,12 +29,13 @@ export class MinePage {
     gender: object;
     version: string = '';
     isLatest: boolean = true;
-    picture: string = AppGlobal.picture;
-    picUrl;
 
     mineInfo;
     noReadNum;
 
+    picture = '';
+    picUrl = AppGlobal.domain + '/wisdomgroup/modules/common/file/showImgByFileid/';
+
     constructor(public navCtrl: NavController,
                 private appCtrl: App,
                 private alertCtrl: AlertController,
@@ -56,29 +57,17 @@ export class MinePage {
     ionViewWillEnter() {
         this.user = this.storage.get("user").then((value) => {
             this.user = value;
-            this.picUrl = this.user.userDetail.user.picUrl;
             this.gender = this.user.userDetail.user.gender;
         });
         this.getversion();
         this.tabSer.getUserIntegral().subscribe(
             (res) => {
                 this.mineInfo = res.data;
+                this.picture = res.data.picUrl;
             }
         )
     }
 
-
-    getOrgName(id, callback?): any {
-        this.appService.ObserverHttpPost("/wisdomgroup/app/getOrgName", {"userid": id})
-            .toPromise()
-            .then(res => {
-                var data = res.json();
-                callback(data == null ? "[]" : data);
-            })
-            .catch(error => {
-            });
-    }
-
     //前往
     goTo(page) {
         this.navCtrl.push(page);

src/service/http.service.ts

@@ -15,8 +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 = "";   //本地环境/
+    // static domain = "http://47.103.33.196:8080";   //阿里云测试地址
+    static domain = "http://47.103.35.216:8080";   //阿里云正式地址
+    // static domain = "";   //本地环境/
 
     //图片地址
     //  static picture = AppGlobal.domain + "/wisdomgroup/manager/getIcon/";     //正式地址