存酒电话号码显示

wdn127929
1 parent 7c296962
Showing 9 changed files with 61 additions and 49 deletions
lib/pages/my/store_wine_manage/apply_out_store_page.dart
lib/pages/my/store_wine_manage/out_store_record_detail_page.dart
lib/pages/my/store_wine_manage/out_store_record_page.dart
lib/pages/my/store_wine_manage/store_wine_manage_home_page.dart
lib/pages/my/store_wine_manage/wine_detail_page.dart
lib/pages/my/store_wine_manage/wine_in_store_item.dart
lib/pages/my/store_wine_manage/wine_out_store_item.dart
lib/route/navigator_util.dart
lib/route/route_handles.dart
--- a/lib/pages/my/store_wine_manage/apply_out_store_page.dart
View file @0e4251f
+++ b/lib/pages/my/store_wine_manage/apply_out_store_page.dart
View file @0e4251f
@@ -30,7 +30,8 @@ import 'apply_out_store_item_page.dart';
 class ApplyOutStorePage extends StatefulWidget {
   final WineManageModel wineManageDetail;
-  ApplyOutStorePage({Key key, this.wineManageDetail}) : super(key: key);
+  final bool isStoreWine;
+  ApplyOutStorePage({Key key, this.wineManageDetail,this.isStoreWine}) : super(key: key);
   @override
   _ApplyOutStorePageState createState() => _ApplyOutStorePageState();
@@ -257,7 +258,7 @@ class _ApplyOutStorePageState extends State<ApplyOutStorePage> {
                                 VEmptyView(32),
                                 _textItemWidget(
                                     '联系电话',
-                                    Utils.starPhone(
+                                  widget.isStoreWine? widget.wineManageDetail.phone: Utils.starPhone(
                                         widget.wineManageDetail.phone)),
                                 Container(
                                     height: ScreenUtil().setWidth(48 * 2),
--- a/lib/pages/my/store_wine_manage/out_store_record_detail_page.dart
View file @0e4251f
+++ b/lib/pages/my/store_wine_manage/out_store_record_detail_page.dart
View file @0e4251f
@@ -25,7 +25,9 @@ import 'out_store_record_item_page.dart';
 class OutStoreRecordDetailPage extends StatefulWidget {
   final OutWineRecordSunModel outWineRecordSunModel;
-  OutStoreRecordDetailPage({Key key, this.outWineRecordSunModel})
+  final bool isStoreWine;
+  OutStoreRecordDetailPage(
+      {Key key, this.outWineRecordSunModel, this.isStoreWine})
       : super(key: key);
   @override
@@ -167,8 +169,10 @@ class _OutStoreRecordDetailPageState extends State<OutStoreRecordDetailPage> {
                                 VEmptyView(32),
                                 _textItemWidget(
                                     '联系电话',
-                                    Utils.starPhone(
-                                        widget.outWineRecordSunModel.phone)),
+                                    widget.isStoreWine
+                                        ? widget.outWineRecordSunModel.phone
+                                        : Utils.starPhone(widget
+                                            .outWineRecordSunModel.phone)),
                                 Container(
                                     height: ScreenUtil().setWidth(48 * 2),
                                     padding: EdgeInsets.only(
--- a/lib/pages/my/store_wine_manage/out_store_record_page.dart
View file @0e4251f
+++ b/lib/pages/my/store_wine_manage/out_store_record_page.dart
View file @0e4251f
@@ -25,7 +25,8 @@ import 'out_store_record_item_page.dart';
 class OutStoreRecordPage extends StatefulWidget {
   final String wid;
-  OutStoreRecordPage({Key key, this.wid}) : super(key: key);
+  final bool isStoreWine;
+  OutStoreRecordPage({Key key, this.wid, this.isStoreWine}) : super(key: key);
   @override
   _OutStoreRecordPageState createState() => _OutStoreRecordPageState();
@@ -167,8 +168,11 @@ class _OutStoreRecordPageState extends State<OutStoreRecordPage> {
                                 VEmptyView(32),
                                 _textItemWidget(
                                     '联系电话',
-                                    Utils.starPhone(storeWineProvider
-                                        .outWineRecordData[0].phone)),
+                                    widget.isStoreWine
+                                        ? storeWineProvider
+                                            .outWineRecordData[0].phone
+                                        : Utils.starPhone(storeWineProvider
+                                            .outWineRecordData[0].phone)),
                                 Container(
                                     height: ScreenUtil().setWidth(48 * 2),
                                     padding: EdgeInsets.only(
--- a/lib/pages/my/store_wine_manage/store_wine_manage_home_page.dart
View file @0e4251f
+++ b/lib/pages/my/store_wine_manage/store_wine_manage_home_page.dart
View file @0e4251f
@@ -415,7 +415,7 @@ class _StoreWineManageHomePageState extends State<StoreWineManageHomePage>
           rightImgName: 'set_g.png',
           onTapRight: () {
             if (!collectStoreProvider.sellerWine) {
-              //没有购买优惠券模块
+              //没有购买存酒模块
               //提示购买
               DialogUtil.showSellerVersionBuyDialog(context, '存酒', (v) {});
@@ -539,6 +539,7 @@ class _StoreWineManageHomePageState extends State<StoreWineManageHomePage>
                             return WineOutStoreItem(
                               controller: listInStoreC,
                               outWineRecordSunModel: outWineRecordSunModel,
+                              isStoreWine: isStoreWine
                             );
                           },
                               childCount: storeWineProvider
--- a/lib/pages/my/store_wine_manage/wine_detail_page.dart
View file @0e4251f
+++ b/lib/pages/my/store_wine_manage/wine_detail_page.dart
View file @0e4251f
@@ -168,7 +168,7 @@ class _WineDetailPageState extends State<WineDetailPage> {
                               VEmptyView(32),
                               _textItemWidget(
                                   '联系电话',
-                                  Utils.starPhone(
+                                 widget.isStoreWine ? model.wineManageDetail.phone: Utils.starPhone(
                                       model.wineManageDetail.phone)),
                               Container(
                                   height: ScreenUtil().setWidth(48 * 2),
@@ -269,7 +269,7 @@ class _WineDetailPageState extends State<WineDetailPage> {
                             // if (userModel.user.role_name == '管理员' ||
                             //     userModel.user.role_name == '店长') {
                             NavigatorUtil.goOutStoreRecordPage(
-                                context, widget.idstr);
+                                context, widget.idstr,widget.isStoreWine);
                             // } else {
                             //   bool needRefresh =
                             //       await NavigatorUtil.goCouponEditPage(context);
@@ -363,6 +363,7 @@ class _WineDetailPageState extends State<WineDetailPage> {
                                 NavigatorUtil.goApplyOutStorePage(
                                   context,
                                   modelTemp,
+                                  widget.isStoreWine
                                 );
                                 // } else {
                                 //   bool needRefresh =
--- a/lib/pages/my/store_wine_manage/wine_in_store_item.dart
View file @0e4251f
+++ b/lib/pages/my/store_wine_manage/wine_in_store_item.dart
View file @0e4251f
@@ -77,7 +77,7 @@ class _WineInStoreItemState extends State<WineInStoreItem> {
                           fontWeight: FontWeight.bold,
                           fontSize: ScreenUtil().setSp(36)),
                     ),
-                    Text(Utils.starPhone(widget.wineManageModel.phone),
+                    Text( widget.isStoreWine ? widget.wineManageModel.phone:Utils.starPhone(widget.wineManageModel.phone),
                         maxLines: 1,
                         overflow: TextOverflow.ellipsis,
                         style: TextStyle(
--- a/lib/pages/my/store_wine_manage/wine_out_store_item.dart
View file @0e4251f
+++ b/lib/pages/my/store_wine_manage/wine_out_store_item.dart
View file @0e4251f
@@ -15,10 +15,12 @@ class WineOutStoreItem extends StatefulWidget {
   final OutWineRecordSunModel outWineRecordSunModel;
   final ScrollController controller;
+  final bool isStoreWine;
   // final CouponSunModel couponSonModel;
-  WineOutStoreItem({Key key, this.controller, this.outWineRecordSunModel})
+  WineOutStoreItem(
+      {Key key, this.controller, this.outWineRecordSunModel, this.isStoreWine})
       : super(key: key);
   @override
@@ -35,7 +37,8 @@ class _WineOutStoreItemState extends State<WineOutStoreItem> {
           // modelTemp.wineData = [];
-          NavigatorUtil.goOutStoreRecordDetailPage(context, widget.outWineRecordSunModel);
+          NavigatorUtil.goOutStoreRecordDetailPage(
+              context, widget.outWineRecordSunModel,widget.isStoreWine);
           // NavigatorUtil.goOutStoreRecordPage(
           //     context, widget.outWineRecordSunModel.id);
         },
@@ -83,7 +86,11 @@ class _WineOutStoreItemState extends State<WineOutStoreItem> {
                           fontWeight: FontWeight.bold,
                           fontSize: ScreenUtil().setSp(36)),
                     ),
-                    Text(Utils.starPhone(widget.outWineRecordSunModel.phone),
+                    Text(
+                        widget.isStoreWine
+                            ? widget.outWineRecordSunModel.phone
+                            : Utils.starPhone(
+                                widget.outWineRecordSunModel.phone),
                         maxLines: 1,
                         overflow: TextOverflow.ellipsis,
                         style: TextStyle(
--- a/lib/route/navigator_util.dart
View file @0e4251f
+++ b/lib/route/navigator_util.dart
View file @0e4251f
@@ -1759,22 +1759,22 @@ class NavigatorUtil {
   ///我的------存酒记录
   static Future<dynamic> goOutStoreRecordPage(
     BuildContext context,
-    String idstr, {
+    String idstr, bool isStoreWine,{
     replace = false,
   }) {
-    return _navigateTo(context, "${Routes.out_store_record_page}?idstr=$idstr",
+    return _navigateTo(context, "${Routes.out_store_record_page}?idstr=$idstr&isStoreWine=${isStoreWine}",
         replace: replace);
   }
   ///我的------申请出库
   static Future<dynamic> goApplyOutStorePage(
     BuildContext context,
-    WineManageModel wineManageDetail, {
+    WineManageModel wineManageDetail,bool isStoreWine, {
     Map object,
     replace = false,
   }) {
     return _navigateTo(context,
-        "${Routes.apply_out_store_page}?detail=${FluroConvertUtils.object2string(wineManageDetail)}",
+        "${Routes.apply_out_store_page}?detail=${FluroConvertUtils.object2string(wineManageDetail)}&isStoreWine=${isStoreWine}",
         replace: replace);
     // return _navigateTo(context, "${Routes.apply_out_store_page}?object=$object",
@@ -1795,11 +1795,11 @@ class NavigatorUtil {
   ///我的------出库记录列表详情页
   static Future<dynamic> goOutStoreRecordDetailPage(
     BuildContext context,
-    OutWineRecordSunModel outWineRecordSunModel, {
+    OutWineRecordSunModel outWineRecordSunModel,bool isStoreWine, {
     replace = false,
   }) {
     return _navigateTo(context,
-        "${Routes.out_store_record_detail_page}?detail=${FluroConvertUtils.object2string(outWineRecordSunModel)}",
+        "${Routes.out_store_record_detail_page}?detail=${FluroConvertUtils.object2string(outWineRecordSunModel)}&isStoreWine=${isStoreWine}",
         replace: replace);
   }
--- a/lib/route/route_handles.dart
View file @0e4251f
+++ b/lib/route/route_handles.dart
View file @0e4251f
@@ -230,7 +230,6 @@ import '../pages/my/marketing_center/comments_setting_page.dart';
 import '../pages/my/marketing_center/customer_notice_setting_page.dart';
 import '../pages/my/marketing_center/invitation_theme_home_page.dart';
-
 import '../pages/my/marketing_center/invitation_theme_home_preview_page.dart';
 import '../pages/my/marketing_center/marketing_center_home_page.dart';
 import '../pages/my/marketing_center/order_setting_manager_page.dart';
@@ -540,7 +539,6 @@ var handleSelectTableFHandler = new Handler(
               ridFeast: ridFeast)));
 });
-
 // 跳转到选择桌位_方硕新修改的页面
 var handleSelectTableFOrReserveHandler = new Handler(
     handlerFunc: (BuildContext context, Map<String, List<Object>> params) {
@@ -632,9 +630,9 @@ var handleInvicationHandler = new Handler(
           create: (_) => BaseIndoProvider(),
           child: ChangeNotifierProvider<CustomerProvider>(
               create: (_) => CustomerProvider(),
-              child:  ChangeNotifierProvider<MarketingCenterProvider>(
-                      create: (_) => MarketingCenterProvider(),
-                      child:  InvicationPage(rid)))));
+              child: ChangeNotifierProvider<MarketingCenterProvider>(
+                  create: (_) => MarketingCenterProvider(),
+                  child: InvicationPage(rid)))));
 });
 // 跳转到邀请函页面
@@ -729,13 +727,12 @@ var noteBookChangeFPageHandle = new Handler(
                   )))));
 });
-
 // 跳转到变更预订——方硕新修改页面
 var noteBookChangeFPageOnlyHandle = new Handler(
     handlerFunc: (BuildContext context, Map<String, List<Object>> params) {
   // String rid=params['rid'].first;
   // NotebookDetail detailEntity = params["detailEntity"].first;
- 
+
   String rid = params['rid'].first;
   bool back = FluroConvertUtils.string2bool(params["back"].first);
   return ChangeNotifierProvider<NotebookDetailChangeModelOnly>(
@@ -746,13 +743,12 @@ var noteBookChangeFPageOnlyHandle = new Handler(
               create: (_) => CustomerProvider(),
               child: ChangeNotifierProvider<MarketingCenterProvider>(
                   create: (_) => MarketingCenterProvider(),
-                  child:  ChangeNotifierProvider<NotebookDetailModel>(
-                  create: (_) => NotebookDetailModel(),
-                  child:NoteBookChangeFPageOnly(
-                 
-                    rid: rid,
-                    back: back,
-                  ))))));
+                  child: ChangeNotifierProvider<NotebookDetailModel>(
+                      create: (_) => NotebookDetailModel(),
+                      child: NoteBookChangeFPageOnly(
+                        rid: rid,
+                        back: back,
+                      ))))));
 });
 // 跳转可订时段管理页面
@@ -1888,9 +1884,11 @@ var tableManagerPageHandle = new Handler(
                               create: (_) => MarketingCenterProvider(),
                               child: ChangeNotifierProvider<SmsModel>(
                                   create: (_) => SmsModel(),
-                                  child:  ChangeNotifierProvider<PersonnelProvider>(
-                                  create: (_) => PersonnelProvider(),
-                                  child:TableManagerPage(guest: guest))))))))));
+                                  child:
+                                      ChangeNotifierProvider<PersonnelProvider>(
+                                          create: (_) => PersonnelProvider(),
+                                          child: TableManagerPage(
+                                              guest: guest))))))))));
 });
 ///客情列表详情---再次预订
