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

lib/community/community_view/class_list_view.dart

@@ -4,6 +4,7 @@ import 'package:huixiang/utils/flutter_utils.dart';
 import 'package:huixiang/utils/font_weight.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:huixiang/view_widget/custom_image.dart';
+import 'package:huixiang/view_widget/no_data_view.dart';
 
 class ClassListView extends StatefulWidget {
   final List<CourseList> classList;
@@ -19,7 +20,14 @@ class ClassListView extends StatefulWidget {
 class _ClassListView extends State<ClassListView> {
   @override
   Widget build(BuildContext context) {
-    return GridView.builder(
+    return (widget.classList == null || widget.classList.length == 0)
+        ? NoDataView(
+      src: "assets/image/xiao_fei.webp",
+      isShowBtn: false,
+      text: "当前分类暂无精彩内容",
+      fontSize: 16.sp,
+      margin: EdgeInsets.only( left: 60.w, right: 60.w,bottom: 30),
+    ): GridView.builder(
       itemCount:widget.classList == null ? 0 : widget.classList.length,
       padding: EdgeInsets.only(
         left: 16.w,

lib/community/headlines/activity_top_list.dart

@@ -74,7 +74,7 @@ class _ActivityTopList extends State<ActivityTopList> {
         color: Colors.black,
       ),
       margin: EdgeInsets.symmetric(
-        horizontal: 6,
+        horizontal: 6.w,
       ),
       child:Column(
         children: [

lib/community/order_page.dart

@@ -42,12 +42,7 @@ class _OrderPage extends State<OrderPage>
         appBar: MyAppBar(
           title: "",
           leading: false,
-          bottom: Theme(
+          bottom: TabBar(
-              data: ThemeData(
-                splashColor: Colors.transparent, // 点击时的水波纹颜色设置为透明
-                highlightColor: Colors.transparent, // 点击时的背景高亮颜色设置为透明
-              ),
-              child: TabBar(
             // isScrollable: true, //可滚动
             indicatorColor: Color(0xff39B54A),
             labelColor: Colors.black,
@@ -70,7 +65,7 @@ class _OrderPage extends State<OrderPage>
               MyTab(text: S.of(context).weiwancheng),
               MyTab(text: S.of(context).yiwancheng),
             ],
-          )),
+          ),
         ),
         body: TabBarView(
           children: [OrderHistoryList(0),OrderHistoryList(1),OrderHistoryList(2),OrderHistoryList(3), ],

lib/home/points_mall_view/points_goods_title.dart

@@ -75,7 +75,12 @@ class _PointsGoodsTitle extends State<PointsGoodsTitle>
             length: widget.gooodsCategorys == null
                 ? 0
                 : widget.gooodsCategorys.length,
-            child: TabBar(
+            child:  Theme(
+                data: ThemeData(
+                  splashColor: Colors.transparent, // 点击时的水波纹颜色设置为透明
+                  highlightColor: Colors.transparent, // 点击时的背景高亮颜色设置为透明
+                ),
+                child: TabBar(
               isScrollable: true,
               //可滚动
               indicatorColor: Color(0xff39B54A),
@@ -99,7 +104,7 @@ class _PointsGoodsTitle extends State<PointsGoodsTitle>
                       .map((e) => MyTab(text: e.name))
                       .toList(),
               onTap: widget.onTap,
-            ),
+            )),
           ),
         ),
         // Container(

lib/home/welfare_exchange.dart

@@ -220,7 +220,7 @@ class _WelfareExchange extends State<WelfareExchange>  with SingleTickerProvider
                       ),
                     ],
                   )),
-              expandedHeight: 258.h,
+              expandedHeight: ScreenUtil().setHeight(258.h),
               bottom: PreferredSize(
                 preferredSize: Size(double.infinity, 0),
                 child: DefaultTabController(

lib/settlement/settlement.dart

@@ -856,6 +856,9 @@ class _Settlement extends State<Settlement> {
 
   payChannelCheck(int payChannel) {
     this.payChannel = payChannel;
+    if (tableId > 0) {
+     queryOrderDetails(parentId);
+    } else {
     queryOrderInfo(
         address?.id,
         selectedBtn,
@@ -867,7 +870,7 @@ class _Settlement extends State<Settlement> {
         actProductSkuId ?? "",
         count1,
         payChannel,
-        tableId);
+        tableId);}
   }
 
   mobileChange(String mobile) {