From 7faec20596f624631b8bbca8baf7594aa4e56f93 Mon Sep 17 00:00:00 2001 From: PH2 <1293456824@qq.com> Date: Mon, 7 Dec 2020 10:52:45 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=8A=8A=E5=AD=97=E4=BD=93=E7=A7=BB?= =?UTF-8?q?=E5=88=B0comm=E5=BA=93=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/fonts/DIN-Bold.otf | Bin 28640 -> 0 bytes assets/fonts/DIN-Medium.otf | Bin 20924 -> 0 bytes assets/fonts/DIN-Regular.otf | Bin 20676 -> 0 bytes .../item/search_result_item_page.dart | 3 ++ lib/pages/withdraw_page/withdraw_page.dart | 2 +- .../goods_share_template.dart | 6 +-- .../goods_details/coupon/counpon_widget.dart | 2 +- .../footer/goods_details_footer_widget.dart | 4 +- .../price/goods_details_price_widget.dart | 6 +-- .../home/home_goods/home_goods_item.dart | 6 +-- .../home_goods/home_goods_item_single.dart | 6 +-- .../hot_ranking_goods/hot_ranking_goods.dart | 10 ++--- .../mine/mine_data/mine_data_widget.dart | 6 +-- .../mine_header/mine_header_container.dart | 2 +- .../search/tabbar/model/search_tab_model.dart | 36 +++++++++++++++--- .../search/tabbar/search_tab_widget.dart | 6 +-- lib/widgets/team/data/team_data_widet.dart | 4 +- .../team/fans_list/team_fans_item.dart | 8 ++-- .../team/fans_list/team_fans_number_item.dart | 4 +- .../team/recommend/team_recommend_widget.dart | 6 +-- .../team_details_month_data_widget.dart | 2 +- .../team_details_referrer_widget.dart | 8 ++-- .../wallet/wallet_data/wallet_data.dart | 4 +- .../wallet/wallet_detail/wallet_detail.dart | 6 +-- .../wallet_bil_detail/wallet_bil_detail.dart | 2 +- pubspec.yaml | 11 ------ 26 files changed, 84 insertions(+), 66 deletions(-) delete mode 100644 assets/fonts/DIN-Bold.otf delete mode 100644 assets/fonts/DIN-Medium.otf delete mode 100644 assets/fonts/DIN-Regular.otf diff --git a/assets/fonts/DIN-Bold.otf b/assets/fonts/DIN-Bold.otf deleted file mode 100644 index 782e68e87cb6e13104c45c64eebd0f14eea66ad5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 28640 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 syxn!9@#G6HYK7zlnxfGU^iol8hb%Oil_)S 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 I5ybBQ0jnylJ^%m! diff --git a/assets/fonts/DIN-Regular.otf b/assets/fonts/DIN-Regular.otf deleted file mode 100644 index 2ea937973e4e93ecf83c8a21101e6142101cd184..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 20676 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 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