diff --git a/assets/fonts/DIN-Bold.otf b/assets/fonts/DIN-Bold.otf deleted file mode 100644 index 782e68e..0000000 Binary files a/assets/fonts/DIN-Bold.otf and /dev/null differ diff --git a/assets/fonts/DIN-Medium.otf b/assets/fonts/DIN-Medium.otf deleted file mode 100644 index ceed4be..0000000 Binary files a/assets/fonts/DIN-Medium.otf and /dev/null differ diff --git a/assets/fonts/DIN-Regular.otf b/assets/fonts/DIN-Regular.otf deleted file mode 100644 index 2ea9379..0000000 Binary files a/assets/fonts/DIN-Regular.otf and /dev/null differ diff --git a/lib/pages/search_result_page/item/search_result_item_page.dart b/lib/pages/search_result_page/item/search_result_item_page.dart index 915282d..703c5ab 100644 --- a/lib/pages/search_result_page/item/search_result_item_page.dart +++ b/lib/pages/search_result_page/item/search_result_item_page.dart @@ -3,6 +3,8 @@ import 'package:pull_to_refresh/pull_to_refresh.dart'; import 'package:zhiying_base_widget/pages/search_result_page/item/bloc/search_result_item_bloc.dart'; import 'package:zhiying_base_widget/pages/search_result_page/item/bloc/search_result_item_repository.dart'; import 'package:zhiying_base_widget/widgets/home/home_goods/skeleton/home_goods_sk.dart'; +import 'package:zhiying_base_widget/widgets/refresh/refresh_header/refresh_gif_header.dart'; +import 'package:zhiying_base_widget/widgets/refresh/refresh_header/refresh_header.dart'; import 'package:zhiying_base_widget/widgets/search_result/goods_list/bloc/search_result_goods_list_bloc.dart'; import 'package:zhiying_base_widget/widgets/search_result/goods_list/bloc/search_result_goods_list_repository.dart'; import 'package:zhiying_comm/zhiying_comm.dart'; @@ -142,6 +144,7 @@ class _SearchResultItemPageContianerState extends State { fontSize: 30, color: Color(0xff333333), fontFamily: 'Din-Bold', - package: 'zhiying_base_widget', + package: 'zhiying_comm', ), decoration: BoxDecoration(color: Colors.transparent), keyboardType: TextInputType.numberWithOptions(decimal: true), diff --git a/lib/template/goods_share_template/goods_share_template.dart b/lib/template/goods_share_template/goods_share_template.dart index fbde4e3..22b0983 100644 --- a/lib/template/goods_share_template/goods_share_template.dart +++ b/lib/template/goods_share_template/goods_share_template.dart @@ -248,7 +248,7 @@ class GoodsShareTemplate extends StatelessWidget { color: HexColor.fromHex('#b3b3b3'), fontWeight: FontWeight.normal, fontFamily: 'Din', - package: 'zhiying_base_widget', + package: 'zhiying_comm', decoration: TextDecoration.lineThrough, ), )); @@ -266,7 +266,7 @@ class GoodsShareTemplate extends StatelessWidget { color: HexColor.fromHex('#ff4242'), fontWeight: FontWeight.bold, fontFamily: 'Din-Bold', - package: 'zhiying_base_widget', + package: 'zhiying_comm', ), ), TextSpan( @@ -276,7 +276,7 @@ class GoodsShareTemplate extends StatelessWidget { color: HexColor.fromHex('#ff4242'), fontWeight: FontWeight.bold, fontFamily: 'Din-Bold', - package: 'zhiying_base_widget', + package: 'zhiying_comm', ), ) ]), diff --git a/lib/widgets/goods_details/coupon/counpon_widget.dart b/lib/widgets/goods_details/coupon/counpon_widget.dart index 7a9cfa5..2b36ed8 100644 --- a/lib/widgets/goods_details/coupon/counpon_widget.dart +++ b/lib/widgets/goods_details/coupon/counpon_widget.dart @@ -129,7 +129,7 @@ class _CounponWidgetContainerState extends State { /// 价格 Text(model?.coupon_price ?? '100', - style: TextStyle(fontSize: 30, color: HexColor.fromHex(model?.coupon_price_color ?? '#FFFFFF'), fontFamily: 'Din', package: 'zhiying_base_widget')), + style: TextStyle(fontSize: 30, color: HexColor.fromHex(model?.coupon_price_color ?? '#FFFFFF'), fontFamily: 'Din', package: 'zhiying_comm')), ], ); } diff --git a/lib/widgets/goods_details/footer/goods_details_footer_widget.dart b/lib/widgets/goods_details/footer/goods_details_footer_widget.dart index 37462bd..758d85d 100644 --- a/lib/widgets/goods_details/footer/goods_details_footer_widget.dart +++ b/lib/widgets/goods_details/footer/goods_details_footer_widget.dart @@ -218,7 +218,7 @@ class _GoodsDetailsFooterContainerState extends State<_GoodsDetailsFooterContain TextSpan( text: model?.share_value ?? '0.0', style: TextStyle( - fontSize: 15, fontWeight: FontWeight.bold, color: HexColor.fromHex(model?.share_earn_color ?? '#FFFFFF'), fontFamily: 'Din', package: 'zhiying_base_widget')), + fontSize: 15, fontWeight: FontWeight.bold, color: HexColor.fromHex(model?.share_earn_color ?? '#FFFFFF'), fontFamily: 'Din', package: 'zhiying_comm')), ]), ), Text( @@ -260,7 +260,7 @@ class _GoodsDetailsFooterContainerState extends State<_GoodsDetailsFooterContain fontWeight: FontWeight.bold, color: HexColor.fromHex(model?.save_earn_val_color ?? '#FFFFFF'), fontFamily: 'Din', - package: 'zhiying_base_widget', + package: 'zhiying_comm', )), ]), ), diff --git a/lib/widgets/goods_details/price/goods_details_price_widget.dart b/lib/widgets/goods_details/price/goods_details_price_widget.dart index 6c5dd88..7626f52 100644 --- a/lib/widgets/goods_details/price/goods_details_price_widget.dart +++ b/lib/widgets/goods_details/price/goods_details_price_widget.dart @@ -68,7 +68,7 @@ class GoodsDetailsPriceWidget extends StatelessWidget { return Row( children: [ Text(model?.symbol ?? '¥ ', style: TextStyle(color: HexColor.fromHex( model?.price_color ??'#FF4242'), fontSize: 15)), - Text(model?.current_price ?? '0', style: TextStyle(color: HexColor.fromHex(model?.price_color ?? '#FF4242'), fontSize: 30, fontFamily: 'Din', package: 'zhiying_base_widget', fontWeight: FontWeight.bold)), + Text(model?.current_price ?? '0', style: TextStyle(color: HexColor.fromHex(model?.price_color ?? '#FF4242'), fontSize: 30, fontFamily: 'Din', package: 'zhiying_comm', fontWeight: FontWeight.bold)), ], ); } @@ -78,7 +78,7 @@ class GoodsDetailsPriceWidget extends StatelessWidget { return Container( decoration: BoxDecoration(color: HexColor.fromHex(model?.points_bg_color ?? '#FFEFDA'), borderRadius: BorderRadius.circular(5)), padding: const EdgeInsets.only(left: 4, right: 7.5, top: 4, bottom: 4), - child: Text(model?.point ?? '+ 0.00 积分', style: TextStyle(color: HexColor.fromHex( model?.points_color ?? '#B78107'), fontSize: 9, fontFamily: 'Din', package: 'zhiying_base_widget')), + child: Text(model?.point ?? '+ 0.00 积分', style: TextStyle(color: HexColor.fromHex( model?.points_color ?? '#B78107'), fontSize: 9, fontFamily: 'Din', package: 'zhiying_comm')), ); } @@ -87,7 +87,7 @@ class GoodsDetailsPriceWidget extends StatelessWidget { return Column( children: [ Text( model?.is_coupon == '1' ? model?.ticket ?? '券后' : model?.hand_price_text ?? '到手价', style: TextStyle(color: HexColor.fromHex(model?.ticket_color ?? '#FF4242'), fontSize: 11)), - Text('${model?.symbol}${model?.market_price}' ?? '¥ 0', style: TextStyle(color: HexColor.fromHex(model?.ticket_price_color ?? '#FF4242'), fontSize: 10, fontFamily: 'Din', package: 'zhiying_base_widget', decoration: TextDecoration.lineThrough)), + Text('${model?.symbol}${model?.market_price}' ?? '¥ 0', style: TextStyle(color: HexColor.fromHex(model?.ticket_price_color ?? '#FF4242'), fontSize: 10, fontFamily: 'Din', package: 'zhiying_comm', decoration: TextDecoration.lineThrough)), ], ); } diff --git a/lib/widgets/home/home_goods/home_goods_item.dart b/lib/widgets/home/home_goods/home_goods_item.dart index 9e065f5..3b56a47 100644 --- a/lib/widgets/home/home_goods/home_goods_item.dart +++ b/lib/widgets/home/home_goods/home_goods_item.dart @@ -306,7 +306,7 @@ class HomeGoodsItem extends StatelessWidget { color: HexColor.fromHex(style?.listStyle?.currentPriceColor), fontWeight: FontWeight.bold, fontFamily: 'Din', - package: 'zhiying_base_widget', + package: 'zhiying_comm', ), ), TextSpan( @@ -316,7 +316,7 @@ class HomeGoodsItem extends StatelessWidget { color: HexColor.fromHex(style?.listStyle?.currentPriceColor), fontWeight: FontWeight.bold, fontFamily: 'Din', - package: 'zhiying_base_widget', + package: 'zhiying_comm', ), ) ]), @@ -334,7 +334,7 @@ class HomeGoodsItem extends StatelessWidget { color: HexColor.fromHex(style?.listStyle?.marketPriceColor), fontWeight: FontWeight.normal, fontFamily: 'Din', - package: 'zhiying_base_widget', + package: 'zhiying_comm', decoration: TextDecoration.lineThrough, ), )); diff --git a/lib/widgets/home/home_goods/home_goods_item_single.dart b/lib/widgets/home/home_goods/home_goods_item_single.dart index 2ce1318..d29953a 100644 --- a/lib/widgets/home/home_goods/home_goods_item_single.dart +++ b/lib/widgets/home/home_goods/home_goods_item_single.dart @@ -326,7 +326,7 @@ class HomeGoodsItemSingle extends StatelessWidget { color: HexColor.fromHex(style?.listStyle?.currentPriceColor), fontWeight: FontWeight.bold, fontFamily: 'Din', - package: 'zhiying_base_widget', + package: 'zhiying_comm', ), ), TextSpan( @@ -336,7 +336,7 @@ class HomeGoodsItemSingle extends StatelessWidget { color: HexColor.fromHex(style?.listStyle?.currentPriceColor), fontWeight: FontWeight.bold, fontFamily: 'Din', - package: 'zhiying_base_widget', + package: 'zhiying_comm', ), ) ]), @@ -354,7 +354,7 @@ class HomeGoodsItemSingle extends StatelessWidget { color: HexColor.fromHex(style?.listStyle?.marketPriceColor), fontWeight: FontWeight.normal, fontFamily: 'Din', - package: 'zhiying_base_widget', + package: 'zhiying_comm', decoration: TextDecoration.lineThrough, ), )); diff --git a/lib/widgets/hot_ranking/hot_ranking_goods/hot_ranking_goods.dart b/lib/widgets/hot_ranking/hot_ranking_goods/hot_ranking_goods.dart index fd01893..3837925 100644 --- a/lib/widgets/hot_ranking/hot_ranking_goods/hot_ranking_goods.dart +++ b/lib/widgets/hot_ranking/hot_ranking_goods/hot_ranking_goods.dart @@ -130,7 +130,7 @@ class HotRankingGoods extends StatelessWidget { .couponFontColor), fontSize: 11, fontFamily: 'Din', - package: 'zhiying_base_widget'), + package: 'zhiying_comm'), ), ), ), @@ -165,7 +165,7 @@ class HotRankingGoods extends StatelessWidget { .commissionFontColor), fontSize: 11, fontFamily: 'Din', - package: 'zhiying_base_widget'), + package: 'zhiying_comm'), ), ), ), @@ -196,7 +196,7 @@ class HotRankingGoods extends StatelessWidget { fontSize: 20, fontWeight: FontWeight.bold, fontFamily: 'Din', - package: 'zhiying_base_widget'), + package: 'zhiying_comm'), ), SizedBox( width: 6, @@ -211,7 +211,7 @@ class HotRankingGoods extends StatelessWidget { fontSize: 11, decoration: TextDecoration.lineThrough, fontFamily: 'Din', - package: 'zhiying_base_widget'), + package: 'zhiying_comm'), ), ), ], @@ -244,7 +244,7 @@ class HotRankingGoods extends StatelessWidget { color: Colors.white, fontSize: 11, fontFamily: 'Din', - package: 'zhiying_base_widget'), + package: 'zhiying_comm'), ), )) ], diff --git a/lib/widgets/mine/mine_data/mine_data_widget.dart b/lib/widgets/mine/mine_data/mine_data_widget.dart index 62a43db..f8e36db 100644 --- a/lib/widgets/mine/mine_data/mine_data_widget.dart +++ b/lib/widgets/mine/mine_data/mine_data_widget.dart @@ -93,7 +93,7 @@ class MineDataWidget extends StatelessWidget { '' '' '', - package: 'zhiying_base_widget', + package: 'zhiying_comm', ), ), ], @@ -228,7 +228,7 @@ class MineDataWidget extends StatelessWidget { fontSize: 18, color: HexColor.fromHex(_style.gridViewValueColor), fontFamily: 'Din-Bold', - package: 'zhiying_base_widget'), + package: 'zhiying_comm'), ), ), ], @@ -260,7 +260,7 @@ class MineDataWidget extends StatelessWidget { fontSize: 12, color: HexColor.fromHex(_style.gridViewValueColor), fontFamily: 'Din-Bold', - package: 'zhiying_base_widget'), + package: 'zhiying_comm'), ), ), ], diff --git a/lib/widgets/mine/mine_header/mine_header_container.dart b/lib/widgets/mine/mine_header/mine_header_container.dart index d01c268..432e3ab 100644 --- a/lib/widgets/mine/mine_header/mine_header_container.dart +++ b/lib/widgets/mine/mine_header/mine_header_container.dart @@ -134,7 +134,7 @@ class _MineHeaderContainerState extends State { color: HexColor.fromHex( widget.staticModel.userNameColor), fontFamily: 'Din', - package: 'zhiying_base_widget', + package: 'zhiying_comm', ), ), Container( diff --git a/lib/widgets/search/tabbar/model/search_tab_model.dart b/lib/widgets/search/tabbar/model/search_tab_model.dart index c83642c..ec65bf8 100644 --- a/lib/widgets/search/tabbar/model/search_tab_model.dart +++ b/lib/widgets/search/tabbar/model/search_tab_model.dart @@ -1,16 +1,42 @@ class SearchTabModel { + String isShow; + String modName; + String nameColor; + String lineSelectColor; + String nameSelectColor; + List search_icon_list; - SearchTabModel({this.search_icon_list}); + SearchTabModel({ + this.isShow, + this.modName, + this.nameColor, + this.lineSelectColor, + this.nameSelectColor, + this.search_icon_list, + }); - factory SearchTabModel.fromJson(Map json) { - return SearchTabModel( - search_icon_list: json['search_icon_list'] != null ? (json['search_icon_list'] as List).map((i) => SearchTabItemModel.fromJson(i)).toList() : null, - ); + SearchTabModel.fromJson(Map json) { + isShow = json['is_show']; + modName = json['mod_name']; + nameColor = json['name_color']; + lineSelectColor = json['line_select_color']; + nameSelectColor = json['name_select_color']; + if (json['search_icon_list'] != null) { + search_icon_list = new List(); + json['search_icon_list'].forEach((v) { + search_icon_list.add(new SearchTabItemModel.fromJson(v)); + }); + } } Map toJson() { final Map data = new Map(); + data['is_show'] = this.isShow; + data['mod_name'] = this.modName; + data['name_color'] = this.nameColor; + data['line_select_color'] = this.lineSelectColor; + data['name_select_color'] = this.nameSelectColor; if (this.search_icon_list != null) { data['search_icon_list'] = this.search_icon_list.map((v) => v.toJson()).toList(); } diff --git a/lib/widgets/search/tabbar/search_tab_widget.dart b/lib/widgets/search/tabbar/search_tab_widget.dart index a031040..6d75c4d 100644 --- a/lib/widgets/search/tabbar/search_tab_widget.dart +++ b/lib/widgets/search/tabbar/search_tab_widget.dart @@ -102,8 +102,8 @@ class _SearchTabWidgetState extends State { controller: _tabController, isScrollable: true, labelStyle: TextStyle( fontSize: 14, fontWeight: FontWeight.bold), - unselectedLabelColor: HexColor.fromHex('#999999'), - labelColor: HexColor.fromHex('#FF4242'), + unselectedLabelColor: HexColor.fromHex( model?.nameColor ?? '#999999'), + labelColor: HexColor.fromHex(model?.nameSelectColor ?? '#FF4242'), // indicatorSize: TabBarIndicatorSize.label, indicator: MaterialIndicator( height: 2.5, @@ -111,7 +111,7 @@ class _SearchTabWidgetState extends State { topRightRadius: 8, bottomLeftRadius: 8, bottomRightRadius: 8, - color: HexColor.fromHex('#FF4242'), + color: HexColor.fromHex(model?.lineSelectColor ?? '#FF4242'), horizontalPadding: 25, ), tabs: model.search_icon_list.map((item) { diff --git a/lib/widgets/team/data/team_data_widet.dart b/lib/widgets/team/data/team_data_widet.dart index 6e5e76e..fc258d4 100644 --- a/lib/widgets/team/data/team_data_widet.dart +++ b/lib/widgets/team/data/team_data_widet.dart @@ -148,7 +148,7 @@ class TeamDataWidget extends StatelessWidget { children: [ /// nummber\ Text(number, - style: TextStyle(color: HexColor.fromHex(numberColor), fontSize: numberSize, fontWeight: FontWeight.bold, fontFamily: 'Din', package: 'zhiying_base_widget')), + style: TextStyle(color: HexColor.fromHex(numberColor), fontSize: numberSize, fontWeight: FontWeight.bold, fontFamily: 'Din', package: 'zhiying_comm')), /// icon Visibility( @@ -163,7 +163,7 @@ class TeamDataWidget extends StatelessWidget { // children: [ // TextSpan( // text: number, - // style: TextStyle(color: HexColor.fromHex(numberColor), fontSize: numberSize, fontWeight: FontWeight.bold, fontFamily: 'Din', package: 'zhiying_base_widget'), + // style: TextStyle(color: HexColor.fromHex(numberColor), fontSize: numberSize, fontWeight: FontWeight.bold, fontFamily: 'Din', package: 'zhiying_comm'), // ), // WidgetSpan( // alignment: ui.PlaceholderAlignment.top, diff --git a/lib/widgets/team/fans_list/team_fans_item.dart b/lib/widgets/team/fans_list/team_fans_item.dart index bcd885f..1132cd0 100644 --- a/lib/widgets/team/fans_list/team_fans_item.dart +++ b/lib/widgets/team/fans_list/team_fans_item.dart @@ -151,7 +151,7 @@ class _TeamFansItemState extends State { TextSpan( text: widget?.dataModel?.blurMobile ?? '', style: TextStyle( - color: HexColor.fromHex(widget?.styleModel?.phoneColor ?? '#333333'), fontSize: 11, fontFamily: 'Din', package: 'zhiying_base_widget')), + color: HexColor.fromHex(widget?.styleModel?.phoneColor ?? '#333333'), fontSize: 11, fontFamily: 'Din', package: 'zhiying_comm')), /// 复制按钮 WidgetSpan( @@ -204,7 +204,7 @@ class _TeamFansItemState extends State { fontWeight: FontWeight.bold, fontSize: 11, fontFamily: 'Din', - package: 'zhiying_base_widget')), + package: 'zhiying_comm')), /// 复制安妮 WidgetSpan( @@ -238,7 +238,7 @@ class _TeamFansItemState extends State { color: HexColor.fromHex(widget?.styleModel?.infoBarLastLoginValueColor ?? '#909090'), fontSize: 11, fontFamily: 'Din', - package: 'zhiying_base_widget')), + package: 'zhiying_comm')), ]), ) ], @@ -370,7 +370,7 @@ class _TeamFansItemState extends State { crossAxisAlignment: CrossAxisAlignment.center, children: [ /// Number - Text(number, style: TextStyle(color: HexColor.fromHex(numberColor), fontSize: numberSize, fontWeight: FontWeight.bold, fontFamily: 'Din', package: 'zhiying_base_widget')), + Text(number, style: TextStyle(color: HexColor.fromHex(numberColor), fontSize: numberSize, fontWeight: FontWeight.bold, fontFamily: 'Din', package: 'zhiying_comm')), /// Text Text(text, style: TextStyle(color: HexColor.fromHex(textColor), fontSize: textSize)), diff --git a/lib/widgets/team/fans_list/team_fans_number_item.dart b/lib/widgets/team/fans_list/team_fans_number_item.dart index c9be469..d8431ba 100644 --- a/lib/widgets/team/fans_list/team_fans_number_item.dart +++ b/lib/widgets/team/fans_list/team_fans_number_item.dart @@ -27,7 +27,7 @@ class TeamFansNumberItemWidget extends StatelessWidget { fontSize: 18, color: HexColor.fromHex(styleModel?.teamViewItemTitleList[0]?.valueColor ?? '#FF4242'), fontFamily: 'Din', - package: 'zhiying_base_widget', + package: 'zhiying_comm', fontWeight: FontWeight.bold), ), TextSpan( @@ -43,7 +43,7 @@ class TeamFansNumberItemWidget extends StatelessWidget { fontSize: 18, color: HexColor.fromHex(styleModel?.teamViewItemTitleList[1]?.valueColor ?? '#FF4242'), fontFamily: 'Din', - package: 'zhiying_base_widget', + package: 'zhiying_comm', fontWeight: FontWeight.bold)), TextSpan( text: styleModel?.teamViewItemTitleList[1]?.unitText ?? '人', diff --git a/lib/widgets/team/recommend/team_recommend_widget.dart b/lib/widgets/team/recommend/team_recommend_widget.dart index 239fa69..1841b8c 100644 --- a/lib/widgets/team/recommend/team_recommend_widget.dart +++ b/lib/widgets/team/recommend/team_recommend_widget.dart @@ -316,7 +316,7 @@ class __TeamRecommendWidgetState extends State<_TeamRecommendWidgetContainer> { style: TextStyle(fontSize: 11, color: HexColor.fromHex(widget?.styleModel?.headerReferrerInvitecodeColor ?? '#909090'))), Text(dataModel?.referrer_invite_code ?? '', style: TextStyle( - fontSize: 11, color: HexColor.fromHex(widget?.styleModel?.headerReferrerInvitecodeColor ?? '#909090'), fontFamily: 'Din', package: 'zhiying_base_widget')), + fontSize: 11, color: HexColor.fromHex(widget?.styleModel?.headerReferrerInvitecodeColor ?? '#909090'), fontFamily: 'Din', package: 'zhiying_comm')), ], ); } @@ -328,7 +328,7 @@ class __TeamRecommendWidgetState extends State<_TeamRecommendWidgetContainer> { Text(widget?.styleModel?.headerReferrerPhoneText ?? '手机号：', style: TextStyle(fontSize: 11, color: HexColor.fromHex(widget?.styleModel?.headerReferrerPhoneColor ?? '#AFAFAF'))), Text(dataModel?.referrer_phone ?? '', - style: TextStyle(fontSize: 11, color: HexColor.fromHex(widget?.styleModel?.headerReferrerPhoneColor ?? '#AFAFAF'), fontFamily: 'Din', package: 'zhiying_base_widget')), + style: TextStyle(fontSize: 11, color: HexColor.fromHex(widget?.styleModel?.headerReferrerPhoneColor ?? '#AFAFAF'), fontFamily: 'Din', package: 'zhiying_comm')), const SizedBox(width: 6), /// 拷贝按钮 @@ -343,7 +343,7 @@ class __TeamRecommendWidgetState extends State<_TeamRecommendWidgetContainer> { children: [ Text(widget?.styleModel?.headerReferrerWxText ?? '微信号：', style: TextStyle(fontSize: 11, color: HexColor.fromHex(widget?.styleModel?.headerReferrerWxColor ?? '#AFAFAF'))), Text(dataModel?.referrer_wechat ?? '', - style: TextStyle(fontSize: 11, color: HexColor.fromHex(widget?.styleModel?.headerReferrerWxColor ?? '#AFAFAF'), fontFamily: 'Din', package: 'zhiying_base_widget')), + style: TextStyle(fontSize: 11, color: HexColor.fromHex(widget?.styleModel?.headerReferrerWxColor ?? '#AFAFAF'), fontFamily: 'Din', package: 'zhiying_comm')), const SizedBox(width: 6), /// 拷贝按钮 diff --git a/lib/widgets/team_details/month_data/team_details_month_data_widget.dart b/lib/widgets/team_details/month_data/team_details_month_data_widget.dart index 69ec50a..88b7c4c 100644 --- a/lib/widgets/team_details/month_data/team_details_month_data_widget.dart +++ b/lib/widgets/team_details/month_data/team_details_month_data_widget.dart @@ -94,7 +94,7 @@ class TeamDetailsMonthDataWidget extends StatelessWidget { /// number Text( number, - style: TextStyle(color: HexColor.fromHex(numberColor), fontSize: numberSize, fontWeight: FontWeight.bold, fontFamily: 'Din', package: 'zhiying_base_widget'), + style: TextStyle(color: HexColor.fromHex(numberColor), fontSize: numberSize, fontWeight: FontWeight.bold, fontFamily: 'Din', package: 'zhiying_comm'), ), /// text diff --git a/lib/widgets/team_details/referrer/team_details_referrer_widget.dart b/lib/widgets/team_details/referrer/team_details_referrer_widget.dart index cc8cda1..b61de18 100644 --- a/lib/widgets/team_details/referrer/team_details_referrer_widget.dart +++ b/lib/widgets/team_details/referrer/team_details_referrer_widget.dart @@ -142,7 +142,7 @@ class TeamDetailsReferrerWidget extends StatelessWidget { TextSpan(text: styleModel?.phone_text ?? '手机号：', style: TextStyle(color: HexColor.fromHex(styleModel?.phone_color ?? '#333333'), fontSize: 11)), TextSpan( text: dataModel?.blurMobile ?? '', - style: TextStyle(color: HexColor.fromHex(styleModel?.phone_color ?? '#333333'), fontSize: 11, fontFamily: 'Din', package: 'zhiying_base_widget')), + style: TextStyle(color: HexColor.fromHex(styleModel?.phone_color ?? '#333333'), fontSize: 11, fontFamily: 'Din', package: 'zhiying_comm')), /// 复制按钮 _getCopyWidget(dataModel?.phone), @@ -196,7 +196,7 @@ class TeamDetailsReferrerWidget extends StatelessWidget { color: HexColor.fromHex(styleModel?.wx_value_color ?? '#333333'), fontSize: 11, fontFamily: 'Din', - package: 'zhiying_base_widget')), + package: 'zhiying_comm')), _getCopyWidget(dataModel?.wechat), ]), ), @@ -207,10 +207,10 @@ class TeamDetailsReferrerWidget extends StatelessWidget { text: TextSpan(children: [ TextSpan( text: styleModel?.last_login_text ?? '最近登陆', - style: TextStyle(color: HexColor.fromHex(styleModel?.last_login_text_color ?? '#909090'), fontSize: 11, fontFamily: 'Din', package: 'zhiying_base_widget')), + style: TextStyle(color: HexColor.fromHex(styleModel?.last_login_text_color ?? '#909090'), fontSize: 11, fontFamily: 'Din', package: 'zhiying_comm')), TextSpan( text: dataModel?.lastLogin ?? '', - style: TextStyle(color: HexColor.fromHex(styleModel?.last_login_value_color ?? '#909090'), fontSize: 11, fontFamily: 'Din', package: 'zhiying_base_widget')), + style: TextStyle(color: HexColor.fromHex(styleModel?.last_login_value_color ?? '#909090'), fontSize: 11, fontFamily: 'Din', package: 'zhiying_comm')), ]), ), ], diff --git a/lib/widgets/wallet/wallet_data/wallet_data.dart b/lib/widgets/wallet/wallet_data/wallet_data.dart index fba20a2..a1b56ca 100644 --- a/lib/widgets/wallet/wallet_data/wallet_data.dart +++ b/lib/widgets/wallet/wallet_data/wallet_data.dart @@ -112,7 +112,7 @@ class _WalletDataState extends State { color: HexColor.fromHex( model.headerCashOutTextColor), fontFamily: 'Din-Bold', - package: 'zhiying_base_widget', + package: 'zhiying_comm', ), ), ], @@ -178,7 +178,7 @@ class _WalletDataState extends State { color: HexColor.fromHex(item.valueColor), fontSize: 15, fontFamily: 'Din-Bold', - package: 'zhiying_base_widget'), + package: 'zhiying_comm'), ), Text( item.text, diff --git a/lib/widgets/wallet/wallet_detail/wallet_detail.dart b/lib/widgets/wallet/wallet_detail/wallet_detail.dart index f7b84b7..aa5344f 100644 --- a/lib/widgets/wallet/wallet_detail/wallet_detail.dart +++ b/lib/widgets/wallet/wallet_detail/wallet_detail.dart @@ -180,7 +180,7 @@ class _WalletDetailState extends State color: Colors.red, fontSize: 20, fontFamily: 'Din', - package: 'zhiying_base_widget', + package: 'zhiying_comm', fontWeight: FontWeight.bold), ) ], @@ -332,7 +332,7 @@ class _WalletDetailState extends State Text(dataMap[item.itemList[0].vauleKey], style: TextStyle( fontFamily: 'Din', - package: 'zhiying_base_widget', + package: 'zhiying_comm', fontWeight: FontWeight.bold, fontSize: 17, color: @@ -390,7 +390,7 @@ class _WalletDetailState extends State fontSize: 17, color: HexColor.fromHex(item.itemList[1].valueColor), fontFamily: 'Din', - package: 'zhiying_base_widget', + package: 'zhiying_comm', fontWeight: FontWeight.bold), ) ], diff --git a/lib/widgets/wallet_bil_detail/wallet_bil_detail.dart b/lib/widgets/wallet_bil_detail/wallet_bil_detail.dart index 81f79a0..96c062b 100644 --- a/lib/widgets/wallet_bil_detail/wallet_bil_detail.dart +++ b/lib/widgets/wallet_bil_detail/wallet_bil_detail.dart @@ -299,7 +299,7 @@ class _WalletBilDetailState extends State color: HexColor.fromHex(inputItemStyle.amountColor), fontSize: 15, fontFamily: 'Din', - package: 'zhiying_base_widget'), + package: 'zhiying_comm'), ) ], ) diff --git a/pubspec.yaml b/pubspec.yaml index ad87c6d..d668095 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -81,17 +81,6 @@ flutter: # "family" key with the font family name, and a "fonts" key with a # list giving the asset and other descriptors for the font. For # example: - fonts: - - family: Din-Bold - fonts: - - asset: assets/fonts/DIN-Bold.otf - - family: Din-Medium - fonts: - - asset: assets/fonts/DIN-Medium.otf - - family: Din - fonts: - - asset: assets/fonts/DIN-Regular.otf - # # For details regarding fonts in packages, see # https://flutter.dev/custom-fonts/#from-packages