xt / Flutter-ReserveApp · Commits

Go to a project

Commit c2e69018c622bfc595660ae01fb2c67fdc91200c

Authored by “gaiyaguang”
2 parents cba8b34a ada2701f
build: skipped

Merge branch 'v1.1+' of http://123.56.79.57/xt/Flutter-ReserveApp into v1.1+

Inline Side-by-side
Showing 3 changed files with 50 additions and 58 deletions
1 -531384610a6c9ce5834584b7a30c7a32  
  1 +081ce440b595dea4e6dbd6e5e186ed70
@@ -153,7 +153,7 @@ class HomePageState extends State<HomePage>{ @@ -153,7 +153,7 @@ class HomePageState extends State<HomePage>{
153 Map<String,String> params={ 153 Map<String,String> params={
154 "sid":userModel.user.sellerid, 154 "sid":userModel.user.sellerid,
155 "account":userModel.user.account, 155 "account":userModel.user.account,
156 - "user_token":token 156 + "user_token":Platform.isAndroid?"Android_$token":"Ios_$token"
157 }; 157 };
158 userModel.userTokenInit(context, params); 158 userModel.userTokenInit(context, params);
159 } 159 }
@@ -8,6 +8,7 @@ import 'package:one_key/provider/update_model.dart'; @@ -8,6 +8,7 @@ import 'package:one_key/provider/update_model.dart';
8 import 'package:one_key/provider/user_model.dart'; 8 import 'package:one_key/provider/user_model.dart';
9 import 'package:one_key/res/colors.dart'; 9 import 'package:one_key/res/colors.dart';
10 import 'package:one_key/utils/dialog_util.dart'; 10 import 'package:one_key/utils/dialog_util.dart';
  11 +import 'package:one_key/utils/log_util.dart';
11 import 'package:one_key/utils/utils.dart'; 12 import 'package:one_key/utils/utils.dart';
12 import 'package:one_key/widgets/MyDivider.dart'; 13 import 'package:one_key/widgets/MyDivider.dart';
13 import 'package:one_key/widgets/app_bar.dart'; 14 import 'package:one_key/widgets/app_bar.dart';
@@ -306,71 +307,62 @@ class NoteBookPageState extends State<NoteBookPage> { @@ -306,71 +307,62 @@ class NoteBookPageState extends State<NoteBookPage> {
306 children: <Widget>[ 307 children: <Widget>[
307 Offstage( 308 Offstage(
308 offstage: morning == "00:00-00:00" ? true : false, 309 offstage: morning == "00:00-00:00" ? true : false,
309 - child: GestureDetector(  
310 - onTap: () {  
311 - if (currTimeIndex == 1) return;  
312 - setState(() {  
313 - currTimeIndex = 1;  
314 - });  
315 - _getReserveList();  
316 - }, 310 + child: Padding(
  311 + padding: EdgeInsets.symmetric(
  312 + horizontal: ScreenUtil().setWidth(10)),
  313 + child: CommonButton(
  314 + content: "早市",
  315 + state: currTimeIndex == 1 ? 1 : 0,
  316 + width: ScreenUtil().setWidth(180),
  317 + height: ScreenUtil().setHeight(100),
  318 + fontSize: 32,
  319 + onPress: () {
  320 + if (currTimeIndex == 1) return;
  321 + setState(() {
  322 + currTimeIndex = 1;
  323 + });
  324 + _getReserveList();
  325 + },
  326 + ))
  327 + ),
  328 + Offstage(
  329 + offstage: noon == "00:00-00:00" ? true : false,
317 child: Padding( 330 child: Padding(
318 padding: EdgeInsets.symmetric( 331 padding: EdgeInsets.symmetric(
319 horizontal: ScreenUtil().setWidth(10)), 332 horizontal: ScreenUtil().setWidth(10)),
320 child: CommonButton( 333 child: CommonButton(
321 - content: "早市",  
322 - state: currTimeIndex == 1 ? 1 : 0, 334 + content: "午市",
  335 + state: currTimeIndex == 2 ? 1 : 0,
323 width: ScreenUtil().setWidth(180), 336 width: ScreenUtil().setWidth(180),
324 height: ScreenUtil().setHeight(100), 337 height: ScreenUtil().setHeight(100),
325 fontSize: 32, 338 fontSize: 32,
326 - onPress: () {},  
327 - )),  
328 - ),  
329 - ),  
330 - Offstage(  
331 - offstage: noon == "00:00-00:00" ? true : false,  
332 - child: GestureDetector(  
333 - onTap: () {  
334 - if (currTimeIndex == 2) return;  
335 - setState(() {  
336 - currTimeIndex = 2;  
337 - });  
338 - _getReserveList();  
339 - },  
340 - child: Padding(  
341 - padding: EdgeInsets.symmetric(  
342 - horizontal: ScreenUtil().setWidth(10)),  
343 - child: CommonButton(  
344 - content: "午市",  
345 - state: currTimeIndex == 2 ? 1 : 0,  
346 - width: ScreenUtil().setWidth(180),  
347 - height: ScreenUtil().setHeight(100),  
348 - fontSize: 32,  
349 - onPress: () {},  
350 - )),  
351 - )), 339 + onPress: () {
  340 + if (currTimeIndex == 2) return;
  341 + setState(() {
  342 + currTimeIndex = 2;
  343 + });
  344 + _getReserveList();
  345 + },
  346 + ))),
352 Offstage( 347 Offstage(
353 offstage: night == "00:00-00:00" ? true : false, 348 offstage: night == "00:00-00:00" ? true : false,
354 - child: GestureDetector(  
355 - onTap: () {  
356 - if (currTimeIndex == 3) return;  
357 - setState(() {  
358 - currTimeIndex = 3;  
359 - });  
360 - _getReserveList();  
361 - },  
362 - child: Padding(  
363 - padding: EdgeInsets.symmetric(  
364 - horizontal: ScreenUtil().setWidth(10)),  
365 - child: CommonButton(  
366 - content: "晚市",  
367 - state: currTimeIndex == 3 ? 1 : 0,  
368 - width: ScreenUtil().setWidth(180),  
369 - height: ScreenUtil().setHeight(100),  
370 - fontSize: 32,  
371 - onPress: () {},  
372 - )),  
373 - )), 349 + child: Padding(
  350 + padding: EdgeInsets.symmetric(
  351 + horizontal: ScreenUtil().setWidth(10)),
  352 + child: CommonButton(
  353 + content: "晚市",
  354 + state: currTimeIndex == 3 ? 1 : 0,
  355 + width: ScreenUtil().setWidth(180),
  356 + height: ScreenUtil().setHeight(100),
  357 + fontSize: 32,
  358 + onPress: () {
  359 + if (currTimeIndex == 3) return;
  360 + setState(() {
  361 + currTimeIndex = 3;
  362 + });
  363 + _getReserveList();
  364 + },
  365 + )),),
374 ], 366 ],
375 ), 367 ),
376 ) 368 )