更新部分问题

projects/live-app/src/app/app.component.ts

@@ -1,4 +1,4 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, HostListener, OnInit } from '@angular/core';
 import { IonApp, IonRouterOutlet } from '@ionic/angular/standalone';
 import Parse from 'parse';
 import { StatusBar, Style, StatusBarStyle } from '@capacitor/status-bar';
@@ -19,6 +19,15 @@ import { SafariViewController } from '@ionic-native/safari-view-controller/ngx';
 })
 export class AppComponent implements OnInit {
   title = 'live-app';
+  // @HostListener("document:visibilitychange", ["$event"])
+  // onvisibilitychange(event) {
+  //   let isExits = event.target.visibilityState
+  //     if (isExits == 'visible') {
+  //       console.log('进入该页面')
+  //     } else {
+  //       console.log('离开该页面')
+  //     }
+  // }
   constructor(
     private router: Router,
     private backgroundColorService: BackgroundColorService

projects/live-app/src/app/app.routes.ts

@@ -20,6 +20,11 @@ export const routes: Routes = [
     canActivate: mapToCanActivate([LoginAuthGuard]),
     loadComponent:()=> import('../modules/login/login.component').then((mod) => mod.LoginComponent),
   },
+  {
+    path: 'webview',
+    canActivate: mapToCanActivate([AuthGuard]),
+    loadComponent:()=> import('../modules/webview/webview.component').then((mod) => mod.WebviewComponent),
+  },
   {
     path: 'tabs', //首页tabs
     component: TabsComponent,

projects/live-app/src/app/components/pay-comp/pay-comp.component.html

@@ -2,7 +2,6 @@
   #modal
   trigger="open-modal"
   [isOpen]="isOpen"
-  (didDismiss)="isOpen = false"
   [backdropDismiss]="false"
 >
   <ng-template>

projects/live-app/src/modules/account/account.modules.routes.ts

@@ -10,6 +10,7 @@ import { RecordsComponent } from './records/records.component';
 import { WattleComponent } from './wattle/wattle.component';
 import { WithdrawalComponent } from './withdrawal/withdrawal.component';
 import { RecDetailComponent } from './records/detail/detail.component';
+import { LeaveGuard } from '../../services/leave.guard';
 
 const routes: Routes = [
   {
@@ -27,6 +28,7 @@ const routes: Routes = [
   },
   {
     path: 'recharge',
+    canDeactivate: [LeaveGuard],
     component: RechargeComponent,
   },
   {

projects/live-app/src/modules/goods/goods.modules.routes.ts

@@ -1,5 +1,6 @@
 import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
+import { LeaveGuard } from '../../services/leave.guard';
 import { VipComponent } from './vip/vip.component';
 const routes: Routes = [
   {
@@ -8,7 +9,8 @@ const routes: Routes = [
     pathMatch: "full",
   },
   {
-    path: 'vip',//实名
+    path: 'vip',
+    canDeactivate: [LeaveGuard],
     component: VipComponent,
   },
 

projects/live-app/src/modules/tabs/my/my.component.html

@@ -115,9 +115,9 @@
     <div class="title">
       <div class="link">排行榜</div>
       <div class="btns">
-        <div class="btn" (click)="changeTop($event)">总部</div>
         <div class="btn" (click)="changeTop($event, 'day')">日榜</div>
         <div class="btn" (click)="changeTop($event, 'week')">周榜</div>
+        <div class="btn" (click)="changeTop($event, 'month')">月榜</div>
       </div>
     </div>
     <div class="ladder">
@@ -144,7 +144,6 @@
                 src="img/1.png"
                 alt=""
                 class="tag"
-                style="transform: rotate(90deg)"
               />
               <img [src]="orderList[0]?.avatar" class="avatar" alt="" />
             </div>
@@ -271,6 +270,15 @@
           <ion-icon name="chevron-forward-outline"></ion-icon>
         </div>
       </div>
+      <div class="li" (click)="toArticle()">
+        <div class="li-lable">
+          <img src="img/商业合作.png" alt="" class="icon" />
+        </div>
+        <div class="li-val">
+          官方合作
+          <ion-icon name="chevron-forward-outline"></ion-icon>
+        </div>
+      </div>
       <div class="li" (click)="onLogout()">
         <div class="li-lable">
           <img src="img/退出登录.png" alt="" class="icon" />

projects/live-app/src/modules/tabs/my/my.component.scss

@@ -240,9 +240,6 @@
                 border-radius: 50%;
               }
             }
-            .user-name {
-              text-align: center;
-            }
           }
         }
         .top1 {
@@ -386,6 +383,9 @@
       }
     }
   }
+  .user-name {
+    text-align: center;
+  }
 }
 ion-toggle::part(track),
 ion-toggle.toggle-checked::part(track) {

projects/live-app/src/modules/tabs/my/my.component.ts

@@ -89,7 +89,7 @@ export class MyComponent implements OnInit {
     this.getAgreement();
     const data = await this.aiServ.getFansAndFollow(this.user.id);
     // console.log(data);
-    this.orderList = await this.aiServ.getOrderAnchor(null,10);
+    this.orderList = await this.aiServ.getOrderAnchor(null,10,'day');
     console.log(this.orderList);
     const { fans, follow } = data.data[0];
     this.userObj = { fans, follow, friendly_degree: 0 };
@@ -259,4 +259,15 @@ export class MyComponent implements OnInit {
     e.cancelBubble = true;
     this.orderList = await this.aiServ.getOrderAnchor(null,10,type);
   }
+  async toArticle(){
+    let query = new Parse.Query('Article');
+    query.equalTo('company', this.aiServ.company);
+    query.equalTo('isEnabled', true);
+    query.notEqualTo('isDeleted', true);
+    query.equalTo('type', 'promotion');
+    query.select('objectId');
+    let article = await query.first();
+    console.log(article?.id);
+    this.router.navigate(['webview',{id:article?.id}]);
+  }
 }

projects/live-app/src/modules/user/profile/profile.component.html

@@ -17,7 +17,7 @@
           />
           }
           <div class="top-right-block">
-            <div class="top-left-title">{{profile?.get('user')?.get('nickname') || profile?.get('user')?.get('mobile') }}</div>
+            <div class="top-left-title">{{profile?.get('user')?.get('nickname') || profile?.get('user')?.id }}</div>
             @if (profile?.get('user')?.get('sex') == '男') {
             <div class="sex">
               <ion-icon name="male-outline"></ion-icon>

projects/live-app/src/modules/user/ranking/ranking.component.html

@@ -19,9 +19,9 @@
     <div class="title">
       <div class="link"></div>
       <div class="btns">
-        <div class="btn" (click)="changeTop($event)">总部</div>
         <div class="btn" (click)="changeTop($event, 'day')">日榜</div>
         <div class="btn" (click)="changeTop($event, 'week')">周榜</div>
+        <div class="btn" (click)="changeTop($event, 'month')">月榜</div>
       </div>
     </div>
     <div class="ladder">
@@ -48,7 +48,6 @@
                 src="img/1.png"
                 alt=""
                 class="tag"
-                style="transform: rotate(90deg)"
               />
               <img [src]="orderList[0]?.avatar" class="avatar" alt="" />
             </div>

projects/live-app/src/modules/user/ranking/ranking.component.scss

@@ -148,4 +148,7 @@
       }
     }
   }
