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

README.md

@@ -3,7 +3,7 @@
 > 想法：人情世故APP，帮助用户学习送礼知识；聚餐礼仪；职场技巧；提升社交能力。
 
 # 项目简介
-- 项目名称：AI智谋
+- 项目名称：人情智谋AIHRM(AI Human Relationship management)
 - 一句话：利用AGI助手帮助初入职场、性格内向的用户学习送礼知识、聚餐礼仪，提升社交能力和职场技巧。
 - 简介：人情智谋助手是一款通过AGI助手提供服务的APP，旨在帮助初入职场、性格内向的用户改善社交能力、提高沟通技巧，让他们更好地融入团队，学习送礼知识和聚餐礼仪。
 - 主要服务用户
@@ -17,8 +17,6 @@
     - 帮助初入职场的新人熟悉团队写作
 # 背景分析
 ## 政策背景
-
-
 心理健康政策：鼓励帮助有心理问题社交能力有限的青少年，提供社交基本交涉能力的提示与训练。
 - 江西省残联联合省发改委、省教育厅等10个厅局印发《关于加强孤独症儿童关爱服务工作的通知》
 - 《江苏省残疾预防行动计划（2021—2025年）》

app-angular/capacitor.config.ts

@@ -2,7 +2,7 @@ import { CapacitorConfig } from '@capacitor/cli';
 
 const config: CapacitorConfig = {
   appId: 'com.example.app',
-  appName: 'PetFavor',
+  appName: 'HRMAI',
   webDir: 'www',
   server: {
     androidScheme: 'https'

app-angular/package.json

@@ -35,7 +35,7 @@
     "@angular/cli": "~16.2.2",
     "@angular/compiler-cli": "^16.2.0",
     "@capacitor/cli": "^5.6.0",
-    "@compodoc/compodoc": "^1.1.23",
+    "@compodoc/compodoc": "^1.1.25",
     "@ionic/angular-toolkit": "latest",
     "@types/jasmine": "~4.3.0",
     "@types/parse": "^3.0.5",

app-angular/src/modules/lesson/lesson-routing.module.ts

@@ -22,7 +22,7 @@ import { UserSkillComponent } from './user-skill/user-skill.component';
 
 const routes: Routes = [
   { path: 'me', component: MeComponent},
-  { path: 'community', component: CommunityComponent },
+  { path: 'community', component: CommunityComponent, canActivate: [authGuard] },
   { path: 'lesson', component: PageLessonComponent, canActivate: [authGuard] },
   { path: 'lesson/detail', component: PageLessonDetailComponent },
   { path: 'page-chat', component: PageChatComponent , canActivate: [authGuard]},

app-angular/src/modules/lesson/me/me.component.html

@@ -88,7 +88,7 @@
     </ion-list> -->
    
 
-    <ion-accordion-group [multiple]="true" [value]="['first', 'third']">
+    <ion-accordion-group [multiple]="true" >
         <ion-accordion value="third">
             <ion-item slot="header" color="light">
               <ion-label class="larger-font">🎡功能</ion-label>

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

@@ -24,8 +24,8 @@
   <ion-card>
     <ion-list>
       <ion-item>
-        <ion-input  [(ngModel)]="userAdd.name" placeholder="姓名*"></ion-input>
-        <ion-input [(ngModel)]="userAdd.name"></ion-input>
+        <ion-input  [(ngModel)]="userAdd.name"  placeholder="姓名*"></ion-input>
+        <ion-input ></ion-input>
       </ion-item>
       <ion-item>
         <ion-input  placeholder="生日*"></ion-input>
@@ -37,7 +37,7 @@
             <ion-toolbar>
               <ion-title>请选择</ion-title>
               <ion-buttons slot="end">
-                <ion-button color="black" (click)="modal.dismiss()">完成</ion-button>
+                <ion-button color="black" (click)="dismissModal()">完成</ion-button>
               </ion-buttons>
             </ion-toolbar>
             <ion-datetime-button datetime="datetime" style="width: 100%;"></ion-datetime-button>
@@ -72,8 +72,8 @@
         <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-input  placeholder="城市"></ion-input>
+        <ion-input ></ion-input>
       </ion-item>
     </ion-list>
   </ion-card>
@@ -82,37 +82,37 @@
     <ion-item [button]="true">
       <ion-icon color="danger" slot="start" name="heart-circle-outline" size="large"></ion-icon>
       <ion-label>爱好</ion-label>
-      <ion-icon slot="end" name="chevron-forward-outline" size="small"></ion-icon>
+      
     </ion-item>
     <ion-item [button]="true">
       <ion-icon color="success" slot="start" name="restaurant-outline" size="large"></ion-icon>
       <ion-label>口味</ion-label>
-      <ion-icon slot="end" name="chevron-forward-outline" size="small"></ion-icon>
+      
     </ion-item>
     <ion-item [button]="true">
       <ion-icon color="tertiary" slot="start" name="rose-outline" size="large"></ion-icon>
       <ion-label>习惯</ion-label>
-      <ion-icon slot="end" name="chevron-forward-outline" size="small"></ion-icon>
+      
     </ion-item>
     <ion-item [button]="true">
       <ion-icon color="warning" slot="start" name="heart-dislike-outline" size="large"></ion-icon>
       <ion-label>讨厌</ion-label>
-      <ion-icon slot="end" name="chevron-forward-outline" size="small"></ion-icon>
+      
     </ion-item>
   </ion-list>
 </ion-card>
 <ion-card>
   <ion-item>
-    <ion-input  [(ngModel)]="userAdd.name" placeholder="学校"></ion-input>
-    <ion-input [(ngModel)]="userAdd.name"></ion-input>
+    <ion-input  placeholder="学校"></ion-input>
+    <ion-input ></ion-input>
   </ion-item>
   <ion-item>
-    <ion-input  [(ngModel)]="userAdd.name" placeholder="职业"></ion-input>
-    <ion-input [(ngModel)]="userAdd.name"></ion-input>
+    <ion-input  placeholder="职业"></ion-input>
+    <ion-input ></ion-input>
   </ion-item>
   <ion-item>
-    <ion-input  [(ngModel)]="userAdd.name" placeholder="公司"></ion-input>
-    <ion-input [(ngModel)]="userAdd.name"></ion-input>
+    <ion-input  placeholder="公司"></ion-input>
+    <ion-input ></ion-input>
   </ion-item>
   <ion-item>
     <ion-icon slot="start" color="tertiary" name="flash-outline" ></ion-icon>
@@ -125,7 +125,7 @@
             <ion-toolbar>
               <ion-title>请选择</ion-title>
               <ion-buttons slot="end">
-                <ion-button (click)="modal.dismiss()">完成</ion-button>
+                <ion-button color="black" (click)="dismissModal()">完成</ion-button>
               </ion-buttons>
             </ion-toolbar>
           </ion-header>
@@ -167,17 +167,23 @@
 </ion-card>
 <ion-card>
   <ion-item>
-    <ion-input  [(ngModel)]="userAdd.name" placeholder="MBTI"></ion-input>
-    <ion-input [(ngModel)]="userAdd.name"></ion-input>
+    <ion-input  placeholder="MBTI"></ion-input>
+    <ion-input ></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>
         <div class="wrapper" class="ion-text-center">
-          <ion-title>你和ta如何认识的</ion-title>
-  
+          <ion-toolbar>
+          <ion-buttons slot="end">
+            <ion-button color="black" (click)="dismissModal()">完成</ion-button>
+          </ion-buttons>
+        </ion-toolbar>
+        <ion-title>你和ta如何认识的</ion-title>
+
           <ion-list lines="none">
             <ion-item button="true" detail="false" (click)="modal.dismiss()">
               <ion-icon name="pizza-outline"></ion-icon>
@@ -213,8 +219,9 @@
           <ion-toolbar>
             <ion-title>重置</ion-title>
             <ion-buttons slot="end">
-              <ion-button color="black" (click)="modal.dismiss()">完成</ion-button>
+              <ion-button color="black" (click)="dismissModal()">完成</ion-button>
             </ion-buttons>
+            
           </ion-toolbar>
           <ion-datetime-button datetime="datetime" style="width: 100%;"></ion-datetime-button>
           <ion-modal [keepContentsMounted]="true">

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

@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
 import { Router } from '@angular/router';
 import * as Parse from "parse";
-import { CheckboxCustomEvent } from '@ionic/angular';
+import { CheckboxCustomEvent,ModalController } from '@ionic/angular';
 
 @Component({
   selector: 'app-page-add',
@@ -18,10 +18,13 @@ export class PageAddComponent {
   selectedImage: string | ArrayBuffer | null = null;
   canDismiss = false;
   presentingElement: Element | null = null;
+  modalController: ModalController;
 
-  constructor(
+  constructor(modalController: ModalController,
     private router: Router
-  ) {}
+
+  ) {    this.modalController = modalController;
+  }
 
   ngOnInit() {
     this.presentingElement = document.querySelector('.ion-page');
@@ -45,7 +48,9 @@ export class PageAddComponent {
       console.error('Error while saving new contact', error);
     }
   }
-
+  saveBack(){
+    this.router.navigate(['/lesson/me/add']); // 导航到联系人列表页面
+  }
   onFileSelected(event: Event) {
     const inputElement = event.target as HTMLInputElement;
     if (inputElement.files && inputElement.files[0]) {
@@ -58,7 +63,10 @@ export class PageAddComponent {
       reader.readAsDataURL(file);
     }
   }
-
+  dismissModal() {
+    this.modalController.dismiss();
+  }
+  
   onTermsChanged(event: Event) {
     const ev = event as CheckboxCustomEvent;
     this.canDismiss = ev.detail.checked;