flowaaa 4 months ago
parent
commit
39e75fb167

+ 1 - 1
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]},

+ 1 - 1
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>

+ 25 - 18
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>
@@ -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>
@@ -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>
@@ -215,6 +221,7 @@
             <ion-buttons slot="end">
               <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">