From 451f2eb592036cc1ca6399eba58e001f08f13685 Mon Sep 17 00:00:00 2001 From: "CHIEFSOFT\\ameye" Date: Mon, 4 Dec 2023 11:59:59 -0500 Subject: [PATCH] market message --- .../market-messages.component.html | 15 ++++- .../market-messages.component.scss | 60 +++++++++++++++++ .../market-messages.component.ts | 67 ++++++++++++++++++- .../pages/marketdetail/marketdetail.page.html | 4 +- .../pages/marketdetail/marketdetail.page.ts | 5 +- src/app/services/wrench.service.ts | 4 ++ 6 files changed, 145 insertions(+), 10 deletions(-) diff --git a/src/app/components/market-messages/market-messages.component.html b/src/app/components/market-messages/market-messages.component.html index d4506a9..6f12625 100644 --- a/src/app/components/market-messages/market-messages.component.html +++ b/src/app/components/market-messages/market-messages.component.html @@ -1,3 +1,12 @@ -

- market-messages works! -

+ +
+ + + + {{item.msg_date}} + {{item.msg}} + + + + +
diff --git a/src/app/components/market-messages/market-messages.component.scss b/src/app/components/market-messages/market-messages.component.scss index e69de29..43ff1e2 100644 --- a/src/app/components/market-messages/market-messages.component.scss +++ b/src/app/components/market-messages/market-messages.component.scss @@ -0,0 +1,60 @@ +.msg-list { + margin-top: 10px; + + .msg-grid{ + background-color: aliceblue; + border-radius: 5px; + margin:0px 20px 10px 0px; + .mdate{ + font-weight: bolder; + color: darkorchid; + font-size: 12px; + } + .mmsg{ + color: black; + font-size: 12px; + margin-left: 15px; + } + } + + .head_text { + font-size: 18px; + font-family: 'semi-bold'; + margin-bottom: 10px; + } + + .mentor { + display: flex; + justify-content: space-between; + align-items: center; + margin-bottom: 20px; + + .left { + display: flex; + + .men_image { + height: 50px; + width: 50px; + border-radius: 100%; + } + + .bold { + font-family: 'semi-bold'; + } + + .grey { + color: grey; + font-size: 14px; + } + } + + ion-icon { + font-size: 25px; + } + } + + .description { + color: grey; + margin-bottom: 5px; + } +} \ No newline at end of file diff --git a/src/app/components/market-messages/market-messages.component.ts b/src/app/components/market-messages/market-messages.component.ts index 41d0d90..9ae7c4a 100644 --- a/src/app/components/market-messages/market-messages.component.ts +++ b/src/app/components/market-messages/market-messages.component.ts @@ -1,4 +1,7 @@ -import { Component, OnInit } from '@angular/core'; +import {Component, Input, OnInit} from '@angular/core'; +import {SessionDataProviderService} from "../../store/session-data-provider.service"; +import {WrenchService} from "../../services/wrench.service"; +import {Router} from "@angular/router"; @Component({ selector: 'app-market-messages', @@ -6,9 +9,67 @@ import { Component, OnInit } from '@angular/core'; styleUrls: ['./market-messages.component.scss'], }) export class MarketMessagesComponent implements OnInit { + @Input('jobData') jobData:any; + offer_code:string=''; - constructor() { } + constructor( public sessionDataProviderService: SessionDataProviderService, + private wrenchService: WrenchService, + private router: Router) { - ngOnInit() {} + this.jobData = this.router.getCurrentNavigation().extras.state; + console.log("XXXXX 1", this.router.getCurrentNavigation().extras); + // console.log("XXXXX 2", this.router.getCurrentNavigation().extras.state); + //console.log("XXXXX 3", this.router.getCurrentNavigation().extras.state.ID); + if (this.jobData==undefined){ + return; + } + this.offer_code = this.jobData.offer_code; + addEventListener('app-market-messages-refresh', () => { + this.marketMessageList(); + }); + } + + ngOnInit() { + this.marketMessageList(); + } + + + + + reqData: { + action:number, + member_id: number, + uid: string, + sessionid: string, + page:number, + offer_code:string, + limit: number + }; + +messageTotalResult:any; +messageResult:any; + async marketMessageList(){ + + this.reqData = { + action:13025, + member_id: this.sessionDataProviderService.member_id, + uid: this.sessionDataProviderService.member_uid, + sessionid: this.sessionDataProviderService.session, + page: 0, + offer_code: this.offer_code, + limit: 20 + }; + + + this.wrenchService.marketMessages(this.reqData).subscribe( + messageTotalResult => { + this.messageTotalResult = messageTotalResult; + console.log("messageTotalResult RETURN->", this.messageTotalResult); + this.messageResult = this.messageTotalResult.result_list; + + } + ); + + } } diff --git a/src/app/pages/marketdetail/marketdetail.page.html b/src/app/pages/marketdetail/marketdetail.page.html index bcc2f90..3cb08bc 100644 --- a/src/app/pages/marketdetail/marketdetail.page.html +++ b/src/app/pages/marketdetail/marketdetail.page.html @@ -65,8 +65,6 @@
{{jobData.offer_code}} - -
@@ -149,6 +147,6 @@
- + diff --git a/src/app/pages/marketdetail/marketdetail.page.ts b/src/app/pages/marketdetail/marketdetail.page.ts index 2b28583..c8a34bb 100644 --- a/src/app/pages/marketdetail/marketdetail.page.ts +++ b/src/app/pages/marketdetail/marketdetail.page.ts @@ -16,6 +16,7 @@ export class MarketdetailPage implements OnInit { tabs = 'lesson'; session_image_server:string=''; curr_session:string=''; + offer_code:string=''; jobData: any; constructor( @@ -28,12 +29,13 @@ export class MarketdetailPage implements OnInit { ) { this.jobData = this.router.getCurrentNavigation().extras.state; - // console.log("XXXXX 1", this.router.getCurrentNavigation().extras); + console.log("XXXXX 1", this.router.getCurrentNavigation().extras); // console.log("XXXXX 2", this.router.getCurrentNavigation().extras.state); //console.log("XXXXX 3", this.router.getCurrentNavigation().extras.state.ID); if (this.jobData==undefined){ this.onBack(); } + this.offer_code = this.jobData.offer_code; } interestStatus: boolean= false; @@ -122,6 +124,7 @@ export class MarketdetailPage implements OnInit { this.yourmessage=''; setTimeout(()=>{ this.interest_msg_status=''; + dispatchEvent(new Event("app-market-messages-refresh")); },3000); this.waitingInterestService.getInterestList(); } diff --git a/src/app/services/wrench.service.ts b/src/app/services/wrench.service.ts index dc68591..ab73add 100644 --- a/src/app/services/wrench.service.ts +++ b/src/app/services/wrench.service.ts @@ -155,6 +155,10 @@ export class WrenchService { return this.getPostData("assigntask", reqData); } + marketMessages(reqData){ + return this.getPostData("message", reqData); + } + getFamilySampleTasks(reqData) { return this.getPostData("familysampletasks", reqData); }