邀请新人更改

lib/qr/invite_friends.dart

@@ -228,7 +228,7 @@ class _InviteFriends extends State<InviteFriends> {
               height: 52.h,
               decoration: BoxDecoration(
                 borderRadius: BorderRadius.circular(26),
-                color: Color(0xFF00E16F),
+                color: Color(0xFF32A060),
               ),
               margin: EdgeInsets.symmetric(horizontal:14.w),
               child: Row(
@@ -263,13 +263,15 @@ class _InviteFriends extends State<InviteFriends> {
   Widget activityRule(){
     return Container(
       width:double.infinity,
-      height: 173.h,decoration: BoxDecoration(
+      decoration: BoxDecoration(
       borderRadius: BorderRadius.circular(6),
       color: Color(0xFFFFFFFF),
     ),
       margin: EdgeInsets.only(bottom:12.h,left:14.h,right: 14.h),
-      padding: EdgeInsets.only(top: 6.h,left: 6,right: 6),
+      padding: EdgeInsets.all(6),
       child:Column(
+        // mainAxisAlignment: MainAxisAlignment.spaceAround,
+        crossAxisAlignment: CrossAxisAlignment.start,
         children: [
           Container(
             decoration: BoxDecoration(
@@ -291,20 +293,19 @@ class _InviteFriends extends State<InviteFriends> {
             )
           ),
           SizedBox(height: 17.h,),
-          Row(
+          IntrinsicHeight(
+            child: Row(
               mainAxisAlignment: MainAxisAlignment.center,
               crossAxisAlignment: CrossAxisAlignment.center,
               children: [
                 Column(
-                mainAxisAlignment: MainAxisAlignment.center,
-                crossAxisAlignment: CrossAxisAlignment.center,
                   children: [
                     Row(
                       mainAxisAlignment: MainAxisAlignment.spaceAround,
                       crossAxisAlignment: CrossAxisAlignment.center,
                       children: [
                         Image.asset(
-                        "assets/image/zu_tuan.webp",
+                          "assets/image/invite_wx.webp",
                           width: 42,
                           height: 42,
                           fit: BoxFit.cover,
@@ -328,6 +329,34 @@ class _InviteFriends extends State<InviteFriends> {
                         ),
                       ],
                     ),
+                    Row(
+                      mainAxisAlignment: MainAxisAlignment.center,
+                      crossAxisAlignment: CrossAxisAlignment.center,
+                      children: [
+                        Image.asset(
+                          "assets/image/invite_1.webp",
+                          width: 24,
+                          height: 24,
+                          fit: BoxFit.cover,
+                        ),
+                        Container(
+                          width: 43.w,
+                          child: Flex(
+                            children: List.generate(0, (_) {
+                              return SizedBox(
+                                width: 3,
+                                height: 1,
+                                child: DecoratedBox(
+                                  decoration: BoxDecoration(color: Colors.white),
+                                ),
+                              );
+                            }),
+                            mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                            direction: Axis.horizontal,
+                          ),
+                        ),
+                      ],
+                    ),
                     SizedBox(height: 8.h),
                     Row(
                       mainAxisAlignment: MainAxisAlignment.spaceAround,
@@ -337,9 +366,10 @@ class _InviteFriends extends State<InviteFriends> {
                           width:46.w,
                           child:
                           Text(
-                          "1.分享给微信好友",
+                            "分享链接给好友",
                             style: TextStyle(
                               fontSize: 12.sp,
+                              height: 1.3.h,
                               fontWeight: MyFontWeight.regular,
                               color: Color(0xFF181818),
                             ),
@@ -372,7 +402,7 @@ class _InviteFriends extends State<InviteFriends> {
                       crossAxisAlignment: CrossAxisAlignment.center,
                       children: [
                         Image.asset(
-                        "assets/image/zt_zf.webp",
+                          "assets/image/yq_zt.webp",
                           width: 42,
                           height: 42,
                           fit: BoxFit.cover,
@@ -396,6 +426,34 @@ class _InviteFriends extends State<InviteFriends> {
                         ),
                       ],
                     ),
+                    Row(
+                      mainAxisAlignment: MainAxisAlignment.center,
+                      crossAxisAlignment: CrossAxisAlignment.center,
+                      children: [
+                        Image.asset(
+                          "assets/image/invite_2.webp",
+                          width: 24,
+                          height: 24,
+                          fit: BoxFit.cover,
+                        ),
+                        Container(
+                          width: 43.w,
+                          child: Flex(
+                            children: List.generate(0, (_) {
+                              return SizedBox(
+                                width: 3,
+                                height: 1,
+                                child: DecoratedBox(
+                                  decoration: BoxDecoration(color: Colors.white),
+                                ),
+                              );
+                            }),
+                            mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                            direction: Axis.horizontal,
+                          ),
+                        ),
+                      ],
+                    ),
                     SizedBox(height: 8.h),
                     Row(
                       mainAxisAlignment: MainAxisAlignment.spaceAround,
@@ -405,9 +463,10 @@ class _InviteFriends extends State<InviteFriends> {
                           width:46.w,
                           child:
                           Text(
-                          "2.好友注册",
+                            "好友注册并获得10元优惠券",
                             style: TextStyle(
                               fontSize: 12.sp,
+                              height: 1.3.h,
                               fontWeight: MyFontWeight.regular,
                               color: Color(0xFF181818),
                             ),
@@ -440,7 +499,7 @@ class _InviteFriends extends State<InviteFriends> {
                       crossAxisAlignment: CrossAxisAlignment.center,
                       children: [
                         Image.asset(
-                        "assets/image/yq_zt.webp",
+                          "assets/image/zt_m.webp",
                           width: 42,
                           height: 42,
                           fit: BoxFit.cover,
@@ -464,19 +523,47 @@ class _InviteFriends extends State<InviteFriends> {
                         ),
                       ],
                     ),
+                    Row(
+                      mainAxisAlignment: MainAxisAlignment.center,
+                      crossAxisAlignment: CrossAxisAlignment.center,
+                      children: [
+                        Image.asset(
+                          "assets/image/invite_3.webp",
+                          width: 24,
+                          height: 24,
+                          fit: BoxFit.cover,
+                        ),
+                        Container(
+                          width: 43.w,
+                          child: Flex(
+                            children: List.generate(0, (_) {
+                              return SizedBox(
+                                width: 3,
+                                height: 1,
+                                child: DecoratedBox(
+                                  decoration: BoxDecoration(color: Colors.white),
+                                ),
+                              );
+                            }),
+                            mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                            direction: Axis.horizontal,
+                          ),
+                        ),
+                      ],
+                    ),
                     SizedBox(height: 8.h),
                     Row(
-                    mainAxisAlignment: MainAxisAlignment.spaceAround,
+                      mainAxisAlignment: MainAxisAlignment.center,
                       crossAxisAlignment: CrossAxisAlignment.center,
                       children: [
-
                         Container(
                           width: 46.w,
                           child:
                           Text(
-                          "3.邀请完成",
+                            "好友完成首单",
                             style: TextStyle(
                               fontSize: 12.sp,
+                              height: 1.3.h,
                               fontWeight: MyFontWeight.regular,
                               color: Color(0xFF181818),
                             ),
@@ -505,19 +592,26 @@ class _InviteFriends extends State<InviteFriends> {
                 Column(
                   children: [
                     Image.asset(
-                    "assets/image/zt_m.webp",
+                      "assets/image/invite_q.webp",
                       width: 42,
                       height: 42,
                       fit: BoxFit.cover,
                     ),
+                    Image.asset(
+                      "assets/image/invite_4.webp",
+                      width: 24,
+                      height: 24,
+                      fit: BoxFit.cover,
+                    ),
                     SizedBox(height: 8.h),
                     Container(
                       width: 46.w,
                       child:
                       Text(
-                      "4.获得优惠券",
+                        "邀请达成获得奖励",
                         style: TextStyle(
                           fontSize: 12.sp,
+                          height: 1.3.h,
                           fontWeight: MyFontWeight.regular,
                           color: Color(0xFF181818),
                         ),
@@ -527,6 +621,7 @@ class _InviteFriends extends State<InviteFriends> {
                 ),
               ],
             ),
+          ),
         ],
       ),
     );
@@ -664,7 +759,7 @@ class _InviteFriends extends State<InviteFriends> {
               ),
             ),
             Text(
-              S.of(context).jiangli,
+              "注册时间",
               style: TextStyle(
                 fontWeight: MyFontWeight.semi_bold,
                 fontSize:14.sp,
@@ -706,10 +801,6 @@ class _InviteFriends extends State<InviteFriends> {
           Row(
             mainAxisAlignment: MainAxisAlignment.spaceBetween,
             crossAxisAlignment: CrossAxisAlignment.center,
-            children: [
-              Column(
-                mainAxisAlignment: MainAxisAlignment.start,
-                crossAxisAlignment: CrossAxisAlignment.start,
             children: [
               Text(
               AppUtils.phoneEncode(invitationList?.phone ?? ""),
@@ -719,9 +810,8 @@ class _InviteFriends extends State<InviteFriends> {
                 fontWeight: MyFontWeight.regular,
               ),
             ),
-                  SizedBox(height:8),
               Text(
-                    "注册时间:${invitationList?.createTime ?? ""}",
+                invitationList?.createTime ?? "",
                 style: TextStyle(
                   color: Color(0xFF000000),
                   fontSize: 12.sp,
@@ -730,16 +820,6 @@ class _InviteFriends extends State<InviteFriends> {
               ),
             ],
           ),
-              Text(
-                "新人全场减30优惠券*1",
-                style: TextStyle(
-                  color: Color(0xFF353535),
-                  fontSize: 12.sp,
-                  fontWeight: MyFontWeight.medium,
-                ),
-              ),
-            ],
-          ),
           Container(
             width: double.infinity,
             height: 1.h,

lib/retrofit/data/activity_details.dart

@@ -469,6 +469,7 @@ class ActProduct {
     String shortName,
     String supplierName,
     String detail,
+    String details,
     String rightImg,
   }) {
     _id = id;
@@ -491,6 +492,7 @@ class ActProduct {
     _shortName = shortName;
     _supplierName =supplierName;
     _detail = detail;
+    _details = details;
     _rightImg = rightImg;
   }
 
@@ -520,6 +522,7 @@ class ActProduct {
     _shortName = json['shortName'];
     _supplierName = json['supplierName'];
     _detail = json['detail'];
+    _details = json['details'];
     _rightImg = json['rightImg'];
   }
 
@@ -543,6 +546,7 @@ class ActProduct {
   String _shortName;
   String _supplierName;
   String _detail;
+  String _details;
   String _rightImg;
 
   String get id => _id;
@@ -585,6 +589,8 @@ class ActProduct {
 
   String get detail => _detail;
 
+  String get details => _details;
+
   String get rightImg => _rightImg;
 
   Map<String, dynamic> toJson() {
@@ -611,6 +617,7 @@ class ActProduct {
     map['shortName'] = _shortName;
     map['supplierName'] = _supplierName;
     map['detail'] = _detail;
+    map['details'] = _details;
     map['rightImg'] = _rightImg;
     return map;
   }

lib/retrofit/data/brand_data.dart

@@ -11,6 +11,7 @@ class BrandData {
   String originAvatar;
   String originDesc;
   String originator;
+  bool inviteNewShow;
 
   dynamic contents;
   dynamic ideals;
@@ -24,6 +25,7 @@ class BrandData {
     ..originAvatar = json['originAvatar'] as String
     ..originDesc = json['originDesc'] as String
     ..originator = json['originator'] as String
+    ..inviteNewShow = json['inviteNewShow'] as bool
     ..contents = json['contents']
     ..ideals = json['ideals'];
 
@@ -34,6 +36,7 @@ class BrandData {
     'originAvatar': this.originAvatar,
     'originDesc': this.originDesc,
     'originator': this.originator,
+    'inviteNewShow': this.inviteNewShow,
     'contents': this.contents,
     'ideals': this.ideals,
   };

lib/retrofit/data/miNiDetail.dart

@@ -69,6 +69,7 @@ class MiNiDetail {
   int setMeal;
   int attrStyle;
   String detail;
+  String details;
   int isDelete;
   String printerFlag;
   String thumbnailImg;
@@ -117,6 +118,7 @@ class MiNiDetail {
     miNiDetailBean.setMeal = map['setMeal'];
     miNiDetailBean.attrStyle = map['attrStyle'];
     miNiDetailBean.detail = map['detail'];
+    miNiDetailBean.details = map['details'];
     miNiDetailBean.isDelete = map['isDelete'];
     miNiDetailBean.printerFlag = map['printerFlag'];
     miNiDetailBean.thumbnailImg = map['thumbnailImg'];
@@ -171,6 +173,7 @@ class MiNiDetail {
     "setMeal": setMeal,
     "attrStyle": attrStyle,
     "detail" :detail,
+    "details" :details,
     "isDelete": isDelete,
     "printerFlag": printerFlag,
     "thumbnailImg": thumbnailImg,

lib/store/shop__details_page.dart

@@ -593,7 +593,7 @@ class _ShopDetailsPage extends State<ShopDetailsPage> {
                               Container(
                                 color: Colors.white,
                                 child: Html(
-                                  data: miNiDetail?.detail ?? "",
+                                  data: miNiDetail?.details ?? "",
                                   customImageRenders: {
                                     networkSourceMatcher(): networkImageRender(
                                       loadingWidget: () {

lib/store/shopping/shopping_goods_details.dart

@@ -565,8 +565,8 @@ class _ShoppingGoodsDetails extends State<ShoppingGoodsDetails> {
                             margin: EdgeInsets.only(bottom: 72.h),
                             child: Html(
                               data: pageType != null
-                                  ? (activityDetails?.actProduct?.detail ?? "")
-                                  : (miNiDetail?.detail ?? ""),
+                                  ? (activityDetails?.actProduct?.details ?? "")
+                                  : (miNiDetail?.details ?? ""),
                               customImageRenders: {
                                 networkSourceMatcher(): networkImageRender(
                                   loadingWidget: () {

lib/store/shopping/shopping_home/group_details.dart

@@ -736,7 +736,8 @@ class _GroupDetails extends State<GroupDetails> {
               ),
             ),
             SizedBox(height: 12.h),
-            Row(
+            IntrinsicHeight(
+              child: Row(
                 mainAxisAlignment: MainAxisAlignment.center,
                 crossAxisAlignment: CrossAxisAlignment.center,
                 children: [
@@ -1000,6 +1001,7 @@ class _GroupDetails extends State<GroupDetails> {
                   ),
                 ],
               ),
+            ),
           ],
         ));
   }

lib/store/store_view/shop_goods.dart

@@ -237,6 +237,7 @@ class _ShopGoods extends State<ShopGoods> {
                         (widget.productListBean?.attrStyle ?? 0) == 0)
                       GestureDetector(
                         onTap: () {
+
                           widget.add(widget.shoppingCartSkuItemListBean);
                         },
                         child: Image.asset(

lib/web/web_page.dart

@@ -277,7 +277,7 @@ class _WebPage extends State<WebPage> with WidgetsBindingObserver {
                       ),
 
                       /// 富文本的评论
-                      if(Platform.isAndroid&&!ExamineInstance.instance.isExamine)
+                      if(!ExamineInstance.instance.isExamine)
                       CommentList(
                         commentKey,
                         article?.likes ?? activity?.likes ?? 0,
@@ -302,7 +302,7 @@ class _WebPage extends State<WebPage> with WidgetsBindingObserver {
             ),
 
             /// 富文本评论的输入框
-            if(Platform.isAndroid&&!ExamineInstance.instance.isExamine)
+            if(!ExamineInstance.instance.isExamine)
             InputComment(
               inputKey,
               hintText,