pull/1/head
戴余标 3 years ago
parent cae0380d42
commit e996c93858

@ -1,4 +1,4 @@
{ {
"flutterSdkVersion": "2.8.1", "flutterSdkVersion": "3.0.0",
"flavors": {} "flavors": {}
} }

@ -323,6 +323,9 @@ class _Pay {
/// ///
String get livingExpensesOrderCheckAlipay => String get livingExpensesOrderCheckAlipay =>
'/app/user/alipay/livingExpensesOrderCheckAlipay'; '/app/user/alipay/livingExpensesOrderCheckAlipay';
String get settlement =>
'/app/user/shop/cart/settlement';
} }
class _LifePay { class _LifePay {

@ -4,6 +4,7 @@
// ignore_for_file: directives_ordering // ignore_for_file: directives_ordering
// ignore_for_file: lines_longer_than_80_chars // ignore_for_file: lines_longer_than_80_chars
// ignore_for_file: depend_on_referenced_packages
import 'package:audio_session/audio_session_web.dart'; import 'package:audio_session/audio_session_web.dart';
import 'package:device_info_plus_web/device_info_plus_web.dart'; import 'package:device_info_plus_web/device_info_plus_web.dart';

@ -190,57 +190,51 @@ class _SubmitOrderPageState extends State<SubmitOrderPage> {
), ),
_addressModel != null _addressModel != null
? Column( ? Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Column( Padding(
crossAxisAlignment: CrossAxisAlignment.start, padding: EdgeInsets.symmetric(
children: [ horizontal: 20.w, vertical: 6.w),
Padding( child: SizedBox(
padding: EdgeInsets.symmetric( width: 518.w,
horizontal: 20.w, vertical: 6.w), child: Text(
child: SizedBox( _addressModel!.locationName ?? '',
width: 518.w, style: TextStyle(
child: Text( fontSize: 24.sp, color: ktextPrimary),
_addressModel!.locationName ?? '', maxLines: 1,
style: TextStyle( overflow: TextOverflow.ellipsis,
fontSize: 24.sp, color: ktextPrimary),
maxLines: 1,
overflow: TextOverflow.ellipsis,
),
),
),
Padding(
padding: EdgeInsets.symmetric(
horizontal: 20.w, vertical: 6.w),
child: SizedBox(
width: 518.w,
child: Text(
(_addressModel!.addressDetail ?? ''),
style: TextStyle(
fontSize: 32.sp, color: ktextPrimary),
maxLines: 1,
overflow: TextOverflow.ellipsis,
),
),
), ),
Padding( ),
padding: EdgeInsets.symmetric( ),
horizontal: 20.w, vertical: 6.w), Padding(
child: Row( padding: EdgeInsets.symmetric(
crossAxisAlignment: CrossAxisAlignment.end, horizontal: 20.w, vertical: 6.w),
children: <Widget>[ child: SizedBox(
Text(_addressModel!.name ?? '', width: 518.w,
style: TextStyle( child: Text(
fontSize: 24.sp, (_addressModel!.addressDetail ?? ''),
color: ktextPrimary)), style: TextStyle(
30.wb, fontSize: 32.sp, color: ktextPrimary),
Text(_addressModel!.tel ?? '', maxLines: 1,
style: TextStyle( overflow: TextOverflow.ellipsis,
fontSize: 24.sp,
color: ktextPrimary)),
],
),
), ),
], ),
),
Padding(
padding: EdgeInsets.symmetric(
horizontal: 20.w, vertical: 6.w),
child: Row(
crossAxisAlignment: CrossAxisAlignment.end,
children: <Widget>[
Text(_addressModel!.name ?? '',
style: TextStyle(
fontSize: 24.sp, color: ktextPrimary)),
30.wb,
Text(_addressModel!.tel ?? '',
style: TextStyle(
fontSize: 24.sp, color: ktextPrimary)),
],
),
), ),
], ],
) )

@ -513,7 +513,6 @@ class _ShopCarPageState extends State<ShopCarPage> {
_controllers[index].text = (num - 1).toString(); _controllers[index].text = (num - 1).toString();
} }
} }
setState(() {}); setState(() {});
}, },
child: Padding( child: Padding(

@ -245,7 +245,7 @@ packages:
name: collection name: collection
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.15.0" version: "1.16.0"
color: color:
dependency: transitive dependency: transitive
description: description:
@ -408,7 +408,7 @@ packages:
name: fake_async name: fake_async
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.2.0" version: "1.3.0"
ffi: ffi:
dependency: transitive dependency: transitive
description: description:
@ -717,7 +717,7 @@ packages:
name: js name: js
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.6.3" version: "0.6.4"
json_annotation: json_annotation:
dependency: "direct main" dependency: "direct main"
description: description:
@ -787,7 +787,7 @@ packages:
name: material_color_utilities name: material_color_utilities
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.1.3" version: "0.1.4"
meta: meta:
dependency: transitive dependency: transitive
description: description:
@ -892,7 +892,7 @@ packages:
name: path name: path
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.8.0" version: "1.8.1"
path_drawing: path_drawing:
dependency: transitive dependency: transitive
description: description:
@ -1174,7 +1174,7 @@ packages:
name: source_span name: source_span
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.8.1" version: "1.8.2"
sqflite: sqflite:
dependency: transitive dependency: transitive
description: description:
@ -1237,7 +1237,7 @@ packages:
name: test_api name: test_api
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.4.8" version: "0.4.9"
time: time:
dependency: transitive dependency: transitive
description: description:
@ -1342,7 +1342,7 @@ packages:
name: vector_math name: vector_math
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "2.1.1" version: "2.1.2"
velocity_x: velocity_x:
dependency: "direct main" dependency: "direct main"
description: description:
@ -1407,5 +1407,5 @@ packages:
source: hosted source: hosted
version: "3.1.0" version: "3.1.0"
sdks: sdks:
dart: ">=2.15.0 <3.0.0" dart: ">=2.17.0-0 <3.0.0"
flutter: ">=2.8.0" flutter: ">=2.8.0"

Loading…
Cancel
Save