Skip to content

F
feelver
Commit 4dee3d82 by Mobile : Jetrin Phuekkaew (N'new)
Options

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

# Conflicts:
#	lib/main.dart
parents d9ab39cf facc6447
Showing with 498 additions and 260 deletions
lib/main.dart
......@@ -19,7 +19,13 @@ class MyApp extends StatelessWidget {
primarySwatch: Colors.blue,
),
// home: AccountSettingPage(),
<<<<<<< HEAD
home: MainShop(),
=======
// home: OtherMenuPage(),
home: MainShop(),
// home: service_tab(),
>>>>>>> facc6447c0f3c38afad557fe3ab0af7590a20bff
// home: SplashScreenPage(),
);
}
......
lib/ui/my_service/my_service_tab.dart
import 'package:feelverapp/ui/my_service/service_paid.dart';
import 'package:feelverapp/ui/my_service/service_ready.dart';
import 'package:feelverapp/ui/my_service/service_success.dart';
import 'package:feelverapp/ui/my_service/service_ticket.dart';
import 'package:feelverapp/util/SizeConfig.dart';
import 'package:flutter/material.dart';
import 'my_ticket.dart';
class service_tab extends StatefulWidget {
@override
......@@ -66,61 +69,61 @@ class _service_tabState extends State<service_tab> with SingleTickerProviderStat
indicatorColor: Colors.transparent,
controller: controller,
tabs: [
Container(
child: new Tab(
icon: Icon(Icons.assignment,
new Tab(
// icon: Icon(Icons.assignment,
icon: Icon(Icons.system_update,
color: controller.index == 0
? Colors.yellowAccent: Colors.white),
child:Text(
'ข้อมูลร้าน',
'การจอง',
style: TextStyle(
color: controller.index == 0
? Colors.yellowAccent: Colors.white,
fontSize: 11
),
textAlign: TextAlign.center,
),
),
),
new Tab(
icon: Icon(Icons.loyalty,
icon: Icon(Icons.check_circle,
color: controller.index == 1
? Colors.yellowAccent: Colors.white),
child:Text(
'บริการ',
'บริการที่พร้อมใช้งาน',
style: TextStyle(
color: controller.index == 1
? Colors.yellowAccent: Colors.white,
fontSize: 11
),
textAlign: TextAlign.center,
),
),
new Tab(
icon: Icon(Icons.star,
icon: Icon(Icons.credit_card,
color: controller.index == 2
? Colors.yellowAccent: Colors.white),
child:Text(
'รีวิว',
'บริการที่ต้องชำระ',
style: TextStyle(
color: controller.index == 2
? Colors.yellowAccent: Colors.white,
fontSize: 11
),
textAlign: TextAlign.center,
),
),
Container(
width: 200,
child: Tab(
icon: Icon(Icons.pin_drop,
icon: Icon(Icons.thumb_up,
color: controller.index == 3
? Colors.yellowAccent: Colors.white),
child:
Text(
'สถานที่ใกล้เคียง',maxLines: 1,
'บริการที่แล้วเสร็จ',maxLines: 1,
style: TextStyle(
color: controller.index == 3
? Colors.yellowAccent: Colors.white,
......@@ -147,23 +150,11 @@ class _service_tabState extends State<service_tab> with SingleTickerProviderStat
///onWillPop: onWillPop,
child: getTabBarView(<Widget>[
myTicketPage(),
ServiceTicketPage(),
ServiceReadyPage(),
ServicePaidPage(),
ServiceSuccessPage(),
Container(
width: double.infinity,
height: double.infinity,
color: Colors.green,
),
Container(
width: double.infinity,
height: double.infinity,
color: Colors.yellow,
),
Container(
width: double.infinity,
height: double.infinity,
color: Colors.blue,
),
]),
......
lib/ui/my_service/service_paid.dart 0 → 100644
import 'package:feelverapp/util/SizeConfig.dart';
import 'package:flutter/material.dart';
class ServicePaidPage extends StatefulWidget {
@override
_ServicePaidPageState createState() => _ServicePaidPageState();
}
class _ServicePaidPageState extends State<ServicePaidPage> {
@override
Widget build(BuildContext context) {
SizeConfig(context);
return Container(
child: ListView(
children: <Widget>[
myCard(),
],
),
);
}
Widget myCard(){
return Card(
margin: EdgeInsets.only(right: SizeConfig.getPadding(16),left: SizeConfig.getPadding(16),top: SizeConfig.getPadding(20),bottom: SizeConfig.getPadding(10)),
child: Container(
margin: EdgeInsets.only(right: 15,left: 15,bottom: 20,top: 20),
// color: Colors.yellow,
child: Column(
children: <Widget>[
Row(
children: <Widget>[
Expanded(
flex: 3,
child: Container(
// color: Colors.blue,
height: SizeConfig.getHeight(200),
child: Image.asset("assets/images/demo_img.png",
fit: BoxFit.cover,),
),
),
Expanded(
flex: 5,
child: Container(
margin: EdgeInsets.only(left: 15),
// color: Colors.yellow,
height: SizeConfig.getHeight(200),
child: Column(
children: <Widget>[
Container(
padding: EdgeInsets.all(10),
alignment: Alignment.topLeft,
// color: Colors.red,
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Text("Thai Body Balance",style: TextStyle(
color: Colors.black,
fontSize: SizeConfig.getFontSize(12),
fontFamily: "SF_Pro_Text",
fontWeight: FontWeight.w500),),
SizedBox(
height: 5,
),
Text("SPA Cenvaree @ Centara Grand CentralWorld Bangkok",style: TextStyle(
color: Color(0xff969696),
fontSize: SizeConfig.getFontSize(11),
fontFamily: "SF_Pro_Text",
fontWeight: FontWeight.w500),),
],
),
),
Container(
padding: EdgeInsets.only(left: 10,right: 10),
alignment: Alignment.topLeft,
// color: Colors.blue,
child: Column(
mainAxisAlignment: MainAxisAlignment.start,
children: <Widget>[
Row(
crossAxisAlignment: CrossAxisAlignment.center,
children: <Widget>[
Icon(Icons.access_time,color: Color(0xffEEAFB7),),
SizedBox(
width: 5,
),
Text("150 Min",style: TextStyle(
color: Colors.black,
fontSize: SizeConfig.getFontSize(13),
fontFamily: "SF_Pro_Text",
),),
],
),
SizedBox(
height: 10,
),
Row(
crossAxisAlignment: CrossAxisAlignment.end,
children: <Widget>[
Text("฿599.0",style: TextStyle(fontSize: SizeConfig.getFontSize(12),decoration: TextDecoration.lineThrough,),),
SizedBox(
width: 15,
),
Text("฿199.00",style: TextStyle(
color: Colors.red,
fontSize: SizeConfig.getFontSize(18),
fontFamily: "SF_Pro_Text",
fontWeight: FontWeight.w500),),
],
),
],
),
),
Expanded(
child: Container(
// color: Colors.blue,
padding: EdgeInsets.only(left: 10,right: 10,top: 10,bottom: 10),
alignment: Alignment.bottomLeft,
child: Text("ราคาพิเศษนี้ได้รับ \nเมื่อชำระเงินออนไลน์",style: TextStyle(
color: Color(0xff6AB3AA),
fontSize: SizeConfig.getFontSize(14),
fontFamily: "SF_Pro_Text",
fontWeight: FontWeight.w500),),
),
),
],
),
),
),
],
),
Container(
width: double.infinity,
padding: EdgeInsets.only(bottom: SizeConfig.getPadding(10),top: SizeConfig.getPadding(20),left: 0,right: 0),
height: SizeConfig.getHeight(80),
// color: Colors.blue,
child: RaisedButton(
shape: new RoundedRectangleBorder(
borderRadius: new BorderRadius.circular(180.0)),
child: Text(
"Payment",
style: TextStyle(
color: Colors.white,
fontSize: SizeConfig.getFontSize(16),
fontFamily: "SF_Pro_Text",
fontWeight: FontWeight.w500),
),
color: Color(0xffE8A6B4),
onPressed: () {
}
),
),
],
)
),
);
}
}
lib/ui/my_service/my_ticket.dart → lib/ui/my_service/service_ticket.dart
import 'package:feelverapp/util/SizeConfig.dart';
import 'package:flutter/material.dart';
class myTicketPage extends StatefulWidget {
class ServiceTicketPage extends StatefulWidget {
@override
_myTicketPageState createState() => _myTicketPageState();
_ServiceTicketPageState createState() => _ServiceTicketPageState();
}
class _myTicketPageState extends State<myTicketPage> {
class _ServiceTicketPageState extends State<ServiceTicketPage> {
@override
Widget build(BuildContext context) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment