合并

@@ -51,7 +51,6 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> {
   FocusNode _needNode = FocusNode();
   FocusNode _needNode = FocusNode();
   NotebookDetailModel detailModel = NotebookDetailModel();
   NotebookDetailModel detailModel = NotebookDetailModel();
   EasyContactPicker _contactPicker = EasyContactPicker();
   EasyContactPicker _contactPicker = EasyContactPicker();
-   bool goSetting = false;
 
 
   @override
   @override
   void initState() {
   void initState() {
@@ -858,8 +857,10 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> {
   _getContactData() async {
   _getContactData() async {
     Contact contact = await _contactPicker.selectContactWithNative();
     Contact contact = await _contactPicker.selectContactWithNative();
     setState(() {
     setState(() {
-      String fullName = contact.fullName.replaceAll(new RegExp(r"\s+\b|\b\s"), "");
-      String phone = contact.phoneNumber.replaceAll(new RegExp(r"\s+\b|\b\s"), "");
+      String fullName =
+          contact.fullName.replaceAll(new RegExp(r"\s+\b|\b\s"), "");
+      String phone =
+          contact.phoneNumber.replaceAll(new RegExp(r"\s+\b|\b\s"), "");
       if (fullName.compareTo(phone) == 0) {
       if (fullName.compareTo(phone) == 0) {
         fullName = '';
         fullName = '';
       } else {
       } else {
@@ -871,7 +872,6 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> {
     });
     });
   }
   }
 
 
-
   @override
   @override
   Widget build(BuildContext context) {
   Widget build(BuildContext context) {
     _notebookDetailChangeModel =
     _notebookDetailChangeModel =

@@ -735,14 +735,18 @@ class DialogUtil {
                   MyDivider(
                   MyDivider(
                       ScreenUtil().setWidth(280 * 2), ScreenUtil().setWidth(2),
                       ScreenUtil().setWidth(280 * 2), ScreenUtil().setWidth(2),
                       color: MyColours.color_efefef),
                       color: MyColours.color_efefef),
-                  FlatButton(
-                    child: Text(
-                      '去设置',
-                      style: TextStyle(
-                          color: MyColours.color_2bb5b7,
-                          fontSize: ScreenUtil().setWidth(34)),
+                  InkWell(
+                    child: Container(
+                      height: ScreenUtil().setWidth(47 * 2),
+                      alignment: Alignment.center,
+                      child: Text(
+                        '去设置',
+                        style: TextStyle(
+                            color: MyColours.color_2bb5b7,
+                            fontSize: ScreenUtil().setWidth(34)),
+                      ),
                     ),
                     ),
-                    onPressed: () {
+                    onTap: () {
                       openSetting();
                       openSetting();
                       Navigator.pop(context, '');
                       Navigator.pop(context, '');
                     },
                     },