update

projects/live-app/src/app/components/avatar/avatar.component.html

@@ -10,5 +10,7 @@
     [src]="avatar"
     alt=""
   />
-  <div class="frame-item1" [id]="frameId"></div>
+  @if (frame) {
+    <div class="frame-item1" [id]="frameId"></div>
+  }
 </div>

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

@@ -22,6 +22,9 @@ export class AvatarComponent implements OnInit {
   ngOnInit() {
     setTimeout(() => {
       console.log('init-avatar');
+      if(!this.frame){
+        this.size = this.avatarSize + 10
+      }
       this.initSVGA();
     }, 0);
   }

projects/live-app/src/modules/account/recharge/recharge.component.scss

@@ -26,7 +26,8 @@
       }
     }
 		.select:active{
-      border: 0.2564vw solid #92a1ff;
+      border: 0.2564vw solid #c5000f;
+      color: #c5000f;
 		}
   }
   .h3 {

projects/live-app/src/modules/account/wattle/wattle.component.html

@@ -7,48 +7,39 @@
           <div class="count">{{ account?.balance?.toFixed(2) || 0 }}</div>
           <div class="title">钻石余额</div>
         </div>
-        @if (isAnthor) {
+        <!-- @if (isAnthor) { -->
         <div class="balance">
           <div class="count">{{ anthorWallet?.balance || 0 }}</div>
           <div class="title">可提现</div>
         </div>
-        }
+        <!-- } -->
       </div>
       <div class="figure">
         <div class="recharge" (click)="recharge()">充值</div>
-        @if (isAnthor) {
+        <!-- @if (isAnthor) { -->
         <div class="recharges" (click)="withdrawal()">提现</div>
-        }
+        <!-- } -->
       </div>
     </div>
-    @if (isAnthor) {
+    <!-- @if (isAnthor) { -->
     <div class="install" (click)="toBank()">
       <div class="install-to">
-        <div class="name">我的银行卡</div>
+        <div class="name"><ion-icon style="color:#c22d41" name="folder-open"></ion-icon>我的银行卡</div>
       </div>
-      <img
-        class="img"
-        src="https://file-cloud.fmode.cn/uiZD6NisQm/20220808/9sq3d1093746.png"
-      />
+      <ion-icon class="img" name="chevron-forward-outline"></ion-icon>
     </div>
     <div class="install" (click)="records()">
       <div class="install-to">
-        <div class="name">提现记录</div>
+        <div class="name"><ion-icon style="color:#1091d3" name="document-text"></ion-icon>提现记录</div>
       </div>
-      <img
-        class="img"
-        src="https://file-cloud.fmode.cn/uiZD6NisQm/20220808/9sq3d1093746.png"
-      />
+      <ion-icon class="img" name="chevron-forward-outline"></ion-icon>
     </div>
-    }
+    <!-- } -->
     <div class="install" (click)="record()">
       <div class="install-to">
-        <div class="name">动账记录</div>
+        <div class="name"><ion-icon style="color:#b5841c" name="folder-open"></ion-icon>动账记录</div>
       </div>
-      <img
-        class="img"
-        src="https://file-cloud.fmode.cn/uiZD6NisQm/20220808/9sq3d1093746.png"
-      />
+      <ion-icon class="img" name="chevron-forward-outline"></ion-icon>
     </div>
   </div>
 </ion-content>

projects/live-app/src/modules/account/wattle/wattle.component.scss

@@ -27,7 +27,7 @@
     width: 92%;
     height: 28vh;
     // margin-top: 5.1282vw;
-    border: 0.2564vw solid #000000;
+    border: 1px solid #e7435c;
 
     .account_info {
       display: flex;
@@ -61,7 +61,7 @@
 
       .recharge {
         width: 38.4615vw;
-        background: #92a1ff;
+        background: #e7435c;
         border-radius: 4.6154vw;
         padding: 2.5641vw 0 2.5641vw 0;
         margin: 0 auto;
@@ -70,12 +70,13 @@
 
       .recharges {
         width: 38.4615vw;
-        border: 0.2564vw solid #000000;
+        border: 0.2564vw solid #ffffff;
         border-radius: 4.6154vw;
         padding: 2.5641vw 0 2.5641vw 0;
         margin: 0 auto;
-        color: #000000;
+        color: #ffffff;
         margin-left: 5.1282vw;
+        background: #1a65eb;
       }
     }
   }
@@ -87,15 +88,21 @@
     padding: 2.5641vw 0;
     display: flex;
     justify-content: space-between;
-    border: 0.2564vw solid #000000;
+    border: 1px solid #e7435c;
 
     .install-to {
       display: flex;
       padding-left: 2.5641vw;
 
       .name {
-        color: #000000;
         margin: auto 1.2821vw;
+        display: flex;
+        align-items: center;
+        ion-icon{
+          font-size: 20px;
+          margin-right: 4px;
+          color: #e7435c;
+        }
       }
     }
 

projects/live-app/src/modules/account/wattle/wattle.component.ts

@@ -37,10 +37,10 @@ export class WattleComponent implements OnInit {
     this.account = await this.aiServ.getWallet(id!)
     console.log(this.account);
     this.isAnthor = this.aiServ.identity
-    if(this.aiServ.identity){
+    // if(this.aiServ.identity){
       this.anthorWallet = await this.aiServ.getAuthorWallet(id!)
       console.log(this.anthorWallet);
-    }
+    // }
   }
 
   // showBalance(balance:number) {

projects/live-app/src/modules/account/withdrawal/withdrawal.component.html

@@ -14,7 +14,7 @@
         <div class="name">银行名称:</div>
         <input
           type="text"
-          [(ngModel)]="bankinfo.bankName"
+          [(ngModel)]="bankinfo.bankname"
           maxlength="8"
           name="bankName"
           autocomplete="off"
@@ -49,7 +49,7 @@
       <div class="bank">
         <div class="name">卡号:</div>
         <input
-          type="number"
+          type="text"
           [(ngModel)]="bankinfo.bankcard"
           maxlength="8"
           name="accountId"

projects/live-app/src/modules/account/withdrawal/withdrawal.component.ts

@@ -16,23 +16,29 @@ import {
   imports: [...ionicStandaloneModules, NavComponent, CommonModule, FormsModule],
 })
 export class WithdrawalComponent implements OnInit {
-  constructor(private toastController: ToastController,
-    private aiServ: AiChatService,
-    ) {}
+  constructor(
+    private toastController: ToastController,
+    private aiServ: AiChatService
+  ) {}
   price: number = 0;
-  balance:number = 0;
-  bankinfo: any = {
-    bankcard: '',
+  balance: number = 0;
+  bankinfo: {
+    bankname: string;
+    name: string;
+    mobile: string;
+    bankcard: string;
+  } = {
+    bankname: '',
     name: '',
-    idcard: '',
     mobile: '',
+    bankcard: '',
   };
   data: any = [
     { value: 0, name: '银行卡' },
     { value: 1, name: '微信' },
   ];
   value: Number = 0;
-  account?: Parse.Object
+  account?: Parse.Object;
   ngOnInit() {
     this.getAccount();
   }
@@ -42,15 +48,19 @@ export class WithdrawalComponent implements OnInit {
     query.equalTo('user', id);
     query.equalTo('company', this.aiServ.company);
     this.account = await query.first();
-    if(this.account?.get('bank')){
+    if (this.account?.get('bank')) {
       this.bankinfo = this.account?.get('bank')[0];
     }
     console.log(this.account);
-    let anthorWallet = await this.aiServ.getAuthorWallet(id!)
-    this.balance = anthorWallet.balance
+    let anthorWallet = await this.aiServ.getAuthorWallet(id!);
+    this.balance = anthorWallet.balance;
   }
   async withdrawal() {
-    if (!this.bankinfo.name || !this.bankinfo.bankcard || !this.bankinfo.mobile) {
+    if (
+      !this.bankinfo.bankname ||
+      !this.bankinfo.bankcard ||
+      !this.bankinfo.mobile
+    ) {
       this.toast('请先绑定银行卡', 1500);
       return;
     }

projects/live-app/src/modules/live/call-log/call-log.component.html

@@ -3,7 +3,11 @@
   @for (item of list; track $index) {
   <div class="log-item" (click)="toUrl(item.id)">
     <div class="item-col">
-      <div class="title">{{ item?.get("title") }}</div>
+      @if (user?.id === item?.get("user")?.id) {
+        <div class="title">与{{ item?.get("profile")?.get("user")?.get("nickname") }}直播通话</div>
+      }@else {
+        <div class="title">与{{ user?.get("nickname") }}直播通话</div>
+      }
       <div class="desc">
         {{ item?.get("createdAt") | date : "yyyy-MM-dd HH:mm" }}
       </div>

projects/live-app/src/modules/live/call-log/call-log.component.ts

@@ -16,6 +16,7 @@ import { InfiniteScrollCustomEvent } from '@ionic/angular';
 })
 export class CallLogComponent implements OnInit {
   list: Array<any> = [];
+  user:Parse.User = Parse.User.current()
   constructor(private router: Router) {}
 
   ngOnInit() {
@@ -39,7 +40,7 @@ export class CallLogComponent implements OnInit {
     query.notEqualTo('isDeleted', true);
     query.limit(20);
     query.skip(this.list.length);
-    query.include('profile');
+    query.include('profile.user');
     query.descending('createdAt');
     let log = await query.find();
     this.list.push(...log)

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

@@ -196,7 +196,8 @@
     .list-row {
       // width: 46.1538vw;
       height: 64.1026vw;
-      background-size: 100% 100%;
+      // background-size: 100% 100%;
+      background-size: cover;
       position: relative;
       color: white;
       border-radius: 2.5641vw;

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

@@ -148,7 +148,8 @@
     .list-row {
       // width: 46.1538vw;
       height: 64.1026vw;
-      background-size: 100% 100%;
+      // background-size: 100% 100%;
+      background-size: cover;
       position: relative;
       color: white;
       border-radius: 2.5641vw;

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

@@ -15,6 +15,7 @@ import { Camera } from '@capacitor/camera';
 import { Filesystem } from '@capacitor/filesystem';
 import { DeviceService } from '../../../services/device.service';
 import { CommonModule } from '@angular/common';
+import { HttpService } from '../../../services/http.service';
 
 @Component({
   selector: 'live-tabs',
@@ -30,7 +31,8 @@ export class TabsComponent implements OnInit {
     private router: Router,
     // private alertController: AlertController,
     private activateRoute: ActivatedRoute,
-    public deviceSer: DeviceService
+    public deviceSer: DeviceService,
+    private http: HttpService
   ) // private connectTask: ConnectTaskService
   {
     this.activateRoute.paramMap.subscribe(async (params) => {
@@ -85,6 +87,7 @@ export class TabsComponent implements OnInit {
 
   ngOnInit() {
     this.initDeviceService()
+    this.updateParent()
   }
 
   async presentAlert() {
@@ -199,4 +202,9 @@ export class TabsComponent implements OnInit {
       console.error('麦克风权限被拒绝或请求失败:', error);
     }
   }
+
+  updateParent(){
+    let url = `https://server.fmode.cn/api/user/agent/parent`
+    this.http.httpRequst(url,{uid:Parse.User.current()?.id},'POST')
+  }
 }

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

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

@@ -188,7 +188,7 @@ export class AiChatService {
   /* 获取主播余额 */
   async getAuthorWallet(uid: string): Promise<any> {
     const data = await this.http.httpRequst(
-      'https://server.fmode.cn/api/ailiao/wallet/anthor',
+      'https://server.fmode.cn/api/ailiao/wallet/income',
       { uid: uid },
       'POST'
     );
@@ -275,8 +275,8 @@ export class AiChatService {
   getSysNotice(uid: string, limit?: number, skip?: number): Promise<any> {
     let sql = `SELECT
     "Friends"."objectId" fid,"friend","Friends"."user",
-    (CASE WHEN "user" = '${uid}' THEN '请求添加' || us.name ||'为好友'
-	  ELSE '收到'||u.name||'的好友申请' END) title,
+    (CASE WHEN "user" = '${uid}' THEN '请求添加' || us.nickname ||'为好友'
+	  ELSE '收到'||u.nickname||'的好友申请' END) title,
     (CASE WHEN "user" = '${uid}' THEN us.avatar
 	  ELSE u.avatar END) avatar,
     (CASE WHEN "user" = '${uid}' THEN us."objectId"