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

lib/community/community_child_page.dart

@@ -170,7 +170,7 @@ class CommunityChildPageState extends State<CommunityChildPage>
             SmartRefresher(
               controller: refreshController,
               enablePullDown: true,
-              enablePullUp: true,
+              enablePullUp: (articles == null || articles.length == 0) ? false:true,
               physics: BouncingScrollPhysics(),
               header: MyHeader(),
               footer: CustomFooter(

lib/home/home_view/home_banner.dart

@@ -23,7 +23,7 @@ class _HomeBanner extends State<HomeBanner> {
   Widget build(BuildContext context) {
     return Container(
       child: AspectRatio(
-        aspectRatio: 375/300,
+        aspectRatio: 1.25,
         child: Swiper(
           pagination: SwiperPagination(
             margin: EdgeInsets.only(bottom: 12.h),

lib/home/trading_card_page.dart

@@ -189,7 +189,7 @@ class _TradingCardPage extends State<TradingCardPage> {
                               Image.asset(
                                 "assets/image/trading_text.webp",
                                 width:314.w,
-                                fit: BoxFit.cover,
+                                fit: BoxFit.fill,
                                 height:98.h,
                               ),
                             ]

lib/mine/mine_view/mine_navbar.dart

@@ -231,6 +231,25 @@ class _MineNavbar extends State<MineNavbar> {
                   ),
                 ),
               ),
+              ///集换卡
+              Expanded(
+                child: InkWell(
+                  onTap: () {
+                    SharedPreferences.getInstance().then((value) {
+                      if (value.getString("token") == null ||
+                          value.getString("token") == "") {
+                        LoginTipsDialog().show(context);
+                        return;
+                      }
+                      Navigator.of(context).pushNamed('/router/trading_card_page');
+                    });
+                  },
+                  child: mineBottomItem(
+                    widget?.userInfo?.happyBean?? "0",
+                    "印章卡",
+                  ),
+                ),
+              ),
             ],
           )
         ],

lib/mine/mine_vip/mine_vip_core.dart

@@ -746,7 +746,10 @@ class _MineVipCore extends State<MineVipCore> {
                   if(userInfo?.memberRankVo?.rankName != ranks[position].rankName || (userInfo?.memberRankVo?.rankName == "共创会员" && ranks[position].rankName == "共创会员"))
                   Align(alignment: Alignment.centerRight,
                   child: Text(
-                    (ranks[position].rankName == "共创会员") ? "永久VIP" : (ranks[position]?.originScore ?? 0).toString(),
+                    (ranks[position].rankName == "共创会员") ?
+                    (userInfo?.memberRankVo?.rankName == "共创会员" ? "永久VIP"
+                    :"￥${AppUtils.calculateDouble(double.tryParse(ranks[position].price??""))}/永久")
+                        : (ranks[position]?.originScore ?? 0).toString(),
                     overflow: TextOverflow.ellipsis,
                     style: TextStyle(
                       color:Color(int.parse((ranks[position]?.textColor ?? "").replaceAll("#", "FF"), radix: 16)),

lib/mine/personal_page.dart

@@ -327,7 +327,7 @@ class _PersonalPage extends State<PersonalPage> with WidgetsBindingObserver {
         body:SmartRefresher(
           controller: refreshController,
           enablePullDown: true,
-          enablePullUp: true,
+          enablePullUp: (articles == null || articles.length == 0) ? false: true,
           header: MyHeader(),
           footer: CustomFooter(
             builder: (context, mode) {

lib/settlement/settlement.dart

@@ -1284,16 +1284,16 @@ class _Settlement extends State<Settlement> {
           productSkuId ?? "",
           actProductId ?? "",
           actProductSkuId ?? "",
-          // (settleOrderInfo.isRaise || payChannel == 5)
+          (settleOrderInfo.isRaise || payChannel == 5)
-          //     ? "NONE"
+              ? "NONE"
-          //     : ((useVipPriceSelect == false &&
+              : ((useVipPriceSelect == false &&
-          //             couponListBean?.id != "" &&
+                      couponListBean?.id != "" &&
-          //             ((promotion?.id ?? productId) != ""))
+                      ((promotion?.id ?? productId) != ""))
-          //         ? "MEMBER_RANK"
+                  ? "MEMBER_RANK"
-          //         : (isVips == false && vipLevelName == "黄金会员")
+                  : (isVips == false)
-          //             ? "MEMBER_RANK"
+                      ? "MEMBER_RANK"
-          //             : "AUTO"),
+                      : "AUTO"),
-          preferentialType(),
+          // preferentialType(),
           // (settleOrderInfo.isRaise || payChannel == 5 || ((payChannel == 4 && settleOrderInfo.usePlateMoney == false))) ? false :useVipPriceSelect,
           // (settleOrderInfo.isRaise || payChannel == 5 || ((payChannel == 4 && settleOrderInfo.usePlateMoney == false)) || useVipPriceSelect == true) ? false :useBenefitSelect,
           count1,
@@ -1309,10 +1309,10 @@ class _Settlement extends State<Settlement> {
       return "ACTIVITY";
     }else if((couponListBean?.id ?? "") != "" && (((promotion?.id ?? productId) ?? "") == "")){
       return "COUPON";
+    }else if(useVipPriceSelect == false && (couponListBean?.id ?? "") == "" && ((promotion?.id ?? productId ?? "") == "")){
+      return "MEMBER_RANK";
     }else if(useVipPriceSelect == true && (couponListBean?.id ?? "") == "" && ((promotion?.id ?? productId ??"") == "")){
       return "VIP";
-    }if(useVipPriceSelect == false && (couponListBean?.id ?? "") == "" && ((promotion?.id ?? productId ?? "") == "")){
-      return "MEMBER_RANK";
     }else {
       return "AUTO";
     }

lib/view_widget/classic_header.dart

@@ -117,7 +117,7 @@ class MyClassicHeader extends RefreshIndicator {
   const MyClassicHeader({
     Key key,
     RefreshStyle refreshStyle: RefreshStyle.Follow,
-    double height: 60.0,
+    double height: 70.0,
     Duration completeDuration: const Duration(milliseconds: 600),
     this.outerBuilder,
     this.textStyle: const TextStyle(color: Colors.grey),
@@ -219,7 +219,7 @@ class _ClassicHeaderState extends RefreshIndicatorState<MyClassicHeader> {
       ),
       textWidget
     ];
-    final Widget container = Row(
+    final Widget container = Padding(padding: EdgeInsets.only(top: MediaQuery.of(context).padding.top,),child: Row(
       // spacing: widget.spacing,
       // textDirection: widget.iconPos == IconPosition.left
       //     ? TextDirection.ltr
@@ -236,7 +236,7 @@ class _ClassicHeaderState extends RefreshIndicatorState<MyClassicHeader> {
       mainAxisAlignment: MainAxisAlignment.center,
       crossAxisAlignment: CrossAxisAlignment.center,
       children: children,
-    );
+    ),);
     return widget.outerBuilder != null
         ? widget.outerBuilder(container)
         : Container(

lib/view_widget/vip_dialog.dart

@@ -138,7 +138,7 @@ class _VipDialog extends State<VipDialog> {
                   GestureDetector(
                     onTap: () {
                       Navigator.of(context)
-                          .pushNamed('/router/legal_right_details', arguments: {
+                          .popAndPushNamed('/router/legal_right_details', arguments: {
                         "vipBenefitList": vipBenefitList,
                       });
                     },

lib/vip/vip_view/exclusive_coupon.dart

@@ -180,7 +180,7 @@ class _ExclusiveCoupon extends State<ExclusiveCoupon> {
                                       TextSpan(
                                         children: [
                                           TextSpan(
-                                            text: "6",
+                                            text: "9.2",
                                             style: TextStyle(
                                               fontWeight: MyFontWeight.extra_bold,
                                               fontSize: 36.sp,
@@ -253,7 +253,7 @@ class _ExclusiveCoupon extends State<ExclusiveCoupon> {
                                       TextSpan(
                                         children: [
                                           TextSpan(
-                                            text: "7",
+                                            text: "9.2",
                                             style: TextStyle(
                                               fontWeight: MyFontWeight.extra_bold,
                                               fontSize: 36.sp,
@@ -326,7 +326,7 @@ class _ExclusiveCoupon extends State<ExclusiveCoupon> {
                                       TextSpan(
                                         children: [
                                           TextSpan(
-                                            text: "8",
+                                            text: "9.2",
                                             style: TextStyle(
                                               fontWeight: MyFontWeight.extra_bold,
                                               fontSize: 36.sp,