Merge remote-tracking branch 'origin/test' into test

lib/pages/library/widgets/filter.dart

@@ -28,6 +28,7 @@ class _FilterPageState extends State<FilterPage> {
 
     return Container(
       color: const Color(0xFF000000).withOpacity(0.5),
+      child: SingleChildScrollView(
         child: Column(
           children: [
             Container(
@@ -98,6 +99,7 @@ class _FilterPageState extends State<FilterPage> {
             )
           ],
         ),
+      ),
     );
   }
 

lib/pages/user_order_evaluate/view.dart

@@ -194,7 +194,7 @@ class _UserOrderEvaluatePageState extends State<UserOrderEvaluatePage> with Auto
                       ),
                       Gaps.hGaps20,
                       AbsorbPointer(
-                        absorbing: false,
+                        absorbing: bookListModel.rating!.toDouble()>0,
                         child: CustomRating(
                           max: 5,
                           score:bookListModel.rating !=null ?bookListModel.rating!.toDouble():0,
@@ -221,6 +221,7 @@ class _UserOrderEvaluatePageState extends State<UserOrderEvaluatePage> with Auto
                         focusedBorder: InputBorder.none,
                         border: InputBorder.none,
                         enabledBorder: InputBorder.none,
+                        disabledBorder: InputBorder.none,
                         errorBorder: InputBorder.none,
                         fillColor: Colors.white,
                         hintText: '请简要描述',
@@ -233,6 +234,7 @@ class _UserOrderEvaluatePageState extends State<UserOrderEvaluatePage> with Auto
                     },
                     focusNode: myController._focusNode,
                     controller: myController._commentsControllers[index],
+                    enabled: myController._commentsControllers[index].text.isEmpty,
                     onTap: () {
                       // 在文本框获取焦点时，将光标移动到文本末尾
                       myController._commentsControllers[index].selection = TextSelection.fromPosition(
@@ -240,27 +242,6 @@ class _UserOrderEvaluatePageState extends State<UserOrderEvaluatePage> with Auto
                       );
                     },
                   ),
-
-
-                  // CustomInputCommands(
-                  //   decoration: InputDecoration(
-                  //       focusedBorder: InputBorder.none,
-                  //       border: InputBorder.none,
-                  //       enabledBorder: InputBorder.none,
-                  //       errorBorder: InputBorder.none,
-                  //       fillColor: Colors.white,
-                  //       hintStyle: TextStyle(
-                  //           fontSize: 14.w, height: 1.5, color: Colours.c6)),
-                  //   maxLines: 5,
-                  //   controller: myController.commentsInput,
-                  //   hintText: '请简要描述',
-                  //    onChanged: (text){
-                  //      myController.setCanClick();
-                  //      print(myController.commentsInput.text);
-                  //      orderEvaluates[index].comments=myController.commentsInput.text;
-                  //    },
-                  //    focusNode: myController._focusNode,
-                  // ),
                 ],
               ),
             ),