收集店铺信息

@@ -128,6 +128,9 @@ class SellerList extends Object {
   @JsonKey(name: 'cdate')
   @JsonKey(name: 'cdate')
   String cdate;
   String cdate;
 
 
+  @JsonKey(name: 'remaining_time')
+  int remainingTime;
+
   String get cdateStr {
   String get cdateStr {
     if (cdate != null) {
     if (cdate != null) {
       DateTime dateTime = DateTime.fromMillisecondsSinceEpoch(
       DateTime dateTime = DateTime.fromMillisecondsSinceEpoch(
@@ -156,6 +159,7 @@ class SellerList extends Object {
     this.finishedStatus,
     this.finishedStatus,
     this.edate,
     this.edate,
     this.cdate,
     this.cdate,
+    this.remainingTime
   );
   );
 
 
   factory SellerList.fromJson(Map<String, dynamic> srcJson) =>
   factory SellerList.fromJson(Map<String, dynamic> srcJson) =>

@@ -79,6 +79,7 @@ SellerList _$SellerListFromJson(Map<String, dynamic> json) {
     json['finished_status'] as String,
     json['finished_status'] as String,
     json['edate'] as String,
     json['edate'] as String,
     json['cdate'] as String,
     json['cdate'] as String,
+    json['remaining_time'] as int,
   );
   );
 }
 }
 
 
@@ -95,4 +96,5 @@ Map<String, dynamic> _$SellerListToJson(SellerList instance) =>
       'finished_status': instance.finishedStatus,
       'finished_status': instance.finishedStatus,
       'edate': instance.edate,
       'edate': instance.edate,
       'cdate': instance.cdate,
       'cdate': instance.cdate,
+      'remaining_time': instance.remainingTime,
     };
     };

@@ -462,4 +462,7 @@ class HttpUrl {
 
 
   static const String set_comment = "?service=App.User.SetComment"; //  用户评论【预订】
   static const String set_comment = "?service=App.User.SetComment"; //  用户评论【预订】
 
 
+  static const String set_seller_collect =
+      "?service=App.SellerVersion.SetSellerCollect"; //  收集店铺信息
+
 }
 }

