何何何 před 1 rokem
rodič
revize
7f27528cf6

Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 908 - 7
paint-app/package-lock.json


+ 1 - 0
paint-app/package.json

@@ -45,6 +45,7 @@
     "@angular/compiler-cli": "^18.0.0",
     "@angular/language-service": "^18.0.0",
     "@capacitor/cli": "6.2.0",
+    "@compodoc/compodoc": "^1.1.26",
     "@ionic/angular-toolkit": "^11.0.1",
     "@types/jasmine": "~5.1.0",
     "@typescript-eslint/eslint-plugin": "^6.0.0",

+ 1 - 1
paint-app/src/app/detail-page/detail-page.component.html

@@ -6,7 +6,7 @@
         </ion-icon>返回
       </ion-button>
     </ion-buttons>
-    <ion-title>图画详情</ion-title>
+    <ion-title>画作详细</ion-title>
   </ion-toolbar>
 </ion-header>
 

+ 2 - 8
paint-app/src/app/detail-page/detail-page.component.ts

@@ -39,10 +39,6 @@ export class DetailPageComponent{
           // 从路由参数中获取 'id' 参数并赋值给 paintname
           this.paintnameid = params['id'];
           console.log('接收到的参数:', this.paintnameid); // 打印接收到的参数以进行调试
-          
-          // 根据 paintname 加载相关的绘画数据
-          // 这里可以调用一个方法来加载与 paintname 相关的数据
-          // this.loadPaintData(this.paintname); // 示例:根据 paintname 加载数据
       });
 
       this.loadpaintList().then(() => {
@@ -209,7 +205,6 @@ export class DetailPageComponent{
   favoritedata: any = {};
   currentfavorit: CloudObject | undefined; // 
   favoritList:Array<CloudObject> = []
-  
     async judgeFavorite() {
     let currentUser = new CloudUser();
     let query = new CloudQuery("plike");
@@ -227,6 +222,8 @@ export class DetailPageComponent{
     }
     console.log('判断完成')
 }
+
+
   async addFavorite() {
      let currentUser = new CloudUser();
      if (currentUser?.id) {
@@ -239,9 +236,6 @@ export class DetailPageComponent{
      console.log('添加成功')
      this.isFavorite = !this.isFavorite;
   }
-
-
-
   currentfavorit1: CloudObject | undefined;  
   favoritList1:Array<CloudObject> = []
   async removeFavorite() {

+ 2 - 2
paint-app/src/app/tab2/tab2.page.html

@@ -1,7 +1,7 @@
 <ion-header [translucent]="true">
   <ion-toolbar>
     <ion-title>
-      素材库
+      发现
     </ion-title>
   </ion-toolbar>
 </ion-header>
@@ -93,7 +93,7 @@
                     <p class="page2-text">{{video.get('introduce')}}</p>  
                     <p style="font-size: 12px; color: #999;">评分: {{video.get('score')}}分</p>  
                     <p style="font-size: 12px; color: #999;">类型: {{video.get('type')}}{{video.get('name')}}</p>   
-                    <button class="page2-watch-button" (click)="gopage(video.get('name'))" style="position: absolute; bottom: 0; right: 0;">看正片</button>    
+                    <button class="page2-watch-button" (click)="gopage(video.get('name'))" style="position: absolute; bottom: 0; right: 0;">播放</button>    
                 </div>
               </div>    
             </section>  

+ 2 - 2
paint-app/src/app/tab2/tab2.page.ts

@@ -75,8 +75,6 @@ export class Tab2Page{
     }
       this.paintList = await query.find()
     }
-
-    
     async onTextClick1(text:string){
       let query = new CloudQuery("paint");
       if(text!=='全部'){
@@ -89,6 +87,8 @@ export class Tab2Page{
     }
 
     typeValue: string = '全部'; // 默认值
+
+    
     onHistoryChange(value: string) {
       if (value==='全部') {
           this.typeValue = '全部'; // 自动选择类型的全部

+ 2 - 0
paint-app/src/app/tab4/tab4.component.ts

@@ -119,6 +119,8 @@ ngOnInit() {
       await this.currentcomment?.save();
       
     }
+
+    
     click1(discuss:any){ 
       if(!this.currentUser?.id){
         console.log("用户未登录,请登录后重试"); 

+ 1 - 1
paint-app/src/app/tabs/tabs.page.html

@@ -8,7 +8,7 @@
 
     <ion-tab-button tab="tab2" href="/tabs/tab2">
       <ion-icon aria-hidden="true" name="speedometer"></ion-icon>
-      <ion-label>素材</ion-label>
+      <ion-label>发现</ion-label>
     </ion-tab-button>
 
     <ion-tab-button tab="tab4" href="/paint-app/src/app/tab4/tab4.component.html">

+ 1 - 1
paint-app/src/app/video-page/video-page.component.html

@@ -6,7 +6,7 @@
         </ion-icon>返回
       </ion-button>
     </ion-buttons>
-    <ion-title>视频</ion-title>
+    <ion-title>视频播放</ion-title>
   </ion-toolbar>
 </ion-header>
 

+ 3 - 0
paint-app/tsconfig.doc.json

@@ -0,0 +1,3 @@
+{    
+     "include": ["src/**/*.ts"]
+}

Některé soubory nejsou zobrazeny, neboť je v těchto rozdílových datech změněno mnoho souborů