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

lib/community/community_child_page.dart

@@ -10,8 +10,10 @@ import 'package:huixiang/retrofit/data/page.dart';
 import 'package:huixiang/retrofit/retrofit_api.dart';
 import 'package:huixiang/view_widget/classic_header.dart';
 import 'package:huixiang/view_widget/my_footer.dart';
+import 'package:huixiang/view_widget/no_data_view.dart';
 import 'package:pull_to_refresh/pull_to_refresh.dart';
 import 'package:shared_preferences/shared_preferences.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
 
 class CommunityChildPage extends StatefulWidget {
   final String typeStr;
@@ -81,7 +83,7 @@ class _CommunityChildPage extends State<CommunityChildPage> with AutomaticKeepAl
         article.id = element.id;
         article.content = jsonEncode(element.subjectInfo);
         article.mainTitle =element.subject;
-        article.liked = element.selfFollow;
+        article.isFollow = element.selfFollow;
         article.authorHeadImg = element.memberInfo?.avatar;
         article.authorName = element.memberInfo?.nickname;
         article.createTime = element.createTime;
@@ -121,7 +123,13 @@ class _CommunityChildPage extends State<CommunityChildPage> with AutomaticKeepAl
             isLoadMore = true;
             setState(() {});
           },
-          child: ListView.builder(
+          child: (articles == null || articles.length == 0)? NoDataView(
+            src: "assets/image/guan_zhu.png",
+            isShowBtn: false,
+            text: "目前暂无添加关注，可在推荐中关注自己喜欢的人哦~",
+            fontSize: 16.sp,
+            margin: EdgeInsets.only(top: 120.h,left: 60.w,right: 60.w),
+          ):ListView.builder(
             physics: NeverScrollableScrollPhysics(),
             itemBuilder: (context, position) {
               return InkWell(
@@ -145,7 +153,9 @@ class _CommunityChildPage extends State<CommunityChildPage> with AutomaticKeepAl
                     },
                   ).then((value) {
                     _onRefresh();
+                    setState(() {});
                   });
+                  setState(() {});
                 },
               );
             },

lib/community/community_view/community_dynamic.dart