@@ -2585,9 +2583,6 @@ var orderAdvanceHomePageHandle = new Handler(
           child: OrderAdvanceHomePage(detailEntity: detailEntity, rid: rid)));
 });
-
-
-
 // ///经理排菜---首页
 // var orderAdvanceHomePageSimHandle = new Handler(
 //     handlerFunc: (BuildContext context, Map<dynamic, List<Object>> params) {
@@ -3134,12 +3129,12 @@ var wineDetailPageHandle = new Handler(
 var outStoreRecordPageHandle = new Handler(
     handlerFunc: (BuildContext context, Map<dynamic, List<Object>> params) {
   String idstr = params["idstr"].first;
-
+  bool isStoreWine = FluroConvertUtils.string2bool(params["isStoreWine"].first);
   return ChangeNotifierProvider<StoreWineProvider>(
       create: (_) => StoreWineProvider(),
       child: ChangeNotifierProvider<CustomerProvider>(
           create: (_) => CustomerProvider(),
-          child: OutStoreRecordPage(wid: idstr)));
+          child: OutStoreRecordPage(wid: idstr,isStoreWine:isStoreWine)));
 });
 ///我的----申请出库
@@ -3147,14 +3142,14 @@ var applyOutStorePageHandle = new Handler(
     handlerFunc: (BuildContext context, Map<dynamic, List<Object>> params) {
   WineManageModel wineManageDetail = WineManageModel.fromJson(json
       .decode(FluroConvertUtils.fluroCnParamsDecode(params["detail"].first)));
-
+  bool isStoreWine = FluroConvertUtils.string2bool(params["isStoreWine"].first);
   return ChangeNotifierProvider<StoreWineProvider>(
       create: (_) => StoreWineProvider(),
       child: ChangeNotifierProvider<CustomerProvider>(
           create: (_) => CustomerProvider(),
           child: ChangeNotifierProvider<MenuManageProvider>(
               create: (_) => MenuManageProvider(),
-              child: ApplyOutStorePage(wineManageDetail: wineManageDetail))));
+              child: ApplyOutStorePage(wineManageDetail: wineManageDetail,isStoreWine:isStoreWine))));
 });
 ///我的----申请出库短信验证输入
