xt / Flutter-ReserveApp · Commits

Go to a project

Commit a6eaf305e246ae66c975da24be6d81fdf4b57ee9

Authored by wdn127929
1 parent aaf2c8f9
build: skipped

店铺变好样式修改

Inline Side-by-side
Showing 2 changed files with 70 additions and 49 deletions
@@ -15,17 +15,17 @@ if (flutterRoot == null) { @@ -15,17 +15,17 @@ if (flutterRoot == null) {
15 15
16 16
17 17
18 -def flutterVersionCode = "480" 18 +def flutterVersionCode = "481"
19 if (flutterVersionCode == null) { 19 if (flutterVersionCode == null) {
20 - flutterVersionCode = '480' 20 + flutterVersionCode = '481'
21 } 21 }
22 22
23 23
24 24
25 25
26 -def flutterVersionName = "4.8.0" 26 +def flutterVersionName = "4.8.1"
27 if (flutterVersionName == null) { 27 if (flutterVersionName == null) {
28 - flutterVersionName = '4.8.0' 28 + flutterVersionName = '4.8.1'
29 } 29 }
30 30
31 31
@@ -26,6 +26,7 @@ import 'package:one_key/widgets/v_empty_view.dart'; @@ -26,6 +26,7 @@ import 'package:one_key/widgets/v_empty_view.dart';
26 import 'package:provider/provider.dart'; 26 import 'package:provider/provider.dart';
27 27
28 import '../../app.dart'; 28 import '../../app.dart';
  29 +import '../../utils/screen_util.dart';
29 30
30 class MyPage extends StatefulWidget { 31 class MyPage extends StatefulWidget {
31 @override 32 @override
@@ -213,10 +214,10 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver { @@ -213,10 +214,10 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver {
213 padding: EdgeInsets.only( 214 padding: EdgeInsets.only(
214 left: ScreenUtil().setWidth(24 * 2), 215 left: ScreenUtil().setWidth(24 * 2),
215 right: ScreenUtil().setWidth(24 * 2), 216 right: ScreenUtil().setWidth(24 * 2),
216 - top: ScreenUtil().setWidth(60 * 2 + 20), 217 + // top: ScreenUtil().setWidth(60 * 2 + 20),
217 ), 218 ),
218 child: Row( 219 child: Row(
219 - crossAxisAlignment: CrossAxisAlignment.start, 220 + crossAxisAlignment: CrossAxisAlignment.center,
220 children: [ 221 children: [
221 Stack(clipBehavior: Clip.none, children: [ 222 Stack(clipBehavior: Clip.none, children: [
222 Container( 223 Container(
@@ -270,7 +271,7 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver { @@ -270,7 +271,7 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver {
270 HEmptyView(22), 271 HEmptyView(22),
271 Column( 272 Column(
272 crossAxisAlignment: CrossAxisAlignment.start, 273 crossAxisAlignment: CrossAxisAlignment.start,
273 - mainAxisAlignment: MainAxisAlignment.start, 274 + mainAxisAlignment: MainAxisAlignment.center,
274 children: [ 275 children: [
275 Container( 276 Container(
276 constraints: BoxConstraints( 277 constraints: BoxConstraints(
@@ -281,53 +282,73 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver { @@ -281,53 +282,73 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver {
281 maxLines: 1, 282 maxLines: 1,
282 overflow: TextOverflow.ellipsis, 283 overflow: TextOverflow.ellipsis,
283 style: TextStyle( 284 style: TextStyle(
  285 + letterSpacing: 0.2,
284 fontWeight: FontWeight.w600, 286 fontWeight: FontWeight.w600,
285 color: MyColours.color_ffffff, 287 color: MyColours.color_ffffff,
286 fontSize: ScreenUtil().setSp(28)), 288 fontSize: ScreenUtil().setSp(28)),
287 ), 289 ),
288 ), 290 ),
289 - VEmptyView(14),  
290 - Container(  
291 - height: ScreenUtil().setWidth(52),  
292 - padding: EdgeInsets.only(  
293 - left: ScreenUtil().setWidth(8),  
294 - right: ScreenUtil().setWidth(8),  
295 - ),  
296 - alignment: Alignment.center,  
297 - decoration: BoxDecoration(  
298 - color: MyColours.color_ffffff,  
299 - borderRadius: BorderRadius.circular(  
300 - ScreenUtil().setWidth(6))),  
301 - child: Column(  
302 - crossAxisAlignment:  
303 - CrossAxisAlignment.start,  
304 - mainAxisAlignment:  
305 - MainAxisAlignment.center,  
306 - children: [  
307 - ExText(  
308 - '店铺编号：' +  
309 - model.user.sellerid  
310 - .padLeft(6, '0'),  
311 - TextStyle(  
312 - fontWeight: FontWeight.bold,  
313 - color:  
314 - MyColours.color_515151,  
315 - fontSize:  
316 - ScreenUtil().setSp(16)),  
317 - ),  
318 - ExText(  
319 - '员工编号：' +  
320 - model.user.account +  
321 - " " +  
322 - model.user.role_name,  
323 - TextStyle(  
324 - fontWeight: FontWeight.bold,  
325 - color:  
326 - MyColours.color_515151,  
327 - fontSize:  
328 - ScreenUtil().setSp(16)),  
329 - )  
330 - ])), 291 + VEmptyView(24),
  292 + ExText(
  293 + '店铺编号：' +
  294 + model.user.sellerid.padLeft(6, '0'),
  295 + TextStyle(
  296 + fontWeight: FontWeight.bold,
  297 + color: MyColours.color_ffffff,
  298 + fontSize: font(10)),
  299 + ),
  300 + VEmptyView(10),
  301 + ExText(
  302 + '员工编号：' +
  303 + model.user.account +
  304 + " " +
  305 + model.user.role_name,
  306 + TextStyle(
  307 + fontWeight: FontWeight.bold,
  308 + color: MyColours.color_ffffff,
  309 + fontSize: font(10)),
  310 + )
  311 + // Container(
  312 + // height: ScreenUtil().setWidth(52),
  313 + // padding: EdgeInsets.only(
  314 + // left: ScreenUtil().setWidth(8),
  315 + // right: ScreenUtil().setWidth(8),
  316 + // ),
  317 + // alignment: Alignment.center,
  318 + // decoration: BoxDecoration(
  319 + // color: MyColours.color_ffffff,
  320 + // borderRadius: BorderRadius.circular(
  321 + // ScreenUtil().setWidth(6))),
  322 + // child: Column(
  323 + // crossAxisAlignment:
  324 + // CrossAxisAlignment.start,
  325 + // mainAxisAlignment:
  326 + // MainAxisAlignment.center,
  327 + // children: [
  328 + // ExText(
  329 + // '店铺编号：' +
  330 + // model.user.sellerid
  331 + // .padLeft(6, '0'),
  332 + // TextStyle(
  333 + // fontWeight: FontWeight.bold,
  334 + // color:
  335 + // MyColours.color_515151,
  336 + // fontSize:
  337 + // ScreenUtil().setSp(16)),
  338 + // ),
  339 + // ExText(
  340 + // '员工编号：' +
  341 + // model.user.account +
  342 + // " " +
  343 + // model.user.role_name,
  344 + // TextStyle(
  345 + // fontWeight: FontWeight.bold,
  346 + // color:
  347 + // MyColours.color_515151,
  348 + // fontSize:
  349 + // ScreenUtil().setSp(16)),
  350 + // )
  351 + // ])),
331 // VEmptyView(20), 352 // VEmptyView(20),
332 // InkWell( 353 // InkWell(
333 // onTap: () { 354 // onTap: () {