update

ios/Flutter/.last_build_id

-65bf9efbfad64e1b5e4b50eeaed8247f
+13553ffa98d5b0aaa390f5899ef7a33e
\ No newline at end of file

lib/main.dart

@@ -32,7 +32,7 @@ class MyApp extends StatelessWidget {
       ),
 
 
- home: SplashScreenPage()
+ home: MainShop()
 
  //home: EditProfile(),
 

lib/model/category/category_model.dart

@@ -5,7 +5,7 @@ class categoryModel {
   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 +16,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 +57,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/ui/booking/booking_detail.dart

@@ -11,10 +11,9 @@ class BookingDetail extends StatefulWidget {
 class _BookingDetailState extends State<BookingDetail> {
   @override
   Widget build(BuildContext context) {
-    return Scaffold(
-      body: _setupView(),
-
-    );
+    return ListView(padding: EdgeInsets.all(0), children: <Widget>[
+      _setupView(),
+    ]);
   }
 
   _setupView() {
@@ -29,20 +28,7 @@ class _BookingDetailState extends State<BookingDetail> {
                 height: SizeConfig.getHeight(450),
                 fit: BoxFit.cover,
               ),
-              Positioned(
-                top: SizeConfig.getPadding(44),
-                left: SizeConfig.getPadding(16),
-                child: InkWell(
-                  onTap: () {
-                    Navigator.pop(context);
-                  },
-                  child: Image.asset(
-                    'assets/images/ic_back.png',
-                    width: SizeConfig.getWidth(20),
-                    height: SizeConfig.getWidth(20),
-                  ),
-                ),
-              ),
+
             ],
           ),
           Container(
@@ -143,11 +129,11 @@ class _BookingDetailState extends State<BookingDetail> {
               SizedBox(
                 width: SizeConfig.getWidth(20),
               ),
-              ImageIcon(
-                AssetImage('assets/images/ic_twitter.png'),
-                color: Colors.grey,
-                size: SizeConfig.getFontSize(24),
-              ),
+//              ImageIcon(
+//                AssetImage('assets/images/ic_twitter.png'),
+//                color: Colors.grey,
+//                size: SizeConfig.getFontSize(24),
+//              ),
             ],
           ),
           SizedBox(

lib/ui/home/home.dart

@@ -36,10 +36,10 @@ class _HomePageState extends State<HomePage> with TickerProviderStateMixin {
     presenter.Listitem();
 
     // presenter.getid();
-    presenter.getprofile();
+//    presenter.getprofile();
 
 
-    presenter.getSearch();
+//    presenter.getSearch();
   }
 
   @override

lib/ui/home/home_presenter.dart

@@ -33,13 +33,13 @@ class HomePresenter extends BasePresenter<HomePage> {
     var res = await _api.category({
       "access_type": "portal",
     });
+    print("dddddddddddddddd");
 
     if (res.fail == null){
       setState(() {
 
 
         CatModel = res.success;
-        print("dddddddddddddddd");
 
         print('${CatModel.dATA[0].name}');
       });

lib/ui/shop/shop_service.dart

@@ -45,12 +45,6 @@ class _ShopServicePageState extends State<ShopServicePage>
                   );
                 })
 
-//      ListView(
-//        children: <Widget>[
-//          myCard();
-//
-//        ],
-//      ),
         );
   }
 
@@ -80,7 +74,7 @@ class _ShopServicePageState extends State<ShopServicePage>
                               fit: BoxFit.cover,
                             )
                           : Image.network(
-                              image,
+                        'https://backend.feelver.com/storage/' + image,
                               fit: BoxFit.cover,
                             )),
                 ),

lib/ui/shop/show_Nearby_places_presenter.dart

+import 'package:feelverapp/model/Login/login_model.dart';
+import 'package:feelverapp/model/category/category_model.dart';
+import 'package:feelverapp/model/editprofile/getprofilemodel.dart';
+import 'package:feelverapp/model/home/home_model.dart';
+import 'package:feelverapp/model/nearme/nearme_list_model.dart';
+import 'package:feelverapp/service/Loading.dart';
+
+import 'package:feelverapp/service/api.dart';
+import 'package:feelverapp/service/base_presenter.dart';
+import 'package:feelverapp/ui/home/home.dart';
+import 'package:feelverapp/util/Accout_util.dart';
+import 'package:flutter/material.dart';
+import 'package:rflutter_alert/rflutter_alert.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+
+import 'package:feelverapp/ui/shop/shop_Nearby_places.dart';
+
+
+class ShopNearByPlacePresenter extends BasePresenter<ShopNearbyPlacesPage> {
+  final formkey = GlobalKey<FormState>();
+  Api _api;
+  String type = '3';
+  NearMeListModel getmodel ;
+
+  ShopNearByPlacePresenter(State<ShopNearbyPlacesPage> state) : super(state);
+
+
+  getnearme() async {
+
+    _api = Api<NearMeListModel>();
+
+    var res = await _api.getNearList({});
+
+    if(res.fail == null){
+      if(res.success.status){
+        setState((){
+          print("AAAA :${res.success}");
+          getmodel = res.success;
+//        print(getmodel.results.data.length);
+//          print("getmodel" + getmodel[0].results.data[0].storeName);
+
+        },);
+      }
+    }else{
+      Alert(
+          style: AlertStyle(
+            animationType: AnimationType.fromTop,
+            isCloseButton: false,
+          ),
+          context: state.context,
+          title: "ไม่พบข้อมูล",
+          content: Icon(
+            Icons.warning,
+            color: Colors.orange,
+            size: 80,
+          ),
+          buttons: [
+            DialogButton(
+              color: Color.fromRGBO(106, 179, 170, 1),
+              onPressed: () => Navigator.pop(state.context),
+              child: Text(
+                "ลองอีกครั้ง",
+                style: TextStyle(color: Colors.white, fontSize: 20),
+              ),
+            )
+          ]).show();
+    }
+  }
+
+//  getnearme() async {
+//    _api = Api<NearMeListModel>();
+//
+//    var res = await _api.getNearList({});
+//    print("Hii" + getmodel[0].storeName);
+//    print("Hii2" + res.success);
+//
+//    if (res.fail == null) {
+//      setState(() {
+//        NearMeListModel model = res.success;
+//
+////        getmodel = res.success
+//      }
+//      );
+//    } else {
+//      Alert(
+//          style: AlertStyle(
+//            animationType: AnimationType.fromTop,
+//            isCloseButton: false,
+//          ),
+//          context: state.context,
+//          title: "ไม่สามารถติดต่อ\nเซิร์ฟเวอร์ได้",
+//          content: Icon(
+//            Icons.warning,
+//            color: Colors.orange,
+//            size: 80,
+//          ),
+//          buttons: [
+//            DialogButton(
+//              color: Color.fromRGBO(106, 179, 170, 1),
+//              onPressed: () => Navigator.pop(state.context),
+//              child: Text(
+//                "ลองอีกครั้ง",
+//                style: TextStyle(color: Colors.white, fontSize: 20),
+//              ),
+//            )
+//          ]).show();
+//    }
+//  }
+}