@@ -227,8 +227,7 @@ class _CommunityDynamic extends State<CommunityDynamic> {
                       onTap: () {
                         setState(() {
                           if (widget.commentType == 0) {
-                            widget.article.isFollow =
+                            widget.article.isFollow = !(widget.article.isFollow ?? false);
-                                !(widget.article.isFollow ?? false);
                             _vipFollow(widget.article.updateUser,
                                 widget.article.isFollow ?? false);
                           } else {

lib/message/system_details.dart

@@ -198,6 +198,7 @@ class _SystemDetails extends State<SystemDetails> {
         children: [
           (messages == null || messages.length == 0)
               ? NoDataView(
+            src: "assets/image/icon_empty.png",
             isShowBtn: false,
             text: S.of(context).haimeiyouxiaoxi,
             fontSize: 16.sp,
@@ -322,6 +323,7 @@ class _SystemDetails extends State<SystemDetails> {
           children: [
             (messages == null || messages.length == 0)
                 ? NoDataView(
+              src:"assets/image/icon_empty.png",
               isShowBtn: false,
               text: S.of(context).haimeiyouxiaoxi,
               fontSize: 16.sp,
@@ -457,6 +459,7 @@ class _SystemDetails extends State<SystemDetails> {
           children: [
             (messages == null || messages.length == 0)
                 ? NoDataView(
+              src:"assets/image/icon_empty.png",
               isShowBtn: false,
               text: S.of(context).haimeiyouxiaoxi,
               fontSize: 16.sp,
@@ -603,6 +606,7 @@ class _SystemDetails extends State<SystemDetails> {
               children: [
                 (messages == null || messages.length == 0)
                     ? NoDataView(
+                  src:"assets/image/icon_empty.png",
                   isShowBtn: false,
                   text: S.of(context).haimeiyouxiaoxi,
                   fontSize: 16.sp,
@@ -846,6 +850,7 @@ class _SystemDetails extends State<SystemDetails> {
           children: [
             (messages == null || messages.length == 0)
                 ? NoDataView(
+              src:"assets/image/icon_empty.png",
               isShowBtn: false,
               text: S.of(context).haimeiyouxiaoxi,
               fontSize: 16.sp,

lib/message/system_message.dart

@@ -403,6 +403,7 @@ class _SystemMessagePage extends State<SystemMessagePage> {
           ),
           (messages == null || messages.length == 0)
               ? NoDataView(
+            src: "assets/image/icon_empty.png",
             isShowBtn: false,
             text: S.of(context).haimeiyouxiaoxi,
             fontSize: 16.sp,

lib/mine/coupons_page.dart

@@ -200,6 +200,7 @@ class _CouponsPage extends State<CouponsPage> {
                       itemCount: coupons != null ? coupons.length : 0,
                     )
                   : NoDataView(
+                src:"assets/image/ka.png",
                       isShowBtn: false,
                       text: "你还没有券～",
                       fontSize: 16.sp,

lib/mine/fans_page.dart

@@ -10,6 +10,7 @@ import 'package:huixiang/utils/font_weight.dart';
 import 'package:huixiang/view_widget/classic_header.dart';
 import 'package:huixiang/view_widget/custom_image.dart';
 import 'package:huixiang/view_widget/my_footer.dart';
+import 'package:huixiang/view_widget/no_data_view.dart';
 import 'package:huixiang/view_widget/round_button.dart';
 import 'package:pull_to_refresh/pull_to_refresh.dart';
 import 'package:shared_preferences/shared_preferences.dart';
@@ -110,7 +111,13 @@ class _FansPage extends State<FansPage> {
             controller: _refreshController,
             onRefresh: (){_queryFollowList();},
             physics: BouncingScrollPhysics(),
-            child: ListView.builder(
+            child: (list == null || list.length == 0)? NoDataView(
+              src: "assets/image/fen_si.png",
+              isShowBtn: false,
+              text: "目前暂无粉丝，听说多发动态可以涨粉哦~",
+              fontSize: 16.sp,
+              margin: EdgeInsets.only(top: 120.h,left: 60.w,right: 60.w),
+            ):ListView.builder(
               itemCount: list == null ? 0 : list.length,
               padding: EdgeInsets.symmetric(vertical: 8.h),
               shrinkWrap: true,

lib/mine/follow_page.dart

@@ -112,7 +112,13 @@ class _FollowPage extends State<FollowPage> {
           controller: _refreshController,
           onRefresh: (){_queryFollowList();},
           physics: BouncingScrollPhysics(),
-          child: ListView.builder(
+          child:(list == null || list.length == 0)? NoDataView(
+            src: "assets/image/guan_zhu.png",
+            isShowBtn: false,
+            text: "目前暂无添加关注，可在推荐中关注自己喜欢的人哦~",
+            fontSize: 16.sp,
+            margin: EdgeInsets.only(top: 120.h,left: 60.w,right: 60.w),
+          ):ListView.builder(
             itemCount: list == null ? 0 : list.length,
             shrinkWrap: true,
             physics: NeverScrollableScrollPhysics(),
@@ -123,13 +129,7 @@ class _FollowPage extends State<FollowPage> {
                 child: followItem(list[position]),
               );
             },
-          ),
+          )
-          //     NoDataView(
-          //   isShowBtn: false,
-          //   text: "共关注0人",
-          //   fontSize: 16.sp,
-          //   margin: EdgeInsets.only(top: 120.h),
-          // ),
         ),
 
       ),

lib/mine/invitation_record.dart

@@ -305,6 +305,7 @@ class _InvitationRecord extends State<InvitationRecord>
                                 Expanded(child:
                                 (invitationList.length == null || invitationList.length == 0)
                                     ? NoDataView(
+                                  src: "assets/image/icon_empty.png",
                                   isShowBtn: false,
                                   text:"还没有邀请记录哦~",
                                   fontSize: 16.sp,

lib/mine/manage_address_page.dart

@@ -66,6 +66,7 @@ class _ManageAddressPage extends State<ManageAddressPage> {
           Expanded(
             child: (addressList == null || addressList.length == 0)
                 ? NoDataView(
+                    src:"assets/image/di_zhi.png",
                     isShowBtn: false,
                     text: "目前暂无送货地址，请添加",
                     fontSize: 16.sp,

lib/mine/mine_wallet_page.dart

@@ -172,6 +172,7 @@ class _MineWalletPage extends State<MineWalletPage> {
             margin: EdgeInsets.only(top: 14.h),
             child: (userBills == null || userBills.length == 0)
                 ? NoDataView(
+                    src: "assets/image/xiao_fei.png",
                     isShowBtn: false,
                     text: "目前暂未记录哦",
                     fontSize: 16.sp,

lib/mine/release_page.dart

@@ -76,7 +76,7 @@ class _ReleasePage extends State<ReleasePage> {
         article.id = element.id;
         article.content = jsonEncode(element.subjectInfo);
         article.mainTitle =element.subject;
-        article.liked = element.selfFollow;
+        article.isFollow = element.selfFollow;
         article.authorHeadImg = element.memberInfo?.avatar;
         article.authorName = element.memberInfo?.nickname;
         article.createTime = element.createTime;
@@ -132,7 +132,9 @@ class _ReleasePage extends State<ReleasePage> {
                         _onRefresh();
                       });},
                       removalDynamic: () {
-                        _onRefresh();
+                        setState(() {
+                          _onRefresh();
+                        });
                       },
                     ),
                     onTap: () {
@@ -141,7 +143,9 @@ class _ReleasePage extends State<ReleasePage> {
                         arguments: {
                           "businessId": articles[position].id,"userId":userId,
                         },
-                      );
+                      ).then((value) {
+                        _onRefresh();
+                      });
                     },
                   );
                 },

lib/mine/roll_center_page.dart

@@ -152,6 +152,7 @@ class _RollCenterPage extends State<RollCenterPage> {
                         itemCount: (coupons != null && coupons.length > 0) ? coupons.length : 0,
                       )
                     : NoDataView(
+                        src: "assets/image/ka.png",
                         isShowBtn: false,
                         text: S.of(context).haimeiyouyouhuiquankeyilingqu,
                         fontSize: 16.sp,

lib/mine/vip_balance_page.dart

@@ -92,6 +92,7 @@ class _VipBalancePage extends State<VipBalancePage> {
       body: Container(
         child: (userBills == null || userBills.length == 0)
             ? NoDataView(
+          src: "assets/image/icon_empty.png",
                 isShowBtn: false,
                 text: S.of(context).nihaimeiyouchongzhihuoxiaofeijilu,
                 fontSize: 16.sp,

lib/mine/vip_card_page.dart

@@ -88,6 +88,7 @@ class _VipCardPage extends State<VipCardPage> {
                   itemCount: coupons != null ? coupons.length : 0,
                 )
               : NoDataView(
+            src: "assets/image/icon_empty.png",
                   isShowBtn: false,
                   text: "还没有会员卡～",
                   fontSize: 16.sp,

lib/order/exchange_history_page.dart

@@ -192,6 +192,7 @@ class _ExchangeHistoryList extends State<ExchangeHistoryList> {
       onLoading: queryHistory,
       child: orders == null || orders.length == 0
           ? NoDataView(
+              src: "assets/image/ding_dan.png",
               isShowBtn: false,
               text: "暂无已完成的订单",
               fontSize: 16.sp,

lib/order/logistics_information_page.dart

@@ -153,6 +153,7 @@ class _LogisticsInformationPage extends State<LogisticsInformationPage> {
                                       position, logistics.length);
                                 })
                             : NoDataView(
+                          src: "assets/image/ding_dan.png",
                                 isShowBtn: false,
                                 text: "暂无物流信息~",
                                 fontSize: 16.sp,

lib/order/order_history_page.dart

@@ -156,6 +156,7 @@ class _OrderHistoryList extends State<OrderHistoryList>
                 );
               })
           : NoDataView(
+        src: "assets/image/ding_dan.png",
               isShowBtn: false,
               text: "还没有订单，快去下一单吧～",
               fontSize: 16.sp,
@@ -200,7 +201,7 @@ class _OrderHistoryList extends State<OrderHistoryList>
       } else {
         current += 1;
       }
-      // setState(() {});
+      setState(() {});
     } else {
       refreshController.refreshFailed();
       refreshController.loadFailed();
@@ -411,7 +412,8 @@ class _OrderHistoryList extends State<OrderHistoryList>
                               ),
                             ),
                             TextSpan(
-                              text: totalPrice(orderInfo),
+                              // text: totalPrice(orderInfo),
+                              text:orderInfo.finalPayPrice,
                               style: TextStyle(
                                 fontSize: 12.sp,
                                 fontWeight: FontWeight.bold,

lib/settlement/settlement.dart

@@ -55,7 +55,7 @@ class _Settlement extends State<Settlement> {
   String remakers = "";
   String parentCode = "";
   String parentId = "";
-  int payChannel = 4;
+  int payChannel = 1;
   int tableId = 0;
   int numberOfPeople = 0;
 

lib/settlement/settlement_view/pay_method.dart

@@ -190,7 +190,7 @@ class _PayMethod extends State<PayMethod> {
     );
   }
 
-  var checkIndex = 1;
+  var checkIndex = 3;
 
   Widget checkView(var index) {
     return Container(

lib/store/store_view/store_activity.dart

@@ -30,6 +30,7 @@ class _StoreActivity extends State<StoreActivity> {
             ),
             color: Colors.white,
             child: NoDataView(
+              src: "assets/image/icon_empty.png",
               isShowBtn: false,
               text: "还没有活动～",
               iconWidth: 220,

lib/view_widget/no_data_view.dart

@@ -3,6 +3,7 @@ import 'package:huixiang/view_widget/round_button.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 
 class NoDataView extends StatelessWidget {
+  final String src;
   final bool isShowBtn;
   final String text;
   final double fontSize;
@@ -11,6 +12,7 @@ class NoDataView extends StatelessWidget {
   final EdgeInsets margin;
 
   NoDataView({
+    this.src,
     this.isShowBtn = true,
     this.text,
     this.fontSize,
@@ -27,7 +29,7 @@ class NoDataView extends StatelessWidget {
       child: Column(
         children: [
           Image(
-            image: AssetImage("assets/image/icon_empty.png"),
+            image: AssetImage(src),
             width: iconWidth,
             height: iconHeight,
           ),
@@ -36,8 +38,10 @@ class NoDataView extends StatelessWidget {
           ),
           Text(
             text,
+            textAlign: TextAlign.center,
             style: TextStyle(
               fontSize: fontSize,
+              height: 1.5,
               color: Color(0xFF353535),
             ),
           ),
@@ -60,4 +64,4 @@ class NoDataView extends StatelessWidget {
       ),
     );
   }
-}
+}

pubspec.lock

@@ -255,7 +255,7 @@ packages:
       name: flutter_screenutil
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "5.2.0"
+    version: "5.3.0"
   flutter_smart_dialog:
     dependency: "direct main"
     description: