update:新增实时天气和

TFPower-app/angular.json

@@ -31,7 +31,10 @@
                 "output": "assets"
               }
             ],
-            "styles": ["src/global.scss", "src/theme/variables.scss"],
+            "styles": [
+              "src/global.scss",
+              "src/theme/variables.scss"
+            ],
             "scripts": []
           },
           "configurations": {
@@ -44,8 +47,8 @@
                 },
                 {
                   "type": "anyComponentStyle",
-                  "maximumWarning": "2kb",
-                  "maximumError": "4kb"
+                  "maximumWarning": "6kb",
+                  "maximumError": "7kb"
                 }
               ],
               "fileReplacements": [
@@ -72,6 +75,10 @@
         },
         "serve": {
           "builder": "@angular-devkit/build-angular:dev-server",
+          "options": {
+            "browserTarget": "app:build",
+            "proxyConfig": "./src/proxy.config.json"
+          },
           "configurations": {
             "production": {
               "buildTarget": "app:build:production"
@@ -106,7 +113,10 @@
                 "output": "assets"
               }
             ],
-            "styles": ["src/global.scss", "src/theme/variables.scss"],
+            "styles": [
+              "src/global.scss",
+              "src/theme/variables.scss"
+            ],
             "scripts": []
           },
           "configurations": {
@@ -119,7 +129,10 @@
         "lint": {
           "builder": "@angular-eslint/builder:lint",
           "options": {
-            "lintFilePatterns": ["src/**/*.ts", "src/**/*.html"]
+            "lintFilePatterns": [
+              "src/**/*.ts",
+              "src/**/*.html"
+            ]
           }
         }
       }
@@ -145,4 +158,4 @@
       "setParserOptionsProject": true
     }
   }
-}
+}

TFPower-app/package-lock.json

@@ -41,6 +41,7 @@
         "@capacitor/cli": "6.2.0",
         "@ionic/angular-toolkit": "^11.0.1",
         "@types/jasmine": "~5.1.0",
+        "@types/pinyin": "^2.10.2",
         "@typescript-eslint/eslint-plugin": "^6.0.0",
         "@typescript-eslint/parser": "^6.0.0",
         "eslint": "^8.57.0",
@@ -6032,6 +6033,13 @@
         "@types/node": "*"
       }
     },
