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

lib/pages/user_order/view.dart

@@ -8,16 +8,28 @@ class UserOrderPage extends StatefulWidget {
   @override
   State<UserOrderPage> createState() => _UserOrderState();
 }
+
 List<Tab> tabs = [
-  const Tab(text: '全部',),
-  const Tab(text: '待支付',),
-  const Tab(text: '已取消',),
-  const Tab(text: '已完成',),
-  const Tab(text: '已退款',),
+  const Tab(
+    text: '全部',
+  ),
+  const Tab(
+    text: '待支付',
+  ),
+  const Tab(
+    text: '已取消',
+  ),
+  const Tab(
+    text: '已完成',
+  ),
+  const Tab(
+    text: '已退款',
+  ),
 ];
 int tab = 0;
 
-class _UserOrderState extends State<UserOrderPage> with SingleTickerProviderStateMixin{
+class _UserOrderState extends State<UserOrderPage>
+    with SingleTickerProviderStateMixin {
   late TabController _tabController; // 选中的性别
   late TextEditingController searchController = TextEditingController();
 
@@ -37,11 +49,9 @@ class _UserOrderState extends State<UserOrderPage> with SingleTickerProviderStat
         return false;
       },
       child: Scaffold(
-          appBar: CustomAppBar(
-            automaticallyImplyLeading: false,
-            titleSpacing: 0,
-            title: Padding(
-              padding: EdgeInsets.symmetric(horizontal: AppTheme.margin),
+        appBar: AppBar(
+          title: Container(
+            padding: EdgeInsets.only(right: 10.w),
             child: CustomInputSearch(
               controller: searchController,
               readOnly: true,
@@ -51,29 +61,15 @@ class _UserOrderState extends State<UserOrderPage> with SingleTickerProviderStat
               },
             ),
           ),
-            actions: [
-              GestureDetector(
-                onTap: () {
-                  context.pop();
-                },
-                child: Container(
-                  padding: EdgeInsets.only(left: 10.w, top: 10.w, bottom: 10.w),
-                  child: Text(
-                    '取消',
-                    style:
-                    TextStyle(fontSize: 14.w, height: 1.5, color: Colours.c3),
-                  ),
-                ),
-              )
-            ],
+
+          titleSpacing: 0,
         ),
         body: _buildBody(),
       ),
     );
-
   }
 
-  Widget _buildBody( ) {
+  Widget _buildBody() {
     return DefaultTabController(
         length: tabs.length,
         child: Column(
@@ -111,7 +107,7 @@ class _UserOrderState extends State<UserOrderPage> with SingleTickerProviderStat
                     tab = index;
                     return BuildListPage(
                       tag:
-                      tab,/* models:controller.orderList,*//*controller: controller,*//*,context: context,*/
+                          tab, /* models:controller.orderList,*/ /*controller: controller,*/ /*,context: context,*/
                     );
                   })),
             )