@@ -195,10 +195,8 @@ class _IfNeedCreateStoreState extends State<IfNeedCreateStore>
         appBar: SystemAppBar('选择店铺',
         appBar: SystemAppBar('选择店铺',
             // leftTitle: '上一步',
             // leftTitle: '上一步',
             rightImgName: 'add_check_store.png', onTapRight: () async {
             rightImgName: 'add_check_store.png', onTapRight: () async {
-          Result result2 = await CityPickers.showCityPicker(
-            context: context,
-          );
-          print(result2);
+          NavigatorUtil.goCollectStoreInfoPage(context);
+          
         }
         }
 
 
             //     rightImgName: 'add_check_store.png', onTapRight: () {
             //     rightImgName: 'add_check_store.png', onTapRight: () {

@@ -146,9 +146,12 @@ class _MyMarketingRecordsPageState extends State<MyMarketingRecordsPage> {
                                 HEmptyView(10),
                                 HEmptyView(10),
                                 Expanded(
                                 Expanded(
                                     child: Text(
                                     child: Text(
-                                        data.edate == null
+                                        data.remainingTime == null
                                             ? '无限制'
                                             ? '无限制'
-                                            : '剩余${11111}天',
+                                            : '剩余${data.remainingTime}天',
+                                        // data.edate == null
+                                        //     ? '无限制'
+                                        //     : '剩余${data.edate}天',
                                         overflow: TextOverflow.ellipsis,
                                         overflow: TextOverflow.ellipsis,
                                         style: TextStyle(
                                         style: TextStyle(
                                             color: MyColours.color_333333,
                                             color: MyColours.color_333333,

@@ -1817,4 +1817,15 @@ class NavigatorUtil {
     return _navigateTo(context, "${Routes.comments_setting_page}",
     return _navigateTo(context, "${Routes.comments_setting_page}",
         replace: replace);
         replace: replace);
   }
   }
+
+  /// 店铺信息收集
+  static Future<dynamic> goCollectStoreInfoPage(
+    BuildContext context, {
+    replace = false,
+  }) {
+    return _navigateTo(context, "${Routes.collect_store_info_page}",
+        replace: replace);
+  }
+
+
 }
 }

@@ -29,7 +29,7 @@ import 'package:one_key/pages/coupon/coupon_history_page.dart';
 import 'package:one_key/pages/coupon/coupon_page.dart';
 import 'package:one_key/pages/coupon/coupon_page.dart';
 import 'package:one_key/pages/coupon/coupon_selecet_page.dart';
 import 'package:one_key/pages/coupon/coupon_selecet_page.dart';
 import 'package:one_key/pages/coupon/coupon_to_personal_page.dart';
 import 'package:one_key/pages/coupon/coupon_to_personal_page.dart';
-import 'package:one_key/pages/create_store/complete_create_store.dart';
+import 'package:one_key/pages/create_store/complete_create_store_old.dart';
 import 'package:one_key/pages/create_store/create_store.dart';
 import 'package:one_key/pages/create_store/create_store.dart';
 import 'package:one_key/pages/create_store/enter_store_address.dart';
 import 'package:one_key/pages/create_store/enter_store_address.dart';
 import 'package:one_key/pages/create_store/enter_store_environment.dart';
 import 'package:one_key/pages/create_store/enter_store_environment.dart';
@@ -181,6 +181,8 @@ import '../pages/feast/feast_qy_menu_show_page.dart';
 import '../pages/feast/feast_set_page.dart';
 import '../pages/feast/feast_set_page.dart';
 import '../pages/feast/feast_setmeal_page.dart';
 import '../pages/feast/feast_setmeal_page.dart';
 import '../pages/feast/feast_wine_page.dart';
 import '../pages/feast/feast_wine_page.dart';
+import '../pages/login/collect_store_info_page.dart';
+import '../pages/login/complete_create_store.dart';
 import '../pages/message/message_recharge_info_page.dart';
 import '../pages/message/message_recharge_info_page.dart';
 import '../pages/my/comment_manage/comment_manage_home_page.dart';
 import '../pages/my/comment_manage/comment_manage_home_page.dart';
 import '../pages/my/customer_type/my_customer/my_customer_home_page.dart';
 import '../pages/my/customer_type/my_customer/my_customer_home_page.dart';
@@ -244,6 +246,7 @@ import '../pages/order_advance/order_create_temporary_page.dart';
 import '../pages/order_advance/order_edit_list_show_page.dart';
 import '../pages/order_advance/order_edit_list_show_page.dart';
 import '../pages/order_advance/order_preview_page.dart';
 import '../pages/order_advance/order_preview_page.dart';
 import '../pages/order_advance/order_share_page.dart';
 import '../pages/order_advance/order_share_page.dart';
+import '../provider/collect_store_provider.dart';
 import '../provider/comment_manage_provider.dart';
 import '../provider/comment_manage_provider.dart';
 import '../provider/feast_model.dart';
 import '../provider/feast_model.dart';
 import '../provider/marketing_center_provider.dart';
 import '../provider/marketing_center_provider.dart';
@@ -3053,3 +3056,18 @@ var commentsSettingPageHandle = new Handler(
       child: ChangeNotifierProvider<CouponProvider>(
       child: ChangeNotifierProvider<CouponProvider>(
           create: (_) => CouponProvider(), child: CommentsSettingPage()));
           create: (_) => CouponProvider(), child: CommentsSettingPage()));
 });
 });
+
+//店铺信息收集
+var collectStoreInfoPageHandle = new Handler(
+    handlerFunc: (BuildContext context, Map<String, List<Object>> params) {
+  // String year = params["year"].first;
+  // String month = params["month"].first;
+  // String day = params["day"].first;
+  // String uid = params["uid"].first;
+
+  // DayList daylist = DayList.fromJson(json
+  //     .decode(FluroConvertUtils.fluroCnParamsDecode(params["daylist"].first)));
+
+  return ChangeNotifierProvider<CollectStoreProvider>(
+      create: (_) => CollectStoreProvider(), child: CollectStoreInfoPage());
+});

@@ -289,9 +289,9 @@ class Routes {
   static String recharge_setting_page = "/recharge_setting_page"; // 充值优惠设置页
   static String recharge_setting_page = "/recharge_setting_page"; // 充值优惠设置页
   static String comment_manage_home_page = "/comment_manage_home_page"; // 评价管理
   static String comment_manage_home_page = "/comment_manage_home_page"; // 评价管理
 
 
-
   static String comments_setting_page = "/comments_setting_page"; // 评价管理设置
   static String comments_setting_page = "/comments_setting_page"; // 评价管理设置
-  
+
+  static String collect_store_info_page = "/collect_store_info_page"; // 店铺信息收集
 
 
   static void configureRoutes(FluroRouter router) {
   static void configureRoutes(FluroRouter router) {
     router.notFoundHandler = new Handler(
     router.notFoundHandler = new Handler(
@@ -543,9 +543,8 @@ class Routes {
     router.define(comment_manage_home_page,
     router.define(comment_manage_home_page,
         handler: commentManageHomePageHandle);
         handler: commentManageHomePageHandle);
 
 
-    router.define(comments_setting_page,
-        handler: commentsSettingPageHandle);
+    router.define(comments_setting_page, handler: commentsSettingPageHandle);
 
 
-        
+    router.define(collect_store_info_page, handler: collectStoreInfoPageHandle);
   }
   }
 }
 }