订单更改

lib/retrofit/min_api.dart

@@ -35,12 +35,12 @@ part 'min_api.g.dart';
 // 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/";///费韬
+// const base_url = "http://192.168.10.236:8765/app/";///费韬
+// const baseUrl = "http://192.168.10.236:8765/app/";///费韬
 
 
-// const base_url = "http://192.168.10.139:8765/app/";///詹云久
-// const baseUrl = "http://192.168.10.139:8765/app/";///詹云久
+const base_url = "http://192.168.10.104:8765/app/";///詹云久
+const baseUrl = "http://192.168.10.104:8765/app/";///詹云久
 
 
 // const base_url = "http://192.168.10.37:8766/app/";
@@ -190,7 +190,7 @@ abstract class MinApiService {
 
   ///小程序下单
   @POST("order/placeOrderFirst")
-  Future<BaseData<DownOrder>> placeOrderFirst(@Body() Map<String, dynamic> param);
+  Future<BaseData<dynamic>> placeOrderFirst(@Body() Map<String, dynamic> param);
 
   ///小程序下单加菜
   @POST("order/addOrder")

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://192.168.10.236:8765/app/';
+    baseUrl ??= 'http://192.168.10.104:8765/app/';
   }
 
   final Dio _dio;
@@ -269,7 +269,7 @@ class _MinApiService implements MinApiService {
   }
 
   @override
-  Future<BaseData<DownOrder>> placeOrderFirst(param) async {
+  Future<BaseData<dynamic>> placeOrderFirst(param) async {
     ArgumentError.checkNotNull(param, 'param');
     const _extra = <String, dynamic>{};
     final queryParameters = <String, dynamic>{};
@@ -284,9 +284,9 @@ class _MinApiService implements MinApiService {
             extra: _extra,
             baseUrl: baseUrl),
         data: _data);
-    final value = BaseData<DownOrder>.fromJson(
+    final value = BaseData<dynamic>.fromJson(
       _result.data,
-      (json) => DownOrder.fromJson(json),
+      (json) => json,
     );
     return value;
   }

lib/retrofit/retrofit_api.dart

@@ -65,15 +65,15 @@ part 'retrofit_api.g.dart';
 // const base_url = "http://platform.prod.kunqi.lotus-wallet.com/app/"; ///222
 // const baseUrl = "http://platform.prod.kunqi.lotus-wallet.com/app/"; ///222
 
-const base_url = "http://192.168.10.236:8766/app/";   ///费韬
-const baseUrl = "http://192.168.10.236:8766/app/";    ///费韬
+// const base_url = "http://192.168.10.236:8766/app/";   ///费韬
+// const baseUrl = "http://192.168.10.236:8766/app/";    ///费韬
 
 // const base_url = "http://192.168.10.37:8766/app/";
 // const baseUrl = "http://192.168.10.37:8766/app/";
 
 
-// const base_url = "http://192.168.10.139:8766/app/";///詹云久
-// const baseUrl = "http://192.168.10.139:8766/app/";///詹云久
+const base_url = "http://192.168.10.104:8766/app/";///詹云久
+const baseUrl = "http://192.168.10.104: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.236:8766/app/';
+    baseUrl ??= 'http://192.168.10.104:8766/app/';
   }
 
   final Dio _dio;

lib/settlement/settlement.dart

@@ -413,20 +413,17 @@ class _Settlement extends State<Settlement> {
 
     if (tableId == 0) {
       ///正常的商店下单
-      BaseData<DownOrder> baseData = await minService
+      BaseData<dynamic> baseData = await minService
           .placeOrderFirst(placeOrderFirst.toJson())
           .catchError((error) {
         print("error: $error");
       });
       if (baseData != null && baseData.isSuccess) {
         placeOrder = true;
-        this.downOrder = baseData.data;
+        this.downOrder = DownOrder.fromJson(baseData.data);
         querySettlement();
       } else {
-        baseData?.isSuccess ?? false
-            ? SmartDialog.showToast("下单失败:订单实付金额不能为0",
-                alignment: Alignment.center)
-            : SmartDialog.showToast(baseData?.msg ?? "",
+       SmartDialog.showToast(baseData?.msg,
                 alignment: Alignment.center);
       }
     } else {

lib/store/shopping/shopping_cart/shopping_cart_page.dart

@@ -1,7 +1,6 @@
 import 'package:dio/dio.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:flutter_swiper/flutter_swiper.dart';
 import 'package:huixiang/generated/l10n.dart';
 import 'package:huixiang/retrofit/data/base_data.dart';
@@ -323,7 +322,7 @@ class _ShoppingCartPage extends State<ShoppingCartPage>
                           height: 32.h,
                           margin: EdgeInsets.only(left: 6.w),
                           decoration: BoxDecoration(
-                            color:  isAllSelect ? Color(0xFFFB312B) :Color(0xFFE5E5E5),
+                            color:Color(0xFFFB312B),
                             borderRadius: BorderRadius.circular(16),
                             boxShadow: [
                               BoxShadow(

lib/store/store_view/store_info.dart

@@ -30,7 +30,7 @@ class _StoreInfoView extends State<StoreInfoView> {
         top: 5.h,
         bottom: 6.h,
       ),
-      height: 154.h,
+      height: 162.h,
       padding: EdgeInsets.all(12.w),
       decoration: BoxDecoration(
         color: Colors.white,