+    "node_modules/@types/pinyin": {
+      "version": "2.10.2",
+      "resolved": "https://registry.npmmirror.com/@types/pinyin/-/pinyin-2.10.2.tgz",
+      "integrity": "sha512-jLzlRkaLRLg+lgYPjOuP3HX2cozUkhXls5GTXopsKuKJ9lDGlIAb88OoIztH6TbNUsoJnl/7e/kjaumA5IKKJg==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/@types/qs": {
       "version": "6.9.17",
       "resolved": "https://registry.npmmirror.com/@types/qs/-/qs-6.9.17.tgz",

TFPower-app/package.json

@@ -46,6 +46,7 @@
     "@capacitor/cli": "6.2.0",
     "@ionic/angular-toolkit": "^11.0.1",
     "@types/jasmine": "~5.1.0",
+    "@types/pinyin": "^2.10.2",
     "@typescript-eslint/eslint-plugin": "^6.0.0",
     "@typescript-eslint/parser": "^6.0.0",
     "eslint": "^8.57.0",

TFPower-app/src/app/rili/rili.component.html

@@ -0,0 +1,54 @@
+<!-- <ion-header>
+  <ion-toolbar>
+    <ion-buttons slot="start">
+      <ion-button (click)="preMonth()">上个月</ion-button>
+    </ion-buttons>
+    <ion-title (click)="openPicker()">{{ curYear }}年 {{ curMonth }}月 ></ion-title>
+    <ion-buttons slot="end">
+      <ion-button (click)="nextMonth()">下个月</ion-button>
+    </ion-buttons>
+  </ion-toolbar>
+</ion-header> -->
+<div>
+  <div style="display: flex;margin: auto;justify-content: space-between;">
+    <ion-buttons slot="start">
+      <ion-button (click)="preMonth()">上个月</ion-button>
+    </ion-buttons>
+    <div (click)="openPicker()" style="display: flex;align-items: center;justify-content: center;font-weight: bolder;">
+      {{ curYear }}年 {{ curMonth }}月 ></div>
+    <ion-buttons slot="end">
+      <ion-button (click)="nextMonth()">下个月</ion-button>
+    </ion-buttons>
+  </div>
+  <div>
+    <div class="week-days">
+      <div *ngFor="let day of week" class="week-day">{{ day }}</div>
+    </div>
+
+    <div class="days">
+      <!-- 上个月 -->
+      <div *ngFor="let item of firstDays" (click)="topre(item)" class="lastday">
+        {{ item }}
+      </div>
+
+      <!-- 当前月 -->
+      <div *ngFor="let day of curDays" class="curday" [ngClass]="{'selected': selectedDate === day }"
+        (click)="selectDate(day)" style="display: flex; flex-direction: column; justify-content: end;">
+
+        <div class="img" style="height: 60%;">
+          <!-- 根据日期查找天气类型 -->
+          <!-- {{ getWeatherType(curYear, curMonth, day) }} -->
+          <img *ngIf="checkedDates.includes(formatDate(curYear, curMonth, day))" style="height: 100%;"
+            src="https://s1.aigei.com/src/img/gif/74/745acea3ee024c4ca589ed8323755a1c.gif?imageMogr2/auto-orient/thumbnail/!282x282r/gravity/Center/crop/282x282/quality/85/%7CimageView2/2/w/282&e=1735488000&token=P7S2Xpzfz11vAkASLTkfHN7Fw-oOZBecqeJaxypL:mSthK2X-rdE9weDjbe6VF46ck7s="
+            alt="">
+          <img *ngIf="!checkedDates.includes(formatDate(curYear, curMonth, day))" style="height: 100%;"
+            [src]="getWeatherType(curYear, curMonth, day)" alt="">
+        </div>
+        <div style="height: 40%;">{{ day }}</div>
+      </div>
+
+      <!-- 下个月 -->
+      <div *ngFor="let item of nextDaysArray" (click)="tolast(item)" class="lastday">{{ item }}</div>
+    </div>
+  </div>
+</div>

TFPower-app/src/app/rili/rili.component.scss

@@ -0,0 +1,58 @@
+.week-days {
+  display: flex;
+  justify-content: space-between;
+  padding: 10px 0;
+}
+
+.week-day {
+  flex: 1;
+  text-align: center;
+  font-weight: bold;
+}
+
+.days {
+  display: flex;
+  flex-wrap: wrap;
+  padding: 10px;
+}
+
+.curday, .lastday {
+  font-size: 12px;
+  width: calc(100% / 7); /* 每行7个 */
+  height: 43px; /* 每个日期的高度 */
+  width: 14.28%;
+  display: flex;
+  flex-direction: column; /* 垂直排列 */
+  align-items: center;
+  justify-content: flex-end; /* 向下对齐 */
+  cursor: pointer;
+  position: relative; /* 使 dot 可以绝对定位 */
+  border-radius: 50%;
+}
+
+.dot {
+  width: 20px; /* 圆点的直径 */
+  height: 20px; /* 圆点的直径 */
+  background-color: blue; /* 圆点的颜色 */
+  border-radius: 50%; /* 圆形 */
+  top: 0; /* 在顶部 */
+  transform: translateY(-50%); /* 向上移动圆点，使其居中 */
+}
+
+.curday {
+  // background-color: #f0f0f0; 
+}
+
+.lastday {
+  // background-color: #e0e0e0; 
+  color: #ccc;
+}
+
+.selected {
+  border: 1px solid blue; /* 选中日期的背景色 */
+  color: rgb(0, 132, 255); /* 选中日期的字体颜色 */
+}
+
+.daka{
+  background-color: #a4e17e;
+}

TFPower-app/src/app/rili/rili.component.spec.ts

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

TFPower-app/src/app/rili/rili.component.ts

@@ -0,0 +1,234 @@
+import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
+import { IonContent, IonHeader, IonTitle, IonToolbar, IonButton, IonLabel, IonItem, IonList, IonBackButton, IonButtons, IonIcon, IonItemDivider, IonAvatar, IonThumbnail, IonItemOptions, IonItemOption, IonItemSliding, IonInput, IonCheckbox, IonRadio, IonToggle, IonRadioGroup, IonSearchbar, IonSegment, IonSegmentButton, IonDatetime, IonFooter, IonCardContent, IonCardTitle, IonCardHeader, IonCard, IonCol, IonRow, IonGrid, IonChip, IonImg, PickerController, IonPicker } from '@ionic/angular/standalone';
+import { CommonModule } from '@angular/common';
+import { HttpClient } from '@angular/common/http';
+import { pinyin } from 'pinyin-pro';
+import { CloudQuery, CloudUser } from 'src/lib/ncloud';
+
+@Component({
+  selector: 'app-rili',
+  templateUrl: './rili.component.html',
+  styleUrls: ['./rili.component.scss'],
+  standalone: true,
+  imports: [IonContent, IonHeader, IonTitle, IonToolbar, IonButton, IonInput, IonItem, IonList, IonIcon, IonContent, IonHeader, IonTitle, IonToolbar, IonButton, IonLabel, IonLabel, IonList, IonItem, IonBackButton, IonButtons, IonIcon, IonItemDivider, IonAvatar, IonThumbnail, IonItemOptions, IonItemSliding, IonItemOption, IonItemOptions, IonInput, IonCheckbox, IonRadio, IonToggle, IonRadioGroup, IonSearchbar, IonSegment, IonSegmentButton, IonDatetime, IonFooter, IonCardContent, IonCardTitle, IonCardHeader, IonCard, IonCol, IonRow, IonGrid, IonChip, IonImg, CommonModule, IonPicker]
+})
+export class RiliComponent implements OnInit {
+  curYear: number;
+  curMonth: number;
+  week: string[] = ['一', '二', '三', '四', '五', '六', '日'];
+  firstDays: number[] = [];
+  curDays: number[] = [];
+  nextDaysArray: number[] = [];
+  selectedDate: number | null = null;
+
+  pickerColumns: any[] = [];
+  pickerButtons: any[] = [];
+  checkedDates: string[] = [
+
+  ];
+  selectTime: string = ""//选中元素的时间按照“2024-12-20”格式
+
+  async loadDates() {
+    let currentUser = new CloudUser();
+    const cloudQuery = new CloudQuery("fitUser");
+    cloudQuery.equalTo("user", currentUser.toPointer());
+    const userData = await cloudQuery.find();
+    console.log("userData::", userData[0].data.checkeddays);
+    this.checkedDates = userData[0].data.checkeddays
+
+  }
+
+  @Input() value2: string = ""; // 接收父组件传递的值
+  @Output() ionChange2 = new EventEmitter<string>(); // 输出事件
+  // async fetchWeatherData() {
+  //   try {
+  //     this.weatherData = await this.weatherService.getWeatherData(); // 提取 data 字段
+  //     console.log('天气数据:', this.weatherData); // 打印天气数据
+  //   } catch (error) {
+  //     console.error('获取天气数据失败:', error);
+  //     alert('无法获取天气数据，请检查网络连接或API状态。');
+  //   }
+  // }
+  weather: any = [
+  ];
+  fetchWeatherData() {
+    // 第一个请求，获取 adcode
+    const apiUrl = '/api/api/weather/city/101240101';
+    this.http.get(apiUrl)
+      .subscribe((response: any) => {
+        const adcode = response; // 获取 adcode 字段
+        if (adcode) {
+          this.weather = adcode.data.forecast
+          console.log(this.weather);
+          console.log("adcode", adcode);
+
+
+          // 使用 adcode 获取天气信息
+        } else {
+          console.error('adcode not found in response:', response);
+        }
+      }, error => {
+        console.error('Error fetching adcode:', error);
+      });
+  }
+
+  //转化成拼音
+  convertToPinyin(text: string): string {
+    const result = pinyin(text, {
+      toneType: 'none', // 不带声调
+      type: 'array', // 返回拼音数组
+    });
+    return result.join(''); // 将拼音数组转换为字符串
+  }
+  getWeatherType(year: number, month: number, day: number): string {
+    // 格式化日期为 "YYYY-MM-DD"
+    const dateStr = `${year}-${month < 10 ? '0' + month : month}-${day < 10 ? '0' + day : day}`;
+
+    // 查找对应的天气数据
+    const weatherData = this.weather.find((item: { ymd: string; }) => item.ymd === dateStr);
+
+    // 如果找到天气数据，返回类型，否则返回空字符串
+    return weatherData ? "assets/durian/" + this.convertToPinyin(weatherData.type) + ".png" : '';
+  }
+
+
+
+  constructor(private pickerCtrl: PickerController, private http: HttpClient) {
+    const today = new Date();
+    this.curYear = today.getFullYear();
+    this.curMonth = today.getMonth() + 1; // 当前月，0-11
+    this.selectedDate = today.getDate(); // 选中当天的日期
+    this.updateCalendar();
+    this.initializePicker();
+    this.loadDates()
+  }
+
+  ngOnInit() {
+    this.fetchWeatherData();
+  }
+  daka() {
+    //打卡，点击之后，被选中的日期元素背景色被标为绿色
+    if (this.checkedDates.includes(this.selectTime)) {
+      console.log("之前就有记录");
+      return
+
+    }
+    this.checkedDates.push(this.selectTime)
+    console.log(this.checkedDates);
+
+  }
+  initializePicker() {
+    this.pickerColumns = [
+      {
+        name: 'year',
+        options: this.createYearOptions(),
+      },
+      {
+        name: 'month',
+        options: this.createMonthOptions(),
+      },
+    ];
+
+    this.pickerButtons = [
+      {
+        text: '取消',
+        role: 'cancel',
+      },
+      {
+        text: '确定',
+        handler: (value: { year: { value: number; }; month: { value: number; }; }) => {
+          this.curYear = value.year.value;
+          this.curMonth = value.month.value;
+          this.updateCalendar();
+        },
+      },
+    ];
+  }
+
+  updateCalendar() {
+    const firstDay = this.getFirstDayOfMonth(this.curYear, this.curMonth);
+    const daysInMonth = this.getDaysInMonth(this.curYear, this.curMonth);
+
+    this.firstDays = this.createArray(firstDay === 0 ? 6 : firstDay - 1);
+    this.curDays = this.createArray(daysInMonth);
+    this.nextDaysArray = this.createArray(7 - this.getLastDayOfMonth(this.curYear, this.curMonth));
+  }
+
+  preMonth() {
+    this.curMonth--;
+    if (this.curMonth < 1) {
+      this.curYear--;
+      this.curMonth = 12;
+    }
+    this.updateCalendar();
+  }
+
+  nextMonth() {
+    this.curMonth++;
+    if (this.curMonth > 12) {
+      this.curYear++;
+      this.curMonth = 1;
+    }
+    this.updateCalendar();
+  }
+  formatDate(year: number, month: number, day: number): string {
+    return `${year}-${month < 10 ? '0' + month : month}-${day < 10 ? '0' + day : day}`;
+  }
+  selectDate(day: number) {
+    this.selectedDate = day; // 选中日期
+    this.selectTime = `${this.curYear}-${this.curMonth < 10 ? '0' + this.curMonth : this.curMonth}-${day < 10 ? '0' + day : day}`; // 格式化时间
+    console.log("组件运作", this.selectTime);
+    this.ionChange2.emit(this.selectTime);
+  }
+
+  tolast(item: number) {
+    this.nextMonth();
+    this.selectedDate = item; // 选中日期
+  }
+
+  topre(item: number) {
+    this.preMonth();
+    this.selectedDate = item; // 选中日期
+  }
+
+  async openPicker() {
+    const picker = await this.pickerCtrl.create({
+      columns: this.pickerColumns,
+      buttons: this.pickerButtons,
+    });
+    await picker.present();
+  }
+
+  createArray(n: number): number[] {
+    return Array.from({ length: n }, (_, index) => index + 1); // 从1开始
+  }
+
+  getDaysInMonth(year: number, month: number): number {
+    return new Date(year, month, 0).getDate();
+  }
+
+  getFirstDayOfMonth(year: number, month: number): number {
+    return new Date(year, month - 1, 1).getDay(); // 注意：月份是0-11
+  }
+
+  getLastDayOfMonth(year: number, month: number): number {
+    return new Date(year, month, 0).getDay(); // 获取当月最后一天是星期几
+  }
+
+  createYearOptions() {
+    const currentYear = new Date().getFullYear();
+    const years = [];
+    for (let i = currentYear - 10; i <= currentYear + 10; i++) {
+      years.push({ text: `${i}`, value: i });
+    }
+    return years;
+  }
+
+  createMonthOptions() {
+    const months = [];
+    for (let i = 1; i <= 12; i++) {
+      months.push({ text: `${i}`, value: i });
+    }
+    return months;
+  }
+}

TFPower-app/src/app/tab2/tab2.page.html

@@ -49,7 +49,7 @@
             </div>
           </ion-card-content>
         </ion-card>
-
+        <app-tianqi></app-tianqi>
         <ion-card>
           <ion-card-header>
             <ion-card-title>打卡区域</ion-card-title>
@@ -59,8 +59,7 @@
             </div>
           </ion-card-header>
           <ion-card-content>
-            <ion-datetime [value]="realDate.toISOString()" (ionChange)="onDateChange($event)">
-            </ion-datetime>
+            <app-rili (ionChange2)="onDateChange2($event)"></app-rili>
             <div class="card-info">
               <ion-button [disabled]="getButtonState(realDate).isDisabled"
                 (click)="getButtonState(realDate).buttonText === '补签' ? handleMakeupClick() : markAttendance()"
@@ -95,33 +94,7 @@
     </ng-template>
 
 
-    <ion-card>
-      <!-- 未登录 -->
-      @if(!currentUser?.id){
-      <ion-card-header>
-        <ion-card-title>请登录</ion-card-title>
-        <ion-card-subtitle>暂无信息</ion-card-subtitle>
-      </ion-card-header>
-      }
-      <!-- 未登录 -->
-      @if(currentUser?.id){
-      <ion-card-header>
-        <ion-card-title>{{currentUser?.get("username")}} {{currentUser?.get("realname")}}</ion-card-title>
-        <ion-card-subtitle>性别:{{currentUser?.get("gender")||"-"}} 年龄:{{currentUser?.get("age")||"-"}}
-        </ion-card-subtitle>
-      </ion-card-header>
-      }
-      <ion-card-content>
-        @if(!currentUser?.id){
-        <ion-button expand="block" (click)="signup()">注册</ion-button>
-        <ion-button expand="block" (click)="login()">登录</ion-button>
-        }
-        @if(currentUser?.id){
-        <ion-button expand="block" (click)="editUser()">编辑资料</ion-button>
-        <ion-button expand="block" (click)="logout()" color="light">登出</ion-button>
-        }
-      </ion-card-content>
-    </ion-card>
+
 
   </div>
 
@@ -145,15 +118,15 @@
               <ion-col size="2.5" class="grid-header">项目3</ion-col>
               <ion-col size="2.5" class="grid-header">项目4</ion-col>
             </ion-row>
-
-            <!-- 绑定计划数据 -->
+          </ion-grid>
+          <!-- 绑定计划数据 -->
+          <ion-list>
             <ion-row *ngFor="let day of planList">
               <ion-item-sliding>
                 <ion-item>
                   <!-- 显示计划内容 -->
                   <ion-col size="1" class="plan-column">{{ day.get('date') }}</ion-col>
                   <ion-col size="1" class="plan-column">{{ day.get('trainingPart') }}</ion-col>
-                  <!-- 显示每个训练项目，确保即使为空也占位 -->
                   <ion-col size="2.5" *ngFor="let task of day.get('trainingItems'); let i = index" class="plan-column">
                     <div class="task-container">
                       <span class="task-item">{{ task.item || '' }}</span>
@@ -168,10 +141,11 @@
                   <ion-item-option class="delete-btn" color="danger" shape="round" (click)="deletePlan(day)">删除
                   </ion-item-option>
                 </ion-item-options>
-
               </ion-item-sliding>
             </ion-row>
-          </ion-grid>
+          </ion-list>
+
+
         </div>
       </ion-card>
       <ion-card-subtitle>
@@ -207,8 +181,7 @@
         </div>
         <!-- 右侧图片部分 -->
         <div>
-          <img src="../../assets/images/action5.png" style="height: 100px; display: flex; justify-content: flex-end;"
-            alt="">
+          <img src="assets/images/action5.png" style="height: 100px; display: flex; justify-content: flex-end;" alt="">
         </div>
       </div>
 
@@ -301,8 +274,7 @@
 
         <!-- 右侧图片部分 -->
         <div>
-          <img src="../../assets/images/battle1.png" style="height: 100px; display: flex; justify-content: flex-end;"
-            alt="">
+          <img src="assets/images/battle1.png" style="height: 100px; display: flex; justify-content: flex-end;" alt="">
         </div>
       </div>
       <ion-card *ngIf="healthTaskVisible">

TFPower-app/src/app/tab2/tab2.page.scss

@@ -222,7 +222,7 @@ ion-content {
   --border-style: solid;
   --border-width: 1px;
   --box-shadow: 0 2px 6px 0 rgb(0, 0, 0, 0.25);
-  --ripple-color: deeppink;
+  --ripple-color: rgb(206, 178, 193);
   --padding-top: 10px;
   --padding-bottom: 10px;
 }

TFPower-app/src/app/tab2/tab2.page.ts

@@ -19,6 +19,9 @@ import { AlertController } from '@ionic/angular';
 import { openUserEditModal } from 'src/lib/user/modal-user-edit/modal-user-edit.component';
 import { openUserLoginModal } from 'src/lib/user/modal-user-login/modal-user-login.component';
 import { TestPageComponent } from './test-page/test-page.component';
+import { TianqiComponent } from '../tianqi/tianqi.component';
+import { RiliComponent } from '../rili/rili.component';
+
 @Component({
   selector: 'app-tab2',
   templateUrl: 'tab2.page.html',
@@ -57,6 +60,8 @@ import { TestPageComponent } from './test-page/test-page.component';
     IonItemOption,
     IonItemSliding,
     IonItemOptions,
+    TianqiComponent,
+    RiliComponent
   ]
 })
 export class Tab2Page implements OnInit {
@@ -76,7 +81,6 @@ export class Tab2Page implements OnInit {
     this.loadPlanList()
     this.loadCoachList()
     this.loadPlanUser()
-
   }
   async loadPlanList() {
     let currentUser = new CloudUser();
@@ -84,7 +88,7 @@ export class Tab2Page implements OnInit {
     if (currentUser) {
       cloudQuery.equalTo("user", currentUser.toPointer());
       this.planList = await cloudQuery.find();
-      console.log(this.planList)
+      console.log("计划为:", this.planList)
       //排序算法
       this.planList.sort((a, b) => {
         const srcIdA = a.get("srcId").match(/\d+/);
@@ -121,7 +125,10 @@ export class Tab2Page implements OnInit {
     });
     toast.present();
   }
-
+  onDateChange2(event: any) {
+    console.log(event);
+    this.realDate = new Date(event);
+  }
   // 计算 BMI
   calculateBMI(height: number, weight: number): number {
     const heightInMeters = height / 100;
@@ -166,10 +173,9 @@ export class Tab2Page implements OnInit {
             this.checkInHistory.add(date);
           });
         }
-        // 安全地获取数据，使用默认值来防止 null 或 undefined 错误
         this.days = user.get("days") || 0;
         this.consecutiveDays = user.get("sucdays") || 0;
-        this.power = user.get("power") || 0;  // 假设 power 默认是 0
+        this.power = user.get("power") || 0;
       } else {
         console.warn('No user data found');
       }
@@ -277,10 +283,27 @@ export class Tab2Page implements OnInit {
     }
   }
 
-  // 补签操作
   async handleMakeupSignIn(user: CloudUser): Promise<string> {
+    // 如果用户有足够的动力值
     if (user.get("power") >= this.powerForMakup) {
+      const currentDate = this.realDate;
+      const formattedDate = this.formatDate(currentDate);
+
+      // 将补签日期添加到已打卡的日期集合
+      if (!this.checkInHistory.has(formattedDate)) {
+        this.checkInHistory.add(formattedDate);
+        this.days = this.checkInHistory.size;
+        this.calculateConsecutiveDays();
+      }
       user.set({ "power": user.get("power") - this.powerForMakup });
+      let checkedDays = user.get("checkeddays") || [];
+      if (!checkedDays.includes(formattedDate)) {
+        checkedDays.push(formattedDate); // 添加补签日期
+        user.set({ "checkeddays": checkedDays });
+      }
+      user.set({ "days": this.days });
+      user.set({ "sucdays": this.consecutiveDays });
+
       await user.save();
       return '补签成功！';
     } else {
@@ -290,7 +313,7 @@ export class Tab2Page implements OnInit {
 
   // 补签点击事件
   async handleMakeupClick() {
-    const confirmed = window.confirm('补签将消耗 ' + this.powerForMakup + ' 动能，确定补签吗？');
+    const confirmed = window.confirm('补签将消耗 ' + this.powerForMakup + ' 动能，且连续打卡天数清零！确定补签吗？');
     if (confirmed) {
       let currentUser = new CloudUser();
       const cloudQuery = new CloudQuery("fitUser");

TFPower-app/src/app/tab2/test-page/test-page.component.html

@@ -109,16 +109,15 @@
               <ion-row>
                 <!-- 左侧按钮 -->
                 <ion-col size="6">
-                  <ion-button *ngIf="planReady" expand="full" (click)="confirmPlan()" shape="round" class="confirm-btn">
-                    <ion-icon name="checkmark-circle-outline"></ion-icon>确认计划
+                  <ion-button *ngIf="planReady" expand="full" color="light" shape="round" (click)="discardPlan()"
+                    class="discard-btn">
+                    <ion-icon name="close-circle-outline"></ion-icon>放弃计划
                   </ion-button>
                 </ion-col>
-
                 <!-- 右侧按钮 -->
                 <ion-col size="6">
-                  <ion-button *ngIf="planReady" expand="full" color="light" shape="round" (click)="discardPlan()"
-                    class="discard-btn">
-                    <ion-icon name="close-circle-outline"></ion-icon>放弃计划
+                  <ion-button *ngIf="planReady" expand="full" (click)="confirmPlan()" shape="round" class="confirm-btn">
+                    <ion-icon name="checkmark-circle-outline"></ion-icon>确认计划
                   </ion-button>
                 </ion-col>
               </ion-row>

TFPower-app/src/app/tianqi/tianqi.component.html

@@ -0,0 +1,22 @@
+<div class="box1" style="position: relative;width: 90%;margin: auto;">
+  <div class="box2">
+    <div>
+      <span id="crtp" class="span1" style="display: block;">{{weather?.data?.forecast[0].type}}</span>
+      <span id="interval_tp" style="display: block;" class="span2">{{juti}}</span>
+      <span id="interval_tp" style="display: block;" class="span2">湿度:{{weather?.data?.shidu}}</span>
+      <span id="interval_tp" style="display: block;" class="span2">空气质量:{{weather?.data?.quality}}</span>
+    </div>
+    <span class="span3">
+      <i class="layui-icon layui-icon-location" style="color:#65B0FF">{{weather?.cityInfo?.city}}</i><span
+        id="coordinate"></span>
+    </span>
+  </div>
+  <div class="box3">
+    <span id="crdate" class="span4">{{time}}</span>
+    <div class="box4">
+      <img [src]="image">
+    </div>
+    <span id="weekday" class="span5"
+      style="display: flex;text-align: right;">{{weather?.data?.forecast[0].notice}}</span>
+  </div>
+</div>

TFPower-app/src/app/tianqi/tianqi.component.scss

@@ -0,0 +1,112 @@
+body {
+    background-color: aqua;
+}
+ 
+img {
+    max-width: 72px;
+    height: auto;
+}
+ 
+* {
+    box-sizing: border-box;
+    border-width: 0;
+    border-style: solid;
+    border-color: #e5e7eb;
+}
+
+.box1 {
+    margin: auto;
+    margin-top: 20px;
+    box-shadow: rgba(50, 50, 93, 0.25) 0px 2px 5px -1px, rgba(0, 0, 0, 0.3) 0px 1px 3px -1px;
+    display: flex;
+    position: relative;
+    width: 90%;
+    margin-right: 1.5rem;
+    background-color: white;
+    border-radius: 15px;
+    justify-content: space-between;
+    padding: 1.5rem;
+}
+ 
+.box2 {
+    display: flex;
+    flex-direction: column;
+    align-items: flex-start;
+    justify-content: space-between;
+}
+ 
+.box3 {
+    display: flex;
+    flex-direction: column;
+    align-items: flex-end;
+}
+ 
+.box4 {
+    position: relative;
+    width: 72px;
+    margin-bottom: 0.75rem;
+}
+ 
+.span1 {
+    display: block;
+    font-size: 1.875rem;
+    line-height: 2.25rem;
+    margin-bottom: 0.25rem;
+    font-weight: 600;
+}
+ 
+.span2 {
+    --tw-text-opacity: 1;
+    color: rgb(102 102 102 / var(--tw-text-opacity));
+    font-size: 0.875rem;
+    line-height: 1.25rem;
+}
+ 
+.span3 {
+    display: flex;
+    align-items: center;
+}
+ 
+.span4 {
+    --tw-text-opacity: 1;
+    color: rgb(102 102 102 / var(--tw-text-opacity));
+    font-size: 0.875rem;
+    line-height: 1.25rem;
+    margin-bottom: 10px;
+}
+ 
+.span4 {
+    --tw-text-opacity: 1;
+    color: rgb(102 102 102 / var(--tw-text-opacity));
+    font-size: 0.875rem;
+    line-height: 1.25rem;
+}
+
+ion-button {
+    --background: #000;
+    --background-hover: #9ce0be;
+    --background-activated: #88f4be;
+    --background-focused: #88f4be;
+  
+    --color: #ecc422;
+  
+    --border-radius: 15px;
+    --border-color: #000;
+    --border-style: solid;
+    --border-width: 1px;
+  
+    --box-shadow: 0 2px 6px 0 rgb(0, 0, 0, 0.25);
+  
+    --ripple-color: deeppink;
+  
+    --padding-top: 10px;
+    --padding-bottom: 10px;
+  }
+
+
+
+
+
+
+
+

TFPower-app/src/app/tianqi/tianqi.component.spec.ts

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

TFPower-app/src/app/tianqi/tianqi.component.ts

@@ -0,0 +1,88 @@
+import { CommonModule } from '@angular/common';
+import { HttpClient } from '@angular/common/http';
+import { Component, OnInit } from '@angular/core';
+import { pinyin } from 'pinyin-pro';
+import { addIcons } from 'ionicons';
+import { checkmark } from 'ionicons/icons';
+addIcons({ checkmark })
+@Component({
+  selector: 'app-tianqi',
+  templateUrl: './tianqi.component.html',
+  styleUrls: ['./tianqi.component.scss'],
+  standalone: true,
+  imports: [CommonModule]
+})
+export class TianqiComponent implements OnInit {
+
+  time: string = "";
+  yulu: string = "";
+
+  juti: string = "";
+  loading: HTMLIonLoadingElement | null = null;
+  weather: any = [
+  ];
+
+  async fetchWeatherData() {
+    // 第一个请求，获取 adcode
+    const apiUrl = '/api/api/weather/city/101240101';
+    try {
+      const response: any = await this.http.get(apiUrl).toPromise(); // 使用 toPromise()
+      const adcode = response; // 获取 adcode 字段
+      if (adcode) {
+        this.weather = adcode; // 赋值给 weather
+        console.log(this.weather);
+      } else {
+        console.error('adcode not found in response:', response);
+      }
+    } catch (error) {
+      console.error('Error fetching adcode:', error);
+    }
+  }
+  image: string = ""
+  constructor(private http: HttpClient) {
+    this.fetchWeatherData().then(() => {
+      const dateMap = ["周天", "周一", "周二", "周三", "周四", "周五", "周六"];
+      const weekdayMap = ["零", "一", "两", "三", "四", "五"];
+      const date = new Date();
+      this.time = date.getMonth() + 1 + "-" + date.getDate() + " " + dateMap[date.getDay()];
+      if (date.getDay() === 6 || date.getDay() === 0) {
+        this.yulu = "好好享受周末吧~";
+      } else {
+        this.yulu = "再坚持" + weekdayMap[(6 - date.getDay())] + "天就到周末啦~";
+      }
+      console.log("weather.cityInfo:::", this.weather); // 这里打印的 weather 应该不再是空的
+      const weather_log = this.weather.data.forecast[0].type;
+      const daytemp = this.weather.data.forecast[0].high;
+      const nighttemp = this.weather.data.forecast[0].low;
+
+      console.log("nighttemp", nighttemp);
+
+      this.juti = nighttemp + daytemp
+      console.log(this.juti);
+      this.image = "assets/durian/" + this.convertToPinyin(this.weather?.data?.forecast[0].type) + ".png"
+    });
+  }
+  convertToPinyin(text: string): string {
+    const result = pinyin(text, {
+      toneType: 'none', // 不带声调
+      type: 'array', // 返回拼音数组
+    });
+    return result.join(''); // 将拼音数组转换为字符串
+  }
+
+
+  ngOnInit() {
+
+
+
+
+
+  }
+  public gptre: string = "";
+  public progress = 0;
+  public Complete = false
+
+
+
+
+}

TFPower-app/src/lib/ncloud.ts

@@ -29,7 +29,7 @@ export class CloudObject {
 
     async save() {
         let method = "POST";
-        let url = `http://dev.fmode.cn:1337/parse/classes/${this.className}`;
+        let url = `https://dev.fmode.cn/parse/classes/${this.className}`;
 
         // 更新
         if (this.id) {
@@ -61,7 +61,7 @@ export class CloudObject {
 
     async destroy() {
         if (!this.id) return;
-        const response = await fetch(`http://dev.fmode.cn:1337/parse/classes/${this.className}/${this.id}`, {
+        const response = await fetch(`https://dev.fmode.cn/parse/classes/${this.className}/${this.id}`, {
             headers: {
                 "x-parse-application-id": "dev"
             },
@@ -120,7 +120,7 @@ export class CloudQuery {
     }
 
     async get(id: string) {
-        const url = `http://dev.fmode.cn:1337/parse/classes/${this.className}/${id}?`;
+        const url = `https://dev.fmode.cn/parse/classes/${this.className}/${id}?`;
 
         const response = await fetch(url, {
             headers: {
@@ -138,7 +138,7 @@ export class CloudQuery {
     }
 
     async find() {
-        let url = `http://dev.fmode.cn:1337/parse/classes/${this.className}?`;
+        let url = `https://dev.fmode.cn/parse/classes/${this.className}?`;
 
         let queryStr = ``
         Object.keys(this.queryParams).forEach(key => {
@@ -174,7 +174,7 @@ export class CloudQuery {
     }
 
     async first() {
-        let url = `http://dev.fmode.cn:1337/parse/classes/${this.className}?`;
+        let url = `https://dev.fmode.cn/parse/classes/${this.className}?`;
 
         if (Object.keys(this.queryParams["where"]).length) {
             const whereStr = JSON.stringify(this.queryParams["where"]);
@@ -234,7 +234,7 @@ export class CloudUser extends CloudObject {
             return null;
         }
         return this;
-        // const response = await fetch(`http://dev.fmode.cn:1337/parse/users/me`, {
+        // const response = await fetch(`https://dev.fmode.cn/parse/users/me`, {
         //     headers: {
         //         "x-parse-application-id": "dev",
         //         "x-parse-session-token": this.sessionToken // 使用sessionToken进行身份验证
@@ -252,7 +252,7 @@ export class CloudUser extends CloudObject {
 
     /** 登录 */
     async login(username: string, password: string): Promise<CloudUser | null> {
-        const response = await fetch(`http://dev.fmode.cn:1337/parse/login`, {
+        const response = await fetch(`https://dev.fmode.cn/parse/login`, {
             headers: {
                 "x-parse-application-id": "dev",
                 "Content-Type": "application/json"
@@ -284,7 +284,7 @@ export class CloudUser extends CloudObject {
             return;
         }
 
-        const response = await fetch(`http://dev.fmode.cn:1337/parse/logout`, {
+        const response = await fetch(`https://dev.fmode.cn/parse/logout`, {
             headers: {
                 "x-parse-application-id": "dev",
                 "x-parse-session-token": this.sessionToken
@@ -314,7 +314,7 @@ export class CloudUser extends CloudObject {
             ...additionalData // 合并额外的用户数据
         };
 
-        const response = await fetch(`http://dev.fmode.cn:1337/parse/users`, {
+        const response = await fetch(`https://dev.fmode.cn/parse/users`, {
             headers: {
                 "x-parse-application-id": "dev",
                 "Content-Type": "application/json"
@@ -341,7 +341,7 @@ export class CloudUser extends CloudObject {
 
     override async save() {
         let method = "POST";
-        let url = `http://dev.fmode.cn:1337/parse/users`;
+        let url = `https://dev.fmode.cn/parse/users`;
 
         // 更新用户信息
         if (this.id) {

TFPower-app/src/proxy.config.json

@@ -0,0 +1,11 @@
+{
+    "/api": {
+        "target": "http://t.weather.sojson.com/",
+        "secure": false,
+        "logLevel": "debug",
+        "changeOrigin": true,
+        "pathRewrite": {
+            "^/api": ""
+        }
+    }
+}

TFPower-server/lib/ncloud.js

@@ -1,105 +1,105 @@
 
 
-class CloudObject{
+class CloudObject {
     id
     className
     data = {}
-    constructor(className){
+    constructor(className) {
         this.className = className
     }
-    toPointer(){
-        return {"__type":"Pointer","className":this.className,"objectId":this.id}
+    toPointer() {
+        return { "__type": "Pointer", "className": this.className, "objectId": this.id }
     }
-    set(json){
-        Object.keys(json).forEach(key=>{
-            if(["objectId","id","createdAt","updatedAt","ACL"].indexOf(key)>-1){
+    set(json) {
+        Object.keys(json).forEach(key => {
+            if (["objectId", "id", "createdAt", "updatedAt", "ACL"].indexOf(key) > -1) {
                 return
             }
             this.data[key] = json[key]
         })
     }
-    get(key){
+    get(key) {
         return this.data[key] || null
     }
-    async save(){
+    async save() {
         let method = "POST"
-        let url = "http://dev.fmode.cn:1337/parse/classes/" + this.className
+        let url = "https://dev.fmode.cn/parse/classes/" + this.className
         // 更新
-        if(this.id){
-            url += "/"+this.id
+        if (this.id) {
+            url += "/" + this.id
             method = "PUT"
-        } 
+        }
         let body = JSON.stringify(this.data)
         let response = await fetch(url, {
             "headers": {
-              "content-type": "application/json;charset=UTF-8",
-              "x-parse-application-id": "dev"
+                "content-type": "application/json;charset=UTF-8",
+                "x-parse-application-id": "dev"
             },
             "body": body,
             "method": method,
             "mode": "cors",
             "credentials": "omit"
-          });
-          let result = await response?.json();
-          if(result?.error){
+        });
+        let result = await response?.json();
+        if (result?.error) {
             console.error(result?.error)
-          }
-          if(result?.objectId){this.id = result?.objectId}
-          return this
+        }
+        if (result?.objectId) { this.id = result?.objectId }
+        return this
     }
-    async destory(){
-        if(!this.id) return
-        let response = await fetch("http://dev.fmode.cn:1337/parse/classes/Doctor/"+this.id, {
+    async destory() {
+        if (!this.id) return
+        let response = await fetch("https://dev.fmode.cn/parse/classes/Doctor/" + this.id, {
             "headers": {
-              "x-parse-application-id": "dev"
+                "x-parse-application-id": "dev"
             },
             "body": null,
             "method": "DELETE",
             "mode": "cors",
             "credentials": "omit"
-          });
-          let result = await response?.json();
-          if(result){
+        });
+        let result = await response?.json();
+        if (result) {
             this.id = null
         }
         return true
     }
 }
 
-class CloudQuery{
+class CloudQuery {
     className
-    constructor(className){
+    constructor(className) {
         this.className = className
     }
 
     whereOptions = {}
-    greaterThan(key,value){
-        if(!this.whereOptions[key]) this.whereOptions[key] = {}
+    greaterThan(key, value) {
+        if (!this.whereOptions[key]) this.whereOptions[key] = {}
         this.whereOptions[key]["$gt"] = value
     }
-    greaterThanAndEqualTo(key,value){
-        if(!this.whereOptions[key]) this.whereOptions[key] = {}
+    greaterThanAndEqualTo(key, value) {
+        if (!this.whereOptions[key]) this.whereOptions[key] = {}
         this.whereOptions[key]["$gte"] = value
     }
-    lessThan(key,value){
-        if(!this.whereOptions[key]) this.whereOptions[key] = {}
+    lessThan(key, value) {
+        if (!this.whereOptions[key]) this.whereOptions[key] = {}
         this.whereOptions[key]["$lt"] = value
     }
-    lessThanAndEqualTo(key,value){
-        if(!this.whereOptions[key]) this.whereOptions[key] = {}
+    lessThanAndEqualTo(key, value) {
+        if (!this.whereOptions[key]) this.whereOptions[key] = {}
         this.whereOptions[key]["$lte"] = value
     }
-    equalTo(key,value){
+    equalTo(key, value) {
         this.whereOptions[key] = value
     }
 
-    async get(id){
-        let url = "http://dev.fmode.cn:1337/parse/classes/"+this.className+"/"+id+"?"
+    async get(id) {
+        let url = "https://dev.fmode.cn/parse/classes/" + this.className + "/" + id + "?"
 
         let response = await fetch(url, {
             "headers": {
-            "if-none-match": "W/\"1f0-ghxH2EwTk6Blz0g89ivf2adBDKY\"",
-            "x-parse-application-id": "dev"
+                "if-none-match": "W/\"1f0-ghxH2EwTk6Blz0g89ivf2adBDKY\"",
+                "x-parse-application-id": "dev"
             },
             "body": null,
             "method": "GET",
@@ -109,18 +109,18 @@ class CloudQuery{
         let json = await response?.json();
         return json || {}
     }
-    async find(){
-        let url = "http://dev.fmode.cn:1337/parse/classes/"+this.className+"?"
-        
-        if(Object.keys(this.whereOptions)?.length){
+    async find() {
+        let url = "https://dev.fmode.cn/parse/classes/" + this.className + "?"
+
+        if (Object.keys(this.whereOptions)?.length) {
             let whereStr = JSON.stringify(this.whereOptions)
             url += `where=${whereStr}`
         }
 
         let response = await fetch(url, {
             "headers": {
-            "if-none-match": "W/\"1f0-ghxH2EwTk6Blz0g89ivf2adBDKY\"",
-            "x-parse-application-id": "dev"
+                "if-none-match": "W/\"1f0-ghxH2EwTk6Blz0g89ivf2adBDKY\"",
+                "x-parse-application-id": "dev"
             },
             "body": null,
             "method": "GET",
@@ -130,18 +130,18 @@ class CloudQuery{
         let json = await response?.json();
         return json?.results || []
     }
-    async first(){
-        let url = "http://dev.fmode.cn:1337/parse/classes/"+this.className+"?"
-        
-        if(Object.keys(this.whereOptions)?.length){
+    async first() {
+        let url = "https://dev.fmode.cn/parse/classes/" + this.className + "?"
+
+        if (Object.keys(this.whereOptions)?.length) {
             let whereStr = JSON.stringify(this.whereOptions)
             url += `where=${whereStr}`
         }
 
         let response = await fetch(url, {
             "headers": {
-            "if-none-match": "W/\"1f0-ghxH2EwTk6Blz0g89ivf2adBDKY\"",
-            "x-parse-application-id": "dev"
+                "if-none-match": "W/\"1f0-ghxH2EwTk6Blz0g89ivf2adBDKY\"",
+                "x-parse-application-id": "dev"
             },
             "body": null,
             "method": "GET",
@@ -150,7 +150,7 @@ class CloudQuery{
         });
         let json = await response?.json();
         let exists = json?.results?.[0] || null
-        if(exists){
+        if (exists) {
             let existsObject = new CloudObject(this.className)
             existsObject.set(exists)
             existsObject.id = exists.objectId