合并分支 'test' 到 'sim'

lib/apis/library.dart

@@ -42,7 +42,7 @@ abstract class LibraryAPI {
   }) async {
     Map<String,dynamic> params = {
       'page' : page,
-      'limit' : limit,
+      'page_size' : limit,
       'category_id':categoryId
     };
     if (sortField.isNotEmpty){

lib/pages/library/controller.dart

@@ -43,7 +43,7 @@ class LibraryController extends GetxController with GetTickerProviderStateMixin{
   ];
 
 
-  final int _limit = 20;
+  final int _limit = 10;
   int _page = 1;
   bool _noMore = false;
 

lib/pages/login/controller.dart

@@ -154,7 +154,9 @@ class LoginController extends GetxController {
 
     if (context.mounted){
       // context.goNamed(Routes.main);
-      context.pop();
+      Future.delayed(const Duration(milliseconds: 10)).then((value){
+        context.pop();
+      });
     }else {
       context.goNamed(Routes.main);
     }

lib/pages/read_web/discuss_controller.dart

@@ -120,7 +120,8 @@ class DiscussController extends GetxController {
       Toast.show('发表成功');
       discussModel.replyNum = discussModel.replyNum! +1;
       DiscussModel tempModel = DiscussModel.fromJson(discussModel.toJson());
-      tempModel.status = 1;
+      // tempModel.status = 1;
+      tempModel.privacyStatus = 0;
       tempModel.commentsCheck = 0;
       tempModel.isMy = 1;
       tempModel.id = result['id'];

lib/pages/user_discuss_des/controller.dart

@@ -79,7 +79,8 @@ class UserDiscussDesController extends GetxController {
       Toast.show('发表成功');
       discussModel.replyNum = discussModel.replyNum! +1;
       DiscussModel tempModel = DiscussModel.fromJson(discussModel.toJson());
-      tempModel.status = 1;
+      // tempModel.status = 1;
+      tempModel.privacyStatus = 0;
       tempModel.commentsCheck = 0;
       tempModel.isMy = 1;
       tempModel.id = result['id'];

lib/pages/user_set/view.dart

@@ -136,7 +136,9 @@ class _UserSetPageState extends State<UserSetPage> {
                             onTap: () => Navigator.of(context).pop(),
                             child: Container(
                               width: 105.w,
+                              height: 39.5.w,
                               color: Colours.cFF,
+                              // color: Colors.red,
                               alignment: Alignment.center,
                               child: const Text(
                                 '取消',
@@ -168,7 +170,9 @@ class _UserSetPageState extends State<UserSetPage> {
                             },
                             child: Container(
                               width: 105.w,
+                              height: 39.5.w,
                               color: Colours.cFF,
+                              // color: Colors.red,
                               alignment: Alignment.center,
                               child: const Text(
                                 '确定',