diff --git a/src/app/app.component.css b/src/app/app.component.css
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..a4299bec1790b10319c87c807f556d3b7fc5e821 100644
--- a/src/app/app.component.css
+++ b/src/app/app.component.css
@@ -0,0 +1,3 @@
+.btn-space {
+  margin-right: 5px;
+}
diff --git a/src/app/app.component.html b/src/app/app.component.html
index 0f3d9d8b9f8e1a938befbfea5ac8bc11494ea709..d9292d73ce06614208d6abd0a11311094cb9bb17 100644
--- a/src/app/app.component.html
+++ b/src/app/app.component.html
@@ -1,21 +1,42 @@
-<!--The content below is only a placeholder and can be replaced.-->
-<div style="text-align:center">
-  <h1>
-    Welcome to {{ title }}!
-  </h1>
-  <img width="300" alt="Angular Logo" src="data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyNTAgMjUwIj4KICAgIDxwYXRoIGZpbGw9IiNERDAwMzEiIGQ9Ik0xMjUgMzBMMzEuOSA2My4ybDE0LjIgMTIzLjFMMTI1IDIzMGw3OC45LTQzLjcgMTQuMi0xMjMuMXoiIC8+CiAgICA8cGF0aCBmaWxsPSIjQzMwMDJGIiBkPSJNMTI1IDMwdjIyLjItLjFWMjMwbDc4LjktNDMuNyAxNC4yLTEyMy4xTDEyNSAzMHoiIC8+CiAgICA8cGF0aCAgZmlsbD0iI0ZGRkZGRiIgZD0iTTEyNSA1Mi4xTDY2LjggMTgyLjZoMjEuN2wxMS43LTI5LjJoNDkuNGwxMS43IDI5LjJIMTgzTDEyNSA1Mi4xem0xNyA4My4zaC0zNGwxNy00MC45IDE3IDQwLjl6IiAvPgogIDwvc3ZnPg==">
-</div>
-<h2>Here are some links to help you start: </h2>
-<ul>
-  <li>
-    <h2><a target="_blank" rel="noopener" href="https://angular.io/tutorial">Tour of Heroes</a></h2>
-  </li>
-  <li>
-    <h2><a target="_blank" rel="noopener" href="https://angular.io/cli">CLI Documentation</a></h2>
-  </li>
-  <li>
-    <h2><a target="_blank" rel="noopener" href="https://blog.angular.io/">Angular blog</a></h2>
-  </li>
-</ul>
+<form (ngSubmit)="addMessage()">
+<p>
+  單品：<input type="text" name="name" [(ngModel)]="name"><br>
+  單價：<input type="number" name="price" min="1" [(ngModel)]="price"><br>
+  數量：<input type="number" name="quantity" min="1" [(ngModel)]="quantity"><br>
+</p>
+{{message}}
+  <button type="submit" class="btn btn-space">新增項目</button>
+  <button type="reset" ng-click=" remove()">清空所有項目</button>
+</form>
+
+<table border="1" >
+  <tr>
+    <th>動作</th>
+    <th>商品名稱</th>
+    <th>商品價格</th>
+    <th>購買數量</th>
+    <th>小計</th>
+  </tr>
+  <!-- 清單 -->
+  <ng-container *ngFor="let message of messages">
+  <tr>
+    <td><button type="reset">刪除</button></td>
+    <td>{{ message.name }}</td>
+    <td>{{ message.price }}</td>
+    <td>{{ message.quantity }}</td>
+    <td>{{ message.price * message.quantity}}</td>
+  </tr>
+</ng-container>
+  <tr>
+    <td colspan="4" align="right">加總</td>
+    <td></td>
+  </tr>
+</table>
+<!-- <ng-container *ngFor="let message of messages">
+
+<p>商品名稱：{{ message.name }}</p>
+<p>商品價格：{{ message.price }}</p>
+<p>購物數量：{{ message.quantity }}</p>
+<p>小計：{{ message.price * message.quantity}}</p>
+</ng-container> -->
 
-<router-outlet></router-outlet>
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index 0c63d2a7afd9cea43610c31692408277deeda00a..7ff3fd279763541bc1e422340ea444bece30b830 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+import { Message } from './message';
 
 @Component({
   selector: 'app-root',
@@ -6,5 +7,42 @@ import { Component } from '@angular/core';
   styleUrls: ['./app.component.css']
 })
 export class AppComponent {
-  title = 'P2';
+
+  name = '';
+
+  price = '';
+
+  quantity = '';
+
+  messages: Message[] = [];
+
+  addMessage(): void {
+
+ // 防呆，避免名稱或內容是空值時也可以留言
+  if (
+    !this.name.trim() && !this.messages.trim() && !this.quantity.trim()
+  ) {
+    return;
+  }
+
+  // 用名稱跟內容產生一個留言的資料物件
+  const message = new Message(this.name, this.price, this.quantity);
+
+  // 將留言的資料物件放進容器裡
+  this.messages.push(message);
+
+}
+
+  total():void {
+  }
+
+  buildMessage(): void {
+
+  }
+
+  remove(): void {
+    this.messages.remove(new Message);
+  }
+
+
 }
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 2c3ba2995c8510c02ca812f90280146738f162cf..39fb9f35a1dbfa7ef92b37fed5653c6835965ca4 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -4,13 +4,16 @@ import { NgModule } from '@angular/core';
 import { AppRoutingModule } from './app-routing.module';
 import { AppComponent } from './app.component';
 
+import { FormsModule } from '@angular/forms';
+
 @NgModule({
   declarations: [
     AppComponent
   ],
   imports: [
     BrowserModule,
-    AppRoutingModule
+    AppRoutingModule,
+    FormsModule
   ],
   providers: [],
   bootstrap: [AppComponent]
diff --git a/src/app/message.ts b/src/app/message.ts
new file mode 100644
index 0000000000000000000000000000000000000000..6c308270be757b455c303d3992b6358dd85c6f24
--- /dev/null
+++ b/src/app/message.ts
@@ -0,0 +1,15 @@
+export class Message {
+
+  name: string;
+  price: string;
+  quantity: string;
+
+  constructor(name: string, price: string, quantity: string) {
+
+      this.name = name;
+      this.price = price;
+      this.quantity = quantity;
+
+    }
+
+}