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

lib/home/welfare_page.dart

@@ -157,7 +157,7 @@ class _WelfarePage extends State<WelfarePage> {
           appBar: MyAppBar(
             background: Colors.transparent,
             leadingColor: Colors.white,
-            title: "福利中心",
+            title: S.of(context).fulizhongxin,
             titleColor: Colors.white,
             titleSize: 18.sp,
             brightness: Brightness.dark,
@@ -520,7 +520,7 @@ class _WelfarePage extends State<WelfarePage> {
             textBaseline: TextBaseline.alphabetic,
             children: [
               Text(
-                "¥",
+                cop.limitAmount != "0.00"?"¥":"",
                 style: TextStyle(
                   fontSize: 16.sp,
                   fontWeight: MyFontWeight.medium,
@@ -531,9 +531,9 @@ class _WelfarePage extends State<WelfarePage> {
                 height: 4.h,
               ),
               Text(
-                coupon != null
+              cop.limitAmount != "0.00"?(coupon != null
                     ? "${AppUtils.calculateDouble(double.tryParse(cop.limitAmount) ?? 0)}"
-                    : "",
+                    : "") :"",
                 style: TextStyle(
                   fontSize: 24.sp,
                   fontWeight: FontWeight.bold,
@@ -555,10 +555,10 @@ class _WelfarePage extends State<WelfarePage> {
             textBaseline: TextBaseline.alphabetic,
             children: [
               Text(
-                coupon != null
+                cop.discountPercent != 0 ? (coupon != null
                     ? "${(cop.discountPercent / 10.0 >= 10) ? 10 : cop.discountPercent / 10.0}" ??
                     "0"
-                    : "",
+                    : ""):"",
                 style: TextStyle(
                   fontSize: 30.sp,
                   fontWeight: MyFontWeight.semi_bold,
@@ -569,7 +569,7 @@ class _WelfarePage extends State<WelfarePage> {
                 height: 4.h,
               ),
               Text(
-                "折",
+                cop.discountPercent != 0 ? "折" :"",
                 style: TextStyle(
                   fontSize: 16.sp,
                   fontWeight: MyFontWeight.semi_bold,

lib/retrofit/retrofit_api.dart

@@ -537,7 +537,7 @@ abstract class ApiService {
   Future<BaseData<VipCardHome>> vipCardIndex();
 
   ///VIP订阅/购买
-  @POST("/vipCard/orderVip/{id}")
+  @POST("/vipCard/orderVip")
   Future<BaseData<dynamic>> orderVip(@Body() Map<String, dynamic> param);
 
 

lib/settlement/settlement.dart

@@ -80,7 +80,7 @@ class _Settlement extends State<Settlement> {
   int count1 = 0;
   String productId;
   bool orderButton = false;
-  bool useVipPriceSelect = false;
+  bool useVipPriceSelect = true;
 
   @override
   void initState() {

lib/settlement/settlement_view/activity_coupon_remarks.dart

@@ -43,7 +43,7 @@ class ActivityCouponRemarks extends StatefulWidget {
 }
 
 class _ActivityCouponRemarks extends State<ActivityCouponRemarks> {
-  bool vipSelect = false;
+  bool vipSelect = true;
 
   @override
   Widget build(BuildContext context) {

lib/view_widget/new_coupon_widget.dart

@@ -497,6 +497,7 @@ class NewCouponWidget extends StatelessWidget {
         mainAxisAlignment: MainAxisAlignment.center,
         crossAxisAlignment: CrossAxisAlignment.center,
         children: [
+          if(coupon?.limitAmount != "0.00")
           Row(
             mainAxisAlignment: MainAxisAlignment.center,
             crossAxisAlignment: CrossAxisAlignment.baseline,
@@ -532,16 +533,17 @@ class NewCouponWidget extends StatelessWidget {
         mainAxisAlignment: MainAxisAlignment.start,
         crossAxisAlignment: CrossAxisAlignment.center,
         children: [
+          // if(coupon.discountPercent != 0)
           Row(
             mainAxisAlignment: MainAxisAlignment.center,
             crossAxisAlignment: CrossAxisAlignment.baseline,
             textBaseline: TextBaseline.alphabetic,
             children: [
               Text(
-                coupon != null
+                coupon.discountPercent != 0?( coupon != null
                     ? "${(coupon.discountPercent / 10.0 >= 10) ? 10 : coupon.discountPercent / 10.0}" ??
                     "0"
-                    : "",
+                    : ""):"",
                 style: TextStyle(
                   fontSize: 37.sp,
                   fontWeight: MyFontWeight.semi_bold,
@@ -552,7 +554,7 @@ class NewCouponWidget extends StatelessWidget {
                 height: 4.h,
               ),
               Text(
-                "折",
+                "${coupon.discountPercent != 0 ? "折":""}",
                 style: TextStyle(
                   fontSize: 20.sp,
                   fontWeight: MyFontWeight.semi_bold,

lib/vip/vip_page.dart

@@ -44,32 +44,31 @@ class _VipPageState extends State<VipPage> with AutomaticKeepAliveClientMixin {
   }
 
   queryVipHome() async {
-    if (apiService == null) {
+    try{
-    SharedPreferences value = await SharedPreferences.getInstance();
+      if (apiService == null) {
-    apiService = ApiService(
+        SharedPreferences value = await SharedPreferences.getInstance();
-      Dio(),
+        apiService = ApiService(
-      context: context,
+            Dio(),
-      token: value.getString("token"),
+            context: context,
-      showLoading: true
+            token: value.getString("token"),
-    );
+            showLoading: true
-  }
+        );
-    BaseData<VipCardHome> baseData =
+      }
-    await apiService.vipCardIndex().catchError((onError) {
+      BaseData<VipCardHome> baseData =
-      _refreshController.refreshFailed();});
+      await apiService.vipCardIndex().catchError((onError) {
-    if (baseData != null && baseData.isSuccess) {
+        _refreshController.refreshFailed();});
-      vipHome = baseData.data;
+      if (baseData != null && baseData.isSuccess) {
-      _refreshController.refreshCompleted();
+        vipHome = baseData.data;
-    }else{
+        _refreshController.refreshCompleted();
-      _refreshController.refreshFailed();
+      }else{
-      SmartDialog.showToast(baseData.msg ?? "", alignment: Alignment.center);
+        _refreshController.refreshFailed();
+        SmartDialog.showToast(baseData.msg ?? "", alignment: Alignment.center);
+      }
+    }finally{
+      setState((){});
     }
   }
 
-
-  _onRefresh() {
-    queryVipHome();
-  }
-
   @override
   Widget build(BuildContext context) {
     super.build(context);
@@ -77,39 +76,32 @@ class _VipPageState extends State<VipPage> with AutomaticKeepAliveClientMixin {
       backgroundColor: Color(0xFFF9FAF7),
       body: Container(
         padding: EdgeInsets.only(bottom: 76.h),
-        child: Container(
+        child: SmartRefresher(
-          child: FutureBuilder(
+          controller: _refreshController,
-            future:queryVipHome(),
+          enablePullDown: true,
-            builder: (context, snapshot) {
+          enablePullUp: false,
-              return SmartRefresher(
+          header: MyHeader(),
-                controller: _refreshController,
+          physics: BouncingScrollPhysics(),
-                enablePullDown: true,
+          onRefresh: () {
-                enablePullUp: false,
+            queryVipHome();
-                header: MyHeader(),
+          },
-                physics: BouncingScrollPhysics(),
+          child: SingleChildScrollView(
-                onRefresh: () {
+            child: Container(
-                  setState(() {
+              child:Column(
-                    _onRefresh();
+                mainAxisAlignment: MainAxisAlignment.start,
-                  });
+                crossAxisAlignment: CrossAxisAlignment.start,
-                },
+                children: [
-                child: SingleChildScrollView(
+                  VipTop(vipHome,(){
-                  child: Container(
+                    queryVipHome();
-                    child:Column(
+                  }),
-                      mainAxisAlignment: MainAxisAlignment.start,
-                      crossAxisAlignment: CrossAxisAlignment.start,
-                      children: [
-                        VipTop(vipHome,_onRefresh()),
 
-                        if(vipHome !=null)
+                  if(vipHome !=null)
-                          VipGoodsDiscount(vipHome),
+                    VipGoodsDiscount(vipHome),
 
-                        ExclusiveCoupon(),
+                  ExclusiveCoupon(),
-                      ],
+                ],
-                    ),
+              ),
-                  ),
+            ),
-                ),
-              );
-            },
           ),
         ),
       ),

lib/vip/vip_view/vip_top.dart

@@ -20,9 +20,9 @@ import 'package:tobias/tobias.dart' as tobias;
 
 class VipTop extends StatefulWidget {
   final VipCardHome vipCardHome;
-  final Function onRefresh;
+  final Function queryVipHome;
 
-  VipTop(this.vipCardHome, this.onRefresh);
+  VipTop(this.vipCardHome, this.queryVipHome);
 
   @override
   State<StatefulWidget> createState() {
@@ -42,7 +42,7 @@ class _VipTop extends State<VipTop> {
     payListen = weChatResponseEventHandler.listen((event) async {
       print("payCallback: ${event.errCode}");
       if (event.errCode == 0) {
-        widget.onRefresh();
+        widget.queryVipHome();
         SmartDialog.showToast("支付成功", alignment: Alignment.center);
       } else {
         SmartDialog.showToast("支付失败", alignment: Alignment.center);
@@ -96,7 +96,7 @@ class _VipTop extends State<VipTop> {
                   tobias.aliPay(baseData.data["body"]).then((payRes) {
                     if (payRes['resultStatus'] == 9000 ||
                         payRes['resultStatus'] == '9000') {
-                      widget.onRefresh();
+                      widget.queryVipHome();
                       SmartDialog.showToast("支付成功",
                           alignment: Alignment.center);
                     } else {