Merge remote-tracking branch 'origin/master' into yf-master

wisdom-app/src/app/page-inquiry/page-inquiry.component.ts

@@ -24,44 +24,9 @@ addIcons({radioButtonOffOutline,reloadOutline,checkmarkCircleOutline,closeCircle
   ],
 })
 export class PageInquiryComponent  implements OnInit {
-<<<<<<< HEAD
-  constructor() {}
-  ngOnInit(){}
-  // 用户输入提示词
-  keshi:string = "门诊"
-  keshiInput(ev:any){
-    this.keshi = ev.detail.value;
-  }
-  // 用户输入提示词
-  userPrompt:string = "请描述您的症状"
-  promptInput(ev:any){
-    this.userPrompt = ev.detail.value;
-  }
-  // 属性：组件内用于展示消息内容的变量
-  responseMsg:any = ""
-  // 方法：实例化completion对象，传入消息数组，并订阅生成的可观察对象。
-  isComplete:boolean = false; // 定义完成状态属性，用来标记是否补全完成
-  sendMessage(){
-    console.log("create")
-=======
   constructor(private modalCtrl:ModalController) {
->>>>>>> 125c447 (把ai问诊的按钮实现，把医生的大致ui界面实现)
 
 
-<<<<<<< HEAD
-    let completion = new FmodeChatCompletion([
-      {role:"system",content:""},
-      {role:"user",content:PromptTemplate}
-    ])
-    completion.sendCompletion().subscribe((message:any)=>{
-      // 打印消息体
-      console.log(message.content)
-      // 赋值消息内容给组件内属性
-      this.responseMsg = message.content
-      if(message?.complete){ // 判断message为完成状态，则设置isComplete为完成
-        this.isComplete = true
-      }
-=======
   }
 
   taskList:AgentTaskStep[] = []
@@ -71,7 +36,6 @@ export class PageInquiryComponent  implements OnInit {
       setTimeout(() => {
           resolve(true)
       }, duration);
->>>>>>> 125c447 (把ai问诊的按钮实现，把医生的大致ui界面实现)
     })
   }
 

wisdom-app/src/app/poem-picture/poem-picture.component.spec.ts

@@ -0,0 +1,22 @@
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+
+import { PoemPictureComponent } from './poem-picture.component';
+
+describe('PoemPictureComponent', () => {
+  let component: PoemPictureComponent;
+  let fixture: ComponentFixture<PoemPictureComponent>;
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      imports: [PoemPictureComponent],
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(PoemPictureComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  }));
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

wisdom-app/src/app/tab1/tab1.page.html

@@ -28,12 +28,7 @@
       </ion-button>
     </div>
   </div>
-<<<<<<< HEAD
-
-  <app-explore-container name="智养"></app-explore-container>
-=======
   <ion-button expand="block" color="primary" size="large" (click)="goToPicture()">
     生成图片
   </ion-button>
->>>>>>> 125c447 (把ai问诊的按钮实现，把医生的大致ui界面实现)
 </ion-content>

wisdom-app/src/app/tab1/tab1.page.ts

@@ -37,6 +37,9 @@ export class Tab1Page {
     this.router.navigate(['/tabs/inquiry/human'])
   }
 
+  goToPicture(){
+    this.router.navigate(['/tabs/picture'])
+  }
   searchContent:string = ''; //搜索内容
 
   handleInput(ev:any) {
@@ -52,7 +55,8 @@ export class Tab1Page {
       console.log("搜索内容: ",this.searchContent)
       this.searchContent = '';
     }
-
   }
+
+
   ngOnInit() {}
 }

wisdom-app/src/app/tabs/tabs.routes.ts

@@ -27,16 +27,12 @@ export const routes: Routes = [
           import('../tab4/tab4.page').then((m) => m.Tab4Page),
       },
       {
-<<<<<<< HEAD
-        path: 'inquiry',
-=======
         path: 'picture',
         loadComponent: () =>
           import('../poem-picture/poem-picture.component').then((m) => m.PoemPictureComponent),
       },
       {
         path: 'inquiry/ai',
->>>>>>> 125c447 (把ai问诊的按钮实现，把医生的大致ui界面实现)
         loadComponent: () =>
           import('../page-inquiry/page-inquiry.component').then((m) => m.PageInquiryComponent),
       },

wisdom-app/src/main.ts

@@ -17,7 +17,7 @@ Parse.serverURL = "https://server.fmode.cn/parse";
 localStorage.setItem("NOVA_APIG_SERVER", 'aHR0cHMlM0ElMkYlMkZzZXJ2ZXIuZm1vZGUuY24lMkZhcGklMkZhcGlnJTJG')
 
 // 注意：替换Token 根据Token设置Parse服务帐套权限
-Parse.User.become('r:6841da061563b22339ea0799f94c3475')
+Parse.User.become('r:ef31d9ab3a3eef080f4a0920a8e463e6')
 
 bootstrapApplication(AppComponent, {
   providers: [

wisdom-app/src/web3-1021

@@ -0,0 +1 @@
+Subproject commit e4646ef9439e4aa47bd19ad628d311f640d764b0