xt / Flutter-ReserveApp · Commits

Go to a project

Commit b4860752f480cde03843f0f63898ff7a381c48e6

Authored by weixin_45529955
1 parent 159b689f

我的页面UI调整 && 部分新增消费金功能 准备发版 调整

Inline Side-by-side
Showing 11 changed files with 636 additions and 294 deletions
@@ -156,40 +156,40 @@ class _ConsumeHomePageState extends State<ConsumeHomePage> { @@ -156,40 +156,40 @@ class _ConsumeHomePageState extends State<ConsumeHomePage> {
156 child: MyDivider(double.infinity, w(0.5), 156 child: MyDivider(double.infinity, w(0.5),
157 color: MyColours.color_E7E7E7)), 157 color: MyColours.color_E7E7E7)),
158 VEmptyView(24), 158 VEmptyView(24),
159 - InkWell(  
160 - onTap: () {  
161 - //  
162 - },  
163 - child: Padding(  
164 - padding: EdgeInsets.only(  
165 - left: w(16),  
166 - top: w(12),  
167 - bottom: w(12),  
168 - right: w(12)),  
169 - child: Row(  
170 - children: [  
171 - Text(  
172 - '客户裂变设置',  
173 - style: TextStyle(  
174 - color: MyColours.color_515151,  
175 - fontSize: ScreenUtil().setWidth(32)),  
176 - ),  
177 - Spacer(),  
178 - Container(  
179 - padding: EdgeInsets.symmetric(  
180 - horizontal: w(7), vertical: w(4)),  
181 - child: Image.asset(  
182 - "assets/arrow_right_new.png",  
183 - width: ScreenUtil().setWidth(18),  
184 - height: ScreenUtil().setWidth(32),  
185 - ),  
186 - )  
187 - ],  
188 - ))),  
189 - Padding(  
190 - padding: EdgeInsets.only(left: w(16)),  
191 - child: MyDivider(double.infinity, w(0.5),  
192 - color: MyColours.color_E7E7E7)), 159 + // InkWell(
  160 + // onTap: () {
  161 + // //
  162 + // },
  163 + // child: Padding(
  164 + // padding: EdgeInsets.only(
  165 + // left: w(16),
  166 + // top: w(12),
  167 + // bottom: w(12),
  168 + // right: w(12)),
  169 + // child: Row(
  170 + // children: [
  171 + // Text(
  172 + // '客户裂变设置',
  173 + // style: TextStyle(
  174 + // color: MyColours.color_515151,
  175 + // fontSize: ScreenUtil().setWidth(32)),
  176 + // ),
  177 + // Spacer(),
  178 + // Container(
  179 + // padding: EdgeInsets.symmetric(
  180 + // horizontal: w(7), vertical: w(4)),
  181 + // child: Image.asset(
  182 + // "assets/arrow_right_new.png",
  183 + // width: ScreenUtil().setWidth(18),
  184 + // height: ScreenUtil().setWidth(32),
  185 + // ),
  186 + // )
  187 + // ],
  188 + // ))),
  189 + // Padding(
  190 + // padding: EdgeInsets.only(left: w(16)),
  191 + // child: MyDivider(double.infinity, w(0.5),
  192 + // color: MyColours.color_E7E7E7)),
