Merge branch 'master' of codehub-cn-south-1.devcloud.huaweicloud.com:web3000003/web-0210402

app-angular/src/app/app.module.ts

@@ -7,7 +7,7 @@ import { AppComponent } from './app.component';
 import { IonicModule } from '@ionic/angular';
 
 import * as Parse from "parse"
-(Parse as any).serverURL = "http://web2023.fmode.cn:9999/parse"
+(Parse as any).serverURL = "http://metapunk.cn:9999/parse"
 Parse.initialize("dev")
 
 @NgModule({

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

@@ -1,9 +1,6 @@
 import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
 import { MeComponent } from './me/me.component';
-
-
-
 import { CommunityComponent } from './community/community.component';
 import { ScienceDetailComponent } from './science-detail/science-detail.component';
 import { ShareComponent } from './share/share.component';
@@ -20,18 +17,16 @@ import { PageTestComponent } from './page-test/page-test.component';
 
 
 const routes: Routes = [
-  { path: 'me', component: MeComponent },
-
+  { path: 'me', component: MeComponent},
   { path: 'community', component: CommunityComponent },
-  { path: 'lesson', component: PageLessonComponent },
+  { path: 'lesson', component: PageLessonComponent, canActivate: [authGuard] },
   { path: 'lesson/detail', component: PageLessonDetailComponent },
-  { path: 'page-chat', component: PageChatComponent },
-  { path: 'page-test', component: PageTestComponent }, 
-
+  { path: 'page-chat', component: PageChatComponent , canActivate: [authGuard]},
+  { path: 'page-test', component: PageTestComponent, canActivate: [authGuard] }, 
   { path: 'community/scienceDetail', component: ScienceDetailComponent },
-  { path: 'community/share', component: ShareComponent },
   { path: 'community/attentionDetail', component: AttentionDetailComponent },
   { path: 'community/recommendDetail', component: RecommendDetailComponent },
+  { path: 'community/share', component: ShareComponent },
   { path: "me/userFollow", component: UserFollowComponent },
   { path: "me/userTag", component: UserTagComponent },
   { path: "me/userCollection", component: UserCollectionComponent },

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

@@ -5,8 +5,6 @@ import { IonicModule } from '@ionic/angular';
 
 import { LessonRoutingModule } from './lesson-routing.module';
 import { MeComponent } from './me/me.component';
-
-
 import { CommunityComponent } from './community/community.component';
 import { ScienceDetailComponent } from './science-detail/science-detail.component';
 import { ShareComponent } from './share/share.component';
@@ -22,10 +20,7 @@ import { PageTestComponent } from './page-test/page-test.component';
 
 @NgModule({
   declarations: [
- 
     MeComponent,
-   
-
     CommunityComponent,
     ScienceDetailComponent,
     ShareComponent,
@@ -38,9 +33,6 @@ import { PageTestComponent } from './page-test/page-test.component';
     PageLessonDetailComponent,
     PageLessonComponent,
     PageTestComponent,
-    
-
-
 
 
   ],

app-angular/src/modules/lesson/page-lesson-detail/page-lesson-detail.component.scss

@@ -1,5 +1,4 @@
 /* 全局样式文件（styles.css）或组件样式文件 */
-
 ion-img {
     width: 100%;
     /* 设置为你想要的宽度 */
@@ -8,7 +7,6 @@ ion-img {
     object-fit: cover;
     /* 调整适应方式，保持原始比例并填充容器 */
 }
-
 .custom-subtitle {
     color: red;
     font-size: 22px;
@@ -17,7 +15,6 @@ ion-img {
     display: inline-block;
 
 }
-
 .navfooter {
     width: 100%;
     height: 120px;

app-angular/src/modules/lesson/recommend-detail/recommend-detail.component.scss

@@ -17,7 +17,6 @@ ion-content {
 .commentator {
     font-size: 0.7rem;
 }
-
 .comment-time {
     position: absolute;
 

app-angular/src/modules/lesson/recommend-detail/recommend-detail.component.ts

@@ -7,15 +7,12 @@ import { ActivatedRoute } from '@angular/router';
 import * as Parse from "parse"
 (Parse as any).serverURL = "http://metapunk.cn:9999/parse"
 Parse.initialize("dev")
-
-
 @Component({
   selector: 'app-recommend-detail',
   templateUrl: './recommend-detail.component.html',
   styleUrls: ['./recommend-detail.component.scss']
 })
 export class RecommendDetailComponent {
-
   comments: string[] = []
   comment: string = ''
   currentDate = new Date()
@@ -26,7 +23,6 @@ export class RecommendDetailComponent {
       this.comment = '';
     }
   }
-
   //预设值变量
   recommend: Parse.Object | undefined;
   // 依赖注入
@@ -40,6 +36,4 @@ export class RecommendDetailComponent {
     let query = new Parse.Query("PetRecommend")
     this.recommend = await query.get(id)
   }
-
-
 }

app-angular/src/modules/user/guard-auth/auth.guard.ts

@@ -7,7 +7,7 @@ export const authGuard: CanActivateFn = (route, state) => {
   if (userAuth?.id) {
     return true;
   } else {
-    // 暂时存储登陆前用户所在页面
+    // 暂时存储登录前用户所在页面
     let REDIRECT_URL = location.pathname;
     localStorage.setItem("REDIRECT_URL", REDIRECT_URL);
     if (location.pathname?.startsWith("/s0210402")) {

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

@@ -12,7 +12,7 @@
         <ion-card>
             <ion-card-header>
                 <ion-card-title>登录</ion-card-title>
-                <ion-card-subtitle>该页面需登陆可继续使用</ion-card-subtitle>
+                <ion-card-subtitle>该页面需登录可继续使用</ion-card-subtitle>
             </ion-card-header>
 
             <ion-card-content>

app-angular/src/modules/user/page-login/page-login.component.scss

@@ -4,18 +4,15 @@
     flex-direction: column;
     vertical-align: middle;
 }
-
 .register-modal {
     display: flex;
     flex-direction: column;
     vertical-align: middle;
 
 }
-
 .register {
     font-size: 0.9rem;
 }
-
 ion-content {
     height: calc(100vh - 121px) !important;
 }

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

@@ -46,7 +46,7 @@ export class PageLoginComponent {
   }
   async alertError(err: string | undefined) {
     const alert = await this.alertCtrl.create({
-      header: '登陆失败',
+      header: '登录失败',
       subHeader: '请检查用户名密码',
       message: err,
       buttons: ['好的'],

app-angular/src/modules/user/service-user/user.service.ts

@@ -10,13 +10,10 @@ export class UserService {
   }
  
   constructor() { }
-
-
   async checkUserPassword(user: {
     username: string
     password: string
   }) {
-
     let exists = await Parse.User.logIn(user?.username, user?.password)
     if (exists?.id) {
       return true