test

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

-#Mon Aug 19 14:16:36 CST 2019
+#Mon Aug 19 15:00:26 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

src/app/app.component.ts

@@ -91,10 +91,9 @@ export class MyApp {
     }
 
     async loadLogin() {
-
         await this.storage.get('userLoginInfo').then((value => {
             console.log(value)
-            if (value != null && value != '' && !value.remember) {
+            if (value != null && value != '' && value.rememberMe) {
                 this.user = value;
                 this.takeLogin();
             } else {

src/pages/login/login.html

@@ -25,7 +25,7 @@
                            (ionBlur)="loseFocus()" (ionFocus)="getFocus()"/>
                 </div>
                 <div class="mui-input-row mui-checkbox mui-left" style="margin-bottom: 15px;">
-                    <input [(ngModel)]="user.remember" name="checkbox" class="jizhu-password" value="1" type="checkbox"
+                    <input [(ngModel)]="user.rememberMe" name="checkbox" class="jizhu-password" value="1" type="checkbox"
                            checked="true" style="margin-left:10px;width:17px;height:17px;vertical-align:middle">
                     <label style="padding-left:5px;font-family:'微软雅黑';" class="jizhu-password-label">记住密码</label>
                     <label float-end style="padding-left:5px;font-family:'微软雅黑';font-weight: 500" (click)="forgetPassword()" class="main-color jizhu-password-label">忘记密码</label>
@@ -37,4 +37,4 @@
             </div>
         </div>
     </div>
-</ion-content>
+</ion-content>
\ No newline at end of file

src/pages/login/login.ts

-import { Component, ViewChild , Renderer,ElementRef} from '@angular/core';
-import { IonicPage, NavController, NavParams, AlertController, LoadingController } from 'ionic-angular';
-import { NgForm } from '@angular/forms';
-import { TabsPage } from '../tabs/tabs';
-import { Http, Response } from '@angular/http';
-import { Storage } from '@ionic/storage';
+import {Component, ViewChild, Renderer, ElementRef} from '@angular/core';
+import {IonicPage, NavController, NavParams, AlertController, LoadingController} from 'ionic-angular';
+import {NgForm} from '@angular/forms';
+import {TabsPage} from '../tabs/tabs';
+import {Http, Response} from '@angular/http';
+import {Storage} from '@ionic/storage';
 
-import { AppService } from '../../service/http.service';
+import {AppService} from '../../service/http.service';
 import {LoginService} from "./login.service";
 import {TabsService} from "../tabs/tabs.service";
 
 
 @IonicPage()
 @Component({
-  selector: 'page-login',
-  templateUrl: 'login.html'
+    selector: 'page-login',
+    templateUrl: 'login.html'
 })
 export class LoginPage {
-  @ViewChild('loginForm') currentForm: NgForm;	//实时表单
-  loginForm: NgForm;								//初始表单
-  submitted: boolean = false;								//表单是否已经提交
-  tipFlag: boolean = false;            // 输入时隐藏输入框以下信息
-  user = {
-    userid: '',							//登录数据
-    mobile: '',
-    password: '',
-    remember:true
-  };
-  tabflag:any;
-  constructor(public navCtrl: NavController,
-    public navParams: NavParams,
-    public storage: Storage,
-    public alertCtrl: AlertController,
-    private loadingCtrl: LoadingController,
-    public http: Http,private loginSer:LoginService,
-    public appService: AppService,
-    public tabSer: TabsService,
-    public elementRef:ElementRef) {
+    @ViewChild('loginForm') currentForm: NgForm;	//实时表单
+    loginForm: NgForm;								//初始表单
+    submitted: boolean = false;								//表单是否已经提交
+    tipFlag: boolean = false;            // 输入时隐藏输入框以下信息
+    user = {
+        userid: '',							//登录数据
+        mobile: '',
+        password: '',
+        rememberMe: true
+    };
+    tabflag: any;
 
-  }
+    constructor(public navCtrl: NavController,
+                public navParams: NavParams,
+                public storage: Storage,
+                public alertCtrl: AlertController,
+                private loadingCtrl: LoadingController,
+                public http: Http, private loginSer: LoginService,
+                public appService: AppService,
+                public tabSer: TabsService,
+                public elementRef: ElementRef) {
 
-  ionViewDidLoad(){
-
-  }
-
-  ionViewDidEnter() {
-     //默认显示
-     this.storage.get("userLoginInfo").then((value)=>{
-      if(value!=null && value != ''){
-        if( value.remember ){
-            this.user = value;
-        }
-      }    
-    });
-  }
+    }
 
-  //输入框获取焦点：隐藏，失去焦点：显示
-  getFocus() {
-    this.tipFlag = true;
-  }
+    ionViewDidLoad() {
 
-  loseFocus() {
-    this.tipFlag = false;
-  }
+    }
 
-  login() {
+    ionViewDidEnter() {
+        //默认显示
+        this.storage.get("userLoginInfo").then((value) => {
+            if (value != null && value != '') {
+                if (value.remember) {
+                    this.user = value;
+                }
+            }
+        });
+    }
 
-    //验证手机号和密码是否输入
-    if(this.user.mobile == null || this.user.mobile == ''){
-      this.appService.popToastView('请输入手机号！','top',2000);
-      return ;
+    //输入框获取焦点：隐藏，失去焦点：显示
+    getFocus() {
+        this.tipFlag = true;
     }
-    if(this.user.password == null || this.user.password == ''){
-      this.appService.popToastView('请输入密码！','top',2000);
-      return ;
+
+    loseFocus() {
+        this.tipFlag = false;
     }
 
-    let loading = this.loadingCtrl.create({
-      content: '正在登录...',
-      dismissOnPageChange: true,		//打开新的页面则关闭 正在登录 
-      enableBackdropDismiss: true		//点击页面其他地方则关闭 正在登录
-    });
-    loading.present();
-    this.tabSer.loginpost(this.user).subscribe(
-        (res)=>{
-          loading.dismiss();
-          this.submitted = true;
-          if (res["code"] == '200') {
-            //将当前登录用户存进缓存，便于后期逻辑操作
-            this.storage.set('user', res.data);
-            this.user.userid = res.data.id;
-            this.storage.set('userLoginInfo',this.user);
-            return this.navCtrl.setRoot(TabsPage, { "user": this.user });
-          } else {
-            this.appService.alert('手机号或密码错误！');
-            return this.navCtrl.setRoot(LoginPage);
-          }
-        },
-        (err)=>{
-          if (loading) loading.dismiss();
+    login() {
+
+        //验证手机号和密码是否输入
+        if (this.user.mobile == null || this.user.mobile == '') {
+            this.appService.popToastView('请输入手机号！', 'top', 2000);
+            return;
+        }
+        if (this.user.password == null || this.user.password == '') {
+            this.appService.popToastView('请输入密码！', 'top', 2000);
+            return;
         }
-    )
-  }
-  //忘记密码
-  forgetPassword():void{
-    this.navCtrl.push('ForgetPwdPage');
-  }
+
+        let loading = this.loadingCtrl.create({
+            content: '正在登录...',
+            dismissOnPageChange: true,		//打开新的页面则关闭 正在登录
+            enableBackdropDismiss: true		//点击页面其他地方则关闭 正在登录
+        });
+        loading.present();
+        this.tabSer.loginpost(this.user).subscribe(
+            (res) => {
+                loading.dismiss();
+                this.submitted = true;
+                if (res["code"] == '200') {
+                    //将当前登录用户存进缓存，便于后期逻辑操作
+                    this.storage.set('user', res.data);
+                    this.user.userid = res.data.id;
+                    this.storage.set('userLoginInfo', this.user);
+                    return this.navCtrl.setRoot(TabsPage, {"user": this.user});
+                } else {
+                    this.appService.alert('手机号或密码错误！');
+                    return this.navCtrl.setRoot(LoginPage);
+                }
+            },
+            (err) => {
+                if (loading) loading.dismiss();
+            }
+        )
+    }
+
+    //忘记密码
+    forgetPassword(): void {
+        this.navCtrl.push('ForgetPwdPage');
+    }
 }

src/pages/serve-pages/meet-room/meet-room.html

@@ -44,10 +44,10 @@
                         <div class="morning-room">
                             <ion-row>
                                 <ion-col *ngFor="let item1 of room.morning" (click)="chooseType(item1,'8:00:00')"
-                                         [ngClass]="item1.applicantName?'order':''" col-4>
+                                         [ngClass]="item1.applyId?'order':''" col-4>
                                     <div>
                                         <p>{{item1.name}}</p>
-                                        <p *ngIf="item1.applicantName">已预订</p>
+                                        <p *ngIf="item1.applyId">已预订</p>
                                     </div>
                                 </ion-col>
                             </ion-row>
@@ -60,10 +60,10 @@
                         <div class="morning-room">
                             <ion-row>
                                 <ion-col *ngFor="let item1 of room.afternoon" (click)="chooseType(item1,'12:00:00')"
-                                         [ngClass]="item1.applicantName?'order':''" col-4>
+                                         [ngClass]="item1.applyId?'order':''" col-4>
                                     <div>
                                         <p>{{item1.name}}</p>
-                                        <p *ngIf="item1.applicantName">已预订</p>
+                                        <p *ngIf="item1.applyId">已预订</p>
                                     </div>
                                 </ion-col>
                             </ion-row>

src/pages/serve-pages/meet-room/meet-room.ts

@@ -73,10 +73,10 @@ export class MeetRoomPage {
     //获取预定日程
     getApply() {
         const data = {'dateStr': this.date};
-        this.serveSer.queryMeetingRoomByDate(data).subscribe(
+        this.serveSer.meetQueryByDate(data).subscribe(
             (res) => {
-                this.room.morning = res.data.morningUse.concat(res.data.morningNotUse);
-                this.room.afternoon = res.data.afternoonUse.concat(res.data.afternoonNotUse);
+                this.room.morning = res.data.morningUse;
+                this.room.afternoon = res.data.afternoonUse;
             }
         )
     }
@@ -185,11 +185,11 @@ export class MeetRoomPage {
     chooseType(item, time) {
         const nowDate = new Date().getTime();
         const chooseDate = new Date(this.date +' 23:59:59').getTime();
-        if(nowDate > chooseDate && !item.applicantName) {
+        if(nowDate > chooseDate && !item.applyId) {
             this.commonSer.toast('该时间会议室不可预定');
             return false;
         }
-        if (item.applicantName) {
+        if (item.applyId) {
             this.goApplyEdit(item);
         } else {
             this.goApply(item, time);

src/pages/serve-pages/meet-room/room-apply/room-apply.ts

@@ -105,8 +105,7 @@ export class RoomApplyPage {
             this.obj.roomId = data.roomId;
             this.obj.roomText = data.roomName;
             this.roomMax = `该会议室可容纳${data.accommodation}人`;
-            this.obj.equipmervice = data.equipmervice.split(',');
-            this.getEquipmervice(this.obj.equipmervice);
+            this.getEquipmervice(data.equipmervice.split(','));
         } else {
 
         }
@@ -229,8 +228,7 @@ export class RoomApplyPage {
                 handler: () => {
                     this.obj.roomId = e.id;
                     this.obj.roomText = e.name;
-                    this.obj.equipmervice = e.equipmervice.split(',');
-                    this.getEquipmervice(this.obj.equipmervice);
+                    this.getEquipmervice(e.equipmervice.split(','));
                     this.roomMax = `该会议室可容纳${e.accommodation}人`;
                 }
             };

src/pages/tabs/discover/discover.ts

@@ -133,7 +133,7 @@ export class DiscoverPage {
                 },
                 {
                     "name": "学习体会",
-                    "type": 13,
+                    "type": 23,
                     "indexChildren": '36'
                 },
                 {

src/pages/tabs/tabs.service.ts

@@ -16,7 +16,7 @@ export class TabsService {
 
     //登录
     loginpost(data): Observable<any> {
-        return this.http.post(AppGlobal.domain + '/wisdomgroup/app/loginpost',data);
+        return this.http.post(AppGlobal.domain + '/wisdomgroup/app/loginpost', data);
     }
 
     //退出登录
@@ -151,7 +151,7 @@ export class TabsService {
 
     //查询我的草稿
     myDraft(data): Observable<any> {
-        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/stuff/myDraft',data);
+        return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/stuff/myDraft', data);
     }
 
     //审核通过
@@ -196,7 +196,7 @@ export class TabsService {
 
     //我要出题的题目详情
     personDetail(params): Observable<any> {
-        return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/personquestion/detail/'+params);
+        return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/personquestion/detail/' + params);
     }
 
     //采纳答案

src/service/http.service.ts

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