添加菜单

android/app/src/main/AndroidManifest.xml

@@ -7,7 +7,7 @@
          FlutterApplication and put your custom class here. -->
     <application
         android:name="io.flutter.app.FlutterApplication"
-        android:label="fooddeliveryapp"
+        android:label="海底捞点餐"
         android:icon="@mipmap/ic_launcher">
         <activity
             android:name=".MainActivity"

lib/main.dart

@@ -1,15 +1,15 @@
 import 'package:flutter/material.dart';
+import 'package:fooddeliveryapp/model/tableDetail.dart';
 import 'package:fooddeliveryapp/pages/cart.dart';
 import 'package:fooddeliveryapp/pages/check_out.dart';
-import 'package:fooddeliveryapp/pages/login.dart';
-import 'package:fooddeliveryapp/model/tableDetail.dart';
+import 'package:fooddeliveryapp/pages/login_page.dart';
 import 'package:fooddeliveryapp/pages/table.dart';
 import 'package:provider/provider.dart';
 
-import 'pages/Staff.dart';
-import 'pages/welcome_page.dart';
 import 'model/table.dart';
 import 'model/user.dart';
+import 'pages/Staff.dart';
+import 'pages/welcome_page.dart';
 
 void main() => runApp(MyApp());
 
@@ -47,7 +47,8 @@ class MyApp extends StatelessWidget {
           //结账页面
           CheckOut.routeName: (context) => CheckOut()
         },
-        title: '点餐软件demo',
+        debugShowCheckedModeBanner: false,
+        title: '点餐App',
         theme: ThemeData(
           primarySwatch: Colors.red,
         ),

lib/model/product.dart

@@ -131,4 +131,4 @@ List<Product> products = [
 ];
 
 String dummyText =
-    "Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since. When an unknown printer took a galley.";
+    "菜品很好吃，本店特色美食。";

lib/pages/Staff.dart