@@ -3174,13 +3169,14 @@ var outStoreRecordDetailPageHandle = new Handler(
   OutWineRecordSunModel outWineRecordSunModel = OutWineRecordSunModel.fromJson(
       json.decode(
           FluroConvertUtils.fluroCnParamsDecode(params["detail"].first)));
-
+  bool isStoreWine = FluroConvertUtils.string2bool(params["isStoreWine"].first);
   return ChangeNotifierProvider<StoreWineProvider>(
       create: (_) => StoreWineProvider(),
       child: ChangeNotifierProvider<CustomerProvider>(
           create: (_) => CustomerProvider(),
           child: OutStoreRecordDetailPage(
-              outWineRecordSunModel: outWineRecordSunModel)));
+              outWineRecordSunModel: outWineRecordSunModel,
+              isStoreWine: isStoreWine)));
 });
 ///充值优惠-首页
@@ -3649,7 +3645,6 @@ var invitationThemeHomePageHandle = new Handler(
       child: InvitationThemeHomePage());
 });
-
 //邀请函主题选择
 var invitationThemeHomePageSimHandle = new Handler(
     handlerFunc: (BuildContext context, Map<String, List<Object>> params) {
@@ -3684,7 +3679,6 @@ var invitationThemeHomePreviewPageHandle = new Handler(
       child: InvitationThemeHomePreviewPage(themeSunModel: themeSunModel));
 });
-
 //邀请函主题选择预览
 var invitationThemeHomePreviewPageSimHandle = new Handler(
     handlerFunc: (BuildContext context, Map<String, List<Object>> params) {