update:login

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

@@ -35,12 +35,9 @@ export class Tab1Page implements OnInit {
   userInfo: any = null; // 用户信息
   responseMsg: string = ""; // 用于存储 AI 生成的饮食建议
   recipeMsg: string = ""; // 用于存储 AI 生成的推荐食谱
-<<<<<<< HEAD
   isLoading: boolean = false; 
-=======
   dishName:string="";//用于存储菜品名
   dishPhoto:string="";
->>>>>>> 30e3263ceeaa56c2a539c16f61e5f80180fab44a
 
   // 存储图片的数组
   images = [

smarteat-app/src/lib/user/modal-user-login/modal-user-login.component.html

@@ -19,11 +19,11 @@
      <ion-input [value]="username" (ionChange)="usernameChange($event)" label="账号" placeholder="请您输入账号/手机号"></ion-input>
    </ion-item>
    <ion-item>
-     <ion-input [value]="password" (ionChange)="passwordChange($event)" label="密码" type="password" value="password"></ion-input>
+     <ion-input [value]="password" (ionChange)="passwordChange($event)" label="密码" placeholder="请输入密码" type="password" value="password"></ion-input>
    </ion-item>
    @if(type=="signup"){
      <ion-item>
-       <ion-input [value]="password2" (ionChange)="password2Change($event)" label="密码二次" type="password" value="password"></ion-input>
+       <ion-input [value]="password2" (ionChange)="password2Change($event)" label="确认密码" placeholder="请再次输入密码" type="password" value="password"></ion-input>
      </ion-item>
    }