店铺推荐样式更改,精彩活动右边加权重,新人奖励弹窗样式优化更改,头条合集:cover

lib/community/headlines/article_list.dart

@@ -100,7 +100,7 @@ class _ArticleList extends State<ArticleList> {
         children: [
           Expanded(
               child: Container(
-            height: 96,
+            height: 105,
             child: Column(
               crossAxisAlignment: CrossAxisAlignment.start,
               mainAxisAlignment: MainAxisAlignment.spaceAround,
@@ -115,6 +115,7 @@ class _ArticleList extends State<ArticleList> {
                     color: Colors.black,
                   ),
                 ),
+                SizedBox(height:5),
                 Text(
                   widget?.articles[position]?.viceTitle ?? "",
                   overflow: TextOverflow.ellipsis,
@@ -125,8 +126,7 @@ class _ArticleList extends State<ArticleList> {
                     color: Color(0xFF353535),
                   ),
                 ),
-                // SizedBox(height: 20),
-                Row(
+               Expanded(child:Row(
                  children: [
                    Expanded(
                      child: Text(
@@ -168,7 +168,7 @@ class _ArticleList extends State<ArticleList> {
                      ),
                    ),
                  ],
-                ),
+               ),),
               ],
             ),
           )),
@@ -177,8 +177,8 @@ class _ArticleList extends State<ArticleList> {
             widget?.articles[position]?.coverImg ?? "",
             fit: BoxFit.cover,
             radius: BorderRadius.all(Radius.circular(2)),
-            width: 96,
-            height: 96,
+            width: 100,
+            height: 100,
           ),
         ],
       ),

lib/community/headlines/headlines_collection.dart

@@ -86,7 +86,7 @@ class _HeadlinesCollection extends State<HeadlinesCollection> {
                 headlines?.coverImg ?? "",
                 width: 225.w,
                 height: 60.h,
-                fit: BoxFit.fill,
+                fit: BoxFit.cover,
                 errorSrc: "assets/image/default_1.png",
                 fadeSrc: "assets/image/default_1.png",
               ),

lib/home/home_view/featured_acticvity.dart

@@ -92,7 +92,8 @@ class _FeaturedActivity extends State<FeaturedActivity> {
                   ),
                 ),
               if (activityList != null && activityList.length > 1)
-                Container(
+                Expanded(
+                  child: Container(
                     child: Column(
                       mainAxisAlignment: MainAxisAlignment.spaceEvenly,
                       children: [
@@ -146,6 +147,7 @@ class _FeaturedActivity extends State<FeaturedActivity> {
                       ],
                     ),
                   ),
+                ),
             ],
           ),
         ),
