1281228557
/
aku_new_community
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'newHost' of https://git.oa00.com/1281228557/aku_new_community into newHost

Browse Source
pull/1/head
戴余标 3 years ago
parent 989f9072a0 e076f788b9
commit a5ccb0d4cc
15 changed files with 51 additions and 50 deletions
Show Stats Download Patch File Download Diff File

2
.fvm/fvm_config.json
Unescape View File

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

1
lib/generated_plugin_registrant.dart
Unescape View File

@ -4,6 +4,7 @@
// ignore_for_file: directives_ordering
// 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:device_info_plus_web/device_info_plus_web.dart';

2
lib/main.dart
Unescape View File

@ -52,7 +52,7 @@ class _MyAppState extends State<MyApp> {
}
},
child: MediaQuery(
data: MediaQueryData.fromWindow(WidgetsBinding.instance!.window),
data: MediaQueryData.fromWindow(WidgetsBinding.instance.window),
child: ScreenUtilInit(
designSize: Size(750, 1334),
// minTextAdapt: true,

2
lib/ui/function_and_service/work_order/history_report_page.dart
Unescape View File

@ -106,7 +106,7 @@ class _LineCardState extends State<LineCard> {
@override
void didChangeDependencies() {
WidgetsBinding.instance?.addPostFrameCallback((timeStamp) {
WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
_height = context.size?.height ?? 0;
print(context.size?.height);
setState(() {});

2
lib/ui/market/collection/collection_list_card.dart
Unescape View File

@ -67,7 +67,7 @@ class CollectionListCard extends StatelessWidget {
),
),
5.hb,
_getIcon(2),
// _getIcon(2),
//_getIcon(model.kind??0),
Spacer(),
20.hb,

18
lib/ui/market/market_home_goods_card.dart
Unescape View File

@ -83,15 +83,15 @@ class MarketHomeGoodsCard extends StatelessWidget {
style: TextStyle(fontSize: 28.sp, color: ktextPrimary),
),
),
Padding(
padding: EdgeInsets.only(
left: 16.w,
right: 16.w,
top: 10.w,
),
child: Container(
child: _getIcon(1),
)),
// Padding(
// padding: EdgeInsets.only(
// left: 16.w,
// right: 16.w,
// top: 10.w,
// ),
// child: Container(
// child: _getIcon(1),
// )),
10.hb,
Padding(
padding: EdgeInsets.symmetric(

8
lib/ui/market/market_page.dart
Unescape View File

@ -327,7 +327,7 @@ class _MarketPageState extends State<MarketPage>
172 * 2.w,
flexibleSpace: _flexibleSpaceBar(context),
bottom: PreferredSize(
preferredSize: Size.fromHeight(tabBarHeight+50.h),
preferredSize: Size.fromHeight(tabBarHeight),
child: _goodsTitle(
normalTypeButton,
salesTypeButton,
@ -600,9 +600,9 @@ class _MarketPageState extends State<MarketPage>
geSearch() {
return Column(
children: [
16.hb,
'本商城所有商品来源于京东'.text.color(Color(0xFFACACAC)).normal.size(30.sp).make(),
16.hb,
// 16.hb,
// // '本商城所有商品来源于京东'.text.color(Color(0xFFACACAC)).normal.size(30.sp).make(),
// 16.hb,
Row(
mainAxisSize: MainAxisSize.min,
children: [

6
lib/ui/market/order/order_card.dart
Unescape View File

@ -527,9 +527,9 @@ class _OrderCardState extends State<OrderCard> {
Widget _goodCard(MyOrderListVoList model) {
var top = RichText(
text: TextSpan(children: [
WidgetSpan(
child: _getKindWd(model.kind ?? 0),
),
// WidgetSpan(
// child: _getKindWd(model.kind ?? 0),
// ),
TextSpan(
text: model.skuName,
style: TextStyle(fontSize: 28.sp, color: ktextPrimary)),

6
lib/ui/market/order/order_detail_page.dart
Unescape View File

@ -581,9 +581,9 @@ class _OrderDetailPageState extends State<OrderDetailPage> {
Widget _goodCard(MyOrderListVoList model) {
var top = RichText(
text: TextSpan(children: [
WidgetSpan(
child: _getKindWd(model.kind ?? 0),
),
// WidgetSpan(
// child: _getKindWd(model.kind ?? 0),
// ),
TextSpan(
text: model.skuName,
style: TextStyle(fontSize: 28.sp, color: ktextPrimary)),

4
lib/ui/market/search/good_detail_page.dart
Unescape View File

@ -283,7 +283,7 @@ class _GoodDetailPageState extends State<GoodDetailPage> {
overflow: TextOverflow.ellipsis,
),
),
_getIcon(_goodDetail!.kind),
// _getIcon(_goodDetail!.kind),
24.hb,
Row(
crossAxisAlignment: CrossAxisAlignment.center,
@ -348,7 +348,7 @@ class _GoodDetailPageState extends State<GoodDetailPage> {
overflow: TextOverflow.ellipsis,
),
),
_getIcon(_goodDetail!.kind),
// _getIcon(_goodDetail!.kind),
Spacer(),
Row(
crossAxisAlignment: CrossAxisAlignment.center,

2
lib/ui/market/search/goods_list_card.dart
Unescape View File

@ -76,7 +76,7 @@ class GoodsListCardState extends State<GoodsListCard> {
),
),
5.hb,
_getIcon(2),
// _getIcon(2),
//_getIcon(model.kind??0),
Spacer(),
20.hb,

6
lib/ui/market/search/submit_order_page_normal.dart
Unescape View File

@ -455,9 +455,9 @@ class _SubmitOrderNormalPageState extends State<SubmitOrderNormalPage> {
Widget _goodCard(GoodDetailModel model) {
var top = RichText(
text: TextSpan(children: [
WidgetSpan(
child: _getKindWd(model.kind),
),
// WidgetSpan(
// child: _getKindWd(model.kind),
// ),
TextSpan(
text: model.skuName,
style: TextStyle(fontSize: 28.sp, color: ktextPrimary)),

18
lib/ui/market/search_goods_card.dart
Unescape View File

@ -91,15 +91,15 @@ class _SearchGoodsCardState extends State<SearchGoodsCard> {
style: TextStyle(fontSize: 28.sp, color: ktextPrimary),
),
),
Padding(
padding: EdgeInsets.only(
left: 16.w,
right: 16.w,
top: 10.w,
),
child: Container(
child: _getIcon(widget.item.kind ?? 0),
)),
// Padding(
// padding: EdgeInsets.only(
// left: 16.w,
// right: 16.w,
// top: 10.w,
// ),
// child: Container(
// child: _getIcon(widget.item.kind ?? 0),
// )),
10.hb,
Padding(
padding: EdgeInsets.symmetric(

6
lib/ui/market/shop_car/shop_car_page.dart
Unescape View File

@ -265,9 +265,9 @@ class _ShopCarPageState extends State<ShopCarPage> {
Widget _goodCard(ShopCarListModel model, int index) {
var top = RichText(
text: TextSpan(children: [
WidgetSpan(
child: _getKindWd(model.kind ?? 0),
),
// WidgetSpan(
// child: _getKindWd(model.kind ?? 0),
// ),
TextSpan(
text: model.skuName,
style: TextStyle(fontSize: 28.sp, color: ktextPrimary)),

18
pubspec.lock
Unescape View File

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

Write Preview
Loading…
Cancel
Save