Skip to content

F
feelver
Commit 18a3224b by Mobile : Art
Options

update

parent 0722bbc6
Showing with 98 additions and 232 deletions
ios/Flutter/.last_build_id
eba39b331d7b395476ba8953e31f8092 65bf9efbfad64e1b5e4b50eeaed8247f
\ No newline at end of file \ No newline at end of file
lib/ui/home/home.dart
...@@ -3,6 +3,7 @@ import 'package:feelverapp/ui/home/home_presenter.dart'; ...@@ -3,6 +3,7 @@ import 'package:feelverapp/ui/home/home_presenter.dart';
import 'package:feelverapp/ui/login/login.dart'; import 'package:feelverapp/ui/login/login.dart';
import 'package:feelverapp/ui/menu/menu.dart'; import 'package:feelverapp/ui/menu/menu.dart';
import 'package:feelverapp/ui/nearme/near_me_list.dart'; import 'package:feelverapp/ui/nearme/near_me_list.dart';
import 'package:feelverapp/ui/payment/payment_detail.dart';
import 'package:feelverapp/ui/reserve/reserve_list.dart'; import 'package:feelverapp/ui/reserve/reserve_list.dart';
import 'package:feelverapp/ui/shop/shop_list.dart'; import 'package:feelverapp/ui/shop/shop_list.dart';
import 'package:feelverapp/util/Accout_util.dart'; import 'package:feelverapp/util/Accout_util.dart';
...@@ -130,10 +131,10 @@ class _HomePageState extends State<HomePage> with TickerProviderStateMixin { ...@@ -130,10 +131,10 @@ class _HomePageState extends State<HomePage> with TickerProviderStateMixin {
height: SizeConfig.getWidth(24), height: SizeConfig.getWidth(24),
), ),
onPressed: () { onPressed: () {
// Navigator.push( Navigator.push(
// context, context,
// MaterialPageRoute(builder: (context) => LoginPage()), MaterialPageRoute(builder: (context) => Paymentdetail()),
// ); );
}, },
), ),
Text( Text(
......
lib/ui/payment/payment_detail.dart
...@@ -26,173 +26,86 @@ class _PaymentdetailState extends State<Paymentdetail> { ...@@ -26,173 +26,86 @@ class _PaymentdetailState extends State<Paymentdetail> {
} }
Widget containt() { Widget containt() {
return Expanded( List<String> litems = ["1", "2", "Third", "4"];
child: SingleChildScrollView(
padding: EdgeInsets.only(
left: SizeConfig.getPadding(10),
right: SizeConfig.getPadding(10),
top: SizeConfig.getPadding(8),
bottom: SizeConfig.getPadding(8),
),
child: Container(
alignment: FractionalOffset.topLeft,
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Text(
'สั่งซื้อสำเร็จ',
style: TextStyle(
fontSize: SizeConfig.getFontSize(16),
fontWeight: FontWeight.bold),
),
Text(
'รายละเอียดการสั่งซื้อ',
style: TextStyle(
fontSize: SizeConfig.getFontSize(16),
),
),
Divider(
color: Colors.black,
height: 40,
),
list1(),
list2(),
],
),
),
),
);
}
Widget list1() { return Expanded(
return Container( child: Container(
child: Column( alignment: Alignment.topLeft,
children: <Widget>[ padding: EdgeInsets.only(
Row( left: SizeConfig.getPadding(24),
children: <Widget>[ right: SizeConfig.getPadding(24),
Text( top: SizeConfig.getPadding(12),
'Order : 9S284-11506', bottom: SizeConfig.getPadding(24)),
style: TextStyle( child: Column(crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
'สั่งซื้อสำเร็จ',
style: TextStyle(
color: Colors.black, color: Colors.black,
fontSize: SizeConfig.getFontSize(16), fontSize: SizeConfig.getFontSize(16),
fontWeight: FontWeight.bold, fontFamily: "SF_Pro_Text",
), fontWeight: FontWeight.w700),
), ),
Text(
Spacer(), 'รายละเอียดการสั่งซื้อ',
Text( style: TextStyle(
'23.02.2020 08:57',
style: TextStyle(
color: Colors.black, color: Colors.black,
fontSize: SizeConfig.getFontSize(16), fontSize: SizeConfig.getFontSize(16),
), fontFamily: "SF_Pro_Text",
), fontWeight: FontWeight.w500),
], ),
), SizedBox(
SizedBox( height: SizeConfig.getHeight(16),
height: SizeConfig.getHeight(15), ),
), Expanded(
Row( child: ListView.builder(
children: <Widget>[ itemCount: 5,
Image.asset( itemBuilder: (BuildContext ctxt, int index) {
'assets/images/demo_img.png', return list1('title');
height: SizeConfig.getPadding(90), },
width: SizeConfig.getPadding(80),
fit: BoxFit.cover,
),
Expanded(
child: Container(
// color: Colors.green,
padding: EdgeInsets.only(left: SizeConfig.getPadding(8),),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Text(
'Ivory Relax and Spa',
style: TextStyle(
fontSize: SizeConfig.getFontSize(16),
fontFamily: "SF_Pro_Text",
fontWeight: FontWeight.bold,
color: Colors.black,
),
),
SizedBox(
height: SizeConfig.getHeight(12),
),
Text(
'นวดแผนไทย',
style: TextStyle(
fontSize: SizeConfig.getFontSize(16),
fontFamily: "SF_Pro_Text",
color: Colors.black,
),
),
SizedBox(
height: SizeConfig.getHeight(15),
),
Row(
children: <Widget>[
Text(
'฿1,200.00',
style: TextStyle(
fontSize: SizeConfig.getFontSize(20),
color: Color(0xFFFD2956),
fontFamily: "SF_Pro_Text",
fontWeight: FontWeight.bold,
),
),
Spacer(),
Text(
'X1',
style: TextStyle(
color: Color(0xFF9D9D9D),
fontSize: SizeConfig.getFontSize(20),
),
),
],
),
],
),
),
), ),
], )
), ],
Divider( ),
color: Colors.black,
height: 40,
),
],
), ),
); );
} }
Widget list2() { list1(String title) {
return Container( return Container(
padding: EdgeInsets.only(top: SizeConfig.getPadding(6),bottom: SizeConfig.getPadding(16)),
child: Column( child: Column(
children: <Widget>[ children: <Widget>[
Divider(
color: Colors.black,
height: SizeConfig.getHeight(16),
),
SizedBox(
height: SizeConfig.getHeight(16),
),
Row( Row(
children: <Widget>[ children: <Widget>[
Text( Text(
'Order : 9S284-11506', 'Order : 9S284-11506',
style: TextStyle( style: TextStyle(
color: Colors.black, color: Colors.black,
fontSize: SizeConfig.getFontSize(16), fontSize: SizeConfig.getFontSize(16),
fontWeight: FontWeight.bold, fontFamily: "SF_Pro_Text",
), fontWeight: FontWeight.w700),
), ),
Spacer(), Spacer(),
Text( Text(
'23.02.2020 08:57', '23.02.2020 08:57',
style: TextStyle( style: TextStyle(
color: Colors.black, color: Colors.black54,
fontSize: SizeConfig.getFontSize(16), fontSize: SizeConfig.getFontSize(16),
), fontFamily: "SF_Pro_Text",
fontWeight: FontWeight.w500),
), ),
], ],
), ),
SizedBox( SizedBox(
height: SizeConfig.getHeight(15), height: SizeConfig.getHeight(16),
), ),
Row( Row(
children: <Widget>[ children: <Widget>[
...@@ -205,29 +118,30 @@ class _PaymentdetailState extends State<Paymentdetail> { ...@@ -205,29 +118,30 @@ class _PaymentdetailState extends State<Paymentdetail> {
Expanded( Expanded(
child: Container( child: Container(
// color: Colors.green, // color: Colors.green,
padding: EdgeInsets.only(left: SizeConfig.getPadding(8),), padding: EdgeInsets.only(
left: SizeConfig.getPadding(8),
),
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
Text( Text(
'Sunshine Spa & Massage', 'Ivory Relax and Spa',
style: TextStyle( style: TextStyle(
fontSize: SizeConfig.getFontSize(16), color: Colors.black,
fontFamily: "SF_Pro_Text", fontSize: SizeConfig.getFontSize(16),
fontWeight: FontWeight.bold, fontFamily: "SF_Pro_Text",
color: Colors.black, fontWeight: FontWeight.w700),
),
), ),
SizedBox( SizedBox(
height: SizeConfig.getHeight(12), height: SizeConfig.getHeight(12),
), ),
Text( Text(
'Footology', 'นวดแผนไทย',
style: TextStyle( style: TextStyle(
fontSize: SizeConfig.getFontSize(16), color: Colors.black,
fontFamily: "SF_Pro_Text", fontSize: SizeConfig.getFontSize(16),
color: Colors.black, fontFamily: "SF_Pro_Text",
), fontWeight: FontWeight.w500),
), ),
SizedBox( SizedBox(
height: SizeConfig.getHeight(15), height: SizeConfig.getHeight(15),
...@@ -235,17 +149,17 @@ class _PaymentdetailState extends State<Paymentdetail> { ...@@ -235,17 +149,17 @@ class _PaymentdetailState extends State<Paymentdetail> {
Row( Row(
children: <Widget>[ children: <Widget>[
Text( Text(
'฿1,000.00', '฿1,200.00',
style: TextStyle( style: TextStyle(
fontSize: SizeConfig.getFontSize(20), fontSize: SizeConfig.getFontSize(20),
color: Color(0xFFFD2956), color: Color(0xFFFD2956),
fontFamily: "SF_Pro_Text", fontFamily: "SF_Pro_Text",
fontWeight: FontWeight.bold, fontWeight: FontWeight.w700,
), ),
), ),
Spacer(), Spacer(),
Text( Text(
'X1', 'x1',
style: TextStyle( style: TextStyle(
color: Color(0xFF9D9D9D), color: Color(0xFF9D9D9D),
fontSize: SizeConfig.getFontSize(20), fontSize: SizeConfig.getFontSize(20),
...@@ -259,16 +173,15 @@ class _PaymentdetailState extends State<Paymentdetail> { ...@@ -259,16 +173,15 @@ class _PaymentdetailState extends State<Paymentdetail> {
), ),
], ],
), ),
Divider( // Divider(
color: Colors.black, // color: Colors.black,
height: 40, // height: 40,
), // ),
], ],
), ),
); );
} }
Widget header() { Widget header() {
return Container( return Container(
child: Stack( child: Stack(
......
lib/ui/reserve/reserve_date_time.dart
...@@ -5,7 +5,7 @@ import 'package:flutter/material.dart'; ...@@ -5,7 +5,7 @@ import 'package:flutter/material.dart';
import 'package:flutter_datetime_picker/flutter_datetime_picker.dart'; import 'package:flutter_datetime_picker/flutter_datetime_picker.dart';
class ReserveDateTime extends StatefulWidget { class ReserveDateTime extends StatefulWidget {
String bith = 'ปี / เดือน / วัน'; String bith = 'ปี / เดือน / วัน / เวลาเข้าใช้บริการ';
DateTime day; DateTime day;
@override @override
...@@ -247,7 +247,7 @@ class _ReserveDateTimeState extends State<ReserveDateTime> { ...@@ -247,7 +247,7 @@ class _ReserveDateTimeState extends State<ReserveDateTime> {
), ),
Container( Container(
width: MediaQuery.of(context).size.width / 1, width: MediaQuery.of(context).size.width / 1,
margin: EdgeInsets.only( margin: EdgeInsets.only(top: SizeConfig.getPadding(16),
left: SizeConfig.getPadding(24), left: SizeConfig.getPadding(24),
right: SizeConfig.getPadding(24)), right: SizeConfig.getPadding(24)),
child: Card( child: Card(
...@@ -266,7 +266,7 @@ class _ReserveDateTimeState extends State<ReserveDateTime> { ...@@ -266,7 +266,7 @@ class _ReserveDateTimeState extends State<ReserveDateTime> {
setState(() { setState(() {
widget.day = date; widget.day = date;
widget.bith = widget.bith =
"${widget.day.year}-${widget.day.month}-${widget.day.day} เวลา ${widget.day.timeZoneOffset.inHours.toString()}"; "${widget.day.year}-${widget.day.month}-${widget.day.day} เวลา ${widget.day.hour} : ${widget.day.minute}";
print( print(
'${widget.day.year} / ${widget.day.month} / ${widget.day.day}'); '${widget.day.year} / ${widget.day.month} / ${widget.day.day}');
print(widget.bith); print(widget.bith);
...@@ -274,75 +274,27 @@ class _ReserveDateTimeState extends State<ReserveDateTime> { ...@@ -274,75 +274,27 @@ class _ReserveDateTimeState extends State<ReserveDateTime> {
print('confirm $date'); print('confirm $date');
}, currentTime: DateTime.now(), locale: LocaleType.th); }, currentTime: DateTime.now(), locale: LocaleType.th);
}, },
// { child: widget.bith == 'ปี / เดือน / วัน / เวลาเข้าใช้บริการ'
// DatePicker.showDatePicker(context,
// showTitleActions: true,
// minTime: DateTime(1980, 3, 5),
// maxTime: DateTime(2025, 6, 7), onChanged: (date) {
// print('change $date');
// }, onConfirm: (date) {
// setState(() {
// widget.day = date;
// widget.bith =
// "${widget.day.year}-${widget.day.month}-${widget.day.day}";
//
// print(
// '${widget.day.year} / ${widget.day.month} / ${widget.day.day}');
// print(widget.bith);
// });
// }, currentTime: DateTime.now(), locale: LocaleType.th);
// },
child: widget.bith == 'ปี / เดือน / วัน'
? Text( ? Text(
'ปี / เดือน / วัน', 'ปี / เดือน / วัน / เวลาเข้าใช้บริการ',
style: TextStyle(color: Colors.black), style: TextStyle(
) color: Colors.black,
fontSize: SizeConfig.getFontSize(16),
fontFamily: "SF_Pro_Text",
fontWeight: FontWeight.w500),
)
: Text( : Text(
'${widget.bith}', '${widget.bith}',
style: TextStyle(color: Colors.black), style: TextStyle(
), color: Colors.black,
), fontSize: SizeConfig.getFontSize(16),
), fontFamily: "SF_Pro_Text",
), fontWeight: FontWeight.w500),
Container( )
alignment: Alignment.topLeft,
padding: EdgeInsets.only(
left: SizeConfig.getPadding(30),
top: SizeConfig.getPadding(16)),
child: Text(
'ระบุเวลาที่เข้าใช้บริการ',
style: TextStyle(
color: Colors.black,
fontSize: SizeConfig.getFontSize(20),
fontFamily: "SF_Pro_Text",
fontWeight: FontWeight.w500),
),
),
Padding(
padding: EdgeInsets.symmetric(
vertical: SizeConfig.getPadding(8.0),
horizontal: SizeConfig.getPadding(24)),
child: Card(
shape: RoundedRectangleBorder(
borderRadius:
BorderRadius.circular(SizeConfig.getPadding(50.0)),
),
child: TextFormField(
// controller: loginBloc.passCtrl,
// validator: loginBloc.validateField,
decoration: InputDecoration(
contentPadding: EdgeInsets.symmetric(
vertical: SizeConfig.getPadding(20),
horizontal: SizeConfig.getPadding(16),
),
// hintText:
// allTranslations.text(key2: 'password', key: 'login'),
border: OutlineInputBorder(borderSide: BorderSide.none),
),
obscureText: true,
), ),
), ),
), ),
SizedBox( SizedBox(
height: SizeConfig.getWidth(30), height: SizeConfig.getWidth(30),
), ),
......
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