更改

lib/generated/intl/messages_en.dart

@@ -154,6 +154,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "dengdaiyonghuqucan" : MessageLookupByLibrary.simpleMessage("等待用户取餐"),
     "denglu" : MessageLookupByLibrary.simpleMessage("登录"),
     "diancan" : MessageLookupByLibrary.simpleMessage("点餐"),
+    "diandan" : MessageLookupByLibrary.simpleMessage("点单"),
     "dianhua" : MessageLookupByLibrary.simpleMessage("电话"),
     "dianjidenglu" : MessageLookupByLibrary.simpleMessage("点击登录，享受更多精彩信息"),
     "dianwolingqu" : MessageLookupByLibrary.simpleMessage("点我领取"),

lib/generated/intl/messages_zh_CN.dart

@@ -154,6 +154,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "dengdaiyonghuqucan" : MessageLookupByLibrary.simpleMessage("等待用户取餐"),
     "denglu" : MessageLookupByLibrary.simpleMessage("登录"),
     "diancan" : MessageLookupByLibrary.simpleMessage("点餐"),
+    "diandan" : MessageLookupByLibrary.simpleMessage("点单"),
     "dianhua" : MessageLookupByLibrary.simpleMessage("电话"),
     "dianjidenglu" : MessageLookupByLibrary.simpleMessage("点击登录，享受更多精彩信息"),
     "dianwolingqu" : MessageLookupByLibrary.simpleMessage("点我领取"),

lib/generated/intl/messages_zh_Hans_CN.dart

@@ -154,6 +154,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "dengdaiyonghuqucan" : MessageLookupByLibrary.simpleMessage("等待用户取餐"),
     "denglu" : MessageLookupByLibrary.simpleMessage("登录"),
     "diancan" : MessageLookupByLibrary.simpleMessage("点餐"),
+    "diandan" : MessageLookupByLibrary.simpleMessage("点单"),
     "dianhua" : MessageLookupByLibrary.simpleMessage("电话"),
     "dianjidenglu" : MessageLookupByLibrary.simpleMessage("点击登录，享受更多精彩信息"),
     "dianwolingqu" : MessageLookupByLibrary.simpleMessage("点我领取"),

lib/generated/intl/messages_zh_Hant_CN.dart

@@ -154,6 +154,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "dengdaiyonghuqucan" : MessageLookupByLibrary.simpleMessage("等待用戶取餐"),
     "denglu" : MessageLookupByLibrary.simpleMessage("登錄"),
     "diancan" : MessageLookupByLibrary.simpleMessage("點餐"),
+    "diandan" : MessageLookupByLibrary.simpleMessage("點單"),
     "dianhua" : MessageLookupByLibrary.simpleMessage("電話"),
     "dianjidenglu" : MessageLookupByLibrary.simpleMessage("點擊登錄，享受更多精彩信息"),
     "dianwolingqu" : MessageLookupByLibrary.simpleMessage("點我領取"),

lib/generated/intl/messages_zh_TW.dart

@@ -154,6 +154,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "dengdaiyonghuqucan" : MessageLookupByLibrary.simpleMessage("等待用戶取餐"),
     "denglu" : MessageLookupByLibrary.simpleMessage("登錄"),
     "diancan" : MessageLookupByLibrary.simpleMessage("點餐"),
+    "diandan" : MessageLookupByLibrary.simpleMessage("點單"),
     "dianhua" : MessageLookupByLibrary.simpleMessage("電話"),
     "dianjidenglu" : MessageLookupByLibrary.simpleMessage("點擊登錄，享受更多精彩信息"),
     "dianwolingqu" : MessageLookupByLibrary.simpleMessage("點我領取"),

lib/generated/l10n.dart

@@ -4985,6 +4985,16 @@ class S {
     );
   }
 