@@ -157,7 +159,9 @@ class _FeaturedActivity extends State<FeaturedActivity> {
   }
 
   Widget stackItem(double textSize, Activity activity) {
-    return Container(color: Color.fromARGB(80, 0, 0, 0),child: Column(
+    return Container(
+        color: Color.fromARGB(80, 0, 0, 0),
+        child: Column(
           mainAxisAlignment: MainAxisAlignment.spaceBetween,
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [

lib/home/home_view/quick_order.dart

@@ -52,8 +52,7 @@ class _QuickOrder extends State<QuickOrder> {
       "latitude": latitude,
       "longitude": longitude,
       "searchKey": searchKey
-    }).catchError((error) {
-    });
+    }).catchError((error) {});
     if (baseData != null && baseData.isSuccess) {
       storeList = baseData.data;
     }
@@ -143,8 +142,7 @@ class _QuickOrder extends State<QuickOrder> {
     });
 
     Location.getInstance().prepareLoc();
-    Location.getInstance().startLocation(context).then((value) {
-    });
+    Location.getInstance().startLocation(context).then((value) {});
   }
 
   saveLatLng(BMFCoordinate latLng, province, city, district) async {
@@ -226,7 +224,7 @@ class _QuickOrder extends State<QuickOrder> {
               child: MImage(
                 store.facade,
                 width: double.infinity,
-                height: 95,
+                height: 100,
                 fit: BoxFit.cover,
                 errorSrc: "assets/image/default_1.png",
                 fadeSrc: "assets/image/default_1.png",
@@ -243,7 +241,7 @@ class _QuickOrder extends State<QuickOrder> {
             child: SvgPicture.asset(
               "assets/svg/kuaijiexiadan_bg.svg",
               width: double.infinity,
-              height: 95,
+              height: 85,
               fit: BoxFit.fill,
             ),
           ),
@@ -265,7 +263,9 @@ class _QuickOrder extends State<QuickOrder> {
                     errorSrc: "assets/image/default_1.png",
                     fadeSrc: "assets/image/default_1.png",
                   ),
-                  Padding(padding: EdgeInsets.only(left: 10,right: 10),child:Text(
+                  Padding(
+                    padding: EdgeInsets.only(left: 10, right: 10),
+                    child: Text(
                       store.storeName,
                       textAlign: TextAlign.center,
                       style: TextStyle(
@@ -273,7 +273,8 @@ class _QuickOrder extends State<QuickOrder> {
                         fontWeight: MyFontWeight.medium,
                         color: Colors.black,
                       ),
-                  ),),
+                    ),
+                  ),
                   // Text(
                   //   store?.remark ??"",
                   //   style: TextStyle(
@@ -396,7 +397,12 @@ class _QuickOrder extends State<QuickOrder> {
       String tableId = uri.queryParameters["tableId"];
       String tenantCode = uri.queryParameters["tenantCode"];
       String shopId = uri.queryParameters["shopId"];
-      if (tableId != null && tableId != "" && tenantCode != null && tenantCode != "" && shopId != null && shopId != "") {
+      if (tableId != null &&
+          tableId != "" &&
+          tenantCode != null &&
+          tenantCode != "" &&
+          shopId != null &&
+          shopId != "") {
         Navigator.of(context).pushNamed(
           '/router/store_order',
           arguments: {

lib/retrofit/min_api.dart

@@ -21,12 +21,12 @@ import 'data/shoppingCart.dart';
 
 part 'min_api.g.dart';
 
-// const base_url = "https://pos.api.lotus-wallet.com/app/"; ///正式
-// const baseUrl = "https://pos.api.lotus-wallet.com/app/"; ///正式
+const base_url = "https://pos.api.lotus-wallet.com/app/"; ///正式
+const baseUrl = "https://pos.api.lotus-wallet.com/app/"; ///正式
 
 
-const base_url = "http://user.prod.kunqi.lotus-wallet.com/app/"; ///222
-const baseUrl = "http://user.prod.kunqi.lotus-wallet.com/app/"; ///222
+// const base_url = "http://user.prod.kunqi.lotus-wallet.com/app/"; ///222
+// const baseUrl = "http://user.prod.kunqi.lotus-wallet.com/app/"; ///222
 
 // const base_url = "http://192.168.10.236:8765/app/";///费韬
 // const baseUrl = "http://192.168.10.236:8765/app/";///费韬

lib/retrofit/min_api.g.dart

@@ -9,7 +9,7 @@ part of 'min_api.dart';
 class _MinApiService implements MinApiService {
   _MinApiService(this._dio, {this.baseUrl}) {
     ArgumentError.checkNotNull(_dio, '_dio');
-    baseUrl ??= 'http://user.prod.kunqi.lotus-wallet.com/app/';
+    baseUrl ??= 'https://pos.api.lotus-wallet.com/app/';
   }
 
   final Dio _dio;

lib/retrofit/retrofit_api.dart

@@ -53,8 +53,8 @@ import 'data/wx_pay.dart';
 
 part 'retrofit_api.g.dart';
 
-// const base_url = "https://pos.platform.lotus-wallet.com/app/"; ///正式
-// const baseUrl = "https://pos.platform.lotus-wallet.com/app/"; ///正式
+const base_url = "https://pos.platform.lotus-wallet.com/app/"; ///正式
+const baseUrl = "https://pos.platform.lotus-wallet.com/app/"; ///正式
 
 // const base_url = "http://platform.prod.kunqi.lotus-wallet.com/app/"; ///222
 // const baseUrl = "http://platform.prod.kunqi.lotus-wallet.com/app/"; ///222
@@ -66,8 +66,8 @@ part 'retrofit_api.g.dart';
 // const baseUrl = "http://192.168.10.37:8766/app/";
 
 
-const base_url = "http://192.168.10.142:8766/app/";///詹云久
-const baseUrl = "http://192.168.10.142:8766/app/";///詹云久
+// const base_url = "http://192.168.10.142:8766/app/";///詹云久
+// const baseUrl = "http://192.168.10.142:8766/app/";///詹云久
 
 @RestApi(baseUrl: baseUrl)
 abstract class ApiService {

lib/retrofit/retrofit_api.g.dart

@@ -9,7 +9,7 @@ part of 'retrofit_api.dart';
 class _ApiService implements ApiService {
   _ApiService(this._dio, {this.baseUrl}) {
     ArgumentError.checkNotNull(_dio, '_dio');
-    baseUrl ??= 'http://192.168.10.142:8766/app/';
+    baseUrl ??= 'https://pos.platform.lotus-wallet.com/app/';
   }
 
   final Dio _dio;

lib/view_widget/new_people_reward.dart

@@ -121,7 +121,7 @@ class _NewPeopleReward extends State<NewPeopleReward> {
         ),
       ),
       margin: EdgeInsets.symmetric(horizontal: 60, vertical: 5),
-      padding: EdgeInsets.only(left: 16.w, right: 33.w),
+      padding: EdgeInsets.only(left: 16.w, right: 25.w),
       child: Row(
         crossAxisAlignment: CrossAxisAlignment.center,
         mainAxisAlignment: MainAxisAlignment.spaceBetween,
@@ -138,7 +138,11 @@ class _NewPeopleReward extends State<NewPeopleReward> {
                   ),
                 ),
                 TextSpan(
-                  text:newUserCouponList.discountAmount,
+                  text: double.tryParse(
+                              "${newUserCouponList.discountAmount}" ?? "0")
+                          .toInt()
+                          .toString() ??
+                      "",
                   style: TextStyle(
                     fontSize: 35.sp,
                     fontWeight: MyFontWeight.semi_bold,
@@ -148,7 +152,8 @@ class _NewPeopleReward extends State<NewPeopleReward> {
               ],
             ),
           ),
-          Padding(
+          Expanded(
+            child: Padding(
                 padding: EdgeInsets.only(top: 4, bottom: 4),
                 child: Column(
                   crossAxisAlignment: CrossAxisAlignment.center,
@@ -175,7 +180,7 @@ class _NewPeopleReward extends State<NewPeopleReward> {
                       ),
                     ),
                     Text(
-                    "有效期至:${newUserCouponList.useEndTime}",
+                      "有效期至:${(newUserCouponList.useEndTime != null && newUserCouponList.useEndTime != "") ? newUserCouponList.useEndTime.split(" ")[0] : "$newUserCouponList.useEndTime"}",
                       overflow: TextOverflow.ellipsis,
                       maxLines: 2,
                       style: TextStyle(
@@ -186,6 +191,7 @@ class _NewPeopleReward extends State<NewPeopleReward> {
                     )
                   ],
                 )),
+          ),
         ],
       ),
     );