+  .user-name {
+    text-align: center;
+  }
 }

projects/live-app/src/modules/user/ranking/ranking.component.ts

@@ -22,8 +22,8 @@ export class RankingComponent implements OnInit {
   ) {}
 
   async ngOnInit() {
-    this.orderList = await this.aiServ.getOrderAnchor()
-    console.log(this.orderList);
+    this.orderList = await this.aiServ.getOrderAnchor(null,null,'day')
+    // console.log(this.orderList);
   }
   async segmentChanged(e: any) {
     let { value } = e.detail;
@@ -35,6 +35,6 @@ export class RankingComponent implements OnInit {
   }
   async changeTop(e:any, type?:string){
     e.cancelBubble = true;
-    this.orderList = await this.aiServ.getOrderAnchor(null,null,type);
+    this.orderList = await this.aiServ.getOrderAnchor(this.active,null,type);
   }
 }

projects/live-app/src/modules/user/share/share.component.html

@@ -33,7 +33,7 @@
           <div class="user-name">
             {{
               item?.get("nickname") ||
-                item?.get("name")
+                item?.id
             }}
           </div>
           <div class="time">

projects/live-app/src/modules/user/share/share.component.ts

@@ -52,7 +52,7 @@ export class ShareComponent implements OnInit {
   }
   async getBanner() {
     let type = 'user'
-    if(Parse.User.current().get('angentLevel')){
+    if(Parse.User.current().get('agentLevel')){
       type = 'union'
     }else if(this.aiServ.identity){
       type = 'uanchor'

projects/live-app/src/modules/webview/webview.component.html

@@ -0,0 +1,4 @@
+<nav [title]="article?.get('title')"></nav>
+<ion-content class="content">
+  <div [innerHTML]="article?.get('content')" class="div"></div>
+</ion-content>

projects/live-app/src/modules/webview/webview.component.spec.ts

@@ -0,0 +1,28 @@
+/* tslint:disable:no-unused-variable */
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import { DebugElement } from '@angular/core';
+
+import { WebviewComponent } from './webview.component';
+
+describe('WebviewComponent', () => {
+  let component: WebviewComponent;
+  let fixture: ComponentFixture<WebviewComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ WebviewComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(WebviewComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

projects/live-app/src/modules/webview/webview.component.ts

@@ -0,0 +1,26 @@
+import { Component, OnInit } from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
+import * as Parse from 'parse';
+import { NavComponent } from '../../app/components/nav/nav.component';
+import { ionicStandaloneModules } from '../ionic-standalone.modules';
+
+@Component({
+  selector: 'app-webview',
+  templateUrl: './webview.component.html',
+  styleUrls: ['./webview.component.scss'],
+  standalone: true,
+  imports: [...ionicStandaloneModules, NavComponent],
+})
+export class WebviewComponent implements OnInit {
+  article:Parse.Object;
+  constructor(private activateRoute: ActivatedRoute) { }
+
+  ngOnInit() {
+    this.activateRoute.paramMap.subscribe(async (params) => {
+      let id: any = params.get('id');
+      let query = new Parse.Query('Article');
+      this.article = await query.get(id);
+    })
+  }
+
+}

projects/live-app/src/services/aichart.service.ts

@@ -210,7 +210,7 @@ export class AiChatService {
     AND "isDeleted" IS NOT TRUE
     ${where}
     ${whereId}
-    ORDER BY "price"`;
+    ORDER BY "order"`;
     const data: any = await this.http.customSQL(sql);
     return data?.data;
   }
@@ -343,9 +343,10 @@ export class AiChatService {
     let startTime;
     let date = new Date();
     switch (range) {
-      case 'day':
-        startTime =
-          date.getFullYear() + '-' + (date.getMonth() + 1) + '-' + date.getDate();
+      case 'month':
+        date.setDate(date.getDate() - date.getDay() + 1);
+        date = new Date();
+        startTime = date.getFullYear() + '-' + (date.getMonth() + 1) + '-1';
         break;
       case 'week':
         date.setDate(date.getDate() - date.getDay() + 1);
@@ -358,6 +359,12 @@ export class AiChatService {
           date.getDate();
         break;
       default:
+        startTime =
+          date.getFullYear() +
+          '-' +
+          (date.getMonth() + 1) +
+          '-' +
+          date.getDate();
         break;
     }
     let sql = `SELECT us."objectId",us."nickname",us."avatar",ROUND(SUM("credit")::numeric, 2) AS credit

projects/live-app/src/services/leave.guard.ts

@@ -0,0 +1,20 @@
+import { Injectable } from '@angular/core';
+import { CanDeactivate } from '@angular/router';
+import { Observable, of } from 'rxjs';
+import { RechargeComponent } from '../modules/account/recharge/recharge.component';
+import { VipComponent } from '../modules/goods/vip/vip.component';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class LeaveGuard implements CanDeactivate<RechargeComponent|VipComponent> {
+
+  public canDeactivate(component: RechargeComponent|VipComponent): Observable<boolean> {
+    if(component?.paycomp?.isOpen){
+      component.paycomp.isOpen = false
+      return of(false);
+    }else{
+      return of(true);
+    }
+  }
+}