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

ios/Flutter/.last_build_id

-be0f81c896162f43cdffd3c7f9c50177
\ No newline at end of file
+13553ffa98d5b0aaa390f5899ef7a33e
\ No newline at end of file

ios/Podfile.lock

@@ -44,4 +44,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: aafe91acc616949ddb318b77800a7f51bffa2a4c
 
-COCOAPODS: 1.9.1
+COCOAPODS: 1.10.0.beta.1

lib/main.dart

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

lib/model/category/category_model.dart

@@ -3,6 +3,7 @@ class CategoryModel {
 
   CategoryModel({this.result});
 
+
   CategoryModel.fromJson(Map<String, dynamic> json) {
     if (json['result'] != null) {
       result = new List<Result>();
@@ -14,6 +15,7 @@ class CategoryModel {
 
   Map<String, dynamic> toJson() {
     final Map<String, dynamic> data = new Map<String, dynamic>();
+
     if (this.result != null) {
       data['result'] = this.result.map((v) => v.toJson()).toList();
     }
@@ -55,6 +57,7 @@ class Result {
       this.updatedAt,
       this.visibility});
 
+
   Result.fromJson(Map<String, dynamic> json) {
     id = json['id'];
     parentId = json['parent_id'];

lib/ui/booking/booking_detail.dart

@@ -28,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(
@@ -142,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

@@ -38,6 +38,7 @@ class _HomePageState extends State<HomePage> with TickerProviderStateMixin {
     presenter.Listitem();
 
     // presenter.getid();
+
     presenter.getprofile();
 //print("nenwenwenwew"+presenter.CatModel.dATA[0].cover,);
 

lib/ui/home/home_presenter.dart

@@ -35,13 +35,13 @@ class HomePresenter extends BasePresenter<HomePage> {
     var res = await _api.category({
       "access_type": "mobile",
     });
+
 // LoadingView(state.context).hide();
     if (res.success != null){
       setState(() {
 
 
         CatModel = res.success;
-        print("dddddddddddddddd");
 
      
       });

lib/ui/shop/shop_service.dart

@@ -47,12 +47,6 @@ class _ShopServicePageState extends State<ShopServicePage>
                   );
                 })
 
-//      ListView(
-//        children: <Widget>[
-//          myCard();
-//
-//        ],
-//      ),
         );
   }
 
@@ -82,9 +76,9 @@ class _ShopServicePageState extends State<ShopServicePage>
                               fit: BoxFit.cover,
                             )
                           : Image.network(
-                            Api.baseApi+ image,
+                        'https://backend.feelver.com/storage/' + image,
                               fit: BoxFit.cover,
-                            )),
+                            ),),
                 ),
                 Expanded(
                   flex: 5,

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();
+//    }
+//  }
+}