Merge branch 'develop' of https://gitlab.2fellows.com/art/feelver into develop

lib/main.dart

 import 'package:feelverapp/ui/account_setting/account_setting_page.dart';
+import 'package:feelverapp/ui/booking/bookingflow.dart';
+import 'package:feelverapp/ui/my_order_status/my_order_status.dart';
 import 'package:feelverapp/ui/my_reviews/my_reviews_page.dart';
 import 'package:feelverapp/ui/my_service/my_service_tab.dart';
+import 'package:feelverapp/ui/my_service/service_paid.dart';
+import 'package:feelverapp/ui/my_service/service_ticket.dart';
 import 'package:feelverapp/ui/notification/notification_page.dart';
 import 'package:feelverapp/ui/other_menu/other_menu_page.dart';
+import 'package:feelverapp/ui/payment/mycart.dart';
+import 'package:feelverapp/ui/payment/payment_detail.dart';
+import 'package:feelverapp/ui/payment/payment_page.dart';
+import 'package:feelverapp/ui/shop/shop.dart';
 import 'package:feelverapp/ui/shop/shop_Nearby_places.dart';
+import 'package:feelverapp/ui/shop/shop_list_detail.dart';
 import 'package:feelverapp/ui/shop/shop_main.dart';
 import 'package:flutter/material.dart';
 import 'ui/splashscreen/splash_screen_page.dart';

lib/ui/shop/shop_main.dart

+import 'package:feelverapp/ui/shop/shop.dart';
 import 'package:feelverapp/ui/shop/shop_Nearby_places.dart';
 import 'package:feelverapp/ui/shop/shop_reviews.dart';
 import 'package:feelverapp/ui/shop/shop_service.dart';
@@ -71,7 +72,9 @@ class _MainShopState extends State<MainShop>  with SingleTickerProviderStateMixi
           icon: Icon(Icons.arrow_back_ios, color: Colors.white),
           onPressed: () => Navigator.of(context).pop(),
         ),
-              title: Text("Thai Body Balance"),
+              title: Center(child:Text("Thai Body Balance",style:TextStyle(
+                        color:Colors.white,
+                        fontSize: 25)),),
               floating: true,
               pinned: false,
               snap: true,
@@ -150,8 +153,7 @@ class _MainShopState extends State<MainShop>  with SingleTickerProviderStateMixi
               controller: _controller,
               children: <Widget>[
                 Container(
-                  color: Colors.deepPurpleAccent,
-                  height: 50,
+                  child:Shop()
                   // child: getlist(),
                   //width: 20,
                 ),