193 ], 193 ],
194 ), 194 ),
195 )), 195 )),
@@ -67,35 +67,50 @@ class _CustomerHomePageState extends State<CustomerHomePage> { @@ -67,35 +67,50 @@ class _CustomerHomePageState extends State<CustomerHomePage> {
67 children: [ 67 children: [
68 InkWell( 68 InkWell(
69 onTap: () async { 69 onTap: () async {
70 - if (userModel.user?.role_name == '管理员' ||  
71 - userModel.user?.role_name == '店长') {  
72 - if (Utils.getAuthority(context, '全店客情')) {  
73 - if (widget.sellerNormalSpecial) {  
74 - //标准版 70 + // if (userModel.user?.role_name == '管理员' ||
  71 + // userModel.user?.role_name == '店长') {
  72 + // if (Utils.getAuthority(context, '全店客情')) {
  73 + // if (widget.sellerNormalSpecial) {
  74 + // //标准版
75 75
76 - if (widget.sellerPreserve ||  
77 - widget.sellerMarketing) {  
78 - NavigatorUtil.goCustomerStatisticsPage(context);  
79 - } else {  
80 - NavigatorUtil.goCustomerListPageSim(context);  
81 - }  
82 - } else {  
83 - NavigatorUtil.goCustomerStatisticsPage(context);  
84 - }  
85 - }  
86 - } else {  
87 - if (Utils.getAuthority(context, '我的客情')) {  
88 - if (widget.sellerNormalSpecial) {  
89 - //标准版  
90 - if (widget.sellerPreserve ||  
91 - widget.sellerMarketing) {  
92 - NavigatorUtil.goMyCustomerPage(context);  
93 - } else {  
94 - NavigatorUtil.goMyCustomerListPageSim(context);  
95 - } 76 + // if (widget.sellerPreserve ||
  77 + // widget.sellerMarketing) {
  78 + // NavigatorUtil.goCustomerStatisticsPage(context);
  79 + // } else {
  80 + // NavigatorUtil.goCustomerListPageSim(context);
  81 + // }
  82 + // } else {
  83 + // NavigatorUtil.goCustomerStatisticsPage(context);
  84 + // }
  85 + // }
  86 + // } else {
  87 + // if (Utils.getAuthority(context, '我的客情')) {
  88 + // if (widget.sellerNormalSpecial) {
  89 + // //标准版
  90 + // if (widget.sellerPreserve ||
  91 + // widget.sellerMarketing) {
  92 + // NavigatorUtil.goMyCustomerPage(context);
  93 + // } else {
  94 + // NavigatorUtil.goMyCustomerListPageSim(context);
  95 + // }
  96 + // } else {
  97 + // NavigatorUtil.goMyCustomerPage(context);
  98 + // }
  99 + // }
  100 + // }
  101 +
  102 + if (Utils.getAuthority(context, '全店客情')) {
  103 + if (widget.sellerNormalSpecial) {
  104 + //标准版
  105 +
  106 + if (widget.sellerPreserve ||
  107 + widget.sellerMarketing) {
  108 + NavigatorUtil.goStoreCustomerPage(context);
96 } else { 109 } else {
97 - NavigatorUtil.goMyCustomerPage(context); 110 + NavigatorUtil.goCustomerListPageSim(context);
98 } 111 }
  112 + } else {
  113 + NavigatorUtil.goStoreCustomerPage(context);
99 } 114 }
100 } 115 }
101 }, 116 },
@@ -108,7 +123,7 @@ class _CustomerHomePageState extends State<CustomerHomePage> { @@ -108,7 +123,7 @@ class _CustomerHomePageState extends State<CustomerHomePage> {
108 child: Row( 123 child: Row(
109 children: [ 124 children: [
110 Text( 125 Text(
111 - '客户汇总', 126 + '全店客情',
112 style: TextStyle( 127 style: TextStyle(
113 color: MyColours.color_515151, 128 color: MyColours.color_515151,
114 fontSize: ScreenUtil().setWidth(32)), 129 fontSize: ScreenUtil().setWidth(32)),
@@ -132,35 +147,49 @@ class _CustomerHomePageState extends State<CustomerHomePage> { @@ -132,35 +147,49 @@ class _CustomerHomePageState extends State<CustomerHomePage> {
132 VEmptyView(24), 147 VEmptyView(24),
133 InkWell( 148 InkWell(
134 onTap: () { 149 onTap: () {
135 - if (userModel.user?.role_name == '管理员' ||  
136 - userModel.user?.role_name == '店长') {  
137 - if (Utils.getAuthority(context, '全店客情')) {  
138 - if (widget.sellerNormalSpecial) {  
139 - //标准版 150 + // if (userModel.user?.role_name == '管理员' ||
  151 + // userModel.user?.role_name == '店长') {
  152 + // if (Utils.getAuthority(context, '全店客情')) {
  153 + // if (widget.sellerNormalSpecial) {
  154 + // //标准版
140 155
141 - if (widget.sellerPreserve ||  
142 - widget.sellerMarketing) {  
143 - NavigatorUtil.goStoreCustomerPage(context);  
144 - } else {  
145 - NavigatorUtil.goCustomerListPageSim(context);  
146 - }  
147 - } else {  
148 - NavigatorUtil.goStoreCustomerPage(context);  
149 - }  
150 - }  
151 - } else {  
152 - if (Utils.getAuthority(context, '我的客情')) {  
153 - if (widget.sellerNormalSpecial) {  
154 - //标准版  
155 - if (widget.sellerPreserve ||  
156 - widget.sellerMarketing) {  
157 - NavigatorUtil.goMyCustomerPage(context);  
158 - } else {  
159 - NavigatorUtil.goMyCustomerListPageSim(context);  
160 - }  
161 - } else { 156 + // if (widget.sellerPreserve ||
  157 + // widget.sellerMarketing) {
  158 + // NavigatorUtil.goStoreCustomerPage(context);
  159 + // } else {
  160 + // NavigatorUtil.goCustomerListPageSim(context);
  161 + // }
  162 + // } else {
  163 + // NavigatorUtil.goStoreCustomerPage(context);
  164 + // }
  165 + // }
  166 + // } else {
  167 + // if (Utils.getAuthority(context, '我的客情')) {
  168 + // if (widget.sellerNormalSpecial) {
  169 + // //标准版
  170 + // if (widget.sellerPreserve ||
  171 + // widget.sellerMarketing) {
  172 + // NavigatorUtil.goMyCustomerPage(context);
  173 + // } else {
  174 + // NavigatorUtil.goMyCustomerListPageSim(context);
  175 + // }
  176 + // } else {
  177 + // NavigatorUtil.goMyCustomerPage(context);
  178 + // }
  179 + // }
  180 + // }
  181 +
  182 + if (Utils.getAuthority(context, '我的客情')) {
  183 + if (widget.sellerNormalSpecial) {
  184 + //标准版
  185 + if (widget.sellerPreserve ||
  186 + widget.sellerMarketing) {
162 NavigatorUtil.goMyCustomerPage(context); 187 NavigatorUtil.goMyCustomerPage(context);
  188 + } else {
  189 + NavigatorUtil.goMyCustomerListPageSim(context);
163 } 190 }
  191 + } else {
  192 + NavigatorUtil.goMyCustomerPage(context);
164 } 193 }
165 } 194 }
166 }, 195 },
@@ -173,7 +202,7 @@ class _CustomerHomePageState extends State<CustomerHomePage> { @@ -173,7 +202,7 @@ class _CustomerHomePageState extends State<CustomerHomePage> {
173 child: Row( 202 child: Row(
174 children: [ 203 children: [
175 Text( 204 Text(
176 - '客户列表', 205 + '我的客情',
177 style: TextStyle( 206 style: TextStyle(
178 color: MyColours.color_515151, 207 color: MyColours.color_515151,
179 fontSize: ScreenUtil().setWidth(32)), 208 fontSize: ScreenUtil().setWidth(32)),
@@ -195,42 +224,42 @@ class _CustomerHomePageState extends State<CustomerHomePage> { @@ -195,42 +224,42 @@ class _CustomerHomePageState extends State<CustomerHomePage> {
195 child: MyDivider(double.infinity, w(0.5), 224 child: MyDivider(double.infinity, w(0.5),
196 color: MyColours.color_E7E7E7)), 225 color: MyColours.color_E7E7E7)),
197 VEmptyView(24), 226 VEmptyView(24),
198 - InkWell(  
199 - onTap: () {  
200 - // 227 + // InkWell(
  228 + // onTap: () {
  229 + // //
201 230
202 - NavigatorUtil.goCustomLabelPage(context);  
203 - },  
204 - child: Padding(  
205 - padding: EdgeInsets.only(  
206 - left: w(16),  
207 - top: w(12),  
208 - bottom: w(12),  
209 - right: w(12)),  
210 - child: Row(  
211 - children: [  
212 - Text(  
213 - '客户自定义标签',  
214 - style: TextStyle(  
215 - color: MyColours.color_515151,  
216 - fontSize: ScreenUtil().setWidth(32)),  
217 - ),  
218 - Spacer(),  
219 - Container(  
220 - padding: EdgeInsets.symmetric(  
221 - horizontal: w(7), vertical: w(4)),  
222 - child: Image.asset(  
223 - "assets/arrow_right_new.png",  
224 - width: ScreenUtil().setWidth(18),  
225 - height: ScreenUtil().setWidth(32),  
226 - ),  
227 - )  
228 - ],  
229 - ))),  
230 - Padding(  
231 - padding: EdgeInsets.only(left: w(16)),  
232 - child: MyDivider(double.infinity, w(0.5),  
233 - color: MyColours.color_E7E7E7)), 231 + // NavigatorUtil.goCustomLabelPage(context);
  232 + // },
  233 + // child: Padding(
  234 + // padding: EdgeInsets.only(
  235 + // left: w(16),
  236 + // top: w(12),
  237 + // bottom: w(12),
  238 + // right: w(12)),
  239 + // child: Row(
  240 + // children: [
  241 + // Text(
  242 + // '客户自定义标签',
  243 + // style: TextStyle(
  244 + // color: MyColours.color_515151,
  245 + // fontSize: ScreenUtil().setWidth(32)),
  246 + // ),
  247 + // Spacer(),
  248 + // Container(
  249 + // padding: EdgeInsets.symmetric(
  250 + // horizontal: w(7), vertical: w(4)),
  251 + // child: Image.asset(
  252 + // "assets/arrow_right_new.png",
  253 + // width: ScreenUtil().setWidth(18),
  254 + // height: ScreenUtil().setWidth(32),
  255 + // ),
  256 + // )
  257 + // ],
  258 + // ))),
  259 + // Padding(
  260 + // padding: EdgeInsets.only(left: w(16)),
  261 + // child: MyDivider(double.infinity, w(0.5),
  262 + // color: MyColours.color_E7E7E7)),
234 ], 263 ],
235 ), 264 ),
236 )), 265 )),
@@ -62,7 +62,7 @@ class _MyCustomerHomePageState extends State<MyCustomerHomePage> { @@ -62,7 +62,7 @@ class _MyCustomerHomePageState extends State<MyCustomerHomePage> {
62 62
63 @override 63 @override
64 void dispose() { 64 void dispose() {
65 - EventBus().emit('changeStatusColor'); 65 + // EventBus().emit('changeStatusColor');
66 bus.off('refresh_my_customer_home'); 66 bus.off('refresh_my_customer_home');
67 // bus.off("refresh_coupon_list"); 67 // bus.off("refresh_coupon_list");
68 super.dispose(); 68 super.dispose();
1 import 'package:flutter/material.dart'; 1 import 'package:flutter/material.dart';
2 import 'package:one_key/res/colors.dart'; 2 import 'package:one_key/res/colors.dart';
  3 +import 'package:one_key/utils/dialog_util.dart';
3 import 'package:one_key/utils/screen_util.dart'; 4 import 'package:one_key/utils/screen_util.dart';
4 import 'package:one_key/widgets/h_empty_view.dart'; 5 import 'package:one_key/widgets/h_empty_view.dart';
5 import 'package:one_key/widgets/round_button.dart'; 6 import 'package:one_key/widgets/round_button.dart';
@@ -148,6 +149,7 @@ class _BalanceDetailsPageState extends State<BalanceDetailsPage> { @@ -148,6 +149,7 @@ class _BalanceDetailsPageState extends State<BalanceDetailsPage> {
148 radius: r(5), 149 radius: r(5),
149 onPressed: () { 150 onPressed: () {
150 // 151 //
  152 + DialogUtil.showRechargeDialog(context, '充值余额', (value) {});
151 }, 153 },
152 ), 154 ),
153 HEmptyView(20), 155 HEmptyView(20),
@@ -56,7 +56,7 @@ class _StoreCustomerHomePageState extends State<StoreCustomerHomePage> @@ -56,7 +56,7 @@ class _StoreCustomerHomePageState extends State<StoreCustomerHomePage>
56 56
57 @override 57 @override
58 void dispose() { 58 void dispose() {
59 - EventBus().emit('changeStatusColor'); 59 + // EventBus().emit('changeStatusColor');
60 super.dispose(); 60 super.dispose();
61 } 61 }
62 62
1 import 'package:flutter/material.dart'; 1 import 'package:flutter/material.dart';
2 import 'package:flutter_screenutil/flutter_screenutil.dart'; 2 import 'package:flutter_screenutil/flutter_screenutil.dart';
3 import 'package:one_key/route/navigator_util.dart'; 3 import 'package:one_key/route/navigator_util.dart';
  4 +import 'package:one_key/utils/event_bus.dart';
4 import 'package:one_key/widgets/system_app_bar.dart'; 5 import 'package:one_key/widgets/system_app_bar.dart';
5 6
6 import '../../../res/colors.dart'; 7 import '../../../res/colors.dart';
@@ -20,6 +21,12 @@ class FinanceManageHomePage extends StatefulWidget { @@ -20,6 +21,12 @@ class FinanceManageHomePage extends StatefulWidget {
20 } 21 }
21 22
22 class _FinanceManageHomePageState extends State<FinanceManageHomePage> { 23 class _FinanceManageHomePageState extends State<FinanceManageHomePage> {
  24 + @override
  25 + void dispose() {
  26 + EventBus().emit('changeStatusColor');
  27 + super.dispose();
  28 + }
  29 +
23 ///时间选择 30 ///时间选择
24 Widget _item(String title, GestureTapCallback onTap) { 31 Widget _item(String title, GestureTapCallback onTap) {
25 return InkWell( 32 return InkWell(
@@ -374,39 +374,39 @@ class _MarketingCenterHomePageState extends State<MarketingCenterHomePage> { @@ -374,39 +374,39 @@ class _MarketingCenterHomePageState extends State<MarketingCenterHomePage> {
374 child: MyDivider(double.infinity, w(0.5), 374 child: MyDivider(double.infinity, w(0.5),
375 color: MyColours.color_E7E7E7)), 375 color: MyColours.color_E7E7E7)),
376 VEmptyView(24), 376 VEmptyView(24),
377 - InkWell(  
378 - onTap: () {},  
379 - child: Padding(  
380 - padding: EdgeInsets.only(  
381 - left: w(16),  
382 - top: w(12),  
383 - bottom: w(12),  
384 - right: w(12)),  
385 - child: Row(  
386 - children: [  
387 - Text(  
388 - '沉睡/流失客户唤醒营销设置',  
389 - style: TextStyle(  
390 - color: MyColours.color_515151,  
391 - fontSize: ScreenUtil().setWidth(32)),  
392 - ),  
393 - Spacer(),  
394 - Container(  
395 - padding: EdgeInsets.symmetric(  
396 - horizontal: w(7), vertical: w(4)),  
397 - child: Image.asset(  
398 - "assets/arrow_right_new.png",  
399 - width: ScreenUtil().setWidth(18),  
400 - height: ScreenUtil().setWidth(32),  
401 - ),  
402 - )  
403 - ],  
404 - ))),  
405 - Padding(  
406 - padding: EdgeInsets.only(left: w(16)),  
407 - child: MyDivider(double.infinity, w(0.5),  
408 - color: MyColours.color_E7E7E7)),  
409 - VEmptyView(24), 377 + // InkWell(
  378 + // onTap: () {},
  379 + // child: Padding(
  380 + // padding: EdgeInsets.only(
  381 + // left: w(16),
  382 + // top: w(12),
  383 + // bottom: w(12),
  384 + // right: w(12)),
  385 + // child: Row(
  386 + // children: [
  387 + // Text(
  388 + // '沉睡/流失客户唤醒营销设置',
  389 + // style: TextStyle(
  390 + // color: MyColours.color_515151,
  391 + // fontSize: ScreenUtil().setWidth(32)),
  392 + // ),
  393 + // Spacer(),
  394 + // Container(
  395 + // padding: EdgeInsets.symmetric(
  396 + // horizontal: w(7), vertical: w(4)),
  397 + // child: Image.asset(
  398 + // "assets/arrow_right_new.png",
  399 + // width: ScreenUtil().setWidth(18),
  400 + // height: ScreenUtil().setWidth(32),
  401 + // ),
  402 + // )
  403 + // ],
  404 + // ))),
  405 + // Padding(
  406 + // padding: EdgeInsets.only(left: w(16)),
  407 + // child: MyDivider(double.infinity, w(0.5),
  408 + // color: MyColours.color_E7E7E7)),
  409 + // VEmptyView(24),
410 // InkWell( 410 // InkWell(
411 // onTap: () { 411 // onTap: () {
412 // NavigatorUtil.goPaymentSettingPage(context); 412 // NavigatorUtil.goPaymentSettingPage(context);
@@ -56,8 +56,7 @@ class _RechargeFirstHomePageState extends State<RechargeFirstHomePage> { @@ -56,8 +56,7 @@ class _RechargeFirstHomePageState extends State<RechargeFirstHomePage> {
56 InkWell( 56 InkWell(
57 onTap: () async { 57 onTap: () async {
58 // 58 //
59 - NavigatorUtil.goRechargeHomePage(  
60 - context); 59 + NavigatorUtil.goRechargeHomePage(context);
61 }, 60 },
62 child: Padding( 61 child: Padding(
63 padding: EdgeInsets.only( 62 padding: EdgeInsets.only(
@@ -90,41 +89,41 @@ class _RechargeFirstHomePageState extends State<RechargeFirstHomePage> { @@ -90,41 +89,41 @@ class _RechargeFirstHomePageState extends State<RechargeFirstHomePage> {
90 child: MyDivider(double.infinity, w(0.5), 89 child: MyDivider(double.infinity, w(0.5),
91 color: MyColours.color_E7E7E7)), 90 color: MyColours.color_E7E7E7)),
92 VEmptyView(24), 91 VEmptyView(24),
93 - InkWell(  
94 - onTap: () {  
95 - //  
96 - NavigatorUtil.goPaymentSettingPage(context);  
97 - },  
98 - child: Padding(  
99 - padding: EdgeInsets.only(  
100 - left: w(16),  
101 - top: w(12),  
102 - bottom: w(12),  
103 - right: w(12)),  
104 - child: Row(  
105 - children: [  
106 - Text(  
107 - '店铺充值记录',  
108 - style: TextStyle(  
109 - color: MyColours.color_515151,  
110 - fontSize: ScreenUtil().setWidth(32)),  
111 - ),  
112 - Spacer(),  
113 - Container(  
114 - padding: EdgeInsets.symmetric(  
115 - horizontal: w(7), vertical: w(4)),  
116 - child: Image.asset(  
117 - "assets/arrow_right_new.png",  
118 - width: ScreenUtil().setWidth(18),  
119 - height: ScreenUtil().setWidth(32),  
120 - ),  
121 - )  
122 - ],  
123 - ))),  
124 - Padding(  
125 - padding: EdgeInsets.only(left: w(16)),  
126 - child: MyDivider(double.infinity, w(0.5),  
127 - color: MyColours.color_E7E7E7)), 92 + // InkWell(
  93 + // onTap: () {
  94 + // //
  95 + // NavigatorUtil.goPaymentSettingPage(context);
  96 + // },
  97 + // child: Padding(
  98 + // padding: EdgeInsets.only(
  99 + // left: w(16),
  100 + // top: w(12),
  101 + // bottom: w(12),
  102 + // right: w(12)),
  103 + // child: Row(
  104 + // children: [
  105 + // Text(
  106 + // '店铺充值记录',
  107 + // style: TextStyle(
  108 + // color: MyColours.color_515151,
  109 + // fontSize: ScreenUtil().setWidth(32)),
  110 + // ),
  111 + // Spacer(),
  112 + // Container(
  113 + // padding: EdgeInsets.symmetric(
  114 + // horizontal: w(7), vertical: w(4)),
  115 + // child: Image.asset(
  116 + // "assets/arrow_right_new.png",
  117 + // width: ScreenUtil().setWidth(18),
  118 + // height: ScreenUtil().setWidth(32),
  119 + // ),
  120 + // )
  121 + // ],
  122 + // ))),
  123 + // Padding(
  124 + // padding: EdgeInsets.only(left: w(16)),
  125 + // child: MyDivider(double.infinity, w(0.5),
  126 + // color: MyColours.color_E7E7E7)),
128 ], 127 ],
129 ), 128 ),
130 )), 129 )),
@@ -1450,13 +1450,13 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver { @@ -1450,13 +1450,13 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver {
1450 child: _item( 1450 child: _item(
1451 outDay == '0' || 1451 outDay == '0' ||
1452 !Utils.getAuthority( 1452 !Utils.getAuthority(
1453 - context, '客户管理') 1453 + context, '我的客情')
1454 ? Utils.getImgPath('yhgl_un') 1454 ? Utils.getImgPath('yhgl_un')
1455 : Utils.getImgPath('yhgl'), 1455 : Utils.getImgPath('yhgl'),
1456 '客户管理', 1456 '客户管理',
1457 isRowLow: outDay == '0' || 1457 isRowLow: outDay == '0' ||
1458 !Utils.getAuthority( 1458 !Utils.getAuthority(
1459 - context, '客户管理'))), 1459 + context, '我的客情'))),
1460 // InkWell( 1460 // InkWell(
1461 // onTap: () async { 1461 // onTap: () async {
1462 // if (outDay == '0') { 1462 // if (outDay == '0') {
@@ -232,10 +232,12 @@ class _MyPlanDishHomePageState extends State<MyPlanDishHomePage> @@ -232,10 +232,12 @@ class _MyPlanDishHomePageState extends State<MyPlanDishHomePage>
232 ), 232 ),
233 ), 233 ),
234 child: Row( 234 child: Row(
  235 + mainAxisAlignment: MainAxisAlignment.center,
235 children: [ 236 children: [
236 - RoundButton( 237 + Expanded(
  238 + child: RoundButton(
237 text: '创建新排菜', 239 text: '创建新排菜',
238 - width: w(105), 240 + // width: w(105),
239 height: ScreenUtil().setWidth(80), 241 height: ScreenUtil().setWidth(80),
240 radius: ScreenUtil().setWidth(14), 242 radius: ScreenUtil().setWidth(14),
241 isBold: false, 243 isBold: false,
@@ -269,91 +271,91 @@ class _MyPlanDishHomePageState extends State<MyPlanDishHomePage> @@ -269,91 +271,91 @@ class _MyPlanDishHomePageState extends State<MyPlanDishHomePage>
269 } 271 }
270 } 272 }
271 }, 273 },
272 - ),  
273 - HEmptyView(20),  
274 - Expanded(  
275 - child: RoundButton(  
276 - text: '生成二维码',  
277 - height: ScreenUtil().setWidth(80),  
278 - radius: ScreenUtil().setWidth(14),  
279 - gradientStart: tabController?.index == 1 &&  
280 - !Utils.getAuthority(context, '生成二维码')  
281 - ? MyColours.color_ffffff  
282 - : MyColours.color_ffffff,  
283 - gradientEnd: tabController?.index == 1 &&  
284 - !Utils.getAuthority(context, '生成二维码')  
285 - ? MyColours.color_ffffff  
286 - : MyColours.color_ffffff,  
287 - fontSize: 28,  
288 - textColor: MyColours.color_199095,  
289 - borderColor: MyColours.color_199095,  
290 - onPressed: () async {  
291 - // UserModel userModel =  
292 - // Provider.of<UserModel>(context, listen: false);  
293 - if (!(tabController?.index == 1 &&  
294 - !Utils.getAuthority(context, '生成二维码'))) {  
295 - if (Utils.getAuthority(context, '生成二维码')) {  
296 - bool? needRefresh =  
297 - await NavigatorUtil.goPlanDishQrcodePage(  
298 - context,  
299 - );  
300 - } else {  
301 - bool? needRefresh =  
302 - await NavigatorUtil.goPlanDishQrcodePage(  
303 - context,  
304 - );  
305 - print(needRefresh);  
306 - if (needRefresh != null && needRefresh) {  
307 - // bus.emit('refresh_coupon_list_f');  
308 - //刷新页面数据  
309 - // _controller.callRefresh();  
310 - // _couponNetworkData(tabController.index);  
311 - }  
312 - }  
313 - }  
314 - },  
315 )), 274 )),
316 - HEmptyView(20),  
317 - Expanded(  
318 - child: RoundButton(  
319 - text: '分享给客户',  
320 - height: ScreenUtil().setWidth(80),  
321 - radius: ScreenUtil().setWidth(14),  
322 - gradientStart: tabController?.index == 1 &&  
323 - !Utils.getAuthority(context, '创建新排菜')  
324 - ? MyColours.color_ffffff  
325 - : MyColours.color_ffffff,  
326 - gradientEnd: tabController?.index == 1 &&  
327 - !Utils.getAuthority(context, '创建新排菜')  
328 - ? MyColours.color_ffffff  
329 - : MyColours.color_ffffff,  
330 - fontSize: 28,  
331 - textColor: MyColours.color_199095,  
332 - borderColor: MyColours.color_199095,  
333 - onPressed: () async {  
334 - // UserModel userModel =  
335 - // Provider.of<UserModel>(context, listen: false);  
336 - if (!(tabController?.index == 1 &&  
337 - !Utils.getAuthority(context, '创建新排菜'))) {  
338 - if (Utils.getAuthority(context, '创建新排菜')) {  
339 - NavigatorUtil.goPlanDishCreateSelectTypePage(  
340 - context);  
341 - } else {  
342 - bool? needRefresh =  
343 - await NavigatorUtil.goPlanDishEditPage(context,  
344 - isMine: true, isEdit: true);  
345 - print(needRefresh);  
346 - if (needRefresh != null && needRefresh) {  
347 - // bus.emit('refresh_coupon_list_f');  
348 - //刷新页面数据  
349 - // _controller.callRefresh();  
350 - // _couponNetworkData(tabController.index);  
351 - }  
352 - }  
353 - }  
354 - },  
355 - ),  
356 - ) 275 + // HEmptyView(20),
  276 + // Expanded(
  277 + // child: RoundButton(
  278 + // text: '生成二维码',
  279 + // height: ScreenUtil().setWidth(80),
  280 + // radius: ScreenUtil().setWidth(14),
  281 + // gradientStart: tabController?.index == 1 &&
  282 + // !Utils.getAuthority(context, '生成二维码')
  283 + // ? MyColours.color_ffffff
  284 + // : MyColours.color_ffffff,
  285 + // gradientEnd: tabController?.index == 1 &&
  286 + // !Utils.getAuthority(context, '生成二维码')
  287 + // ? MyColours.color_ffffff
  288 + // : MyColours.color_ffffff,
  289 + // fontSize: 28,
  290 + // textColor: MyColours.color_199095,
  291 + // borderColor: MyColours.color_199095,
  292 + // onPressed: () async {
  293 + // // UserModel userModel =
  294 + // // Provider.of<UserModel>(context, listen: false);
  295 + // if (!(tabController?.index == 1 &&
  296 + // !Utils.getAuthority(context, '生成二维码'))) {
  297 + // if (Utils.getAuthority(context, '生成二维码')) {
  298 + // bool? needRefresh =
  299 + // await NavigatorUtil.goPlanDishQrcodePage(
  300 + // context,
  301 + // );
  302 + // } else {
  303 + // bool? needRefresh =
  304 + // await NavigatorUtil.goPlanDishQrcodePage(
  305 + // context,
  306 + // );
  307 + // print(needRefresh);
  308 + // if (needRefresh != null && needRefresh) {
  309 + // // bus.emit('refresh_coupon_list_f');
  310 + // //刷新页面数据
  311 + // // _controller.callRefresh();
  312 + // // _couponNetworkData(tabController.index);
  313 + // }
  314 + // }
  315 + // }
  316 + // },
  317 + // )),
  318 + // HEmptyView(20),
  319 + // Expanded(
  320 + // child: RoundButton(
  321 + // text: '分享给客户',
  322 + // height: ScreenUtil().setWidth(80),
  323 + // radius: ScreenUtil().setWidth(14),
  324 + // gradientStart: tabController?.index == 1 &&
  325 + // !Utils.getAuthority(context, '创建新排菜')
  326 + // ? MyColours.color_ffffff
  327 + // : MyColours.color_ffffff,
  328 + // gradientEnd: tabController?.index == 1 &&
  329 + // !Utils.getAuthority(context, '创建新排菜')
  330 + // ? MyColours.color_ffffff
  331 + // : MyColours.color_ffffff,
  332 + // fontSize: 28,
  333 + // textColor: MyColours.color_199095,
  334 + // borderColor: MyColours.color_199095,
  335 + // onPressed: () async {
  336 + // // UserModel userModel =
  337 + // // Provider.of<UserModel>(context, listen: false);
  338 + // if (!(tabController?.index == 1 &&
  339 + // !Utils.getAuthority(context, '创建新排菜'))) {
  340 + // if (Utils.getAuthority(context, '创建新排菜')) {
  341 + // NavigatorUtil.goPlanDishCreateSelectTypePage(
  342 + // context);
  343 + // } else {
  344 + // bool? needRefresh =
  345 + // await NavigatorUtil.goPlanDishEditPage(context,
  346 + // isMine: true, isEdit: true);
  347 + // print(needRefresh);
  348 + // if (needRefresh != null && needRefresh) {
  349 + // // bus.emit('refresh_coupon_list_f');
  350 + // //刷新页面数据
  351 + // // _controller.callRefresh();
  352 + // // _couponNetworkData(tabController.index);
  353 + // }
  354 + // }
  355 + // }
  356 + // },
  357 + // ),
  358 + // )
357 ], 359 ],
358 )) 360 ))
359 ], 361 ],
1 import 'dart:async'; 1 import 'dart:async';
2 -import 'dart:convert'; 2 +
  3 +
3 import 'dart:ui'; 4 import 'dart:ui';
4 5
5 import 'package:cached_network_image/cached_network_image.dart'; 6 import 'package:cached_network_image/cached_network_image.dart';
@@ -13,30 +14,27 @@ import 'package:flutter_lunar_datetime_picker/flutter_lunar_datetime_picker.dart @@ -13,30 +14,27 @@ import 'package:flutter_lunar_datetime_picker/flutter_lunar_datetime_picker.dart
13 import 'package:flutter_picker_plus/flutter_picker_plus.dart'; 14 import 'package:flutter_picker_plus/flutter_picker_plus.dart';
14 import 'package:flutter_screenutil/flutter_screenutil.dart'; 15 import 'package:flutter_screenutil/flutter_screenutil.dart';
15 16
16 -import 'package:one_key/constant/constant.dart'; 17 +
17 import 'package:one_key/models/filter_btn_model.dart'; 18 import 'package:one_key/models/filter_btn_model.dart';
18 import 'package:one_key/models/remark.dart'; 19 import 'package:one_key/models/remark.dart';
19 import 'package:one_key/models/seller_role_model.dart'; 20 import 'package:one_key/models/seller_role_model.dart';
20 import 'package:one_key/models/table_list.dart'; 21 import 'package:one_key/models/table_list.dart';
21 -import 'package:one_key/pages/message/message_dialog_item.dart'; 22 +
22 import 'package:one_key/pages/message/message_dialog_item_f.dart'; 23 import 'package:one_key/pages/message/message_dialog_item_f.dart';
23 import 'package:one_key/provider/message_dialog_model.dart'; 24 import 'package:one_key/provider/message_dialog_model.dart';
24 25
25 import 'package:one_key/res/colors.dart'; 26 import 'package:one_key/res/colors.dart';
26 -import 'package:one_key/utils/NumLengthInputFormatter.dart';  
27 -import 'package:one_key/utils/misc.dart'; 27 +
28 import 'package:one_key/route/navigator_util.dart'; 28 import 'package:one_key/route/navigator_util.dart';
29 import 'package:one_key/utils/pick_date_nonli_gongli/lunar_calendar_util.dart'; 29 import 'package:one_key/utils/pick_date_nonli_gongli/lunar_calendar_util.dart';
30 -import 'package:one_key/utils/pick_date_nonli_gongli/pick_calendar_day.dart';  
31 -import 'package:one_key/utils/pick_date_nonli_gongli/pick_calendar_month.dart';  
32 -import 'package:one_key/utils/pick_date_nonli_gongli/pick_calendar_year.dart'; 30 +
33 import 'package:one_key/utils/screen_util.dart'; 31 import 'package:one_key/utils/screen_util.dart';
34 import 'package:one_key/utils/utils.dart'; 32 import 'package:one_key/utils/utils.dart';
35 import 'package:one_key/widgets/MyDivider.dart'; 33 import 'package:one_key/widgets/MyDivider.dart';
36 import 'package:one_key/widgets/common_button.dart'; 34 import 'package:one_key/widgets/common_button.dart';
37 import 'package:one_key/widgets/h_empty_view.dart'; 35 import 'package:one_key/widgets/h_empty_view.dart';
38 import 'package:one_key/widgets/round_button.dart'; 36 import 'package:one_key/widgets/round_button.dart';
39 -import 'package:one_key/widgets/table_item.dart'; 37 +
40 import 'package:one_key/widgets/v_empty_view.dart'; 38 import 'package:one_key/widgets/v_empty_view.dart';
41 import 'package:provider/provider.dart'; 39 import 'package:provider/provider.dart';
42 import 'package:table_calendar/table_calendar.dart'; 40 import 'package:table_calendar/table_calendar.dart';
@@ -56,10 +54,9 @@ import '../models/seller_version_model.dart'; @@ -56,10 +54,9 @@ import '../models/seller_version_model.dart';
56 import '../models/table_or_reserve_model.dart'; 54 import '../models/table_or_reserve_model.dart';
57 import '../models/theme_color_model.dart'; 55 import '../models/theme_color_model.dart';
58 import '../models/titlte_type_model.dart'; 56 import '../models/titlte_type_model.dart';
59 -import '../pages/my/marketing_center/theme_model.dart'; 57 +
60 import '../provider/collect_store_provider.dart'; 58 import '../provider/collect_store_provider.dart';
61 59
62 -import 'package:flutter_lunar_datetime_picker/flutter_lunar_datetime_picker.dart';  
63 import 'package:flutter_lunar_datetime_picker/datetime_picker_theme.dart' 60 import 'package:flutter_lunar_datetime_picker/datetime_picker_theme.dart'
64 as picker_theme; 61 as picker_theme;
65 62
@@ -1545,6 +1542,312 @@ class DialogUtil { @@ -1545,6 +1542,312 @@ class DialogUtil {
1545 })); 1542 }));
1546 }); 1543 });
1547 } 1544 }
  1545 +
  1546 + static rechargeItem(context, String title, String subTitle) {
  1547 + return Row(
  1548 + children: [
  1549 + Container(
  1550 + child: Text(title,
  1551 + style: TextStyle(
  1552 + color: MyColours.color_515151, fontSize: font(14)))),
  1553 + HEmptyView(32),
  1554 + Expanded(
  1555 + child: InkWell(
  1556 + onTap: () {},
  1557 + child: Container(
  1558 + height: w(40),
  1559 + padding: EdgeInsets.symmetric(horizontal: w(12)),
  1560 + decoration: BoxDecoration(
  1561 + borderRadius: BorderRadius.circular(r(10)),
  1562 + border: Border.all(
  1563 + width: w(0.5), color: MyColours.color_CBCBCB)),
  1564 + child: Row(
  1565 + mainAxisAlignment: MainAxisAlignment.spaceBetween,
  1566 + children: [
  1567 + Expanded(
  1568 + child: TextField(
  1569 + // controller: controller,
  1570 + textAlign: TextAlign.left,
  1571 + textAlignVertical: TextAlignVertical.bottom,
  1572 + maxLines: 1,
  1573 + // //光标颜色
  1574 + // cursorColor:
  1575 + // widget.isSelect ? Colors.white : MyColours.color_199095,
  1576 + //输入文本的样式
  1577 + // inputFormatters: title ==
  1578 + // '券名称'
  1579 + // ? [
  1580 + // LengthLimitingTextInputFormatter(
  1581 + // 15)
  1582 + // ]
  1583 + // : title == '领取后有效天数' ||
  1584 + // title ==
  1585 + // '发放总量限制'
  1586 + // ? [
  1587 + // FilteringTextInputFormatter
  1588 + // .digitsOnly
  1589 + // ]
  1590 + // : title == '券金额' ||
  1591 + // title ==
  1592 + // '分享佣金' ||
  1593 + // title ==
  1594 + // '消费要求（0为无门槛）'
  1595 + // ? [
  1596 + // FilteringTextInputFormatter.allow(
  1597 + // RegExp("[0-9.]")),
  1598 + // ]
  1599 + // : [], // 限制输入为数字,
  1600 + style: TextStyle(
  1601 + color: MyColours.color_515151,
  1602 + fontSize: ScreenUtil().setSp(28),
  1603 + ),
  1604 + // focusNode: focusNode,
  1605 + decoration: InputDecoration(
  1606 + isCollapsed: true,
  1607 + border: OutlineInputBorder(
  1608 + borderSide: BorderSide.none),
  1609 + hintText: '请输入',
  1610 + hintStyle: TextStyle(
  1611 + color: MyColours.color_999999,
  1612 + fontSize: ScreenUtil().setSp(28),
  1613 + ),
  1614 + enabledBorder: new UnderlineInputBorder(
  1615 + borderSide: BorderSide.none,
  1616 + ),
  1617 + focusedBorder: new UnderlineInputBorder(
  1618 + borderSide: BorderSide.none,
  1619 + ),
  1620 + ),
  1621 + onChanged: (value) {},
  1622 + onEditingComplete: () {
  1623 + FocusScope.of(context)
  1624 + .requestFocus(FocusNode()); //点击空白处隐藏键盘
  1625 + })),
  1626 + Container(
  1627 + child: Text(subTitle,
  1628 + style: TextStyle(
  1629 + color: MyColours.color_515151,
  1630 + fontSize: font(14)))),
  1631 + ],
  1632 + )),
  1633 + ),
  1634 + )
  1635 + ],
  1636 + );
  1637 + }
  1638 +
  1639 + ///券说明
  1640 + static Widget rechargeWidget(String title, String hintText,
  1641 + TextEditingController controller, FocusNode node) {
  1642 + return Container(
  1643 + // height: ScreenUtil().setWidth(380),
  1644 + padding: EdgeInsets.symmetric(vertical: ScreenUtil().setWidth(28)),
  1645 + child: Column(
  1646 + crossAxisAlignment: CrossAxisAlignment.start,
  1647 + children: [
  1648 + Align(
  1649 + alignment: Alignment.centerLeft,
  1650 + child: Text(
  1651 + title,
  1652 + textAlign: TextAlign.left,
  1653 + style: TextStyle(
  1654 + color: MyColours.color_515151,
  1655 + fontSize: ScreenUtil().setSp(32)),
  1656 + )),
  1657 + VEmptyView(26),
  1658 + Container(
  1659 + height: ScreenUtil().setWidth(2),
  1660 + color: MyColours.color_E7E7E7,
  1661 + ),
  1662 + TextField(
  1663 + controller: controller,
  1664 + focusNode: node,
  1665 + // keyboardType: TextInputType.numberWithOptions(decimal: true), //键盘类型，数字键盘
  1666 + maxLines: 3,
  1667 + maxLength: 150,
  1668 +
  1669 + // maxLengthEnforced: true,
  1670 + style: TextStyle(
  1671 + fontSize: ScreenUtil().setSp(32),
  1672 + color: MyColours.color_333333), //输入文本的样式
  1673 + decoration: InputDecoration(
  1674 + contentPadding:
  1675 + EdgeInsets.symmetric(vertical: ScreenUtil().setWidth(30)),
  1676 + hintText: hintText,
  1677 + hintStyle: TextStyle(
  1678 + color: MyColours.color_999999,
  1679 + fontSize: ScreenUtil().setSp(32),
  1680 + ),
  1681 +
  1682 + border: OutlineInputBorder(borderSide: BorderSide.none),
  1683 +
  1684 + enabledBorder: new UnderlineInputBorder(
  1685 + borderSide: BorderSide.none,
  1686 + ),
  1687 + focusedBorder: new UnderlineInputBorder(
  1688 + borderSide: BorderSide.none,
  1689 + ),
  1690 +
  1691 + // fillColor: MyColours.color_F9F9F9,
  1692 + // // fillColor: Colors.red,
  1693 + // filled: true,
  1694 + // enabledBorder: OutlineInputBorder(
  1695 + // //未选中时候的颜色
  1696 + // borderRadius: BorderRadius.circular(ScreenUtil().setWidth(20)),
  1697 + // borderSide: BorderSide(
  1698 + // color: MyColours.color_cccccc,
  1699 + // width: ScreenUtil().setWidth(2)),
  1700 + // ),
  1701 + // focusedBorder: OutlineInputBorder(
  1702 + // //选中时外边框颜色
  1703 + // borderRadius: BorderRadius.circular(ScreenUtil().setWidth(20)),
  1704 + // borderSide: BorderSide(
  1705 + // color: MyColours.app_main,
  1706 + // ),
  1707 + // ),
  1708 + // border: OutlineInputBorder(
  1709 + // borderRadius:
  1710 + // BorderRadius.circular(ScreenUtil().setWidth(20)),
  1711 + // borderSide: BorderSide(
  1712 + // color: Colors.red, width: ScreenUtil().setWidth(2))),
  1713 + ),
  1714 + onChanged: (value) {},
  1715 + ),
  1716 + ],
  1717 + ),
  1718 + );
  1719 + }
  1720 +
  1721 + //余额充值弹框
  1722 + static showRechargeDialog(
  1723 + BuildContext context, String title, CustomCallBack callback,
  1724 + {GestureTapCallback? onTapLeft, GestureTapCallback? onTapRight}) {
  1725 + return showDialog(
  1726 + context: context,
  1727 + barrierDismissible: true,
  1728 + builder: (BuildContext context) {
  1729 + return Center(child: StatefulBuilder(builder: (context, state) {
  1730 + // locationState = state;
  1731 + return Material(
  1732 + color: Colors.transparent,
  1733 + child: Container(
  1734 + width: double.infinity,
  1735 + margin: EdgeInsets.symmetric(horizontal: w(37)),
  1736 + decoration: BoxDecoration(
  1737 + color: MyColours.color_ffffff,
  1738 + borderRadius: BorderRadius.circular(
  1739 + r(8),
  1740 + )),
  1741 + child: Column(
  1742 + mainAxisSize: MainAxisSize.min,
  1743 + crossAxisAlignment: CrossAxisAlignment.start,
  1744 + children: <Widget>[
  1745 + Padding(
  1746 + padding: EdgeInsets.symmetric(horizontal: w(20)),
  1747 + child: Column(
  1748 + crossAxisAlignment: CrossAxisAlignment.start,
  1749 + children: [
  1750 + VEmptyView(40),
  1751 + Container(
  1752 + alignment: Alignment.center,
  1753 + child: Text('充值余额',
  1754 + style: TextStyle(
  1755 + fontWeight: FontWeight.bold,
  1756 + color: MyColours.color_515151,
  1757 + fontSize: font(16)))),
  1758 + VEmptyView(30),
  1759 + Row(
  1760 + children: [
  1761 + Container(
  1762 + child: Text('充值优惠活动',
  1763 + style: TextStyle(
  1764 + color:
  1765 + MyColours.color_515151,
  1766 + fontSize: font(14)))),
  1767 + HEmptyView(32),
  1768 + Expanded(
  1769 + child: InkWell(
  1770 + onTap: () {},
  1771 + child: Container(
  1772 + height: w(40),
  1773 + padding: EdgeInsets.symmetric(
  1774 + horizontal: w(12)),
  1775 + decoration: BoxDecoration(
  1776 + borderRadius:
  1777 + BorderRadius.circular(
  1778 + r(10)),
  1779 + border: Border.all(
  1780 + width: w(0.5),
  1781 + color: MyColours
  1782 + .color_CBCBCB)),
  1783 + child: Row(
  1784 + mainAxisAlignment:
  1785 + MainAxisAlignment
  1786 + .spaceBetween,
  1787 + children: [
  1788 + Text('请选择',
  1789 + style: TextStyle(
  1790 + color: true
  1791 + ? MyColours
  1792 + .color_999999
  1793 + : MyColours
  1794 + .color_515151,
  1795 + fontSize:
  1796 + font(14))),
  1797 + Image.asset(
  1798 + Utils.getImgPath(
  1799 + 'c_arrow_down_unsel'),
  1800 + width: w(17),
  1801 + )
  1802 + ],
  1803 + )),
  1804 + ),
  1805 + )
  1806 + ],
  1807 + ),
  1808 + VEmptyView(30),
  1809 + rechargeItem(context, '充值金额', '元'),
  1810 + VEmptyView(30),
  1811 + rechargeItem(context, '赠送金额', '元'),
  1812 + VEmptyView(30),
  1813 + rechargeItem(context, '赠送积分', '分'),
  1814 + rechargeWidget('备注', '请输入备注',
  1815 + TextEditingController(), FocusNode()),
  1816 + MyDivider(double.infinity, w(1),
  1817 + color: MyColours.color_DBDBDB),
  1818 + Row(
  1819 + // mainAxisAlignment: MainAxisAlignment.spaceBetween,
  1820 + children: [
  1821 + Expanded(
  1822 + flex: 1,
  1823 + child: RoundButton(
  1824 + text: '确定',
  1825 + // width: (ScreenUtil().screenWidth -
  1826 + // ScreenUtil().setWidth(62) * 2) /
  1827 + // 2,
  1828 + height:
  1829 + ScreenUtil().setWidth(112),
  1830 + // radius: ScreenUtil().setWidth(10),
  1831 + gradientStart:
  1832 + Colors.transparent,
  1833 + gradientEnd: Colors.transparent,
  1834 + textColor:
  1835 + MyColours.color_515151,
  1836 + isBold: false,
  1837 + fontSize: 32,
  1838 + onPressed: () {
  1839 + if (Navigator.canPop(
  1840 + context)) {
  1841 + Navigator.pop(context);
  1842 + }
  1843 + })),
  1844 + ],
  1845 + ),
  1846 + ]))
  1847 + ])));
  1848 + }));
  1849 + });
  1850 + }
1548 // static showSellerVersionBuyDialog( 1851 // static showSellerVersionBuyDialog(
1549 // BuildContext context, String title, CustomCallBack callback, 1852 // BuildContext context, String title, CustomCallBack callback,
1550 // {GestureTapCallback onTapLeft, GestureTapCallback onTapRight}) { 1853 // {GestureTapCallback onTapLeft, GestureTapCallback onTapRight}) {