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

lib/models/mine.dart

@@ -72,6 +72,7 @@ class CouponModel {
   CouponModel({
     this.couponRecId,
     this.endTime,
+    this.startTime,
     this.couponId,
     this.useStatus,
     this.couponName,
@@ -83,6 +84,7 @@ class CouponModel {
   CouponModel.fromJson(dynamic json) {
     couponRecId = json['coupon_rec_id'];
     endTime = json['end_time'];
+    startTime = json['start_time'];
     couponId = json['coupon_id'];
     useStatus = json['use_status'];
     couponName = json['coupon_name'];
@@ -93,6 +95,7 @@ class CouponModel {
 
   num? couponRecId;
   String? endTime;
+  String? startTime;
   num? couponId;
   num? useStatus;
   String? couponName;
@@ -103,6 +106,7 @@ class CouponModel {
   CouponModel copyWith({
     num? couponRecId,
     String? endTime,
+    String? startTime,
     num? couponId,
     num? useStatus,
     String? couponName,
@@ -113,6 +117,7 @@ class CouponModel {
       CouponModel(
         couponRecId: couponRecId ?? this.couponRecId,
         endTime: endTime ?? this.endTime,
+        startTime: startTime ?? this.startTime,
         couponId: couponId ?? this.couponId,
         useStatus: useStatus ?? this.useStatus,
         couponName: couponName ?? this.couponName,
@@ -124,7 +129,8 @@ class CouponModel {
   Map<String, dynamic> toJson() {
     final map = <String, dynamic>{};
     map['coupon_rec_id'] = couponRecId;
-    // map['end_time'] = endTime;
+    map['end_time'] = endTime;
+    map['start_time'] = startTime;
     map['coupon_id'] = couponId;
     map['use_status'] = useStatus;
     map['coupon_name'] = couponName;

lib/pages/credit_points/view.dart

@@ -105,7 +105,9 @@ class CreditPointsPage extends StatelessWidget {
                                 color: Colours.cE7,
                                 // color: Colors.red,
                               ),
-                              GestureDetector(
+                              Visibility(
+                                visible: controller.creditPointModel.deductibleIntegral ==0?false:true,
+                                child: GestureDetector(
                                   onTap: (){
                                     controller.setUse();
                                     if (controller.useCreditPoint) {
@@ -135,6 +137,7 @@ class CreditPointsPage extends StatelessWidget {
                                       ],
                                     ),
                                   ),
+                                ),
                               )
                             ],
                           ),

lib/pages/mine/view.dart

@@ -132,8 +132,11 @@ class _MinePageState extends State<MinePage> {
                           child: Column(
                             children: [
                               GestureDetector(
-                                onTap:(){
-                                  context.pushNamed(Routes.security,extra: controller.userInfo);
+                                onTap:() async {
+                                  final result = await context.pushNamed(Routes.security,extra: controller.userInfo);
+                                  if (result == true){
+                                    controller.getInfo();
+                                  }
                                 }, child: _buildItem('账户安全')
                               ),
                               Container(color: Colours.cLine,margin: EdgeInsets.symmetric(horizontal: 15.w),height: 1.w,),

lib/pages/pay_coupon/widgets/item.dart

@@ -74,7 +74,7 @@ class BuildItem extends StatelessWidget {
                       Gaps.vGaps5,
                       Text('满${model.normPrice}减${model.reducedPrice}元',style: TextStyle(fontSize: 12.w,height: 1.5,color: Colours.c9),),
                       Gaps.vGaps5,
-                      Text('有效至：${model.endTime}',style: TextStyle(fontSize: 12.w,height: 1.5,color: Colours.c9),),
+                      model.type ==1?Text('有效至:${model.endTime}',style: TextStyle(fontSize: 12.w,height: 1.5,color: Colours.c9),):Text('有效期${model.startTime}至${model.endTime}',style: TextStyle(fontSize: 12.w,height: 1.5,color: Colours.c9),),
                     ],
                   ),
                   if (model.type == 1) GestureDetector(

lib/pages/user_info/view.dart

@@ -261,7 +261,10 @@ class _UserInfoPageState extends State<UserInfoPage> {
 
   getGender(num? sex) {
     String gender;
-    if (sex == 1) {
+    if (sex == 0) {
+      gender = "";
+    }
+    else if (sex == 1) {
       gender = "男";
     } else if (sex == 2) {
       gender = "女";

lib/pages/user_security/view.dart

@@ -12,7 +12,12 @@ class UserSecurityPage extends StatefulWidget {
 class _UserSecurityPageState extends State<UserSecurityPage> {
   @override
   Widget build(BuildContext context) {
-    return Scaffold(
+    return WillPopScope(
+      onWillPop: () async {
+        context.pop(true);
+        return false;
+      },
+      child: Scaffold(
         appBar: AppBar(
           centerTitle: true,
           title: const Text('账号安全'),
@@ -176,6 +181,7 @@ class _UserSecurityPageState extends State<UserSecurityPage> {
             )
           ],
         ),
+      ),
     );
   }