Merge branch 'master' of http://git.fmode.cn:3000/ai/app-gift

app-angular/src/modules/lesson/page-chat/page-chat.component.html

@@ -35,7 +35,7 @@
                         <ng-container *ngIf="msg?.role === 'assistant'">
                             <div class="message-container">
                                 <img class="avatar-left"
-                                    src="https://ts1.cn.mm.bing.net/th/id/R-C.96b2f4c011c90a93e0804dc0368947bb?rik=iuURCAQtZJGBTg&riu=http%3a%2f%2fimg.sytuku.com%2fuptu%2fyulantu%2f160528%2f5-16052R00554.jpg&ehk=cHY%2bSRHYCp30WP97Brg%2fdhkRkesXy91PqmVmm6Q%2fU8A%3d&risl=&pid=ImgRaw&r=0"
+                                src="../../../assets/jl.png"
                                     alt="Avatar">
                                 <div class="message-box-left">
                                     <div class="message-content">

app-angular/src/modules/user/page-add/page-add.component.html

@@ -7,13 +7,11 @@
       </ion-button>
     </ion-buttons>
     <ion-buttons slot="end">
-      
       <ion-button (click)="saveAdd()" color="dark">完成</ion-button>
       <ion-icon name="albums-outline"></ion-icon>
     </ion-buttons>
   </ion-toolbar>
 </ion-header>
-
 <ion-content color="light">
   <div style="display: flex; justify-content: center;">
   <ion-avatar (click)="fileInput.click()">
@@ -21,11 +19,8 @@
     <img *ngIf="!selectedImage" src="https://ionicframework.com/docs/img/demos/avatar.svg" alt="Default Avatar" />
     <ion-input [(ngModel)]="userAdd.img"></ion-input>
   </ion-avatar>
-  
   <input type="file" (change)="onFileSelected($event)" #fileInput style="display: none;" accept="image/*" />
-  
 </div>
-  
   <ion-card>
     <ion-list>
       <ion-item>
@@ -54,12 +49,6 @@
           </ion-content>
         </ng-template>
       </ion-modal>
-     
-      
-      <!-- <ion-item>
-        <ion-label position="stacked">名字：</ion-label>
-        <ion-input [(ngModel)]="userAdd.name"></ion-input>
-      </ion-item> -->
       <ion-item>
         <ion-select label="与ta的关系" [interfaceOptions]="customPopoverOptions" interface="popover" placeholder="选择">
           <ion-select-option value="brown">至亲家人</ion-select-option>
@@ -70,29 +59,24 @@
           <ion-select-option value="red">同学</ion-select-option>
         </ion-select>
       </ion-item>
-      
       <ion-item>
         <ion-label style="font-size: 14px;">性别：</ion-label>
-        <ion-select [(ngModel)]="userAdd.tag" cancelText="取消" okText="确定">
-          <ion-select-option value="male">男</ion-select-option>
-          <ion-select-option value="female">女</ion-select-option>
-          <ion-select-option value="unknown">未知</ion-select-option>
+        <ion-select [(ngModel)]="userAdd.gender" cancelText="取消" okText="确定">
+          <ion-select-option value="男">男</ion-select-option>
+          <ion-select-option value="女">女</ion-select-option>
+          <ion-select-option value="未知">未知</ion-select-option>
         </ion-select>
       </ion-item>
-      
-
       <ion-item>
         <ion-label style="font-size: 14px;">联系方式：</ion-label>
-        <ion-input [(ngModel)]="userAdd.desc"></ion-input>
+        <ion-input [(ngModel)]="userAdd.mobile"></ion-input>
       </ion-item>
       <ion-item>
         <ion-input  [(ngModel)]="userAdd.name" placeholder="城市"></ion-input>
         <ion-input [(ngModel)]="userAdd.name"></ion-input>
       </ion-item>
     </ion-list>
-    
   </ion-card>
-
 <ion-card>
   <ion-list [inset]="true">
     <ion-item [button]="true">
@@ -117,7 +101,6 @@
     </ion-item>
   </ion-list>
 </ion-card>
-
 <ion-card>
   <ion-item>
     <ion-input  [(ngModel)]="userAdd.name" placeholder="学校"></ion-input>
@@ -135,8 +118,7 @@
     <ion-icon slot="start" color="tertiary" name="flash-outline" ></ion-icon>
     <ion-label color="tertiary">添加技能&能力</ion-label>
     <ion-icon slot="end" id="open-modal3" name="chevron-forward-outline" size="small"></ion-icon>
-    <ion-item>
-      
+    <ion-item> 
       <ion-modal #modal trigger="open-modal3" [canDismiss]="canDismiss" [presentingElement]="presentingElement">
         <ng-template>
           <ion-header>
@@ -183,16 +165,13 @@
     </ion-item>
   </ion-item>
 </ion-card>
-
 <ion-card>
   <ion-item>
     <ion-input  [(ngModel)]="userAdd.name" placeholder="MBTI"></ion-input>
     <ion-input [(ngModel)]="userAdd.name"></ion-input>
   </ion-item>
-
   <ion-item>
     <ion-label id="open-custom-dialog2" style="font-size: 14px;">来源</ion-label>
-
     <!-- <ion-icon slot="end" id="open-custom-dialog" name="chevron-forward-outline" size="small"></ion-icon> -->
     <ion-modal id="example-modal" #modal trigger="open-custom-dialog2">
       <ng-template>
@@ -219,8 +198,7 @@
             <ion-item button="true" detail="false" (click)="modal.dismiss()">
               <ion-icon name="bonfire-outline"></ion-icon>
               <ion-label>一见钟情</ion-label>
-            </ion-item>
-            
+            </ion-item>   
           </ion-list>
         </div>
       </ng-template>
@@ -248,7 +226,6 @@
       </ng-template>
     </ion-modal>
   </ion-item>
-  
 </ion-card>
   <ion-list [inset]="true">
     <ion-item>
@@ -258,4 +235,4 @@
   <ion-list [inset]="true">
     <ion-button expand="block" (click)="saveAdd()">保存</ion-button>
   </ion-list>
-</ion-content>
+</ion-content>