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

Merge branch 'zhang'

Browse Source
hmxc
张萌 4 years ago
parent c9dec9df5b 2d2af9fe23
commit 1a54e9ab2f
68 changed files with 309 additions and 343 deletions
Show Stats Download Patch File Download Diff File

1
lib/base/base_style.dart
Unescape View File

@ -13,6 +13,7 @@ const kDarkPrimaryColor=Color(0xFFFF8200);
const kDangerColor = Color(0xFFFF3B30); const kDangerColor = Color(0xFFFF3B30);
const kEstateName = '宁波华悦茂峰'; const kEstateName = '宁波华悦茂峰';
const kDarkSubColor = Color(0xFF979797); const kDarkSubColor = Color(0xFF979797);
class BaseStyle { class BaseStyle {
///字体类 ///字体类
static final double fontSize18 = 18.sp; static final double fontSize18 = 18.sp;

3
lib/model/manager/event_voting_model.dart
Unescape View File

@ -40,7 +40,8 @@ class EventVotingModel {
json['headImgURls'].forEach((v) { json['headImgURls'].forEach((v) {
headImgURls.add(new ImgModel.fromJson(v)); headImgURls.add(new ImgModel.fromJson(v));
}); });
}else headImgURls=[]; } else
headImgURls = [];
} }
Map<String, dynamic> toJson() { Map<String, dynamic> toJson() {

6
lib/model/manager/questinnaire_model.dart
Unescape View File

@ -36,13 +36,15 @@ class QuestionnaireModel {
json['imgUrls'].forEach((v) { json['imgUrls'].forEach((v) {
imgUrls.add(new ImgModel.fromJson(v)); imgUrls.add(new ImgModel.fromJson(v));
}); });
}else imgUrls=[]; } else
imgUrls = [];
if (json['headImgURls'] != null) { if (json['headImgURls'] != null) {
headImgURls = new List<ImgModel>(); headImgURls = new List<ImgModel>();
json['headImgURls'].forEach((v) { json['headImgURls'].forEach((v) {
headImgURls.add(new ImgModel.fromJson(v)); headImgURls.add(new ImgModel.fromJson(v));
}); });
}else headImgURls=[]; } else
headImgURls = [];
} }
Map<String, dynamic> toJson() { Map<String, dynamic> toJson() {

9
lib/model/manager/questionnaire_detail_model.dart
Unescape View File

@ -33,7 +33,8 @@ class QuestionnaireDetialModel {
json['voResourcesImgList'].forEach((v) { json['voResourcesImgList'].forEach((v) {
voResourcesImgList.add(new VoResourcesImgList.fromJson(v)); voResourcesImgList.add(new VoResourcesImgList.fromJson(v));
}); });
}else voResourcesImgList=[]; } else
voResourcesImgList = [];
} }
Map<String, dynamic> toJson() { Map<String, dynamic> toJson() {
@ -74,7 +75,8 @@ class QuestionnaireTopicVoList {
questionnaireChoiceVoList questionnaireChoiceVoList
.add(new QuestionnaireChoiceVoList.fromJson(v)); .add(new QuestionnaireChoiceVoList.fromJson(v));
}); });
}else questionnaireChoiceVoList=[]; } else
questionnaireChoiceVoList = [];
} }
Map<String, dynamic> toJson() { Map<String, dynamic> toJson() {
@ -85,7 +87,8 @@ class QuestionnaireTopicVoList {
if (this.questionnaireChoiceVoList != null) { if (this.questionnaireChoiceVoList != null) {
data['questionnaireChoiceVoList'] = data['questionnaireChoiceVoList'] =
this.questionnaireChoiceVoList.map((v) => v.toJson()).toList(); this.questionnaireChoiceVoList.map((v) => v.toJson()).toList();
}else questionnaireChoiceVoList=[]; } else
questionnaireChoiceVoList = [];
return data; return data;
} }
} }

16
lib/pages/address_page/widget/address_edit_item.dart
Unescape View File

