Skip to content

F
feelver
Commit 6982ef7b by Mobile : Ball (Apprentice)
Options

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

# Conflicts:
#	lib/main.dart
parents 22f9b54e cebda42f
Showing with 72 additions and 103 deletions
lib/main.dart
......@@ -32,7 +32,9 @@ class MyApp extends StatelessWidget {
),
home: ReviewShopPage()
home: MainShop()
//home: EditProfile(),
......
lib/model/category/category_model.dart
class categoryModel {
List<DATA> dATA;
categoryModel({this.dATA});
categoryModel.fromJson(Map<String, dynamic> json) {
if (json['data'] != null) {
if (json['DATA'] != null) {
dATA = new List<DATA>();
json['DATA'].forEach((v) {
dATA.add(new DATA.fromJson(v));
......@@ -16,7 +15,7 @@ class categoryModel {
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
if (this.dATA != null) {
data['data'] = this.dATA.map((v) => v.toJson()).toList();
data['DATA'] = this.dATA.map((v) => v.toJson()).toList();
}
return data;
}
......@@ -57,40 +56,40 @@ class DATA {
this.visibility});
DATA.fromJson(Map<String, dynamic> json) {
// id = json['id'];
// parentId = json['parent_id'];
id = json['id'];
parentId = json['parent_id'];
name = json['name'];
// code = json['code'];
// displayName = json['display_name'];
// cover = json['cover'];
// detail = json['detail'];
// type = json['type'];
// status = json['status'];
// sortOrder = json['sort_order'];
// storeId = json['store_id'];
// vendorId = json['vendor_id'];
// createdAt = json['created_at'];
// updatedAt = json['updated_at'];
// visibility = json['visibility'];
code = json['code'];
displayName = json['display_name'];
cover = json['cover'];
detail = json['detail'];
type = json['type'];
status = json['status'];
sortOrder = json['sort_order'];
storeId = json['store_id'];
vendorId = json['vendor_id'];
createdAt = json['created_at'];
updatedAt = json['updated_at'];
visibility = json['visibility'];
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
// data['id'] = this.id;
// data['parent_id'] = this.parentId;
data['id'] = this.id;
data['parent_id'] = this.parentId;
data['name'] = this.name;
// data['code'] = this.code;
// data['display_name'] = this.displayName;
// data['cover'] = this.cover;
// data['detail'] = this.detail;
// data['type'] = this.type;
// data['status'] = this.status;
// data['sort_order'] = this.sortOrder;
// data['store_id'] = this.storeId;
// data['vendor_id'] = this.vendorId;
// data['created_at'] = this.createdAt;
// data['updated_at'] = this.updatedAt;
// data['visibility'] = this.visibility;
data['code'] = this.code;
data['display_name'] = this.displayName;
data['cover'] = this.cover;
data['detail'] = this.detail;
data['type'] = this.type;
data['status'] = this.status;
data['sort_order'] = this.sortOrder;
data['store_id'] = this.storeId;
data['vendor_id'] = this.vendorId;
data['created_at'] = this.createdAt;
data['updated_at'] = this.updatedAt;
data['visibility'] = this.visibility;
return data;
}
}
lib/service/api.dart
......@@ -95,12 +95,12 @@ class Api<T> {
var _model;
var _fail;
var result;
print("this is body " + body.toString());
// print("this is body " + body.toString());
// (body as Map)['lang'] = allTranslations.currentLanguage;
await _httpConnection(
"${this._baseApi}/customer/info", this._headerApi, body)
.then((response) {
print("ผลลัพ เท่ากับบบบ " + "${response.body}");
// print("ผลลัพ เท่ากับบบบ " + "${response.body}");
if (response.statusCode == 200) {
_model = GetprofileModel.fromJson(json.decode(response.body));
} else {
......@@ -224,10 +224,10 @@ class Api<T> {
var _model;
var _fail;
var result;
print("Result test ");
await _httpConnection("${this._baseApi}/category", this._headerApi, body)
.then((response) {
print("ผลลัพท์ เท่ากับ55555 " "${response.body}");
print("ผลลัพท์ เท่ากับ " "${response.body}");
if (response.statusCode == 200) {
// Array to Map Json
Map<String, dynamic> myData = arrayToJson(response.body);
......
lib/ui/booking/bookingflow.dart
......@@ -15,7 +15,7 @@ class _BookingFlowState extends State<BookingFlow> {
body: _setupView(),
bottomNavigationBar: Container(
height: SizeConfig.getHeight(100),
color: Color.fromRGBO(106, 179, 170, 1),
color: Color.fromRGBO(69, 85, 79, 1),
child: Stack(
children: <Widget>[
Positioned(
......
lib/ui/booking/bookingform.dart
......@@ -15,12 +15,12 @@ class _BookingFormState extends State<BookingForm> {
return Scaffold(
appBar: AppBar(
title: Text('จอง'),
backgroundColor: Color.fromRGBO(54, 148, 163, 1),
backgroundColor: Color.fromRGBO(69, 85, 79, 1),
),
body: _setupView(),
bottomNavigationBar: Container(
height: SizeConfig.getHeight(100),
color: Color.fromRGBO(106, 179, 170, 1),
color: Color.fromRGBO(69, 85, 79, 1),
child: Stack(
children: <Widget>[
Positioned(
......@@ -103,7 +103,7 @@ class _BookingFormState extends State<BookingForm> {
'ข้อมูลแพ็คเกจที่คุณจอง',
textAlign: TextAlign.left,
style: TextStyle(
color: Color.fromRGBO(54, 148, 163, 1),
color: Color.fromRGBO(69, 85, 79, 1),
fontSize: SizeConfig.getFontSize(14),
fontFamily: "SF_Pro_Text",
fontWeight: FontWeight.w500),
......@@ -573,7 +573,7 @@ class _BookingFormState extends State<BookingForm> {
width: MediaQuery.of(context).size.width,
height: SizeConfig.getHeight(100),
decoration: BoxDecoration(
color: Color.fromRGBO(54, 148, 163, 1),
color: Color.fromRGBO(69, 85, 79, 1),
),
child: Container(
alignment: Alignment.topLeft,
......
lib/ui/home/home.dart
......@@ -37,9 +37,9 @@ class _HomePageState extends State<HomePage> with TickerProviderStateMixin {
// presenter.getid();
presenter.getprofile();
//print("nenwenwenwew"+presenter.CatModel.dATA[0].cover,);
presenter.getSearch();
// presenter.getSearch();
}
@override
......
lib/ui/home/home_presenter.dart
......@@ -56,7 +56,7 @@ class HomePresenter extends BasePresenter<HomePage> {
"lang" : "all",
"access" : "portal",
});
print('$searchCtrl');
print('$searchCtrl');
if (res.fail == null) if (res.success.status) {
......@@ -64,7 +64,8 @@ print('$searchCtrl');
searchhomeModel = res.success;
category_model = res.success;
});
}else{
}
else{
}
......@@ -87,7 +88,7 @@ print('$searchCtrl');
setState(() {
getmodel = res.success;
});
print("Hii" + getmodel.result[0].name);
// print("Hii" + getmodel.result[0].name);
} else {
Alert(
style: AlertStyle(
......
lib/ui/nearme/near_me_list.dart
......@@ -30,7 +30,7 @@ class _NearmeListState extends State<NearmeList> with TickerProviderStateMixin {
Widget build(BuildContext context) {
return Scaffold(
appBar: AppBar(
backgroundColor: Color.fromRGBO(106, 179, 170, 1),
backgroundColor: Color.fromRGBO(69, 85, 79, 1),
elevation: 0,
centerTitle: true,
title: Text(
......@@ -51,7 +51,7 @@ class _NearmeListState extends State<NearmeList> with TickerProviderStateMixin {
children: <Widget>[
Container(
height: SizeConfig.getWidth(110),
color: Color.fromRGBO(106, 179, 170, 1),
color: Color.fromRGBO(69, 85, 79, 1),
child: Container(
padding: EdgeInsets.only(left: SizeConfig.getPadding(24)),
alignment: Alignment.topLeft,
......@@ -69,7 +69,7 @@ class _NearmeListState extends State<NearmeList> with TickerProviderStateMixin {
fontFamily: "SF_Pro_Text",
fontWeight: FontWeight.w500),
),
backgroundColor: Color.fromRGBO(106, 179, 170, 1),
backgroundColor: Color.fromRGBO(69, 85, 79, 1),
shape: StadiumBorder(
side: BorderSide(color: Colors.white),
),
......@@ -89,7 +89,7 @@ class _NearmeListState extends State<NearmeList> with TickerProviderStateMixin {
fontFamily: "SF_Pro_Text",
fontWeight: FontWeight.w500),
),
backgroundColor: Color.fromRGBO(106, 179, 170, 1),
backgroundColor: Color.fromRGBO(69, 85, 79, 1),
shape: StadiumBorder(
side: BorderSide(color: Colors.white),
),
......@@ -106,7 +106,7 @@ class _NearmeListState extends State<NearmeList> with TickerProviderStateMixin {
fontFamily: "SF_Pro_Text",
fontWeight: FontWeight.w500),
),
backgroundColor: Color.fromRGBO(106, 179, 170, 1),
backgroundColor: Color.fromRGBO(69, 85, 79, 1),
shape: StadiumBorder(
side: BorderSide(color: Colors.white),
),
......@@ -123,7 +123,7 @@ class _NearmeListState extends State<NearmeList> with TickerProviderStateMixin {
fontFamily: "SF_Pro_Text",
fontWeight: FontWeight.w500),
),
backgroundColor: Color.fromRGBO(106, 179, 170, 1),
backgroundColor: Color.fromRGBO(69, 85, 79, 1),
shape: StadiumBorder(
side: BorderSide(color: Colors.white),
),
......@@ -140,7 +140,7 @@ class _NearmeListState extends State<NearmeList> with TickerProviderStateMixin {
fontFamily: "SF_Pro_Text",
fontWeight: FontWeight.w500),
),
backgroundColor: Color.fromRGBO(106, 179, 170, 1),
backgroundColor: Color.fromRGBO(69, 85, 79, 1),
shape: StadiumBorder(
side: BorderSide(color: Colors.white),
),
......
lib/ui/reserve/reserve_date_time.dart
......@@ -19,7 +19,7 @@ class _ReserveDateTimeState extends State<ReserveDateTime> {
body: _setupView(),
bottomNavigationBar: Container(
height: SizeConfig.getHeight(100),
color: Color.fromRGBO(106, 179, 170, 1),
color: Color.fromRGBO(69, 85, 79, 1),
child: Stack(
children: <Widget>[
Positioned(
......@@ -125,7 +125,7 @@ class _ReserveDateTimeState extends State<ReserveDateTime> {
'คุณกำลังจอง',
textAlign: TextAlign.left,
style: TextStyle(
color: Color.fromRGBO(106, 179, 170, 1),
color: Color.fromRGBO(69, 85, 79, 1),
fontSize: SizeConfig.getFontSize(14),
fontFamily: "SF_Pro_Text",
fontWeight: FontWeight.w500),
......
lib/ui/reserve/reserve_list.dart
......@@ -17,7 +17,7 @@ class _ReserveListState extends State<ReserveList> {
body: _setupView(),
bottomNavigationBar: Container(
height: SizeConfig.getHeight(100),
color: Color.fromRGBO(106, 179, 170, 1),
color: Color.fromRGBO(69, 85, 79, 1),
child: Stack(
children: <Widget>[
Positioned(
......@@ -123,7 +123,7 @@ class _ReserveListState extends State<ReserveList> {
'คุณกำลังจอง',
textAlign: TextAlign.left,
style: TextStyle(
color: Color.fromRGBO(106, 179, 170, 1),
color: Color.fromRGBO(69, 85, 79, 1),
fontSize: SizeConfig.getFontSize(14),
fontFamily: "SF_Pro_Text",
fontWeight: FontWeight.w500),
......
lib/ui/shop/shop_main.dart
......@@ -151,9 +151,11 @@ class _MainShopState extends State<MainShop> with SingleTickerProviderStateMixi
controller: _controller,
children: <Widget>[
Container(
//service detail//////////////
child:Shop()
// child: getlist(),
//width: 20,
),
Column(
......
pubspec.lock
# Generated by pub
# See https://dart.dev/tools/pub/glossary#lockfile
packages:
archive:
dependency: transitive
description:
name: archive
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.13"
args:
dependency: transitive
description:
name: args
url: "https://pub.dartlang.org"
source: hosted
version: "1.6.0"
async:
dependency: transitive
description:
......@@ -78,6 +64,13 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "1.0.8"
fake_async:
dependency: transitive
description:
name: fake_async
url: "https://pub.dartlang.org"
source: hosted
version: "1.1.0"
file:
dependency: transitive
description:
......@@ -142,13 +135,6 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "3.1.4"
image:
dependency: transitive
description:
name: image
url: "https://pub.dartlang.org"
source: hosted
version: "2.1.12"
image_cropper:
dependency: "direct main"
description:
......@@ -225,7 +211,7 @@ packages:
name: path_provider_platform_interface
url: "https://pub.dartlang.org"
source: hosted
version: "1.0.2"
version: "1.0.3"
pedantic:
dependency: transitive
description:
......@@ -233,13 +219,6 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "1.9.0"
petitparser:
dependency: transitive
description:
name: petitparser
url: "https://pub.dartlang.org"
source: hosted
version: "2.4.0"
platform:
dependency: transitive
description:
......@@ -275,13 +254,6 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "1.4.4"
quiver:
dependency: transitive
description:
name: quiver
url: "https://pub.dartlang.org"
source: hosted
version: "2.1.3"
rflutter_alert:
dependency: "direct main"
description:
......@@ -412,7 +384,7 @@ packages:
name: url_launcher_web
url: "https://pub.dartlang.org"
source: hosted
version: "0.1.2"
version: "0.1.2+1"
vector_math:
dependency: transitive
description:
......@@ -427,13 +399,6 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "0.1.0"
xml:
dependency: transitive
description:
name: xml
url: "https://pub.dartlang.org"
source: hosted
version: "3.6.1"
sdks:
dart: ">=2.9.0-14.0.dev <3.0.0"
flutter: ">=1.12.13+hotfix.5 <2.0.0"
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