xt / Flutter-ReserveApp · Commits

Go to a project

Commit 941293342d45488e1c638eae969511733a42a533

Authored by wdn127929
1 parent 5e48db50
build: skipped

切换店铺页面调整

Inline Side-by-side
Showing 7 changed files with 276 additions and 246 deletions
@@ -12,14 +12,14 @@ if (flutterRoot == null) { @@ -12,14 +12,14 @@ if (flutterRoot == null) {
12 } 12 }
13 13
14 14
15 -def flutterVersionCode = "351" 15 +def flutterVersionCode = "352"
16 if (flutterVersionCode == null) { 16 if (flutterVersionCode == null) {
17 - flutterVersionCode = '351' 17 + flutterVersionCode = '352'
18 } 18 }
19 19
20 -def flutterVersionName = "3.5.1" 20 +def flutterVersionName = "3.5.2"
21 if (flutterVersionName == null) { 21 if (flutterVersionName == null) {
22 - flutterVersionName = '3.5.1' 22 + flutterVersionName = '3.5.2'
23 } 23 }
24 apply plugin: 'com.android.application' 24 apply plugin: 'com.android.application'
25 apply plugin: 'kotlin-android' 25 apply plugin: 'kotlin-android'
@@ -173,205 +173,224 @@ class _IfNeedCreateStoreState extends State<IfNeedCreateStore> @@ -173,205 +173,224 @@ class _IfNeedCreateStoreState extends State<IfNeedCreateStore>
173 }, 173 },
174 child: Scaffold( 174 child: Scaffold(
175 backgroundColor: Colors.white, 175 backgroundColor: Colors.white,
176 - appBar: SystemAppBar(  
177 - '',  
178 - // leftTitle: '上一步',  
179 - onTap: () {  
180 - if (widget.changeStatus) {  
181 - EventBus().emit('changeStatusColor');  
182 - }  
183 - Navigator.of(context).pop();  
184 - },  
185 - ), 176 + appBar: SystemAppBar('选择店铺',
  177 + // leftTitle: '上一步',
  178 + onTap: () {
  179 + if (widget.changeStatus) {
  180 + EventBus().emit('changeStatusColor');
  181 + }
  182 + Navigator.of(context).pop();
  183 + },
  184 + rightImgName: 'add_check_store.png',
  185 + onTapRight: () {
  186 + if (otherLoginProvider.pageState != PageState.Success) {
  187 + // if (!App.sp.containsKey('openid') ||
  188 + // App.sp.get("openid") == null ||
  189 + // App.sp.get("openid") == '') {
  190 + //跳转小程序
  191 + Utils.goMiniProgramCreatePage(context);
  192 + // } else {
  193 + // //跳转至新建店铺流程
  194 + // NavigatorUtil.goEnterStoreNamePage(context);
  195 + // }
  196 + } else {
  197 + // if (!App.sp.containsKey('openid') ||
  198 + // App.sp.get("openid") == null ||
  199 + // App.sp.get("openid") == '') {
  200 + // //跳转小程序
  201 + // Utils.goMiniProgramCreatePage(context);
  202 + // } else {
  203 + //跳转至新建店铺流程
  204 + NavigatorUtil.goEnterStoreNamePage(context);
  205 + // }
  206 + }
  207 + }),
186 body: Container( 208 body: Container(
187 // margin: EdgeInsets.only(bottom: ScreenUtil().setWidth(40)), 209 // margin: EdgeInsets.only(bottom: ScreenUtil().setWidth(40)),
188 padding: 210 padding:
189 - EdgeInsets.symmetric(horizontal: ScreenUtil().setWidth(70)), 211 + EdgeInsets.symmetric(horizontal: ScreenUtil().setWidth(48)),
190 child: 212 child:
191 Consumer<OtherLoginProvider>(builder: (context, model, _) { 213 Consumer<OtherLoginProvider>(builder: (context, model, _) {
192 if (model.pageState != PageState.Success) { 214 if (model.pageState != PageState.Success) {
193 - if (model.pageState == PageState.Empty) {  
194 - return Container(  
195 - width: double.infinity,  
196 - padding: EdgeInsets.all(ScreenUtil().setWidth(40)),  
197 - child: Column(  
198 - crossAxisAlignment: CrossAxisAlignment.center,  
199 - // mainAxisAlignment: MainAxisAlignment.center,  
200 - children: [  
201 - VEmptyView(80),  
202 - Image.asset(  
203 - Utils.getImgPath('not_member'),  
204 - width: ScreenUtil().setWidth(120),  
205 - height: ScreenUtil().setWidth(120),  
206 - ),  
207 - VEmptyView(60),  
208 - Text(  
209 - '您还没有绑定任何店铺',  
210 - style: TextStyle(  
211 - fontSize: ScreenUtil().setSp(32),  
212 - color: MyColours.color_333333,  
213 - fontWeight: FontWeight.bold),  
214 - ),  
215 - VEmptyView(172),  
216 - InkWell(  
217 - onTap: () {  
218 - // if (!App.sp.containsKey('openid') ||  
219 - // App.sp.get("openid") == null ||  
220 - // App.sp.get("openid") == '') {  
221 - //跳转小程序  
222 - Utils.goMiniProgramCreatePage(context);  
223 - // } else {  
224 - // //跳转至新建店铺流程  
225 - // NavigatorUtil.goEnterStoreNamePage(context);  
226 - // }  
227 - },  
228 - child: Container(  
229 - width: double.infinity,  
230 - padding: EdgeInsets.symmetric(  
231 - horizontal: ScreenUtil().setWidth(40),  
232 - vertical: ScreenUtil().setWidth(18)),  
233 - decoration: BoxDecoration(  
234 - color: MyColours.color_24A4A8,  
235 - borderRadius: BorderRadius.circular(  
236 - ScreenUtil().setWidth(10))),  
237 - child: Text(  
238 - '创建店铺',  
239 - textAlign: TextAlign.center,  
240 - maxLines: 1,  
241 - overflow: TextOverflow.ellipsis,  
242 - style: TextStyle(  
243 - color: MyColours.color_ffffff,  
244 - fontSize: ScreenUtil().setSp(34)),  
245 - ),  
246 - )),  
247 - ]));  
248 - } 215 + // if (model.pageState == PageState.Empty) {
  216 + // return Container(
  217 + // width: double.infinity,
  218 + // padding: EdgeInsets.all(ScreenUtil().setWidth(40)),
  219 + // child: Column(
  220 + // crossAxisAlignment: CrossAxisAlignment.center,
  221 + // // mainAxisAlignment: MainAxisAlignment.center,
  222 + // children: [
  223 + // VEmptyView(80),
  224 + // Image.asset(
  225 + // Utils.getImgPath('not_member'),
  226 + // width: ScreenUtil().setWidth(120),
  227 + // height: ScreenUtil().setWidth(120),
  228 + // ),
  229 + // VEmptyView(60),
  230 + // Text(
  231 + // '您还没有绑定任何店铺',
  232 + // style: TextStyle(
  233 + // fontSize: ScreenUtil().setSp(32),
  234 + // color: MyColours.color_333333,
  235 + // fontWeight: FontWeight.bold),
  236 + // ),
  237 + // VEmptyView(172),
  238 + // InkWell(
  239 + // onTap: () {
  240 + // // if (!App.sp.containsKey('openid') ||
  241 + // // App.sp.get("openid") == null ||
  242 + // // App.sp.get("openid") == '') {
  243 + // //跳转小程序
  244 + // Utils.goMiniProgramCreatePage(context);
  245 + // // } else {
  246 + // // //跳转至新建店铺流程
  247 + // // NavigatorUtil.goEnterStoreNamePage(context);
  248 + // // }
  249 + // },
  250 + // child: Container(
  251 + // width: double.infinity,
  252 + // padding: EdgeInsets.symmetric(
  253 + // horizontal: ScreenUtil().setWidth(40),
  254 + // vertical: ScreenUtil().setWidth(18)),
  255 + // decoration: BoxDecoration(
  256 + // color: MyColours.color_24A4A8,
  257 + // borderRadius: BorderRadius.circular(
  258 + // ScreenUtil().setWidth(10))),
  259 + // child: Text(
  260 + // '创建店铺',
  261 + // textAlign: TextAlign.center,
  262 + // maxLines: 1,
  263 + // overflow: TextOverflow.ellipsis,
  264 + // style: TextStyle(
  265 + // color: MyColours.color_ffffff,
  266 + // fontSize: ScreenUtil().setSp(34)),
  267 + // ),
  268 + // )),
  269 + // ]));
  270 + // }
249 return ExceptionPage( 271 return ExceptionPage(
250 pageState: model.pageState, 272 pageState: model.pageState,
251 callback: () { 273 callback: () {
252 _checkSellerAcc(showLoading: true); 274 _checkSellerAcc(showLoading: true);
253 }, 275 },
254 - emptyMsg: "", 276 + emptyMsg: "您还没有绑定任何店铺",
255 emptyImg: "empty_search", 277 emptyImg: "empty_search",
256 showMsg: "加载中，请稍后...", 278 showMsg: "加载中，请稍后...",
257 ); 279 );
258 } else { 280 } else {
259 - return Column(  
260 - children: [  
261 - VEmptyView(40),  
262 - Text(  
263 - '请选择您要进入的店铺',  
264 - style: TextStyle(  
265 - fontSize: ScreenUtil().setWidth(32),  
266 - color: MyColours.color_333333,  
267 - fontWeight: FontWeight.bold),  
268 - ),  
269 - VEmptyView(100),  
270 - Expanded(  
271 - child: GridView.builder(  
272 - padding: EdgeInsets.only(  
273 - bottom: ScreenUtil().setWidth(50)),  
274 - // controller: widget.scrollController,  
275 - // padding: EdgeInsets.only(top: ScreenUtil().getAdapterSize(10)),  
276 - shrinkWrap: true,  
277 - itemCount: model.sellerList.length + 1,  
278 - cacheExtent: ScreenUtil().setWidth(197 * 2),  
279 - //SliverGridDelegateWithFixedCrossAxisCount 构建一个横轴固定数量Widget  
280 - gridDelegate:  
281 - SliverGridDelegateWithFixedCrossAxisCount(  
282 - //横轴元素个数  
283 - crossAxisCount: 2,  
284 - //纵轴间距  
285 - mainAxisSpacing:  
286 - ScreenUtil().setWidth(50),  
287 - //横轴间距  
288 - crossAxisSpacing:  
289 - ScreenUtil().setWidth(50),  
290 - //子组件宽高长度比例  
291 - childAspectRatio: 140 / 197),  
292 - itemBuilder: (BuildContext context, int index) {  
293 - if (index == model.sellerList.length) {  
294 - return InkWell(  
295 - onTap: () {  
296 - // if (!App.sp.containsKey('openid') ||  
297 - // App.sp.get("openid") == null ||  
298 - // App.sp.get("openid") == '') {  
299 - // //跳转小程序  
300 - // Utils.goMiniProgramCreatePage(context);  
301 - // } else {  
302 - //跳转至新建店铺流程  
303 - NavigatorUtil.goEnterStoreNamePage(  
304 - context);  
305 - // }  
306 - },  
307 - child: DottedBorder(  
308 - dashPattern: [5, 5, 5, 5],  
309 - borderType: BorderType.RRect,  
310 - radius: Radius.circular(  
311 - ScreenUtil().setWidth(10)),  
312 - // padding: EdgeInsets.all(ScreenUtil().setWidth(70)),  
313 - color: MyColours.color_cccccc,  
314 - strokeWidth: ScreenUtil().setWidth(2),  
315 - child: ClipRRect(  
316 - borderRadius: BorderRadius.all(  
317 - Radius.circular(12)),  
318 - child: Container(  
319 - height: ScreenUtil()  
320 - .setWidth(197 * 2),  
321 - width: ScreenUtil()  
322 - .setWidth(140 * 2),  
323 - child: Column(  
324 - mainAxisAlignment:  
325 - MainAxisAlignment.center,  
326 - children: [  
327 - Image.asset(  
328 - Utils.getImgPath(  
329 - 'add_store'),  
330 - width: ScreenUtil()  
331 - .setWidth(32)),  
332 - VEmptyView(10),  
333 - Text(  
334 - '创建店铺',  
335 - style: TextStyle(  
336 - color: MyColours  
337 - .color_999999,  
338 - fontSize: ScreenUtil()  
339 - .setSp(24)),  
340 - )  
341 - ],  
342 - ),  
343 - ),  
344 - ),  
345 - )); 281 + return
  282 + // VEmptyView(40),
  283 + // Text(
  284 + // '请选择您要进入的店铺',
  285 + // style: TextStyle(
  286 + // fontSize: ScreenUtil().setWidth(32),
  287 + // color: MyColours.color_333333,
  288 + // fontWeight: FontWeight.bold),
  289 + // ),
  290 + // VEmptyView(100),
  291 + ListView.builder(
  292 + padding: EdgeInsets.only(
  293 + top: ScreenUtil().setWidth(50),
  294 + bottom: ScreenUtil().setWidth(20)),
  295 + // controller: widget.scrollController,
  296 + // padding: EdgeInsets.only(top: ScreenUtil().getAdapterSize(10)),
  297 + shrinkWrap: true,
  298 + itemCount: model.sellerList.length,
  299 + // cacheExtent: ScreenUtil().setWidth(197 * 2),
  300 + //SliverGridDelegateWithFixedCrossAxisCount 构建一个横轴固定数量Widget
  301 + // gridDelegate:
  302 + // SliverGridDelegateWithFixedCrossAxisCount(
  303 + // //横轴元素个数
  304 + // crossAxisCount: 2,
  305 + // //纵轴间距
  306 + // mainAxisSpacing:
  307 + // ScreenUtil().setWidth(50),
  308 + // //横轴间距
  309 + // crossAxisSpacing:
  310 + // ScreenUtil().setWidth(50),
  311 + // //子组件宽高长度比例
  312 + // childAspectRatio: 140 / 197),
  313 + itemBuilder: (BuildContext context, int index) {
  314 + // if (index == model.sellerList.length) {
  315 + // return InkWell(
  316 + // onTap: () {
  317 + // // if (!App.sp.containsKey('openid') ||
  318 + // // App.sp.get("openid") == null ||
  319 + // // App.sp.get("openid") == '') {
  320 + // // //跳转小程序
  321 + // // Utils.goMiniProgramCreatePage(context);
  322 + // // } else {
  323 + // //跳转至新建店铺流程
  324 + // NavigatorUtil.goEnterStoreNamePage(
  325 + // context);
  326 + // // }
  327 + // },
  328 + // child: DottedBorder(
  329 + // dashPattern: [5, 5, 5, 5],
  330 + // borderType: BorderType.RRect,
  331 + // radius: Radius.circular(
  332 + // ScreenUtil().setWidth(10)),
  333 + // // padding: EdgeInsets.all(ScreenUtil().setWidth(70)),
  334 + // color: MyColours.color_cccccc,
  335 + // strokeWidth: ScreenUtil().setWidth(2),
  336 + // child: ClipRRect(
  337 + // borderRadius: BorderRadius.all(
  338 + // Radius.circular(12)),
  339 + // child: Container(
  340 + // height: ScreenUtil()
  341 + // .setWidth(197 * 2),
  342 + // width: ScreenUtil()
  343 + // .setWidth(140 * 2),
  344 + // child: Column(
  345 + // mainAxisAlignment:
  346 + // MainAxisAlignment.center,
  347 + // children: [
  348 + // Image.asset(
  349 + // Utils.getImgPath(
  350 + // 'add_store'),
  351 + // width: ScreenUtil()
  352 + // .setWidth(32)),
  353 + // VEmptyView(10),
  354 + // Text(
  355 + // '创建店铺',
  356 + // style: TextStyle(
  357 + // color: MyColours
  358 + // .color_999999,
  359 + // fontSize: ScreenUtil()
  360 + // .setSp(24)),
  361 + // )
  362 + // ],
  363 + // ),
  364 + // ),
  365 + // ),
  366 + // ));
  367 + // }
  368 + return InkWell(
  369 + onTap: () async {
  370 + if (widget.changeStatus) {
  371 + UserModel userModel =
  372 + Provider.of<UserModel>(context,
  373 + listen: false);
  374 + bool success = await userModel.loginOutOnly(
  375 + context, {
  376 + "seller_code": userModel.user.sellercode,
  377 + "account": userModel.user.account
  378 + });
  379 + if (success) {
  380 + _clickStore(
  381 + context, model.sellerList[index]);
  382 + }
  383 + } else {
  384 + _clickStore(
  385 + context, model.sellerList[index]);
346 } 386 }
347 - return InkWell(  
348 - onTap: () async {  
349 - if (widget.changeStatus) {  
350 - UserModel userModel =  
351 - Provider.of<UserModel>(context,  
352 - listen: false);  
353 - bool success = await userModel  
354 - .loginOutOnly(context, {  
355 - "seller_code":  
356 - userModel.user.sellercode,  
357 - "account": userModel.user.account  
358 - });  
359 - if (success) {  
360 - _clickStore(  
361 - context, model.sellerList[index]);  
362 - }  
363 - } else {  
364 - _clickStore(  
365 - context, model.sellerList[index]);  
366 - }  
367 - },  
368 - child: IfNeedCreateStoreItem(  
369 - model: model.sellerList[index]),  
370 - );  
371 - })),  
372 - // VEmptyView(40),  
373 - ],  
374 - ); 387 + },
  388 + child: IfNeedCreateStoreItem(
  389 + model: model.sellerList[index]),
  390 + );
  391 + });
  392 + // VEmptyView(40),
  393 +
375 } 394 }
376 })))); 395 }))));
377 } 396 }
@@ -3,6 +3,7 @@ import 'package:flutter_screenutil/screenutil.dart'; @@ -3,6 +3,7 @@ import 'package:flutter_screenutil/screenutil.dart';
3 import 'package:one_key/models/check_seller_acc_model.dart'; 3 import 'package:one_key/models/check_seller_acc_model.dart';
4 import 'package:one_key/res/colors.dart'; 4 import 'package:one_key/res/colors.dart';
5 import 'package:one_key/utils/utils.dart'; 5 import 'package:one_key/utils/utils.dart';
  6 +import 'package:one_key/widgets/h_empty_view.dart';