@@ -31,7 +31,7 @@ class _StaffInfoState extends State<StaffInfoPage> {
                 ),
                 Padding(
                   padding: const EdgeInsets.all(8.0),
-                  child: Text("员工姓名:" + "谭武略"),
+                  child: Text("员工姓名:" + "xx学生"),
                 ),
                 Padding(
                   padding: const EdgeInsets.all(8.0),

lib/pages/details/components/product_title_with_image copy.dart

@@ -1,62 +0,0 @@
-import 'package:flutter/material.dart';
-import '../../../constants.dart';
-import 'package:fooddeliveryapp/model/product.dart';
-
-class ProductTitleWithImage extends StatelessWidget {
-  const ProductTitleWithImage({
-    Key key,
-    @required this.product,
-  }) : super(key: key);
-
-  final Product product;
-
-  @override
-  Widget build(BuildContext context) {
-    return Padding(
-      padding: const EdgeInsets.symmetric(horizontal: kDefaultPaddin),
-      child: Column(
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: <Widget>[
-          Text(
-            "Aristocratic Hand Bag",
-            style: TextStyle(color: Colors.white),
-          ),
-          Text(
-            product.title,
-            style: Theme.of(context)
-                .textTheme
-                .headline4
-                .copyWith(color: Colors.white, fontWeight: FontWeight.bold),
-          ),
-          SizedBox(height: kDefaultPaddin),
-          Row(
-            children: <Widget>[
-              RichText(
-                text: TextSpan(
-                  children: [
-                    TextSpan(text: "Price\n"),
-                    TextSpan(
-                      text: "\$${product.price}",
-                      style: Theme.of(context).textTheme.headline4.copyWith(
-                          color: Colors.white, fontWeight: FontWeight.bold),
-                    ),
-                  ],
-                ),
-              ),
-              SizedBox(width: kDefaultPaddin),
-              Expanded(
-                child: Hero(
-                  tag: "${product.id}",
-                  child: Image.asset(
-                    product.image,
-                    fit: BoxFit.fill,
-                  ),
-                ),
-              )
-            ],
-          )
-        ],
-      ),
-    );
-  }
-}

lib/pages/details/components/product_title_with_image.dart

@@ -18,7 +18,7 @@ class ProductTitleWithImage extends StatelessWidget {
         crossAxisAlignment: CrossAxisAlignment.start,
         children: <Widget>[
           Text(
-            "最最美味的菜品来自口之福",
+            "最最美味的菜品来自海底捞",
             style: TextStyle(color: Colors.white),
           ),
           Text(
@@ -34,9 +34,9 @@ class ProductTitleWithImage extends StatelessWidget {
               RichText(
                 text: TextSpan(
                   children: [
-                    TextSpan(text: "Price\n"),
+                    TextSpan(text: "价格\n"),
                     TextSpan(
-                      text: "\$${product.price}",
+                      text: "${product.price}元",
                       style: Theme.of(context).textTheme.headline4.copyWith(
                           color: Colors.white, fontWeight: FontWeight.bold),
                     ),

lib/pages/login.dart → lib/pages/login_page.dart

@@ -2,8 +2,8 @@ import 'package:flutter/material.dart';
 import 'package:fluttertoast/fluttertoast.dart';
 import 'package:provider/provider.dart';
 
-import 'welcome_page.dart';
 import '../model/user.dart';
+import 'welcome_page.dart';
 
 class LoginPage extends StatefulWidget {
   static const routeName = "/";
@@ -38,8 +38,8 @@ class _LoginPageState extends State<LoginPage> {
     return Scaffold(
       appBar: AppBar(
         leading: Icon(Icons.settings),
-        title: Text("STAFF LOGIN"),
-        backgroundColor: Colors.amber,
+        title: Text("员工登录"),
+        backgroundColor: Colors.green,
         elevation: 0,
       ),
       body: SingleChildScrollView(
@@ -65,7 +65,7 @@ class _LoginPageState extends State<LoginPage> {
     return Container(
       width: width,
       height: height,
-      color: Colors.amber,
+      color: Colors.green,
       child: Stack(
         overflow: Overflow.visible, // 超出部分显示
         children: <Widget>[
@@ -233,7 +233,7 @@ class _LoginPageState extends State<LoginPage> {
           }
         },
         child: Text("登录"),
-        color: Colors.amber,
+        color: Colors.green,
         textColor: Colors.white,
         shape: RoundedRectangleBorder(
           borderRadius: BorderRadius.all(Radius.circular(20.0)),

lib/pages/order/components/item-card.dart

@@ -5,6 +5,7 @@ import 'package:fooddeliveryapp/model/product.dart';
 class ItemCard extends StatelessWidget {
   final Product product;
   final Function press;
+
   const ItemCard({
     Key key,
     this.product,
@@ -44,7 +45,7 @@ class ItemCard extends StatelessWidget {
             ),
           ),
           Text(
-            "\$${product.price}",
+            "${product.price}元",
             style: TextStyle(fontWeight: FontWeight.bold),
           )
         ],

lib/pages/order/order_home_screen.dart

@@ -1,13 +1,14 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/svg.dart';
+import 'package:fooddeliveryapp/constants.dart';
 import 'package:fooddeliveryapp/model/product.dart';
 import 'package:fooddeliveryapp/pages/cart.dart';
-import 'package:fooddeliveryapp/constants.dart';
 import 'package:fooddeliveryapp/pages/order/components/body.dart';
 
 class HomeSrcreen extends StatelessWidget {
   static const routeName = '/order';
   final int index;
+
   //构造函数 同时传入桌号
   HomeSrcreen({Key key, @required this.index}) : super(key: key);
 
@@ -29,7 +30,7 @@ class HomeSrcreen extends StatelessWidget {
       title: Padding(
         padding: const EdgeInsets.symmetric(horizontal: kDefaultPaddin),
         child: Text(
-          "口之福火锅",
+          "海底捞火锅",
           style: Theme.of(context)
               .textTheme
               .headline5
@@ -41,14 +42,14 @@ class HomeSrcreen extends StatelessWidget {
         onPressed: () {},
       ),
       actions: <Widget>[
-        IconButton(
-          icon: SvgPicture.asset(
-            "assets/icons/search.svg",
-            // By default our  icon color is white
-            color: kTextColor,
-          ),
-          onPressed: () {},
-        ),
+        // IconButton(
+        //   icon: SvgPicture.asset(
+        //     "assets/icons/search.svg",
+        //     // By default our  icon color is white
+        //     color: kTextColor,
+        //   ),
+        //   onPressed: () {},
+        // ),
         IconButton(
           icon: SvgPicture.asset(
             "assets/icons/cart.svg",
@@ -71,7 +72,7 @@ List<MyTab> getMyTabs() {
     MyTab(
       Tab(
         child: Text(
-          "功夫锅底",
+          "锅底",
           style: TextStyle(color: Colors.black),
         ),
       ),
@@ -82,7 +83,7 @@ List<MyTab> getMyTabs() {
     MyTab(
       Tab(
         child: Text(
-          "飘香卤味",
+          "荤菜",
           style: TextStyle(color: Colors.black),
         ),
       ),
@@ -92,7 +93,37 @@ List<MyTab> getMyTabs() {
     MyTab(
       Tab(
         child: Text(
-          "安心肉品",
+          "素菜",
+          style: TextStyle(color: Colors.black),
+        ),
+      ),
+      // Icon(Icons.directions_bike, color: Colors.pink, size: 60),
+      Menu(productsList: products2),
+    ),
+    MyTab(
+      Tab(
+        child: Text(
+          "主食",
+          style: TextStyle(color: Colors.black),
+        ),
+      ),
+      // Icon(Icons.directions_bike, color: Colors.pink, size: 60),
+      Menu(productsList: products2),
+    ),
+    MyTab(
+      Tab(
+        child: Text(
+          "酒水",
+          style: TextStyle(color: Colors.black),
+        ),
+      ),
+      // Icon(Icons.directions_bike, color: Colors.pink, size: 60),
+      Menu(productsList: products2),
+    ),
+    MyTab(
+      Tab(
+        child: Text(
+          "调料",
           style: TextStyle(color: Colors.black),
         ),
       ),

lib/pages/welcome_page.dart

@@ -3,7 +3,7 @@ import 'package:fooddeliveryapp/pages/table.dart';
 import 'package:provider/provider.dart';
 
 import 'Staff.dart';
-import 'login.dart';
+import 'login_page.dart';
 import '../model/user.dart';
 
 class WelcomePage extends StatelessWidget {
@@ -14,13 +14,13 @@ class WelcomePage extends StatelessWidget {
     return Scaffold(
       appBar: AppBar(
         automaticallyImplyLeading: false,
-        title: Text("点餐软件首页"),
+        title: Text("点餐App"),
       ),
       body: Consumer<UserStatus>(builder: (context, userStatus, child) {
         return Column(
           children: <Widget>[
             GestureDetector(
-              child: IndexCard("OPEN", "开始自主点餐，并进行结算"),
+              child: IndexCard("顾客", "开始自主点餐，并进行结算"),
               onTap: () {
                 if (userStatus.value)
                   Navigator.pushNamed(context, TablePage.routeName);
@@ -29,7 +29,7 @@ class WelcomePage extends StatelessWidget {
               },
             ),
             GestureDetector(
-                child: IndexCard("STAFF", "设备员工信息"),
+                child: IndexCard("员工", "设备员工信息"),
                 onTap: () {
                   if (userStatus.value)
                     Navigator.pushNamed(context, StaffInfoPage.routeName);