@ -27,8 +27,10 @@ class _AddressEditItemState extends State<AddressEditItem> {
super.initState(); super.initState();
_userName = new TextEditingController(text: widget.addressInfo['name']); _userName = new TextEditingController(text: widget.addressInfo['name']);
_userPhone = new TextEditingController(text: widget.addressInfo['phone']); _userPhone = new TextEditingController(text: widget.addressInfo['phone']);
_userAddress = new TextEditingController(text: widget.addressInfo['address']); _userAddress =
_userAddressDetail = new TextEditingController(text: widget.addressInfo['address']); new TextEditingController(text: widget.addressInfo['address']);
_userAddressDetail =
new TextEditingController(text: widget.addressInfo['address']);
} }
@override @override
@ -70,16 +72,14 @@ class _AddressEditItemState extends State<AddressEditItem> {
border: InputBorder.none, //去掉输入框的下滑线 border: InputBorder.none, //去掉输入框的下滑线
fillColor: Colors.white, fillColor: Colors.white,
filled: true, filled: true,
hintStyle: TextStyle( hintStyle:
color: Color(0xff999999), fontSize: 28.sp), TextStyle(color: Color(0xff999999), fontSize: 28.sp),
prefixIcon: Padding( prefixIcon: Padding(
padding: EdgeInsets.only( padding: EdgeInsets.only(
left: 32.w, left: 32.w,
right: right: (item['title'] == '收货人' ? 88 : 60).w,
(item['title'] == '收货人' ? 88 : 60).w,
top: 28.w, top: 28.w,
bottom: bottom: (item['title'] == '详细地址' ? 158 : 28).w,
(item['title'] == '详细地址' ? 158 : 28).w,
), ),
child: Text( child: Text(
item['title'], item['title'],

1
lib/pages/confirm_order_page/pay_order_page.dart
Unescape View File

@ -15,7 +15,6 @@ class PayOrderPage extends StatelessWidget {
final Bundle bundle; final Bundle bundle;
PayOrderPage({Key key, this.bundle}) : super(key: key); PayOrderPage({Key key, this.bundle}) : super(key: key);
final List<Map<String, dynamic>> _listPay = [ final List<Map<String, dynamic>> _listPay = [
{ {
'title': '支付宝支付', 'title': '支付宝支付',

4
lib/pages/event_activity/event_voting_page.dart
Unescape View File

@ -111,7 +111,9 @@ class _EventVotingPageState extends State<EventVotingPage> {
// EdgeInsets.symmetric(horizontal: 30.w, vertical: 8.w), // EdgeInsets.symmetric(horizontal: 30.w, vertical: 8.w),
elevation: 0, elevation: 0,
onPressed: () { onPressed: () {
VotingDetailPage(id: model.id,).to(); VotingDetailPage(
id: model.id,
).to();
}, },
child: (_getButtonText(model.status)) child: (_getButtonText(model.status))
.text .text

6
lib/pages/fitup_manage/widget/decorator_info.dart
Unescape View File

@ -54,8 +54,7 @@ class _DecoratorInfoState extends State<DecoratorInfo> {
children: [ children: [
Text( Text(
title, title,
style: TextStyle( style: TextStyle(fontSize: 28.sp, color: Color(0xff333333)),
fontSize: 28.sp, color: Color(0xff333333)),
), ),
SizedBox(height: 25.w), SizedBox(height: 25.w),
widget widget
@ -79,8 +78,7 @@ class _DecoratorInfoState extends State<DecoratorInfo> {
children: [ children: [
Text( Text(
'上传证件照片', '上传证件照片',
style: TextStyle( style: TextStyle(fontSize: 28.sp, color: Color(0xff333333)),
fontSize: 28.sp, color: Color(0xff333333)),
), ),
SizedBox(height: 25.w), SizedBox(height: 25.w),
Row( Row(

1
lib/pages/fitup_manage/widget/director_manage.dart
Unescape View File

@ -19,7 +19,6 @@ class DirectorManage extends StatefulWidget {
} }
class _DirectorManageState extends State<DirectorManage> { class _DirectorManageState extends State<DirectorManage> {
TextEditingController _companyName = new TextEditingController(); TextEditingController _companyName = new TextEditingController();
int memberNum = 1; int memberNum = 1;

3
lib/pages/fitup_manage/widget/owner_manage.dart
Unescape View File

@ -95,8 +95,7 @@ class _OwnerManageState extends State<OwnerManage>
Text( Text(
_listWidget[index]['title'], _listWidget[index]['title'],
style: TextStyle( style: TextStyle(
fontSize: BaseStyle.fontSize28, fontSize: BaseStyle.fontSize28, color: ktextPrimary),
color: ktextPrimary),
), ),
SizedBox(height: 25.w), SizedBox(height: 25.w),
_listWidget[index]['widget'], _listWidget[index]['widget'],

6
lib/pages/fitup_manage/widget/pay_model_sheet.dart
Unescape View File

@ -153,8 +153,7 @@ class _PayModelSheetState extends State<PayModelSheet> {
Text( Text(
title, title,
style: TextStyle( style: TextStyle(
fontSize: BaseStyle.fontSize28, fontSize: BaseStyle.fontSize28, color: ktextPrimary),
color: ktextPrimary),
), ),
_listPay[index]['isCheck'] _listPay[index]['isCheck']
? Icon( ? Icon(
@ -195,8 +194,7 @@ class _PayModelSheetState extends State<PayModelSheet> {
Text( Text(
_listPay[_currentindex]['title'], _listPay[_currentindex]['title'],
style: TextStyle( style: TextStyle(
fontSize: BaseStyle.fontSize28, fontSize: BaseStyle.fontSize28, color: ktextPrimary),
color: ktextPrimary),
), ),
], ],
), ),

3
lib/pages/goods_deto_page/widget/goods_info_card.dart
Unescape View File

@ -122,8 +122,7 @@ class GoodsInfoCard extends StatelessWidget {
_builTile('物品重量', BeeMap.goodsOutweight[model.weight]), _builTile('物品重量', BeeMap.goodsOutweight[model.weight]),
_builTile('出户时间', model.expectedTime), _builTile('出户时间', model.expectedTime),
_builTile('物品名称', model.name), _builTile('物品名称', model.name),
_builTile( _builTile('搬运方式', BeeMap.goodsOutApproach[model.approach]),
'搬运方式', BeeMap.goodsOutApproach[model.approach]),
]), ]),
), ),
Container( Container(

8
lib/pages/goods_deto_page/widget/goods_info_card_button.dart
Unescape View File

@ -98,12 +98,10 @@ class GoodsInfoCardButton extends StatelessWidget {
onTap: () async { onTap: () async {
switch (_listButton[index]['title']) { switch (_listButton[index]['title']) {
case '查看二维码': case '查看二维码':
ArticleQRModel _model = await ManagerFunc.getQRcode(id); ArticleQRModel _model =
await ManagerFunc.getQRcode(id);
if (_model.status) { if (_model.status) {
DetoCodePage( DetoCodePage(id: id, model: _model).to();
id: id,
model: _model
).to();
} else { } else {
BotToast.showText(text: _model.message); BotToast.showText(text: _model.message);
} }

1
lib/pages/goods_manage_page/goods_manage_page.dart
Unescape View File

@ -97,7 +97,6 @@ class _GoodsManagePageState extends State<GoodsManagePage> {
alignment: Alignment.center, alignment: Alignment.center,
child: '我的借还物品'.text.black.size(28.sp).make())) child: '我的借还物品'.text.black.size(28.sp).make()))
], ],
body: BeeListView( body: BeeListView(
path: API.manager.articleBorrow, path: API.manager.articleBorrow,
controller: _easyRefreshController, controller: _easyRefreshController,

1
lib/pages/invoice/invoice_page.dart
Unescape View File

@ -39,7 +39,6 @@ class _InvoicePageState extends State<InvoicePage> {
}); });
} }
Container _containerInvoiceDetailCheck() { Container _containerInvoiceDetailCheck() {
return Container( return Container(
color: Colors.white, color: Colors.white,

3
lib/pages/invoice/widget/invoice_input.dart
Unescape View File

@ -77,8 +77,7 @@ class _InvoiceInputState extends State<InvoiceInput> {
fillColor: Colors.white, fillColor: Colors.white,
filled: true, filled: true,
hintStyle: TextStyle( hintStyle: TextStyle(
color: Color(0xff999999), color: Color(0xff999999), fontSize: 24.sp),
fontSize: 24.sp),
), ),
), ),
), ),

4
lib/pages/life_pay/life_pay_bill_page/widget/bill_card.dart
Unescape View File

@ -65,7 +65,9 @@ class BillCard extends StatelessWidget {
), ),
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: _listBill.map((item) => _billItem(item['title'],item['value'])).toList(), children: _listBill
.map((item) => _billItem(item['title'], item['value']))
.toList(),
), ),
); );
} }

6
lib/pages/life_pay/life_pay_page.dart
Unescape View File

@ -125,6 +125,12 @@ class _LifePayPageState extends State<LifePayPage> {
_selectYears.remove(index); _selectYears.remove(index);
_totalCost -= (_selectPay[index].payTotal ?? 0.0); _totalCost -= (_selectPay[index].payTotal ?? 0.0);
_count -= (_selectPay[index].payCount ?? 0); _count -= (_selectPay[index].payCount ?? 0);
if (_count < 0) {
_count = 0;
}
if (_totalCost < 0) {
_totalCost = 0;
}
} else { } else {
_selectYears.add(index); _selectYears.add(index);
_totalCost += (_selectPay[index].payTotal ?? 0.0); _totalCost += (_selectPay[index].payTotal ?? 0.0);

8
lib/pages/life_pay/widget/life_pay_detail_page.dart
Unescape View File

@ -62,7 +62,6 @@ class _LifePayDetailPageState extends State<LifePayDetailPage> {
}, },
child: Row( child: Row(
children: [ children: [
BeeCheckRadio( BeeCheckRadio(
value: id.toString() + groupId.toString(), value: id.toString() + groupId.toString(),
groupValue: _selectItems), groupValue: _selectItems),
@ -71,7 +70,12 @@ class _LifePayDetailPageState extends State<LifePayDetailPage> {
? '$years上半年'.text.black.size(28.sp).make() ? '$years上半年'.text.black.size(28.sp).make()
: '$years下半年'.text.black.size(28.sp).make(), : '$years下半年'.text.black.size(28.sp).make(),
Spacer(), Spacer(),
'¥${price.toString()}'.text.color(kDangerColor).size(28.sp).bold.make(), '¥${price.toString()}'
.text
.color(kDangerColor)
.size(28.sp)
.bold
.make(),
24.w.widthBox, 24.w.widthBox,
Icon( Icon(
CupertinoIcons.chevron_forward, CupertinoIcons.chevron_forward,

4
lib/pages/life_pay/widget/order_card.dart
Unescape View File

@ -7,7 +7,9 @@ import 'package:akuCommunity/base/base_style.dart';
import 'package:akuCommunity/utils/headers.dart'; import 'package:akuCommunity/utils/headers.dart';
class OrderCard extends StatefulWidget { class OrderCard extends StatefulWidget {
OrderCard({Key key,}) : super(key: key); OrderCard({
Key key,
}) : super(key: key);
@override @override
_OrderCardState createState() => _OrderCardState(); _OrderCardState createState() => _OrderCardState();

3
lib/pages/life_pay/widget/submit_bar.dart
Unescape View File

@ -54,8 +54,7 @@ class _SubmitBarState extends State<SubmitBar> {
TextSpan( TextSpan(
text: '合计：', text: '合计：',
style: TextStyle( style: TextStyle(
fontSize: BaseStyle.fontSize26, fontSize: BaseStyle.fontSize26, color: ktextPrimary),
color: ktextPrimary),
), ),
TextSpan( TextSpan(
text: '¥${3009.84}', text: '¥${3009.84}',

6
lib/pages/market/market_cart_page/market_cart_page.dart
Unescape View File

@ -324,8 +324,7 @@ class _MarketCartPageState extends State<MarketCartPage> {
return SlideAction( return SlideAction(
child: Text( child: Text(
'移至收藏夹', '移至收藏夹',
style: TextStyle( style: TextStyle(fontSize: 28.sp, color: Colors.white),
fontSize: 28.sp, color: Colors.white),
), ),
color: renderingMode == SlidableRenderingMode.slide color: renderingMode == SlidableRenderingMode.slide
? Color(0xffffc40c).withOpacity(animation.value) ? Color(0xffffc40c).withOpacity(animation.value)
@ -349,8 +348,7 @@ class _MarketCartPageState extends State<MarketCartPage> {
), ),
child: Text( child: Text(
'删除', '删除',
style: TextStyle( style: TextStyle(fontSize: 28.sp, color: Colors.white),
fontSize: 28.sp, color: Colors.white),
), ),
// onTap: () => _showSnackBar(context, 'Delete'), // onTap: () => _showSnackBar(context, 'Delete'),
); );

5
lib/pages/market/market_cart_page/widget/market_cart_bottom_bar.dart
Unescape View File

@ -99,7 +99,10 @@ class MarketCartBottomBar extends StatelessWidget {
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [
_selectAll(model), _selectAll(model),
_settlement(model,context,) _settlement(
model,
context,
)
], ],
), ),
); );

6
lib/pages/market/market_cart_page/widget/market_cart_card.dart
Unescape View File

@ -142,8 +142,7 @@ class MarketCartCard extends StatelessWidget {
return SlideAction( return SlideAction(
child: Text( child: Text(
'移至收藏夹', '移至收藏夹',
style: TextStyle( style: TextStyle(fontSize: 28.sp, color: Colors.white),
fontSize: 28.sp, color: Colors.white),
), ),
color: renderingMode == SlidableRenderingMode.slide color: renderingMode == SlidableRenderingMode.slide
? Color(0xffffc40c).withOpacity(animation.value) ? Color(0xffffc40c).withOpacity(animation.value)
@ -167,8 +166,7 @@ class MarketCartCard extends StatelessWidget {
), ),
child: Text( child: Text(
'删除', '删除',
style: TextStyle( style: TextStyle(fontSize: 28.sp, color: Colors.white),
fontSize: 28.sp, color: Colors.white),
), ),
// onTap: () => _showSnackBar(context, 'Delete'), // onTap: () => _showSnackBar(context, 'Delete'),
); );

16
lib/pages/market/widget/sliver_goods_group_card.dart
Unescape View File

@ -145,8 +145,7 @@ class _SliverGoodsGroupCardState extends State<SliverGoodsGroupCard> {
), ),
decoration: BoxDecoration( decoration: BoxDecoration(
color: isOverTime ? Color(0xffd9d9d9) : Color(0xffffeee3), color: isOverTime ? Color(0xffd9d9d9) : Color(0xffffeee3),
borderRadius: borderRadius: BorderRadius.all(Radius.circular(4.w)),
BorderRadius.all(Radius.circular(4.w)),
), ),
child: Row( child: Row(
children: [ children: [
@ -178,16 +177,14 @@ class _SliverGoodsGroupCardState extends State<SliverGoodsGroupCard> {
children: [ children: [
Text( Text(
'原产地:$address', '原产地:$address',
style: TextStyle( style:
color: Color(0xff999999), TextStyle(color: Color(0xff999999), fontSize: 20.sp),
fontSize: 20.sp),
), ),
SizedBox(height: 10.w), SizedBox(height: 10.w),
Text( Text(
'预计到货:$arrivalTime', '预计到货:$arrivalTime',
style: TextStyle( style:
color: Color(0xff999999), TextStyle(color: Color(0xff999999), fontSize: 20.sp),
fontSize: 20.sp),
) )
], ],
), ),
@ -217,8 +214,7 @@ class _SliverGoodsGroupCardState extends State<SliverGoodsGroupCard> {
), ),
decoration: BoxDecoration( decoration: BoxDecoration(
color: Colors.white, color: Colors.white,
borderRadius: borderRadius: BorderRadius.all(Radius.circular(8.w)),
BorderRadius.all(Radius.circular(8.w)),
), ),
child: Row( child: Row(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,

5
lib/pages/market_class/widget/market_class_bar.dart
Unescape View File

@ -18,10 +18,7 @@ class MarketClassBar extends StatelessWidget {
}, },
child: Container( child: Container(
margin: EdgeInsets.only(right: 32.w), margin: EdgeInsets.only(right: 32.w),
padding: EdgeInsets.only( padding: EdgeInsets.only(left: 40.w, top: 15.w, bottom: 15.w),
left: 40.w,
top: 15.w,
bottom: 15.w),
decoration: BoxDecoration( decoration: BoxDecoration(
color: Color(0xfff3f3f3), color: Color(0xfff3f3f3),
borderRadius: BorderRadius.all(Radius.circular(36)), borderRadius: BorderRadius.all(Radius.circular(36)),

3
lib/pages/mine_car_page/car_add_page/car_add_page.dart
Unescape View File

@ -85,8 +85,7 @@ class _CarAddPageState extends State<CarAddPage> {
Text( Text(
'您的车牌号', '您的车牌号',
style: TextStyle( style: TextStyle(
fontSize: 28.sp, fontSize: 28.sp, color: Color(0xff333333)),
color: Color(0xff333333)),
), ),
SizedBox(height: 25.w), SizedBox(height: 25.w),
CommonInput( CommonInput(

5
lib/pages/mine_car_page/select_parking_page/select_parking_page.dart
Unescape View File

@ -39,9 +39,8 @@ class _SelectParkingPageState extends State<SelectParkingPage> {
child: Container( child: Container(
width: MediaQuery.of(context).size.width, width: MediaQuery.of(context).size.width,
color: Colors.white, color: Colors.white,
padding: EdgeInsets.symmetric( padding:
vertical: 28.w, EdgeInsets.symmetric(vertical: 28.w, horizontal: 32.w),
horizontal: 32.w),
child: Text( child: Text(
'${widget.bundle.getString('title')}地下车库11号${index + 1}', '${widget.bundle.getString('title')}地下车库11号${index + 1}',
style: TextStyle( style: TextStyle(

3
lib/pages/mine_house_page/house_authenticate_page/house_authenticate_page.dart
Unescape View File

@ -102,8 +102,7 @@ class _HouseAuthenticatePageState extends State<HouseAuthenticatePage> {
Text( Text(
_inputList[index]['title'], _inputList[index]['title'],
style: TextStyle( style: TextStyle(
fontSize: 28.sp, fontSize: 28.sp, color: Color(0xff333333)),
color: Color(0xff333333)),
), ),
SizedBox(height: 25.w), SizedBox(height: 25.w),
CommonInput( CommonInput(

6
lib/pages/opening_code_page/opening_code_page.dart
Unescape View File

@ -39,8 +39,7 @@ class _OpeningCodePageState extends State<OpeningCodePage> {
), ),
decoration: BoxDecoration( decoration: BoxDecoration(
color: Color(0xffffffff), color: Color(0xffffffff),
borderRadius: borderRadius: BorderRadius.all(Radius.circular(8.w)),
BorderRadius.all(Radius.circular(8.w)),
), ),
height: 746.w, height: 746.w,
width: 686.w, width: 686.w,
@ -66,8 +65,7 @@ class _OpeningCodePageState extends State<OpeningCodePage> {
), ),
decoration: BoxDecoration( decoration: BoxDecoration(
color: Color(0xfffffbf6), color: Color(0xfffffbf6),
borderRadius: BorderRadius.all( borderRadius: BorderRadius.all(Radius.circular(8.w)),
Radius.circular(8.w)),
), ),
width: 646.w, width: 646.w,
height: 146.w, height: 146.w,

6
lib/pages/personal/change_nick_name_page.dart
Unescape View File

@ -53,10 +53,8 @@ class _ChangeNickNameState extends State<ChangeNickName> {
decoration: InputDecoration( decoration: InputDecoration(
contentPadding: EdgeInsets.zero, contentPadding: EdgeInsets.zero,
hintText: '${userProvider.userInfoModel.nickName}', hintText: '${userProvider.userInfoModel.nickName}',
hintStyle: TextStyle( hintStyle:
color: Color(0xFF999999), TextStyle(color: Color(0xFF999999), fontSize: 34.sp),
fontSize: 34.sp
),
border: UnderlineInputBorder( border: UnderlineInputBorder(
borderSide: BorderSide( borderSide: BorderSide(
color: Color(0xFFEEEEEE), color: Color(0xFFEEEEEE),

5
lib/pages/personal/order_page.dart
Unescape View File

@ -75,10 +75,7 @@ class _OrderPageState extends State<OrderPage>
onTap: () {}, onTap: () {},
child: Container( child: Container(
margin: EdgeInsets.only(right: 32.w), margin: EdgeInsets.only(right: 32.w),
padding: EdgeInsets.only( padding: EdgeInsets.only(left: 40.w, top: 20.w, bottom: 20.w),
left: 40.w,
top: 20.w,
bottom: 20.w),
decoration: BoxDecoration( decoration: BoxDecoration(
color: BaseStyle.colorf3f3f3, color: BaseStyle.colorf3f3f3,
borderRadius: BorderRadius.all(Radius.circular(36)), borderRadius: BorderRadius.all(Radius.circular(36)),

2
lib/pages/personal/refund_select_page.dart
Unescape View File

@ -23,8 +23,6 @@ class RefundSelectPage extends StatefulWidget {
} }
class _RefundSelectPageState extends State<RefundSelectPage> { class _RefundSelectPageState extends State<RefundSelectPage> {
Container _containerContentList(List<Map<String, dynamic>> listContent) { Container _containerContentList(List<Map<String, dynamic>> listContent) {
return Container( return Container(
child: Column( child: Column(

8
lib/pages/things_page/things_create_page/things_create_page.dart
Unescape View File

@ -135,10 +135,7 @@ class _ThingsCreatePageState extends State<ThingsCreatePage> {
Widget _containerTextField() { Widget _containerTextField() {
return Container( return Container(
padding: EdgeInsets.only( padding: EdgeInsets.only(top: 32.w, left: 22.w, right: 35.w),
top: 32.w,
left: 22.w,
right: 35.w),
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.all(Radius.circular(8)), borderRadius: BorderRadius.all(Radius.circular(8)),
border: Border.all(color: Color(0xffd4cfbe), width: 1.0), border: Border.all(color: Color(0xffd4cfbe), width: 1.0),
@ -207,8 +204,7 @@ class _ThingsCreatePageState extends State<ThingsCreatePage> {
children: [ children: [
Text( Text(
title, title,
style: TextStyle( style: TextStyle(fontSize: 28.sp, color: Color(0xff333333)),
fontSize: 28.sp, color: Color(0xff333333)),
), ),
SizedBox(height: 32.w), SizedBox(height: 32.w),
widget, widget,

17
lib/pages/things_page/things_detail_page/widget/goods_info_card.dart
Unescape View File

@ -49,10 +49,7 @@ class GoodsInfoCard extends StatelessWidget {
blurRadius: 10.0), blurRadius: 10.0),
], ],
), ),
padding: EdgeInsets.only( padding: EdgeInsets.only(top: 25.w, left: 24.w, right: 24.w),
top: 25.w,
left: 24.w,
right: 24.w),
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
@ -97,8 +94,7 @@ class GoodsInfoCard extends StatelessWidget {
child: Text( child: Text(
infodetails, infodetails,
style: TextStyle( style: TextStyle(
fontSize: 28.sp, fontSize: 28.sp, color: Color(0xff333333)),
color: Color(0xff333333)),
), ),
) )
: Column( : Column(
@ -106,8 +102,7 @@ class GoodsInfoCard extends StatelessWidget {
children: detoInfoList children: detoInfoList
.map( .map(
(item) => Container( (item) => Container(
padding: EdgeInsets.only( padding: EdgeInsets.only(top: 8.w),
top: 8.w),
child: Row( child: Row(
mainAxisAlignment: mainAxisAlignment:
MainAxisAlignment.spaceBetween, MainAxisAlignment.spaceBetween,
@ -141,13 +136,11 @@ class GoodsInfoCard extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Container( Container(
margin: EdgeInsets.only( margin: EdgeInsets.only(bottom: 25.w),
bottom: 25.w),
child: Text( child: Text(
'图片信息', '图片信息',
style: TextStyle( style: TextStyle(
fontSize: 28.sp, fontSize: 28.sp, color: Color(0xff333333)),
color: Color(0xff333333)),
), ),
), ),
ImageHorizontalList(imageUrl: listImage), ImageHorizontalList(imageUrl: listImage),

3
lib/pages/things_page/things_detail_page/widget/goods_info_card_button.dart
Unescape View File

@ -121,8 +121,7 @@ class GoodsInfoCardButton extends StatelessWidget {
color: Color(0xff333333), color: Color(0xff333333),
), ),
Container( Container(
margin: margin: EdgeInsets.only(left: 14.w),
EdgeInsets.only(left: 14.w),
child: Text( child: Text(
_listButton[index]['title'], _listButton[index]['title'],
style: TextStyle( style: TextStyle(

4
lib/pages/things_page/widget/fixed_check_box.dart
Unescape View File

@ -18,7 +18,6 @@ class FixedCheckBox extends StatefulWidget {
class _FixedCheckBoxState extends State<FixedCheckBox> { class _FixedCheckBoxState extends State<FixedCheckBox> {
bool _isSelected = false; bool _isSelected = false;
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return GestureDetector( return GestureDetector(
@ -47,8 +46,7 @@ class _FixedCheckBoxState extends State<FixedCheckBox> {
height: 24.w, height: 24.w,
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(24.w), borderRadius: BorderRadius.circular(24.w),
color: kPrimaryColor.withOpacity(_isSelected?1:0) color: kPrimaryColor.withOpacity(_isSelected ? 1 : 0)),
),
), ),
), ),
); );

13
lib/pages/things_page/widget/fixed_detail_page.dart
Unescape View File

@ -102,17 +102,12 @@ class _FixedDetailPageState extends State<FixedDetailPage> {
borderRadius: BorderRadius.circular(36.w), borderRadius: BorderRadius.circular(36.w),
color: Colors.transparent, color: Colors.transparent,
), ),
child: BeeMap child: BeeMap.fixTag[model.appReportRepairVo.type].text.black
.fixTag[model.appReportRepairVo.type]
.text
.black
.size(20.sp) .size(20.sp)
.make(), .make(),
), ),
Spacer(), Spacer(),
BeeMap BeeMap.fixState[model.appReportRepairVo.status].text
.fixState[model.appReportRepairVo.status]
.text
.color(_getColor(_model.appReportRepairVo.status)) .color(_getColor(_model.appReportRepairVo.status))
.size(24.sp) .size(24.sp)
.bold .bold
@ -226,9 +221,7 @@ class _FixedDetailPageState extends State<FixedDetailPage> {
...model.appProcessRecordVo ...model.appProcessRecordVo
.map((e) => Row( .map((e) => Row(
children: [ children: [
BeeMap BeeMap.processClass[e.operationType].text
.processClass[e.operationType]
.text
.color(ktextSubColor) .color(ktextSubColor)
.size(28.sp) .size(28.sp)
.make(), .make(),

6
lib/pages/things_page/widget/things_app_bar.dart
Unescape View File

@ -54,12 +54,10 @@ class ThingsAppBar extends StatelessWidget {
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
fontSize: 28.sp, fontSize: 28.sp,
), ),
labelPadding: labelPadding: EdgeInsets.symmetric(horizontal: 131.5.w),
EdgeInsets.symmetric(horizontal: 131.5.w),
indicatorColor: Color(0xffffc40c), indicatorColor: Color(0xffffc40c),
indicatorSize: TabBarIndicatorSize.label, indicatorSize: TabBarIndicatorSize.label,
indicatorPadding: indicatorPadding: EdgeInsets.symmetric(horizontal: 21.w),
EdgeInsets.symmetric(horizontal: 21.w),
isScrollable: true, isScrollable: true,
controller: tabController, controller: tabController,
tabs: List.generate( tabs: List.generate(

5
lib/provider/cart.dart
Unescape View File

@ -48,8 +48,9 @@ class CartProvidde with ChangeNotifier {
int _goodIndex = cartList.indexWhere((element) { int _goodIndex = cartList.indexWhere((element) {
return element.itemid == _newgoods.itemid; return element.itemid == _newgoods.itemid;
}); });
_goodIndex>-1?cartList[_goodIndex].count+=count: _goodIndex > -1
cartList.add(_newgoods); ? cartList[_goodIndex].count += count
: cartList.add(_newgoods);
} }
cartString = json.encode(tempList).toString(); cartString = json.encode(tempList).toString();
print(cartString); print(cartString);

4
lib/ui/manager/questionnaire/submit_complish_page.dart
Unescape View File

@ -29,7 +29,9 @@ class SubmitComplishPage extends StatelessWidget {
color: this.status ? kPrimaryColor : kDangerColor, color: this.status ? kPrimaryColor : kDangerColor,
), ),
child: Icon( child: Icon(
this.status ? CupertinoIcons.checkmark : CupertinoIcons.multiply, this.status
? CupertinoIcons.checkmark
: CupertinoIcons.multiply,
size: 100.w, size: 100.w,
), ),
), ),

1
lib/ui/manager/visitor/visitor_record_view.dart
Unescape View File

@ -23,7 +23,6 @@ class VisitorRecordView extends StatefulWidget {
class _VisitorRecordViewState extends State<VisitorRecordView> { class _VisitorRecordViewState extends State<VisitorRecordView> {
EasyRefreshController _refreshController = EasyRefreshController(); EasyRefreshController _refreshController = EasyRefreshController();
@override @override
void dispose() { void dispose() {
_refreshController?.dispose(); _refreshController?.dispose();

4
lib/utils/toast.dart
Unescape View File

@ -7,8 +7,8 @@ import 'package:flutter_screenutil/flutter_screenutil.dart';
class Toast { class Toast {
static globalToast(String text) { static globalToast(String text) {
return BotToast.showText(text: return BotToast.showText(
text, text: text,
duration: Duration(milliseconds: 2000), duration: Duration(milliseconds: 2000),
borderRadius: BorderRadius.circular(3.w), borderRadius: BorderRadius.circular(3.w),
backgroundColor: Color(0xff000000).withOpacity(0.85), backgroundColor: Color(0xff000000).withOpacity(0.85),

9
lib/widget/activity_card.dart
Unescape View File

@ -122,8 +122,7 @@ class ActivityCard extends StatelessWidget {
TextSpan( TextSpan(
text: subtitleSecond, text: subtitleSecond,
style: TextStyle( style: TextStyle(
fontSize: BaseStyle.fontSize24, fontSize: BaseStyle.fontSize24, color: ktextPrimary),
color: ktextPrimary),
), ),
]), ]),
), ),
@ -166,7 +165,11 @@ class ActivityCard extends StatelessWidget {
borderRadius: BorderRadius.all(Radius.circular(22)), borderRadius: BorderRadius.all(Radius.circular(22)),
), ),
child: Text( child: Text(
isOver ? '已结束' : isVote ? '去投票' : '去参与', isOver
? '已结束'
: isVote
? '去投票'
: '去参与',
style: TextStyle( style: TextStyle(
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
fontSize: BaseStyle.fontSize22, fontSize: BaseStyle.fontSize22,

14
lib/widget/bee_divider.dart
Unescape View File

@ -19,16 +19,18 @@ class BeeDivider extends StatelessWidget {
this.isHorizontal}) this.isHorizontal})
: super(key: key); : super(key: key);
BeeDivider.horizontal({ BeeDivider.horizontal({
Key key, this.indent, this.endIndent, Key key,
}) : this.indent,
thickness = 1.w, this.endIndent,
}) : thickness = 1.w,
color = Color(0xFFE8E8E8), color = Color(0xFFE8E8E8),
isHorizontal = true, isHorizontal = true,
super(key: key); super(key: key);
BeeDivider.vertical({ BeeDivider.vertical({
Key key, this.indent, this.endIndent, Key key,
}) : this.indent,
thickness = 1.w, this.endIndent,
}) : thickness = 1.w,
color = Color(0xFFE8E8E8), color = Color(0xFFE8E8E8),
isHorizontal = false, isHorizontal = false,
super(key: key); super(key: key);

10
lib/widget/cached_image_wrapper.dart
Unescape View File

@ -40,9 +40,13 @@ class CachedImageWrapper extends StatelessWidget {
width: width, width: width,
height: height, height: height,
decoration: BoxDecoration( decoration: BoxDecoration(
color:isSigned?Colors.transparent:Colors.grey.withOpacity(0.6), color: isSigned
image:isSigned? DecorationImage( ? Colors.transparent
image: imageProvider, fit: BoxFit.cover, scale: 1):null, : Colors.grey.withOpacity(0.6),
image: isSigned
? DecorationImage(
image: imageProvider, fit: BoxFit.cover, scale: 1)
: null,
), ),
); );
}, },

4
lib/widget/circle_trend.dart
Unescape View File

@ -20,9 +20,7 @@ class CircleTrend extends StatefulWidget {
class _CircleTrendState extends State<CircleTrend> { class _CircleTrendState extends State<CircleTrend> {
TextStyle _textStyleTitle() { TextStyle _textStyleTitle() {
return TextStyle( return TextStyle(
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600, fontSize: 52.sp, color: Color(0xff333333));
fontSize: 52.sp,
color: Color(0xff333333));
} }
TextStyle _textStyleSubtitle() { TextStyle _textStyleSubtitle() {

7
lib/widget/community_card.dart
Unescape View File

@ -105,8 +105,8 @@ class _CommunityCardState extends State<CommunityCard> {
); );
} }
Container _cardFooter(String imagePath,title, Container _cardFooter(String imagePath, title, List<String> headList,
List<String> headList, bool isOver, int peopleNum, Function fun) { bool isOver, int peopleNum, Function fun) {
return Container( return Container(
margin: EdgeInsets.only(top: 40.w), margin: EdgeInsets.only(top: 40.w),
child: Row( child: Row(
@ -130,8 +130,7 @@ class _CommunityCardState extends State<CommunityCard> {
Text( Text(
'$peopleNum人已参加', '$peopleNum人已参加',
style: TextStyle( style: TextStyle(
fontSize: BaseStyle.fontSize22, fontSize: BaseStyle.fontSize22, color: ktextPrimary),
color: ktextPrimary),
), ),
], ],
), ),

6
lib/widget/goods_card_skeleton.dart
Unescape View File

@ -59,8 +59,7 @@ class GoodsCardSkeleton extends StatelessWidget {
color: Colors.white, color: Colors.white,
borderRadius: BorderRadius.circular(4), borderRadius: BorderRadius.circular(4),
), ),
margin: margin: EdgeInsets.only(bottom: 6.w),
EdgeInsets.only(bottom: 6.w),
height: 30.w, height: 30.w,
width: double.infinity, width: double.infinity,
), ),
@ -69,8 +68,7 @@ class GoodsCardSkeleton extends StatelessWidget {
color: Colors.white, color: Colors.white,
borderRadius: BorderRadius.circular(4), borderRadius: BorderRadius.circular(4),
), ),
margin: margin: EdgeInsets.only(bottom: 20.w),
EdgeInsets.only(bottom: 20.w),
height: 30.w, height: 30.w,
width: double.infinity, width: double.infinity,
), ),

1
lib/widget/goods_specs_sheet.dart
Unescape View File

@ -305,7 +305,6 @@ class _GoodsSpecsSheetState extends State<GoodsSpecsSheet> {
break; break;
default: default:
} }
}, },
child: Container( child: Container(
decoration: BoxDecoration( decoration: BoxDecoration(

4
lib/widget/others/bee_header_house.dart
Unescape View File

@ -49,9 +49,7 @@ class _BeeHeaderHouseState extends State<BeeHeaderHouse> {
children: [ children: [
kEstateName.text.black.size(32.sp).bold.make(), kEstateName.text.black.size(32.sp).bold.make(),
10.w.heightBox, 10.w.heightBox,
userProvider.currentHouse userProvider.currentHouse.text.black
.text
.black
.size(32.sp) .size(32.sp)
.bold .bold
.make() .make()

1
lib/widget/picker/bee_custom_picker.dart
Unescape View File

@ -8,7 +8,6 @@ import 'package:get/get.dart';
import 'package:akuCommunity/utils/headers.dart'; import 'package:akuCommunity/utils/headers.dart';
class BeeCustomPicker extends StatefulWidget { class BeeCustomPicker extends StatefulWidget {
final Widget body; final Widget body;
final VoidCallback onPressed; final VoidCallback onPressed;
BeeCustomPicker({Key key, this.body, this.onPressed}) : super(key: key); BeeCustomPicker({Key key, this.body, this.onPressed}) : super(key: key);

6
lib/widget/single_image_up.dart
Unescape View File

@ -104,12 +104,10 @@ class _SingleImageUpState extends State<SingleImageUp> {
border: Border.all( border: Border.all(
color: Color(0xffe8e8e8), color: Color(0xffe8e8e8),
width: images.length == 0 ? 0 : 4.w), width: images.length == 0 ? 0 : 4.w),
borderRadius: borderRadius: BorderRadius.all(Radius.circular(6.w)),
BorderRadius.all(Radius.circular(6.w)),
), ),
child: ClipRRect( child: ClipRRect(
borderRadius: borderRadius: BorderRadius.all(Radius.circular(6.w)),
BorderRadius.all(Radius.circular(6.w)),
child: images.length == 0 child: images.length == 0
? Image.asset( ? Image.asset(
widget.imagePath, widget.imagePath,

Write Preview
Loading…
Cancel
Save