xt / Flutter-ReserveApp · Commits

Go to a project

Commit 4851e52fd805a6694c9a82b8e2e9854ab04ba0bd

Authored by wdn127929
2 parents e84e8ac6 8db668e9

Merge branch 'v5.1.2+' into v5.1.4+

Inline Side-by-side
Showing 4 changed files with 181 additions and 42 deletions
... ... @@ -10,6 +10,7 @@ import 'package:one_key/utils/dialog_util.dart';
import 'package:one_key/utils/event_bus.dart';
import 'package:one_key/utils/misc.dart';
import 'package:one_key/utils/utils.dart';
import 'package:one_key/widgets/h_empty_view.dart';
import 'package:one_key/widgets/round_button.dart';
import 'package:one_key/widgets/system_app_bar.dart';
import 'package:one_key/widgets/v_empty_view.dart';
... ... @@ -47,6 +48,7 @@ class _EditReserverPageState extends State<EditReserverPage> {
ScrollController _scrollCrl = ScrollController();
@override
void initState() {
super.initState();
... ... @@ -265,6 +267,18 @@ class _EditReserverPageState extends State<EditReserverPage> {
} else {
nameStr = value;
}
setState(() {
showPhoneHistory = true;
});
Map<String, String> params = {
"keywords": value,
"sid": Provider.of<UserModel>(context,
listen: false)
.user
.sellerid,
};
detailModel.getUserHistorys(
context, params);
},
onEditingComplete: () {
print('fff');
... ... @@ -688,7 +702,16 @@ class _EditReserverPageState extends State<EditReserverPage> {
.spaceBetween,
children: [
Text(
detailModel
_nameNode.hasFocus ? ( detailModel
.userHistorys[
index]
.rnameStr ==
null
? ''
: detailModel
.userHistorys[
index]
.rnameStr): ( detailModel
.userHistorys[
index]
.phone ==
... ... @@ -697,7 +720,7 @@ class _EditReserverPageState extends State<EditReserverPage> {
: detailModel
.userHistorys[
index]
.phone,
.phone),
style: TextStyle(
color: MyColours
.color_333333,
... ... @@ -705,9 +728,19 @@ class _EditReserverPageState extends State<EditReserverPage> {
ScreenUtil()
.setSp(32)),
),
HEmptyView(20),
Expanded(
child: Text(
detailModel
_nameNode.hasFocus ?(detailModel
.userHistorys[
index]
.phone ==
null
? ''
: detailModel
.userHistorys[
index]
.phone):( detailModel
.userHistorys[
index]
.rnameStr ==
... ... @@ -716,7 +749,7 @@ class _EditReserverPageState extends State<EditReserverPage> {
: detailModel
.userHistorys[
index]
.rnameStr,
.rnameStr) ,
style: TextStyle(
color: MyColours
.color_333333,
... ...
... ... @@ -1577,6 +1577,25 @@ class _NoteBookChangeFPageState extends State<NoteBookChangeFPage> {
} else {
nameStr = value;
}
Map<String, String> params = {
"keywords": value,
"sid": Provider.of<UserModel>(
context,
listen: false)
.user
.sellerid,
};
_notebookDetailChangeModel
.getUserHistorys(
context, params);
},
onTap: () {
setState(() {
showPhoneHistory = true;
});
// Future.delayed(Duration(milliseconds: 300), () {
// _controller.jumpTo(_controller.position.maxScrollExtent);
// });
},
onEditingComplete: () {
print('fff');
... ... @@ -1957,20 +1976,29 @@ class _NoteBookChangeFPageState extends State<NoteBookChangeFPage> {
.spaceBetween,
children: [
Text(
_notebookDetailChangeModel
.userHistorys[index]
.phone,
_nameNode.hasFocus
? _notebookDetailChangeModel
.userHistorys[index]
.rnameStr
: _notebookDetailChangeModel
.userHistorys[index]
.phone,
style: TextStyle(
color: MyColours
.color_333333,
fontSize: ScreenUtil()
.setSp(32)),
),
HEmptyView(20),
Expanded(
child: Text(
_notebookDetailChangeModel
.userHistorys[index]
.rnameStr,
_nameNode.hasFocus
? _notebookDetailChangeModel
.userHistorys[index]
.phone
: _notebookDetailChangeModel
.userHistorys[index]
.rnameStr,
style: TextStyle(
color: MyColours
.color_333333,
... ...
... ... @@ -2088,6 +2088,7 @@ class InvicationPageState extends State<InvicationPage>
children: [
Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.max,
children: [
//姓名
if (enterMore)
... ... @@ -2137,6 +2138,23 @@ class InvicationPageState extends State<InvicationPage>
print('ggg');
nameStr = value;
Map<String, String> params = {
"keywords": value.trim(),
"sid": Provider.of<UserModel>(context,
listen: false)
.user
.sellerid,
};
_baseIndoProvider.getUserHistorys(
context, params);
},
onTap: () {
setState(() {
showPhoneHistory = true;
});
// Future.delayed(Duration(milliseconds: 300), () {
// _controller.jumpTo(_controller.position.maxScrollExtent);
// });
},
onEditingComplete: () {
print('fff');
... ... @@ -2423,7 +2441,7 @@ class InvicationPageState extends State<InvicationPage>
),
if (enterMore)
Positioned(
top: 0,
top: _nameNode.hasFocus ? w(60) : 0,
left: 0,
child: Offstage(
offstage: !(showPhoneHistory &&
... ... @@ -2445,7 +2463,7 @@ class InvicationPageState extends State<InvicationPage>
// : ScreenUtil().setWidth(104),
width: ScreenUtil().screenWidth - w(60),
// width: ScreenUtil().setWidth(350),
constraints: BoxConstraints(maxHeight: w(270)),
constraints: BoxConstraints(maxHeight: w(220)),
padding: EdgeInsets.symmetric(
horizontal: ScreenUtil().setWidth(30)),
child: Align(
... ... @@ -2478,7 +2496,7 @@ class InvicationPageState extends State<InvicationPage>
},
child: Container(
width: double.infinity,
height: ScreenUtil().setWidth(102),
height: ScreenUtil().setWidth(100),
decoration: BoxDecoration(
border: Border(
bottom: (index !=
... ... @@ -2501,30 +2519,53 @@ class InvicationPageState extends State<InvicationPage>
MainAxisAlignment.spaceBetween,
children: [
Text(
_baseIndoProvider
_nameNode.hasFocus
? (_baseIndoProvider
.userHistorys[
index]
.rname ==
null
? ''
: _baseIndoProvider
.userHistorys[index]
.rnameStr)
: (_baseIndoProvider
.userHistorys[
index]
.phone ==
null
? ''
: _baseIndoProvider
.userHistorys[index]
.phone ==
null
? ''
: _baseIndoProvider
.userHistorys[index]
.phone,
.phone),
style: TextStyle(
color:
MyColours.color_333333,
fontSize:
ScreenUtil().setSp(32)),
),
HEmptyView(20),
Expanded(
child: Text(
_baseIndoProvider
_nameNode.hasFocus
? (_baseIndoProvider
.userHistorys[
index]
.phone ==
null
? ''
: _baseIndoProvider
.userHistorys[index]
.phone)
: (_baseIndoProvider
.userHistorys[
index]
.rname ==
null
? ''
: _baseIndoProvider
.userHistorys[index]
.rname ==
null
? ''
: _baseIndoProvider
.userHistorys[index]
.rnameStr,
.rnameStr),
style: TextStyle(
color:
MyColours.color_333333,
... ...
... ... @@ -948,6 +948,18 @@ class TableManagerPageState extends State<TableManagerPage> {
print('ggg');
nameStr = value;
setState(() {
showPhoneHistory = true;
});
Map<String, String> params = {
"keywords": value,
"sid": Provider.of<UserModel>(context,
listen: false)
.user
.sellerid,
};
_baseIndoProvider.getUserHistorys(
context, params);
},
onEditingComplete: () {
print('fff');
... ... @@ -1218,7 +1230,7 @@ class TableManagerPageState extends State<TableManagerPage> {
],
),
Positioned(
top: 0,
top: _nameNode.hasFocus ? w(60) : 0,
left: 0,
child: Offstage(
offstage: !(showPhoneHistory &&
... ... @@ -1328,32 +1340,57 @@ class TableManagerPageState extends State<TableManagerPage> {
.spaceBetween,
children: [
Text(
_baseIndoProvider
_nameNode.hasFocus
? (_baseIndoProvider
.userHistorys[
index]
.rname ==
null
? ''
: _baseIndoProvider
.userHistorys[
index]
.phone ==
null
? ''
: _baseIndoProvider
.userHistorys[index]
.phone,
.rnameStr)
: (_baseIndoProvider
.userHistorys[
index]
.phone ==
null
? ''
: _baseIndoProvider
.userHistorys[
index]
.phone),
style: TextStyle(
color: MyColours
.color_333333,
fontSize: ScreenUtil()
.setSp(32)),
),
HEmptyView(20),
Expanded(
child: Text(
_baseIndoProvider
_nameNode.hasFocus
? (_baseIndoProvider
.userHistorys[
index]
.phone ==
null
? ''
: _baseIndoProvider
.userHistorys[
index]
.rname ==
null
? ''
: _baseIndoProvider
.userHistorys[index]
.rnameStr,
.phone)
: (_baseIndoProvider
.userHistorys[
index]
.rname ==
null
? ''
: _baseIndoProvider
.userHistorys[
index]
.rnameStr),
style: TextStyle(
color: MyColours
.color_333333,
... ...