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

lib/home/home_view/featured_acticvity.dart

@@ -197,38 +197,43 @@ class _FeaturedActivity extends State<FeaturedActivity> {
                 ],
               ),
             ),
-            Container(
+            Row(
-              width: 48.w,
+              children: [
-              margin: EdgeInsets.only(left: 8, bottom: 8),
+                Container(
-              padding: EdgeInsets.symmetric(
+                  // width: 52.w,
-                vertical: 4.h,
+                  margin: EdgeInsets.only(left: 8, bottom: 8),
-                horizontal: 8.w,
+                  padding: EdgeInsets.symmetric(
-              ),
+                    vertical: 4.h,
-              decoration: BoxDecoration(
+                    horizontal: 8.w,
-                color: Color(0xFF32A060),
-                borderRadius: BorderRadius.circular(20),
-              ),
-              alignment: Alignment.center,
-              child: Row(
-                mainAxisAlignment: MainAxisAlignment.center,
-                crossAxisAlignment: CrossAxisAlignment.center,
-                children: [
-                  Text(
-                    "了解",
-                    style: TextStyle(
-                      fontSize: 10.sp,
-                      fontWeight: MyFontWeight.medium,
-                      color: Colors.white,
-                    ),
                   ),
-                  Icon(
+                  decoration: BoxDecoration(
-                    Icons.keyboard_arrow_right,
+                    color: Color(0xFF32A060),
-                    color: Colors.white,
+                    borderRadius: BorderRadius.circular(20),
-                    size: 12,
                   ),
-                ],
+                  alignment: Alignment.center,
-              ),
+                  child: Row(
-            ),
+                    mainAxisAlignment: MainAxisAlignment.center,
+                    crossAxisAlignment: CrossAxisAlignment.center,
+                    children: [
+                      Text(
+                        "了解",
+                        style: TextStyle(
+                          fontSize: 10.sp,
+                          fontWeight: MyFontWeight.medium,
+                          color: Colors.white,
+                        ),
+                      ),
+                      Icon(
+                        Icons.keyboard_arrow_right,
+                        color: Colors.white,
+                        size: 12,
+                      ),
+                    ],
+                  ),
+                ),
+                Spacer()
+              ],
+            )
           ],
         ));
   }

lib/login/login_page.dart

@@ -343,7 +343,8 @@ class _MyLoginPageState extends State<LoginPage> with TickerProviderStateMixin {
         EasyLoading.dismiss();
 
       } else {
-        // SmartDialog.showToast("${value?.msg ??""}", alignment: Alignment.center);
+        if(value?.msg !=null)
+        SmartDialog.showToast("${value?.msg ??""}", alignment: Alignment.center);
       }
     });
   }

lib/main_page.dart

