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
531384610a6c9ce5834584b7a30c7a32
\ No newline at end of file
081ce440b595dea4e6dbd6e5e186ed70
\ No newline at end of file
... ...
... ... @@ -153,7 +153,7 @@ class HomePageState extends State<HomePage>{
Map<String,String> params={
"sid":userModel.user.sellerid,
"account":userModel.user.account,
"user_token":token
"user_token":Platform.isAndroid?"Android_$token":"Ios_$token"
};
userModel.userTokenInit(context, params);
}
... ...
... ... @@ -8,6 +8,7 @@ import 'package:one_key/provider/update_model.dart';
import 'package:one_key/provider/user_model.dart';
import 'package:one_key/res/colors.dart';
import 'package:one_key/utils/dialog_util.dart';
import 'package:one_key/utils/log_util.dart';
import 'package:one_key/utils/utils.dart';
import 'package:one_key/widgets/MyDivider.dart';
import 'package:one_key/widgets/app_bar.dart';
... ... @@ -306,71 +307,62 @@ class NoteBookPageState extends State<NoteBookPage> {
children: <Widget>[
Offstage(
offstage: morning == "00:00-00:00" ? true : false,
child: GestureDetector(
onTap: () {
if (currTimeIndex == 1) return;
setState(() {
currTimeIndex = 1;
});
_getReserveList();
},
child: Padding(
padding: EdgeInsets.symmetric(
horizontal: ScreenUtil().setWidth(10)),
child: CommonButton(
content: "早市",
state: currTimeIndex == 1 ? 1 : 0,
width: ScreenUtil().setWidth(180),
height: ScreenUtil().setHeight(100),
fontSize: 32,
onPress: () {
if (currTimeIndex == 1) return;
setState(() {
currTimeIndex = 1;
});
_getReserveList();
},
))
),
Offstage(
offstage: noon == "00:00-00:00" ? true : false,
child: Padding(
padding: EdgeInsets.symmetric(
horizontal: ScreenUtil().setWidth(10)),
child: CommonButton(
content: "早市",
state: currTimeIndex == 1 ? 1 : 0,
content: "午市",
state: currTimeIndex == 2 ? 1 : 0,
width: ScreenUtil().setWidth(180),
height: ScreenUtil().setHeight(100),
fontSize: 32,
onPress: () {},
)),
),
),
Offstage(
offstage: noon == "00:00-00:00" ? true : false,
child: GestureDetector(
onTap: () {
if (currTimeIndex == 2) return;
setState(() {
currTimeIndex = 2;
});
_getReserveList();
},
child: Padding(
padding: EdgeInsets.symmetric(
horizontal: ScreenUtil().setWidth(10)),
child: CommonButton(
content: "午市",
state: currTimeIndex == 2 ? 1 : 0,
width: ScreenUtil().setWidth(180),
height: ScreenUtil().setHeight(100),
fontSize: 32,
onPress: () {},
)),
)),
onPress: () {
if (currTimeIndex == 2) return;
setState(() {
currTimeIndex = 2;
});
_getReserveList();
},
))),
Offstage(
offstage: night == "00:00-00:00" ? true : false,
child: GestureDetector(
onTap: () {
if (currTimeIndex == 3) return;
setState(() {
currTimeIndex = 3;
});
_getReserveList();
},
child: Padding(
padding: EdgeInsets.symmetric(
horizontal: ScreenUtil().setWidth(10)),
child: CommonButton(
content: "晚市",
state: currTimeIndex == 3 ? 1 : 0,
width: ScreenUtil().setWidth(180),
height: ScreenUtil().setHeight(100),
fontSize: 32,
onPress: () {},
)),
)),
child: Padding(
padding: EdgeInsets.symmetric(
horizontal: ScreenUtil().setWidth(10)),
child: CommonButton(
content: "晚市",
state: currTimeIndex == 3 ? 1 : 0,
width: ScreenUtil().setWidth(180),
height: ScreenUtil().setHeight(100),
fontSize: 32,
onPress: () {
if (currTimeIndex == 3) return;
setState(() {
currTimeIndex = 3;
});
_getReserveList();
},
)),),
],
),
)
... ...