mirrors/pilipala
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'fix' into alpha

Browse Source
This commit is contained in:
guozhigq
2023-10-15 16:49:38 +08:00
parent 94aef39f7b 4d5f3eb14a
commit 6c983cf849
1 changed files with 45 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/pages/dynamics/widgets/additional_panel.dart
View File

@ -83,6 +83,7 @@ Widget addWidget(item, context, type, {floor = 1}) {
); );
case 'ADDITIONAL_TYPE_RESERVE': case 'ADDITIONAL_TYPE_RESERVE':
return dynamicProperty[type].state != -1 return dynamicProperty[type].state != -1
? dynamicProperty[type].title != null
? Padding( ? Padding(
padding: const EdgeInsets.only(top: 8), padding: const EdgeInsets.only(top: 8),
child: InkWell( child: InkWell(
@ -110,9 +111,15 @@ Widget addWidget(item, context, type, {floor = 1}) {
.labelMedium! .labelMedium!
.fontSize), .fontSize),
children: [ children: [
TextSpan(text: dynamicProperty[type].desc1['text']), if (dynamicProperty[type].desc1 != null)
TextSpan(
text:
dynamicProperty[type].desc1['text']),
const TextSpan(text: ' '), const TextSpan(text: ' '),
TextSpan(text: dynamicProperty[type].desc2['text']), if (dynamicProperty[type].desc2 != null)
TextSpan(
text:
dynamicProperty[type].desc2['text']),
], ],
), ),
) )
@ -122,6 +129,7 @@ Widget addWidget(item, context, type, {floor = 1}) {
), ),
), ),
) )
: const SizedBox()
: const SizedBox(); : const SizedBox();
case 'ADDITIONAL_TYPE_GOODS': case 'ADDITIONAL_TYPE_GOODS':
// 商品 // 商品