6 import 'package:one_key/widgets/v_empty_view.dart'; 7 import 'package:one_key/widgets/v_empty_view.dart';
7 8
8 class IfNeedCreateStoreItem extends StatefulWidget { 9 class IfNeedCreateStoreItem extends StatefulWidget {
@@ -16,62 +17,69 @@ class IfNeedCreateStoreItem extends StatefulWidget { @@ -16,62 +17,69 @@ class IfNeedCreateStoreItem extends StatefulWidget {
16 class _IfNeedCreateStoreItemState extends State<IfNeedCreateStoreItem> { 17 class _IfNeedCreateStoreItemState extends State<IfNeedCreateStoreItem> {
17 @override 18 @override
18 Widget build(BuildContext context) { 19 Widget build(BuildContext context) {
19 - return Stack(  
20 - children: [  
21 - Container(  
22 - decoration: BoxDecoration(  
23 - border: Border.all(  
24 - width: ScreenUtil().setWidth(2),  
25 - color: MyColours.color_D7F7F7),  
26 - borderRadius: BorderRadius.circular(ScreenUtil().setWidth(10))),  
27 - ),  
28 - Positioned(  
29 - top: 0,  
30 - left: 0,  
31 - child: ClipRRect(  
32 - //圆角图片  
33 - borderRadius: BorderRadius.only(  
34 - topRight: Radius.circular(ScreenUtil().setWidth(10)),  
35 - topLeft: Radius.circular(ScreenUtil().setWidth(10))),  
36 - child: widget.model.sellerImage != ''  
37 - ? Image.network(  
38 - widget.model.sellerImage,  
39 - fit: BoxFit.cover,  
40 - width: ScreenUtil().setWidth(140 * 2),  
41 - height: ScreenUtil().setWidth(140 * 2),  
42 - )  
43 - : Image.asset(  
44 - Utils.getImgPath('no_image'),  
45 - fit: BoxFit.cover,  
46 - width: ScreenUtil().setWidth(140 * 2),  
47 - height: ScreenUtil().setWidth(140 * 2),  
48 - ),  
49 - )),  
50 - Positioned(  
51 - bottom: 0,  
52 - left: ScreenUtil().setWidth(20),  
53 - right: ScreenUtil().setWidth(20),  
54 - child: Padding(  
55 - child: Column(  
56 - children: [  
57 - Text('${widget.model.sellername}',  
58 - maxLines: 1,  
59 - overflow: TextOverflow.ellipsis,  
60 - style: TextStyle(  
61 - fontSize: ScreenUtil().setWidth(30),  
62 - color: MyColours.color_333333)),  
63 - VEmptyView(10),  
64 - Text('${widget.model.roleName}',  
65 - maxLines: 1,  
66 - overflow: TextOverflow.ellipsis,  
67 - style: TextStyle(  
68 - fontSize: ScreenUtil().setWidth(24),  
69 - color: MyColours.color_666666))  
70 - ],  
71 - ),  
72 - padding:  
73 - EdgeInsets.symmetric(vertical: ScreenUtil().setWidth(14))))  
74 - ],  
75 - ); 20 + return Container(
  21 + height: ScreenUtil().setWidth(57 * 2),
  22 + padding: EdgeInsets.only(
  23 + left: ScreenUtil().setWidth(24 * 2),
  24 + right: ScreenUtil().setWidth(35 * 2)),
  25 + margin: EdgeInsets.only(bottom: ScreenUtil().setWidth(40)),
  26 + decoration: BoxDecoration(
  27 + color: MyColours.color_ffffff,
  28 + boxShadow: [
  29 + BoxShadow(
  30 + color: Color.fromRGBO(67, 142, 147, 0.3),
  31 + spreadRadius: ScreenUtil().setWidth(2),
  32 + blurRadius: ScreenUtil().setWidth(8))
  33 + ],
  34 + border: Border.all(
  35 + width: ScreenUtil().setWidth(2), color: MyColours.color_438E93),
  36 + borderRadius: BorderRadius.circular(ScreenUtil().setWidth(16))),
  37 + child: Row(
  38 + children: [
  39 + // Positioned(
  40 + // top: 0,
  41 + // left: 0,
  42 + // child: ClipRRect(
  43 + // //圆角图片
  44 + // borderRadius: BorderRadius.only(
  45 + // topRight: Radius.circular(ScreenUtil().setWidth(10)),
  46 + // topLeft: Radius.circular(ScreenUtil().setWidth(10))),
  47 + // child: widget.model.sellerImage != ''
  48 + // ? Image.network(
  49 + // widget.model.sellerImage,
  50 + // fit: BoxFit.cover,
  51 + // width: ScreenUtil().setWidth(140 * 2),
  52 + // height: ScreenUtil().setWidth(140 * 2),
  53 + // )
  54 + // : Image.asset(
  55 + // Utils.getImgPath('no_image'),
  56 + // fit: BoxFit.cover,
  57 + // width: ScreenUtil().setWidth(140 * 2),
  58 + // height: ScreenUtil().setWidth(140 * 2),
  59 + // ),
  60 + // )),
  61 + Container(
  62 + width: ScreenUtil().setWidth(160 * 2),
  63 + child: Text('${widget.model.sellername}',
  64 + maxLines: 1,
  65 + overflow: TextOverflow.ellipsis,
  66 + style: TextStyle(
  67 + fontSize: ScreenUtil().setWidth(32),
  68 + color: MyColours.color_515151)),
  69 + ),
  70 + Spacer(),
  71 + Text('${widget.model.roleName}',
  72 + maxLines: 1,
  73 + overflow: TextOverflow.ellipsis,
  74 + style: TextStyle(
  75 + fontSize: ScreenUtil().setWidth(32),
  76 + color: MyColours.color_999999)),
  77 + HEmptyView(40),
  78 + Image.asset(
  79 + Utils.getImgPath('enter_store_arrow_r'),
  80 + width: ScreenUtil().setWidth(20),
  81 + )
  82 + ],
  83 + ));
76 } 84 }
77 } 85 }
1 import 'package:flutter/material.dart'; 1 import 'package:flutter/material.dart';
2 2
3 class MyColours { 3 class MyColours {
  4 + static const Color color_515151 = Color(0xff515151);
4 static const Color color_438E93 = Color(0xff438E93); 5 static const Color color_438E93 = Color(0xff438E93);
5 static const Color color_27262B = Color(0xff27262B); 6 static const Color color_27262B = Color(0xff27262B);
6 static const Color color_BFC4D4 = Color(0xffBFC4D4); 7 static const Color color_BFC4D4 = Color(0xffBFC4D4);
@@ -76,8 +76,10 @@ class SystemAppBar extends StatelessWidget implements PreferredSizeWidget { @@ -76,8 +76,10 @@ class SystemAppBar extends StatelessWidget implements PreferredSizeWidget {
76 child: Padding( 76 child: Padding(
77 padding: EdgeInsets.only(right: ScreenUtil().setWidth(40)), 77 padding: EdgeInsets.only(right: ScreenUtil().setWidth(40)),
78 child: rightImgName.endsWith('png') 78 child: rightImgName.endsWith('png')
79 - ? Image.asset(Utils.getImgPath(rightImgName),  
80 - width: ScreenUtil().setWidth(40)) 79 + ? Image.asset(
  80 + Utils.getImgPath(
  81 + rightImgName.replaceAll('.png', '')),
  82 + width: ScreenUtil().setWidth(48))
81 : Container( 83 : Container(
82 // color: Colors.red, 84 // color: Colors.red,
83 alignment: Alignment.center, 85 alignment: Alignment.center,