+  /// `点单`
+  String get diandan {
+    return Intl.message(
+      '点单',
+      name: 'diandan',
+      desc: '',
+      args: [],
+    );
+  }
+
   /// `并使用本机号码登录`
   String get privacy_policy4 {
     return Intl.message(

lib/l10n/intl_en.arb

@@ -516,6 +516,7 @@
   "ninyichenggonglingquyouhuiquan": "您已成功领取优惠劵，请在",
   "kabaokeshiyong": "卡包-可使用",
   "zhongchakan": "中查看",
+  "diandan": "点单",
 
 
 

lib/l10n/intl_zh_CN.arb

@@ -518,6 +518,7 @@
   "ninyichenggonglingquyouhuiquan": "您已成功领取优惠劵，请在",
   "kabaokeshiyong": "卡包-可使用",
   "zhongchakan": "中查看",
+  "diandan": "点单",
 
 
 

lib/l10n/intl_zh_Hans_CN.arb

@@ -518,6 +518,7 @@
   "ninyichenggonglingquyouhuiquan": "您已成功领取优惠劵，请在",
   "kabaokeshiyong": "卡包-可使用",
   "zhongchakan": "中查看",
+  "diandan": "点单",
 
 
 

lib/l10n/intl_zh_Hant_CN.arb

@@ -511,6 +511,7 @@
   "ninyichenggonglingquyouhuiquan": "您已成功領取優惠券，請在",
   "kabaokeshiyong": "卡包-可使用",
   "zhongchakan": "中查看",
+  "diandan": "點單",
 
 
 

lib/l10n/intl_zh_TW.arb

@@ -510,6 +510,7 @@
   "ninyichenggonglingquyouhuiquan": "您已成功領取優惠券，請在",
   "kabaokeshiyong": "卡包-可使用",
   "zhongchakan": "中查看",
+  "diandan": "點單",
 
 
 

lib/order/order_detail_page.dart

@@ -9,17 +9,10 @@ import 'package:huixiang/order/order_view/order_status.dart';
 import 'package:huixiang/retrofit/data/base_data.dart';
 import 'package:huixiang/retrofit/data/order_info.dart';
 import 'package:huixiang/retrofit/retrofit_api.dart';
-import 'package:huixiang/utils/flutter_utils.dart';
-import 'package:huixiang/view_widget/border_text.dart';
-import 'package:huixiang/view_widget/custom_image.dart';
 import 'package:huixiang/view_widget/icon_text.dart';
 import 'package:huixiang/view_widget/my_appbar.dart';
-import 'package:huixiang/view_widget/round_button.dart';
-import 'package:huixiang/view_widget/separator.dart';
-import 'package:huixiang/view_widget/text_image_dialog.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
-import 'package:url_launcher/url_launcher.dart';
 
 class OrderDetailPage extends StatefulWidget {
   final arguments;
@@ -313,8 +306,7 @@ class _OrderDetailPage extends State<OrderDetailPage> {
                   ),
                 ),
                 Text(
-                  S
+                  S.of(context)
-                      .of(context)
                       .yuan_(orderInfo != null ? orderInfo.finalPayPrice : "0"),
                   style: TextStyle(
                     fontSize: 20.sp,

lib/union/union_details_page.dart

@@ -21,6 +21,7 @@ import 'package:huixiang/union/union_view/vip.dart';
 import 'package:huixiang/utils/font_weight.dart';
 import 'package:huixiang/utils/min.dart';
 import 'package:huixiang/view_widget/classic_header.dart';
+import 'package:huixiang/view_widget/custom_image.dart';
 import 'package:huixiang/view_widget/my_appbar.dart';
 import 'package:huixiang/view_widget/receive_success.dart';
 import 'package:path_provider/path_provider.dart';
@@ -82,73 +83,105 @@ class _UnionDetailsPage extends State<UnionDetailsPage> {
       future: queryStoreInfo(),
       builder: (context, snapshot) {
         return Scaffold(
-          appBar: MyAppBar(
+          // appBar: MyAppBar(
-            background: Color(0xFFF7F7F7),
+          //   background: Color(0xFFF7F7F7),
-            title: storeInfo == null
+          //   // title: storeInfo == null
-                ? (widget.arguments["storeName"] ?? "")
+          //   //     ? (widget.arguments["storeName"] ?? "")
-                : storeInfo.storeName,
+          //   //     : storeInfo.storeName,
-            titleColor: Colors.black87,
+          //   title: "",
-            titleSize: 18.sp,
+          //   titleColor: Colors.black87,
-            leadingColor: Colors.black,
+          //   titleSize: 18.sp,
-          ),
+          //   leadingColor: Colors.black,
-          body: Column(
+          // ),
-            children: [
+          body:
-              Expanded(
+              Stack(
-                child: SmartRefresher(
+                children: [
-                  controller: refreshController,
+                  MImage(
-                  enablePullDown: true,
+                    storeInfo != null && storeInfo.bannerList != null?
-                  enablePullUp: false,
+                    storeInfo.bannerList.first.imgUrl:"",
-                  header: MyHeader(),
+                    width: double.infinity,
-                  physics: BouncingScrollPhysics(),
+                    height: 190.h,
-                  onRefresh: () {
+                    fit: BoxFit.cover,
-                    setState(() {});
+                    errorSrc: "assets/image/default_1.png",
-                  },
+                    fadeSrc: "assets/image/default_1.png",
-                  child: SingleChildScrollView(
+                  ),
-                    physics: NeverScrollableScrollPhysics(),
+                  Column(
-                    child: Column(
+                    mainAxisAlignment: MainAxisAlignment.start,
-                      children: [
+                    crossAxisAlignment: CrossAxisAlignment.start,
-                        ///门店信息
+                    children: [
-                        StoreInfos(storeInfo),
+                      SizedBox(height:54.h,),
+                      Padding(padding:EdgeInsets.only(left: 17.w),
+                      child: GestureDetector(
+                          onTap: () {
+                            Navigator.of(context).pop();
+                          },
+                          child:Icon(
+                            Icons.arrow_back_ios,
+                            color: Colors.black,
+                            size: 24,
+                          )
+                      ),),
+                      SizedBox(height:29.h,),
+                      Expanded(
+                        child: SmartRefresher(
+                          controller: refreshController,
+                          enablePullDown: true,
+                          enablePullUp: false,
+                          header: MyHeader(),
+                          physics: BouncingScrollPhysics(),
+                          onRefresh: () {
+                            setState(() {});
+                          },
+                          child: SingleChildScrollView(
+                            physics: NeverScrollableScrollPhysics(),
+                            child: Column(
+                              children: [
+                                ///门店信息
+                                StoreInfos(storeInfo),
 
-                        ///门店对应VIP信息
+                                ///门店对应优惠券
-                        Vip(storeInfo, _receiveVip, isReceive),
+                                UnionCoupon(storeInfo, _receiveCoupon),
 
-                        ///门店对应优惠券
+                                ///门店对应VIP信息
-                        UnionCoupon(storeInfo, _receiveCoupon),
+                                Vip(storeInfo, _receiveVip, isReceive),
 
-                        /// 门店对应的活动
+                                /// 门店对应的活动
-                        StoreActivity(widget.arguments, activitys),
+                                StoreActivity(widget.arguments, activitys),
-                      ],
+
-                    ),
+                              ],
-                  ),
+                            ),
-                ),
+                          ),
-                flex: 1,
+                        ),
-              ),
+                        // flex: 1,
-              InkWell(
+                      ),
-                onTap: _loginMin,
+                      // InkWell(
-                child: Container(
+                      //   onTap: _loginMin,
-                  padding: EdgeInsets.only(top: 16.h, bottom: 16.h),
+                      //   child: Container(
-                  decoration: BoxDecoration(
+                      //     padding: EdgeInsets.only(top: 16.h, bottom: 16.h),
-                    color: isEnable() ? Color(0xFF32A060) : Color(0xFFD8D8D8),
+                      //     decoration: BoxDecoration(
-                    borderRadius: BorderRadius.vertical(
+                      //       color: isEnable() ? Color(0xFF32A060) : Color(0xFFD8D8D8),
-                      top: Radius.circular(4),
+                      //       borderRadius: BorderRadius.vertical(
-                    ),
+                      //         top: Radius.circular(4),
-                  ),
+                      //       ),
-                  alignment: Alignment.center,
+                      //     ),
-                  child: Text(
+                      //     alignment: Alignment.center,
-                    isEnable()
+                      //     child: Text(
-                        ? S.of(context).jinrushangdian
+                      //       isEnable()
-                        : S.of(context).zanwuxianshangjindian,
+                      //           ? S.of(context).jinrushangdian
-                    style: TextStyle(
+                      //           : S.of(context).zanwuxianshangjindian,
-                      fontSize: 16.sp,
+                      //       style: TextStyle(
-                      color: isEnable() ? Colors.white : Color(0xFFA0A0A0),
+                      //         fontSize: 16.sp,
-                      fontWeight: MyFontWeight.semi_bold,
+                      //         color: isEnable() ? Colors.white : Color(0xFFA0A0A0),
-                    ),
+                      //         fontWeight: MyFontWeight.semi_bold,
+                      //       ),
+                      //     ),
+                      //   ),
+                      // ),
+                    ],
                   ),
-                ),
+                ],
               ),
-            ],
+
-          ),
         );
       },
     );

lib/union/union_view/store_activity.dart

@@ -1,13 +1,10 @@
 
-
-
 import 'package:flutter/material.dart';
 import 'package:flutter_swiper/flutter_swiper.dart';
 import 'package:huixiang/generated/l10n.dart';
 import 'package:huixiang/retrofit/data/activity.dart';
 import 'package:huixiang/utils/font_weight.dart';
 import 'package:huixiang/view_widget/custom_image.dart';
-import 'package:huixiang/view_widget/item_title.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 
 class StoreActivity extends StatefulWidget {
@@ -25,17 +22,50 @@ class StoreActivity extends StatefulWidget {
 }
 
 class _StoreActivity extends State<StoreActivity> {
+  int page = 0;
+
   @override
   Widget build(BuildContext context) {
     return Column(
       children: [
         Container(
-          margin: EdgeInsets.only(top: 20.h, bottom: 20.h),
+          alignment:Alignment.centerLeft,
-          child: ItemTitle(
+          margin: EdgeInsets.only(top: 20.h, bottom: 20.h,left: 17.w),
-            text: S.of(context).xindianhuodong,
+          child: Row(
-            imgPath: "assets/image/icon_union_start_store.png",
+            children: [
+              GestureDetector(
+                onTap: (){setState(() {
+                  page = 0;
+                });},
+                child: Text(
+                  S.of(context).diandan,
+                  textAlign: TextAlign.center,
+                  style: TextStyle(
+                    color: page==0?Colors.black:Colors.grey,
+                    fontSize: page==0?16.sp:14.sp,
+                    fontWeight: page==0?FontWeight.bold:FontWeight.normal,
+                  ),
+                ),
+              ),
+              Padding(padding: EdgeInsets.only(left: 10)),
+              GestureDetector(
+                onTap: (){setState(() {
+                  page = 1;
+                });},
+                child: Text(
+                  S.of(context).xindianhuodong,
+                  textAlign: TextAlign.center,
+                  style: TextStyle(
+                    color: page==1?Colors.black:Colors.grey,
+                    fontSize: page==1?16.sp:14.sp,
+                    fontWeight: page==1?FontWeight.bold:FontWeight.normal,
+                  ),
+                ),
+              ),
+            ],
           ),
         ),
+        page == 0 ? order():
         (widget.activitys != null && widget.activitys.length > 0)
             ? Container(
           margin: EdgeInsets.only(bottom: 30.h),
@@ -62,6 +92,12 @@ class _StoreActivity extends State<StoreActivity> {
     );
   }
 
+  Widget order(){
+    return Container(
+      child: Text("点单页面!"),
+    );
+  }
+
 
   Widget buildSwiper2Bottom() {
     return Container(

lib/union/union_view/store_info.dart

@@ -11,7 +11,6 @@ import 'package:huixiang/view_widget/round_button.dart';
 import 'package:url_launcher/url_launcher.dart';
 
 class StoreInfos extends StatefulWidget {
-
   final StoreInfo storeInfo;
 
   StoreInfos(this.storeInfo);
@@ -20,12 +19,164 @@ class StoreInfos extends StatefulWidget {
   State<StatefulWidget> createState() {
     return _StoreInfos();
   }
-
 }
 
 class _StoreInfos extends State<StoreInfos> {
   @override
   Widget build(BuildContext context) {
+    return Container(
+      margin: EdgeInsets.fromLTRB(17, 20, 15, 8),
+      padding: EdgeInsets.fromLTRB(10, 20, 10, 14),
+      width: double.infinity,
+      decoration: BoxDecoration(
+        color: Colors.white,
+        borderRadius: BorderRadius.circular(8),
+        boxShadow: [
+          BoxShadow(
+            color: Colors.black.withAlpha(25),
+            offset: Offset(0, 1),
+            blurRadius: 12,
+            spreadRadius: 0,
+          ),
+        ],
+      ),
+      child: Row(
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          Expanded(
+              flex: 1,
+              child: Column(
+                mainAxisAlignment: MainAxisAlignment.start,
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  Text(
+                    widget.storeInfo != null ? widget.storeInfo.storeName : "",
+                    overflow: TextOverflow.ellipsis,
+                    style: TextStyle(
+                      fontSize: 18.sp,
+                      color: Colors.black,
+                      fontWeight: MyFontWeight.medium,
+                    ),
+                  ),
+                  SizedBox(
+                    height: 8.h,
+                  ),
+                  Row(
+                    children: [
+                      Text(
+                        S.of(context).ren(
+                              widget.storeInfo != null
+                                  ? widget.storeInfo.perCapitaConsumption
+                                  : "",
+                            ),
+                        overflow: TextOverflow.ellipsis,
+                        style: TextStyle(
+                          fontSize: 14.sp,
+                          fontWeight: MyFontWeight.regular,
+                          color: Color(0xFF353535),
+                        ),
+                      ),
+                      SizedBox(
+                        width: 22.w,
+                      ),
+                      Row(
+                        children: itemServer(
+                          widget.storeInfo != null
+                              ? widget.storeInfo.businessService
+                              : "",
+                        ),
+                      ),
+                    ],
+                  ),
+                  SizedBox(
+                    height: 12.h,
+                  ),
+                  Text(
+                    widget.storeInfo != null ? widget.storeInfo.address : "",
+                    maxLines: 2,
+                    textAlign: TextAlign.justify,
+                    style: TextStyle(
+                      color: Color(0xFF353535),
+                      fontWeight: MyFontWeight.regular,
+                      fontSize: 12.sp,
+                    ),
+                  ),
+                  SizedBox(
+                    height: 4.h,
+                  ),
+                  Text(
+                    S.of(context).yingyeshijian(widget.storeInfo == null
+                        ? ""
+                        : (widget.storeInfo.openStartTime == null &&
+                        widget.storeInfo.openEndTime == null)
+                        ? S.of(context).quantian
+                        : "${widget.storeInfo.openStartTime.substring(0, widget.storeInfo.openStartTime.lastIndexOf(":"))} "
+                        "- ${widget.storeInfo.openEndTime.substring(0, widget.storeInfo.openEndTime.lastIndexOf(":"))}"),
+                    style: TextStyle(
+                      color: Color(0xFF353535),
+                      fontWeight: MyFontWeight.regular,
+                      fontSize: 12.sp,
+                    ),
+                  ),
+                ],
+              )),
+          Column(
+            children: [
+              MImage(
+                widget.storeInfo != null ? widget.storeInfo.logo : "",
+                width: 69,
+                height: 69,
+                fit: BoxFit.cover,
+                errorSrc: "assets/image/default_1.png",
+                fadeSrc: "assets/image/default_1.png",
+              ),
+              SizedBox(
+                height: 21.h,
+              ),
+              Row(
+                mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                crossAxisAlignment: CrossAxisAlignment.end,
+                children: [
+                  InkWell(
+                    onTap: () {
+                      if (widget.storeInfo == null ||
+                          widget.storeInfo.latitude == null ||
+                          widget.storeInfo.longitude == null ||
+                          widget.storeInfo.latitude == "" ||
+                          widget.storeInfo.longitude == "") return;
+                      Navigator.of(context)
+                          .pushNamed('/router/location_map', arguments: {
+                        "lat": widget.storeInfo.latitude,
+                        "lng": widget.storeInfo.longitude,
+                        "storeName": widget.storeInfo.storeName,
+                      });
+                    },
+                    child: Image.asset(
+                      "assets/image/icon_union_location.png",
+                      width: 24.w,
+                      height: 24.h,
+                    ),
+                  ),
+                  SizedBox(
+                    width: 16.w,
+                  ),
+                  InkWell(
+                    onTap: () {
+                      showCallMobile();
+                    },
+                    child: Image.asset(
+                      "assets/image/icon_union_call.png",
+                      width: 24,
+                      height: 24,
+                    ),
+                  ),
+                ],
+              ),
+            ],
+          )
+        ],
+      ),
+    );
     return AspectRatio(
       aspectRatio: 1,
       child: Container(
@@ -215,8 +366,8 @@ class _StoreInfos extends State<StoreInfos> {
               margin: EdgeInsets.only(left: 10.w, right: 10.w),
               child: MImage(
                 (widget.storeInfo != null &&
-                    widget.storeInfo.bannerList != null &&
+                        widget.storeInfo.bannerList != null &&
-                    position < widget.storeInfo.bannerList.length)
+                        position < widget.storeInfo.bannerList.length)
                     ? widget.storeInfo.bannerList[position].imgUrl
                     : "",
                 fit: BoxFit.cover,
@@ -226,31 +377,31 @@ class _StoreInfos extends State<StoreInfos> {
               ),
             );
           },
-          itemCount: (widget.storeInfo != null && widget.storeInfo.bannerList != null)
+          itemCount:
-              ? widget.storeInfo.bannerList.length
+              (widget.storeInfo != null && widget.storeInfo.bannerList != null)
-              : 1),
+                  ? widget.storeInfo.bannerList.length
+                  : 1),
     );
   }
 
-
   List<Widget> itemServer(String businessService) {
     if (businessService == null || businessService == "") return [];
     var list = businessService.split(",");
     return list
         .map((e) => Container(
-      margin: EdgeInsets.only(right: 8.w),
+              margin: EdgeInsets.only(right: 8.w),
-      child: RoundButton(
+              child: RoundButton(
-        height: 14.h * AppUtils.textScale(context),
+                height: 14.h * AppUtils.textScale(context),
-        text: "$e",
+                text: "$e",
-        backgroup: Color(0xFFFF7A1A),
+                backgroup: Color(0xFFFF7A1A),
-        padding: EdgeInsets.only(
+                padding: EdgeInsets.only(
-          left: 2.w,
+                  left: 2.w,
-          right: 2.w,
+                  right: 2.w,
-        ),
+                ),
-        fontSize: 10.sp,
+                fontSize: 10.sp,
-        textColor: Colors.white,
+                textColor: Colors.white,
-      ),
+              ),
-    ))
+            ))
         .toList();
   }
 
@@ -293,7 +444,4 @@ class _StoreInfos extends State<StoreInfos> {
       throw 'Could not launch $url';
     }
   }
-
 }
-
-

lib/union/union_view/union_coupon.dart

@@ -29,27 +29,27 @@ class _UnionCoupon extends State<UnionCoupon> {
   Widget build(BuildContext context) {
     return Column(
       children: [
-        Container(
+        // Container(
-          margin: EdgeInsets.only(top: 10.h, bottom: 10.h),
+        //   margin: EdgeInsets.only(top: 10.h, bottom: 10.h),
-          child: ItemTitle(
+        //   child: ItemTitle(
-            text: S.of(context).youhuiquan,
+        //     text: S.of(context).youhuiquan,
-            imgPath: "assets/image/icon_union_coupons.png",
+        //     imgPath: "assets/image/icon_union_coupons.png",
-          ),
+        //   ),
-        ),
+        // ),
         (widget.storeInfo != null && widget.storeInfo.couponVOList != null)
             ? buildCoupon()
             : Container(
           width: double.infinity,
-          height: 50.h,
+          height:  0.h,
           alignment: Alignment.center,
-          child: Text(
+          // child: Text(
-            S.of(context).zanwuyouhuiquankelingqu,
+          //   S.of(context).zanwuyouhuiquankelingqu,
-            style: TextStyle(
+          //   style: TextStyle(
-              fontSize: 14.sp,
+          //     fontSize: 14.sp,
-              fontWeight: MyFontWeight.semi_bold,
+          //     fontWeight: MyFontWeight.semi_bold,
-              color: Color(0xFFA0A0A0),
+          //     color: Color(0xFFA0A0A0),
-            ),
+          //   ),
-          ),
+          // ),
         ),
       ],
     );

lib/web/web_view/comment_list.dart

@@ -23,6 +23,7 @@ class CommentList extends StatefulWidget {
   final bool isKeyBoardShow;
   final Function reply;
   final Function delCommentTips;
+  final double fontSize;
 
   CommentList(
     Key key,
@@ -32,6 +33,7 @@ class CommentList extends StatefulWidget {
     this.isKeyBoardShow,
     this.reply,
     this.delCommentTips,
+      this.fontSize
   ) : super(key: key);
 
   @override
@@ -102,8 +104,8 @@ class _CommentList extends State<CommentList> {
                     Text(
                       S.of(context).pinglun_(commentTotal.toString()),
                       style: TextStyle(
-                        fontSize: 16.sp,
+                        fontSize:widget.fontSize+4,
-                        fontWeight: MyFontWeight.bold,
+                        fontWeight: FontWeight.bold,
                         color: Color(0xff1A1A1A),
                       ),
                     ),
@@ -112,10 +114,10 @@ class _CommentList extends State<CommentList> {
                     ),
                     Text(
                       S.of(context).xihuan_(
-                          "${(widget.article?.likes ?? widget.activity?.likes) ?? "0"}"),
+                          "${widget.article?.likes ?? widget.activity?.likes ?? "0"}"),
                       style: TextStyle(
-                        fontSize: 16.sp,
+                        fontSize:widget.fontSize+4,
-                        fontWeight: MyFontWeight.bold,
+                        fontWeight: FontWeight.bold,
                         color: Color(0xff1A1A1A),
                       ),
                     ),
@@ -161,7 +163,7 @@ class _CommentList extends State<CommentList> {
                   child: Text(
                     S.of(context).yixiansquanbupinglun,
                     style: TextStyle(
-                      fontSize: 14.sp,
+                      fontSize:widget.fontSize+2,
                       color: Color(0xff353535),
                     ),
                   ),
@@ -179,8 +181,8 @@ class _CommentList extends State<CommentList> {
                   child: Text(
                     S.of(context).zanwupinglun,
                     style: TextStyle(
-                      fontSize: 14.sp,
+                      fontSize:widget.fontSize+2,
-                      fontWeight: MyFontWeight.bold,
+                      fontWeight: FontWeight.bold,
                       color: Color(0xFFA0A0A0),
                     ),
                   ),
@@ -277,7 +279,7 @@ class _CommentList extends State<CommentList> {
                 ),
                 Expanded(
                   child: Container(
-                    height: 60.h,
+                    // height: 60.h,
                     child: Column(
                       mainAxisAlignment: MainAxisAlignment.spaceEvenly,
                       crossAxisAlignment: CrossAxisAlignment.start,
@@ -288,8 +290,8 @@ class _CommentList extends State<CommentList> {
                               TextSpan(
                                 text: memberList.username,
                                 style: TextStyle(
-                                  fontWeight: MyFontWeight.bold,
+                                  fontWeight: FontWeight.bold,
-                                  fontSize: 14.sp,
+                                  fontSize:widget.fontSize+2,
                                   color: Colors.black,
                                 ),
                               ),
@@ -297,12 +299,15 @@ class _CommentList extends State<CommentList> {
                           ),
                           textDirection: TextDirection.ltr,
                         ),
+                        SizedBox(
+                          height: 3.h,
+                        ),
                         Text(
                           memberList.createTime,
                           overflow: TextOverflow.ellipsis,
                           maxLines: 2,
                           style: TextStyle(
-                            fontSize: 12.sp,
+                            fontSize:widget.fontSize,
                             color: Color(0xff808080),
                           ),
                         ),
@@ -353,7 +358,7 @@ class _CommentList extends State<CommentList> {
                           text,
                           style: TextStyle(
                             color: Color(0xFF1A1A1A),
-                            fontSize: 12.sp,
+                            fontSize:widget.fontSize,
                           ),
                         );
                       },
@@ -375,7 +380,7 @@ class _CommentList extends State<CommentList> {
               child: Text(
                 memberList.content,
                 style: TextStyle(
-                  fontSize: 14.sp,
+                  fontSize:widget.fontSize+2,
                   color: Color(0xff1A1A1A),
                 ),
               ),
@@ -400,7 +405,7 @@ class _CommentList extends State<CommentList> {
                     Text(
                       "${memberList.parentUserName}:" ?? "",
                       style: TextStyle(
-                        fontSize: 12.sp,
+                        fontSize: widget.fontSize,
                         color: Color(0xff808080),
                       ),
                     ),
@@ -409,7 +414,7 @@ class _CommentList extends State<CommentList> {
                       child: Text(
                         memberList.parentContent ?? "",
                         style: TextStyle(
-                          fontSize: 12.sp,
+                          fontSize:widget.fontSize,
                           color: Color(0xff808080),
                         ),
                       ),