@@ -337,8 +337,8 @@ class _MainPage extends State<MainPage> with WidgetsBindingObserver {
     PackageInfo packageInfo = await PackageInfo.fromPlatform();
     BaseData<AppUpdate> baseData = await apiService.appVersion().catchError((onError) {});
     if (baseData != null && baseData.isSuccess) {
-      baseData.data.appLastVersion = "1.0.5";
+      // baseData.data.appLastVersion = "1.0.95";
-      baseData.data.appLastVersionUp = "1.0.1";
+      // baseData.data.appLastVersionUp = "1.0.95";
       if(AppUtils.versionCompare(packageInfo.version,baseData.data?.appLastVersion)
           && AppUtils.versionCompare(value.getString("appLastVersion")??"1.0.0",baseData.data?.appLastVersion)){
         showDialog(

lib/retrofit/data/settleOrderInfo.dart

@@ -16,6 +16,8 @@ class SettleOrderInfo {
   String threshold;
   String freePostAge;
   List<OrderProductVOList> orderProductList;
+  String promotionId;
+  String memberCouponId;
 
   static SettleOrderInfo fromJson(Map<String, dynamic> map) {
     if (map == null) return null;
@@ -40,6 +42,8 @@ class SettleOrderInfo {
     settleOrderInfoBean.orderProductList = List()..addAll(
       (map['orderProductList'] as List ?? []).map((o) => OrderProductVOList.fromJson(o))
     );
+    settleOrderInfoBean.promotionId = map['promotionId'];
+    settleOrderInfoBean.memberCouponId = map['memberCouponId'];
     return settleOrderInfoBean;
   }
 
@@ -58,6 +62,8 @@ class SettleOrderInfo {
     "threshold": threshold,
     "freePostAge": freePostAge,
     "orderProductList": orderProductList,
+    "promotionId": promotionId,
+    "memberCouponId": memberCouponId,
   };
 }
 

lib/retrofit/min_api.dart

@@ -32,7 +32,7 @@ part 'min_api.g.dart';
 
 // const base_url = "http://192.168.10.37:8765/app/";
 
-const localBaseUrl = "http://192.168.10.236:8766/app/";///本地
+const localBaseUrl = "http://192.168.10.236:8765/app/";///本地
 const serviceBaseUrl = "https://pos.api.lotus-wallet.com/app/";///线上
 
 
@@ -102,7 +102,7 @@ abstract class MinApiService {
           }
         } else if (map["code"] != 0 && response.request.baseUrl == baseUrl) {
           ///高德地图的poi服务请求不需要toast
-          SmartDialog.showToast(map["msg"], alignment: Alignment.center);
+          // SmartDialog.showToast(map["msg"], alignment: Alignment.center);
         }
         debugPrint(
             "======================= Min_响应数据结束 =======================\n");

lib/retrofit/retrofit_api.dart

@@ -130,7 +130,7 @@ abstract class ApiService {
           }
         } else if (map["code"] != 0 && response.request.baseUrl == baseUrl) {
           ///高德地图的poi服务请求不需要toast
-          SmartDialog.showToast(map["msg"], alignment: Alignment.center);
+          // SmartDialog.showToast(map["msg"], alignment: Alignment.center);
         }
         debugPrint("======================= 响应数据结束 =======================\n");
       }, onError: (DioError e) {
@@ -170,8 +170,7 @@ abstract class ApiService {
       @Part(name: "file") File data, @Part(name: "folderId") int folderId,bool isVideo);
 
   /// 周边搜索
-  @GET(
+  @GET("https://restapi.amap.com/v3/place/around?key=542b46afa8e4b88fe1eb3c4d0ba0872f&location={lat},{lng}&keywords={keywords}&offset={size}&page={page}&extensions=all")
-      "https://restapi.amap.com/v3/place/around?key=542b46afa8e4b88fe1eb3c4d0ba0872f&location={lat},{lng}&keywords={keywords}&offset={size}&page={page}&extensions=all")
   Future<dynamic> searchPoi(@Path("lat") String lat, @Path("lng") String lng,
       @Path("keywords") String keywords, int size, int page);
 

lib/retrofit/retrofit_api.g.dart

@@ -92,7 +92,7 @@ class _ApiService implements ApiService {
         data: _data);
     final value = BaseData<LoginInfo>.fromJson(
       _result.data,
-      (json) => LoginInfo.fromJson(json),
+      (json) => json==""?null :LoginInfo.fromJson(json),
     );
     return value;
   }

lib/settlement/settlement.dart

@@ -89,7 +89,7 @@ class _Settlement extends State<Settlement> {
           tenant: tenant,
           storeId: storeId,
           showLoading: true);
-      if (promotions != null && promotions != "" || tableId <= 0) {
+      if (promotions != null && promotions != "" && tableId <= 0) {
         queryOrderInfo(
           address != null ? address.id : null,
           selectedBtn,
@@ -98,7 +98,7 @@ class _Settlement extends State<Settlement> {
           widget.arguments["pid"],
           payChannel
         );
-      } else if (coupons != null && coupons != "" || tableId <= 0) {
+      } else if (coupons != null && coupons != "" && tableId <= 0) {
         queryOrderInfo(
           address != null ? address.id : null,
           selectedBtn,
@@ -134,9 +134,29 @@ class _Settlement extends State<Settlement> {
       "promotionId": promotionId,
       "payChannel": payChannel
     }).catchError((error) {});
+    this.promotion = null;
+    promotions = "";
+    this.couponListBean = null;
+    coupons = "";
     if (baseData != null && baseData.isSuccess) {
       setState(() {
         settleOrderInfo = baseData.data;
+        if((settleOrderInfo?.promotionId??"")!=""){
+          settleOrderInfo.promotionInfoList.forEach((element) {
+            if(element.id == settleOrderInfo.promotionId){
+              this.promotion = element;
+              promotions = promotion?.name ?? "";
+            }
+          });
+        }
+        if((settleOrderInfo?.memberCouponId??"")!=""){
+          settleOrderInfo.couponList.forEach((element) {
+            if(element.id == settleOrderInfo.memberCouponId){
+              this.couponListBean = element;
+              coupons = couponListBean?.promotionName ?? "";
+            }
+          });
+        }
         if (settleOrderInfo.orderProductList == null ||
             settleOrderInfo.orderProductList.length == 0) {
           placeOrder = true;
@@ -468,8 +488,8 @@ class _Settlement extends State<Settlement> {
                                   couponCart,
                                   activityCart,
                                   settleOrderInfo,
-                                  payChannel == 4  ? null : coupons,
+                                  coupons,
-                                  payChannel == 4  ? null : promotions,
+                                  promotions,
                                   couponCount(),
                                   placeOrder,
                                   remakers,
@@ -562,9 +582,9 @@ class _Settlement extends State<Settlement> {
     queryOrderInfo(
         address?.id,
         selectedBtn,
-        payChannel == 4  ? null : couponListBean?.id,
+        couponListBean?.id,
         0,
-        payChannel == 4  ? null : promotion?.id,
+        promotion?.id,
         payChannel
     );
   }
@@ -599,20 +619,20 @@ class _Settlement extends State<Settlement> {
             couponBean: couponListBean);
       },
     );
-    if (couponBean != null) {
+    // if (couponBean != null) {
-      this.couponListBean = couponBean;
+    // this.couponListBean = couponBean;
-      coupons = couponListBean?.promotionName ?? "";
+    // coupons = couponListBean?.promotionName ?? "";
-      promotions = "";
+    // promotions = "";
-      this.promotion = null;
+    // this.promotion = null;
       queryOrderInfo(
         address?.id,
         selectedBtn,
-        couponListBean?.id,
+          couponBean?.id,
         0,
         null,
           payChannel
       );
-    }
+    // }
   }
 
   ///活动弹窗
@@ -625,19 +645,19 @@ class _Settlement extends State<Settlement> {
         return SettlementActivity(settleOrderInfo, storeInfo);
       },
     );
-    if (pro != null) {
+    // if (pro != null) {
-      this.promotion = pro;
+    // this.promotion = pro;
-      promotions = promotion?.name ?? "";
+    // promotions = promotion?.name ?? "";
-      coupons = "";
+    // coupons = "";
-      this.couponListBean = null;
+    // this.couponListBean = null;
       queryOrderInfo(
         address?.id,
         selectedBtn,
         null,
         0,
-        promotion?.id,
+          pro?.id,
           payChannel
       );
-    }
+    // }
   }
 }

lib/store/store_order.dart

@@ -566,9 +566,9 @@ class _StoreOrderPage extends State<StoreOrderPage>
         "tableId": tableId,
         "parentCode": parentCode,
         "parentId": parentId,
-        "pName": pName,
+        // "pName": pName,
         "pid": pid,
-        "cName": cName,
+        // "cName": cName,
         "cid": cid,
         "shoppingCart": shopCarGoods,
         "numberOfPeople": numberOfPeople,

pubspec.yaml

@@ -3,7 +3,7 @@ description: 一心回乡.
 
 publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 
-version: 1.0.1+2
+version: 1.0.94+3
 
 environment:
   sdk: ">=2.7.0 <3.0.0"