diff --git a/lib/constants/api.dart b/lib/constants/api.dart index d2d0ff9..35233b1 100644 --- a/lib/constants/api.dart +++ b/lib/constants/api.dart @@ -213,6 +213,8 @@ class GoodsApi { "/v1/goods/list/purchase/ranking"; static const String goods_code_search = '/v1/goods/code/search'; + + static const String keyWords = '/v1/goods/keyWords/es';//分词 } class OrderApi { diff --git a/lib/constants/api_v2.dart b/lib/constants/api_v2.dart index 9f36111..9b7aaef 100644 --- a/lib/constants/api_v2.dart +++ b/lib/constants/api_v2.dart @@ -175,6 +175,10 @@ class UserAPI { String get wechatUnboundhandle => '/v2/app/command/user/unbundling_wx'; + ///搜索栏的关键字 + String get getKeyWords => '/v2/app/aku_school/search_word'; + + } class BenefitAPI { diff --git a/lib/main.dart b/lib/main.dart index b969c26..d58c634 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -230,6 +230,7 @@ class MyAppState extends State { }); } + final botToastBuilder = BotToastInit(); @override Widget build(BuildContext context) { SystemChrome.setPreferredOrientations([ @@ -252,7 +253,14 @@ class MyAppState extends State { } }, child: GetMaterialApp( - builder: BotToastInit(), + builder: (context, child) { + return MediaQuery( + //设置文字大小不随系统设置改变 + data: MediaQuery.of(context).copyWith(textScaleFactor: 1.0), + child: BotToastInit().call(context,child), + ); + }, + //builder: BotToastInit(), navigatorObservers: [BotToastNavigatorObserver()], localizationsDelegates: [ GlobalMaterialLocalizations.delegate, diff --git a/lib/models/user_brief_info_model.dart b/lib/models/user_brief_info_model.dart index dd27e77..9c89728 100644 --- a/lib/models/user_brief_info_model.dart +++ b/lib/models/user_brief_info_model.dart @@ -164,8 +164,10 @@ class OrderCenter { num waitRecv; num afterSales; num evaNum; + num afterNum; + num collectionNum; - OrderCenter({this.waitPay, this.waitSend, this.waitRecv, this.afterSales,this.evaNum}); + OrderCenter({this.waitPay, this.waitSend, this.waitRecv, this.afterSales,this.evaNum,this.afterNum,this.collectionNum}); OrderCenter.fromJson(Map json) { waitPay = json['waitPay']; @@ -173,6 +175,8 @@ class OrderCenter { waitRecv = json['waitRecv']; afterSales = json['afterSales']; evaNum = json['eva_num']; + afterNum = json['after_num']; + collectionNum = json['collection_num']; } Map toJson() { @@ -182,6 +186,8 @@ class OrderCenter { data['waitRecv'] = this.waitRecv; data['afterSales'] = this.afterSales; data['eva_num'] = this.evaNum; + data['after_num']= this.afterNum; + data['collection_num']= this.collectionNum; return data; } } diff --git a/lib/pages/home/function/home_fuc.dart b/lib/pages/home/function/home_fuc.dart index 34a8e9e..368aaea 100644 --- a/lib/pages/home/function/home_fuc.dart +++ b/lib/pages/home/function/home_fuc.dart @@ -1,3 +1,4 @@ +import 'package:recook/constants/api.dart'; import 'package:recook/constants/api_v2.dart'; import 'package:recook/manager/http_manager.dart'; import 'package:recook/pages/home/model/aku_video_list_model.dart'; @@ -31,4 +32,38 @@ class HomeFuc { return result.data['code']; } } + + //推荐分词列表 + static Future> recommendWords(String keywords) async { + ResultData result = await HttpManager.post(GoodsApi.keyWords, { + 'keyword': keywords, + }); + + if (result.data != null) { + if (result.data['data'] != null) { + return (result.data['data'] as List) + .map((e) => KeyWordModel.fromJson(e)) + .toList(); + } + else + return []; + } + else + return []; + } +} +class KeyWordModel { + String token; + + KeyWordModel({this.token}); + + KeyWordModel.fromJson(Map json) { + token = json['token']; + } + + Map toJson() { + final Map data = new Map(); + data['token'] = this.token; + return data; + } } diff --git a/lib/pages/home/home_page.dart b/lib/pages/home/home_page.dart index 88d7331..7d1bb80 100644 --- a/lib/pages/home/home_page.dart +++ b/lib/pages/home/home_page.dart @@ -29,12 +29,14 @@ import 'package:recook/models/category_model.dart'; import 'package:recook/models/country_list_model.dart'; import 'package:recook/pages/boosting_activitiy/boosting_activity.dart'; import 'package:recook/pages/buy_tickets/choose_tickets_type_page.dart'; +import 'package:recook/pages/home/search_page.dart'; import 'package:recook/pages/home/widget/good_high_commission_page.dart'; import 'package:recook/pages/home/widget/good_preferential_list_page.dart'; import 'package:recook/pages/home/widget/goods_hot_list_page.dart'; import 'package:recook/pages/live/models/king_coin_list_model.dart'; import 'package:cached_network_image/cached_network_image.dart'; import 'package:recook/pages/seckill_activity/seckill_activity_page.dart'; +import 'package:recook/pages/user/functions/user_func.dart'; import 'package:recook/utils/storage/hive_store.dart'; import 'package:recook/widgets/custom_cache_image.dart'; import 'package:sharesdk_plugin/sharesdk_plugin.dart'; @@ -155,6 +157,7 @@ class _HomePageState extends BaseStoreState StateSetter _bannerState; GlobalKey _animatedBackgroundState = GlobalKey(); GlobalKey _sliverAppBarGlobalKey = GlobalKey(); + String keyWords = '锅'; GifController _gifController; @override @@ -179,7 +182,15 @@ class _HomePageState extends BaseStoreState @override void initState() { super.initState(); + Future.delayed(Duration.zero, () async { + UserManager.instance.kingCoinListModelList = + await UserFunc.getKingCoinList(); + setState(() { + + }); + }); _getWeather();//部分机型获取地址较慢 所以放在外面先获取 + requestPermission().then((value) { if (value) { //监听要在设置参数之前 否则无法获取定位 @@ -298,6 +309,7 @@ class _HomePageState extends BaseStoreState _userLottery(); _getNoticeList(); _userCardNoticeList(); + } // 获取当前页面需要刷新的数据 @@ -305,6 +317,14 @@ class _HomePageState extends BaseStoreState _getActiviteList(); _getBannerList(); _getPromotionList(); + _getKeyWords(); + Future.delayed(Duration.zero, () async { + kingCoinListModelList = + await UserFunc.getKingCoinList(); + setState(() { + + }); + }); } _handleOpenInstallEvents() { @@ -527,7 +547,7 @@ class _HomePageState extends BaseStoreState width: 6, ), Text( - "厨房小工具", + keyWords, style: TextStyle( color: Colors.white.withOpacity(0.9), fontSize: 13 * 2.sp, @@ -537,7 +557,8 @@ class _HomePageState extends BaseStoreState ), ), onTap: () { - AppRouter.push(context, RouteName.SEARCH); + Get.to(SearchPage(keyWords: keyWords,)); + //AppRouter.push(context, RouteName.SEARCH); }, ); String locationCityName = @@ -640,8 +661,7 @@ class _HomePageState extends BaseStoreState timeHeight + tabbarHeight - ScreenUtil().statusBarHeight - - tabbarHeight + - 4+84 + 4 : weatherHeight + bannerHeight + buttonsHeight + @@ -652,7 +672,7 @@ class _HomePageState extends BaseStoreState timeHeight + tabbarHeight - ScreenUtil().statusBarHeight + - 4+84, + 4, flexibleSpace: _flexibleSpaceBar(context), bottom: _promotionList == null || _promotionList.length == 0 ? PreferredSize( @@ -748,6 +768,15 @@ class _HomePageState extends BaseStoreState } FlexibleSpaceBar _flexibleSpaceBar(context) { + if(kingCoinListModelList == null){ + Future.delayed(Duration.zero, () async { + kingCoinListModelList = + await UserFunc.getKingCoinList(); + setState(() { + + }); + }); + } return FlexibleSpaceBar( collapseMode: CollapseMode.pin, background: Container( @@ -1066,76 +1095,76 @@ class _HomePageState extends BaseStoreState mainAxisAlignment: MainAxisAlignment.center, children: [ _buttonTitleRow( - AppConfig.commissionByRoleLevel + !AppConfig.commissionByRoleLevel ? kingCoinListModelList[0].data[0] : kingCoinListModelList[0].data[1], // AppConfig.commissionByRoleLevel ? "京东优选" : "京东优选", onPressed: () async { - if (AppConfig.commissionByRoleLevel) { - _KingCionGetto(kingCoinListModelList[0].data[0] + if (!AppConfig.commissionByRoleLevel) { + _kingCoinGet(kingCoinListModelList[0].data[0] .kingName.name); } else { - _KingCionGetto(kingCoinListModelList[0].data[1] + _kingCoinGet(kingCoinListModelList[0].data[1] .kingName.name); } } ), _buttonTitleRow( - AppConfig.commissionByRoleLevel + !AppConfig.commissionByRoleLevel ? kingCoinListModelList[1].data[0] : kingCoinListModelList[1].data[1], // AppConfig.commissionByRoleLevel ? "京东优选" : "京东优选", onPressed: () async { - if (AppConfig.commissionByRoleLevel) { - _KingCionGetto(kingCoinListModelList[1].data[0] + if (!AppConfig.commissionByRoleLevel) { + _kingCoinGet(kingCoinListModelList[1].data[0] .kingName.name); } else { - _KingCionGetto(kingCoinListModelList[1].data[1] + _kingCoinGet(kingCoinListModelList[1].data[1] .kingName.name); } } ), _buttonTitleRow( - AppConfig.commissionByRoleLevel + !AppConfig.commissionByRoleLevel ? kingCoinListModelList[2].data[0] : kingCoinListModelList[2].data[1], // AppConfig.commissionByRoleLevel ? "京东优选" : "京东优选", onPressed: () async { - if (AppConfig.commissionByRoleLevel) { - _KingCionGetto(kingCoinListModelList[2].data[0] + if (!AppConfig.commissionByRoleLevel) { + _kingCoinGet(kingCoinListModelList[2].data[0] .kingName.name); } else { - _KingCionGetto(kingCoinListModelList[2].data[1] + _kingCoinGet(kingCoinListModelList[2].data[1] .kingName.name); } } ), _buttonTitleRow( - AppConfig.commissionByRoleLevel + !AppConfig.commissionByRoleLevel ? kingCoinListModelList[3].data[0] : kingCoinListModelList[3].data[1], // AppConfig.commissionByRoleLevel ? "京东优选" : "京东优选", onPressed: () async { - if (AppConfig.commissionByRoleLevel) { - _KingCionGetto(kingCoinListModelList[3].data[0] + if (!AppConfig.commissionByRoleLevel) { + _kingCoinGet(kingCoinListModelList[3].data[0] .kingName.name); } else { - _KingCionGetto(kingCoinListModelList[3].data[1] + _kingCoinGet(kingCoinListModelList[3].data[1] .kingName.name); } } ), _buttonTitleRow( - AppConfig.commissionByRoleLevel + !AppConfig.commissionByRoleLevel ? kingCoinListModelList[4].data[0] : kingCoinListModelList[4].data[1], // AppConfig.commissionByRoleLevel ? "京东优选" : "京东优选", onPressed: () async { - if (AppConfig.commissionByRoleLevel) { - _KingCionGetto(kingCoinListModelList[4].data[0] + if (!AppConfig.commissionByRoleLevel) { + _kingCoinGet(kingCoinListModelList[4].data[0] .kingName.name); } else { - _KingCionGetto(kingCoinListModelList[4].data[1] + _kingCoinGet(kingCoinListModelList[4].data[1] .kingName.name); } } @@ -1155,76 +1184,76 @@ class _HomePageState extends BaseStoreState mainAxisAlignment: MainAxisAlignment.center, children: [ _buttonTitleRow( - AppConfig.commissionByRoleLevel + !AppConfig.commissionByRoleLevel ? kingCoinListModelList[5].data[0] : kingCoinListModelList[5].data[1], // AppConfig.commissionByRoleLevel ? "京东优选" : "京东优选", onPressed: () async { - if (AppConfig.commissionByRoleLevel) { - _KingCionGetto(kingCoinListModelList[5].data[0] + if (!AppConfig.commissionByRoleLevel) { + _kingCoinGet(kingCoinListModelList[5].data[0] .kingName.name); } else { - _KingCionGetto(kingCoinListModelList[5].data[1] + _kingCoinGet(kingCoinListModelList[5].data[1] .kingName.name); } } ), _buttonTitleRow( - AppConfig.commissionByRoleLevel + !AppConfig.commissionByRoleLevel ? kingCoinListModelList[6].data[0] : kingCoinListModelList[6].data[1], // AppConfig.commissionByRoleLevel ? "京东优选" : "京东优选", onPressed: () async { - if (AppConfig.commissionByRoleLevel) { - _KingCionGetto(kingCoinListModelList[6].data[0] + if (!AppConfig.commissionByRoleLevel) { + _kingCoinGet(kingCoinListModelList[6].data[0] .kingName.name); } else { - _KingCionGetto(kingCoinListModelList[6].data[1] + _kingCoinGet(kingCoinListModelList[6].data[1] .kingName.name); } } ), _buttonTitleRow( - AppConfig.commissionByRoleLevel + !AppConfig.commissionByRoleLevel ? kingCoinListModelList[7].data[0] : kingCoinListModelList[7].data[1], // AppConfig.commissionByRoleLevel ? "京东优选" : "京东优选", onPressed: () async { - if (AppConfig.commissionByRoleLevel) { - _KingCionGetto(kingCoinListModelList[7].data[0] + if (!AppConfig.commissionByRoleLevel) { + _kingCoinGet(kingCoinListModelList[7].data[0] .kingName.name); } else { - _KingCionGetto(kingCoinListModelList[7].data[1] + _kingCoinGet(kingCoinListModelList[7].data[1] .kingName.name); } } ), _buttonTitleRow( - AppConfig.commissionByRoleLevel + !AppConfig.commissionByRoleLevel ? kingCoinListModelList[8].data[0] : kingCoinListModelList[8].data[1], // AppConfig.commissionByRoleLevel ? "京东优选" : "京东优选", onPressed: () async { - if (AppConfig.commissionByRoleLevel) { - _KingCionGetto(kingCoinListModelList[8].data[0] + if (!AppConfig.commissionByRoleLevel) { + _kingCoinGet(kingCoinListModelList[8].data[0] .kingName.name); } else { - _KingCionGetto(kingCoinListModelList[8].data[1] + _kingCoinGet(kingCoinListModelList[8].data[1] .kingName.name); } } ), _buttonTitleRow( - AppConfig.commissionByRoleLevel + !AppConfig.commissionByRoleLevel ? kingCoinListModelList[9].data[0] : kingCoinListModelList[9].data[1], // AppConfig.commissionByRoleLevel ? "京东优选" : "京东优选", onPressed: () async { - if (AppConfig.commissionByRoleLevel) { - _KingCionGetto(kingCoinListModelList[9].data[0] + if (!AppConfig.commissionByRoleLevel) { + _kingCoinGet(kingCoinListModelList[9].data[0] .kingName.name); } else { - _KingCionGetto(kingCoinListModelList[9].data[1] + _kingCoinGet(kingCoinListModelList[9].data[1] .kingName.name); } } @@ -1294,7 +1323,7 @@ class _HomePageState extends BaseStoreState ); } - _KingCionGetto(String name) async { + _kingCoinGet(String name) async { switch(name){ case '京东优选': List firstCategoryList = []; @@ -1308,12 +1337,22 @@ class _HomePageState extends BaseStoreState } break; case '我的权益': + if (!UserManager.instance.haveLogin) { + AppRouter.push(context, RouteName.LOGIN); + return; + } + AppRouter.push( globalContext, RouteName.SHOP_PAGE_USER_RIGHTS_PAGE, ); break; case '一键邀请': + if (!UserManager.instance.haveLogin) { + AppRouter.push(context, RouteName.LOGIN); + return; + } + ShareTool().inviteShare(context, customTitle: Container()); break; case '热销榜单': @@ -1487,6 +1526,27 @@ class _HomePageState extends BaseStoreState @override bool get wantKeepAlive => true; + _getKeyWords() async { + ResultData resultData = await HttpManager.post(APIV2.userAPI.getKeyWords, {}); + if (resultData.data!=null) { + if(resultData.data['data']!=null){ + setState(() { + keyWords = resultData.data['data']; + }); + + } + return; + } + // BannerListModel model = BannerListModel.fromJson(resultData.data); + // if (model.code != HttpStatus.SUCCESS) { + // showError(model.msg); + // return; + // } + // _bannerState(() { + // _bannerList = model.data; + // }); + } + _getBannerList() async { ResultData resultData = await HttpManager.post(HomeApi.banner_list, {}); if (!resultData.result) { @@ -1503,6 +1563,8 @@ class _HomePageState extends BaseStoreState }); } + + _getActiviteList() async { ResultData resultData = await HttpManager.post(HomeApi.activity_list, {}); if (!resultData.result) { diff --git a/lib/pages/home/items/item_brand_detail_grid.dart b/lib/pages/home/items/item_brand_detail_grid.dart index 4babaab..92d4aae 100644 --- a/lib/pages/home/items/item_brand_detail_grid.dart +++ b/lib/pages/home/items/item_brand_detail_grid.dart @@ -184,7 +184,7 @@ class BrandDetailGridItem extends StatelessWidget { ): WidgetSpan(child: SizedBox()), TextSpan( text: this.goods.goodsName, - style: AppTextStyle.generate(14 * 2.sp, + style: AppTextStyle.generate(15 * 2.sp, fontWeight: FontWeight.w600), ), ], @@ -286,7 +286,7 @@ class BrandDetailGridItem extends StatelessWidget { style: TextStyle( letterSpacing: -1, wordSpacing: -1, - fontSize: 18 * 2.sp, + fontSize: 19 * 2.sp, color: Color(0xFFC92219), fontWeight: FontWeight.w500), ), diff --git a/lib/pages/home/search_page.dart b/lib/pages/home/search_page.dart index 0fcfa9e..1b1f296 100644 --- a/lib/pages/home/search_page.dart +++ b/lib/pages/home/search_page.dart @@ -13,6 +13,7 @@ import 'package:flutter/rendering.dart'; import 'package:flutter_gifimage/flutter_gifimage.dart'; import 'package:recook/models/goods_detail_model.dart' hide Data, Promotion; import 'package:recook/pages/home/classify/mvp/goods_detail_model_impl.dart'; +import 'package:recook/pages/home/function/home_fuc.dart'; import 'package:shared_preferences/shared_preferences.dart'; import 'package:waterfall_flow/waterfall_flow.dart'; @@ -53,9 +54,10 @@ import 'package:recook/widgets/refresh_widget.dart'; class SearchPage extends StatefulWidget { final int countryId; - final int jdType; //1为京东商品 空为非jd + final int jdType; + final String keyWords;//1为京东商品 空为非jd - const SearchPage({Key key, this.countryId, this.jdType}) : super(key: key); + const SearchPage({Key key, this.countryId, this.jdType, this.keyWords}) : super(key: key); @override State createState() { @@ -79,6 +81,8 @@ class _SearchPageState extends BaseStoreState TextEditingController _textEditController; List _searchHistory = []; + + List _recommendWords = [];//推荐分词 List _barBool = [false, false, false]; bool _startSearch = false; @@ -113,6 +117,10 @@ class _SearchPageState extends BaseStoreState @override void initState() { + // Future.delayed(Duration.zero, () async { + // _recommendWords = await HomeFuc.recommendWords(widget.keyWords); + // }); + if (widget.jdType == 1) { _jDType = 1; _sortType = SortType.priceAsc; @@ -125,7 +133,7 @@ class _SearchPageState extends BaseStoreState period: Duration(milliseconds: 700), ); getSearchListFromSharedPreferences(); - _textEditController = TextEditingController(); + _textEditController = TextEditingController(text: widget.keyWords); _filterController = FilterToolBarController(); super.initState(); _presenter = GoodsListPresenterImpl(); @@ -168,7 +176,20 @@ class _SearchPageState extends BaseStoreState controller: _filterController, body: Column( children: [ + _filterToolBar(context), + Offstage( + offstage: !(_listViewController.getData().length==0), + child: Container( + color: Colors.white, + child: Container( + padding: EdgeInsets.only(top: 5.rw), + child: Column( + children: [ + _recommendWidget(), + ], + )), + )), Expanded(child: _buildList(context)), ], ), @@ -403,7 +424,7 @@ class _SearchPageState extends BaseStoreState SliverToBoxAdapter( child: NoDataView( title: "换个关键词搜索一下吧~", - height: 500, + height: 200, ), ), SliverToBoxAdapter( @@ -744,6 +765,9 @@ class _SearchPageState extends BaseStoreState keyword: _searchText, JDType: _jDType, ); + + _recommendWords = await HomeFuc.recommendWords(_searchText); + cancel(); _startSearch = true; setState(() {}); @@ -934,6 +958,71 @@ class _SearchPageState extends BaseStoreState ); } + _keyWordsTitle(){ + return Container( + child: Container( + margin: EdgeInsets.only(left: 10, top: 5,right: 10), + child: + Text( + '没找到相关宝贝,试试', + style: TextStyle( + color: Colors.black, + fontWeight: FontWeight.w500, + fontSize: 14 * 2.sp, + ), + ), + )); + } + + _recommendWidget() { + List keyWordList = []; + int leg = 0; + if (_recommendWords != null && _recommendWords.length > 0) { + for (int i=0;i<_recommendWords.length;i++) { + keyWordList.add(Padding( + padding: EdgeInsets.only(right: 10, bottom: 5), + child: ChoiceChip( + backgroundColor: AppColor.frenchColor, + // disabledColor: Colors.blue, + labelStyle: TextStyle(fontSize: 15 * 2.sp, color: Colors.black), + labelPadding: EdgeInsets.only(left: 20, right: 20), + materialTapTargetSize: MaterialTapTargetSize.shrinkWrap, + onSelected: (bool value) async { + _searchText = _recommendWords[i].token; + _textEditController.text = _recommendWords[i].token; + FocusManager.instance.primaryFocus.unfocus(); + _callRefresh(); + setState(() {}); + }, + label: Text(_recommendWords[i].token), + selected: false, + ), + )); + } + keyWordList.insert(0, _keyWordsTitle()); + } + + + + return Container( + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + width: MediaQuery.of(context).size.width, + padding: EdgeInsets.only(left: 10, right: 10), + child: Wrap( + children: keyWordList, + ), + ), + // Spacer() + ], + ), + ); + } + + getSearchListFromSharedPreferences() async { // 获取实例 var prefs = await SharedPreferences.getInstance(); diff --git a/lib/pages/home/widget/modify_detail_app_bar.dart b/lib/pages/home/widget/modify_detail_app_bar.dart index d685e44..3488212 100644 --- a/lib/pages/home/widget/modify_detail_app_bar.dart +++ b/lib/pages/home/widget/modify_detail_app_bar.dart @@ -8,8 +8,11 @@ */ import 'package:flutter/material.dart'; +import 'package:get/get.dart'; +import 'package:recook/base/base_store_state.dart'; import 'package:recook/constants/header.dart'; +import 'package:recook/pages/user/my_favorites_page.dart'; import 'package:recook/widgets/custom_app_bar.dart'; import 'package:recook/widgets/custom_image_button.dart'; @@ -28,7 +31,7 @@ class DetailAppBar extends StatefulWidget { } } -class _DetailAppBarState extends State { +class _DetailAppBarState extends BaseStoreState { // appbar背景色 Color _appBarBgColor = Colors.transparent; @@ -75,7 +78,7 @@ class _DetailAppBarState extends State { } @override - Widget build(BuildContext context) { + Widget buildContext(BuildContext context, {store}) { return _buildCustomAppBar(context); } @@ -109,7 +112,7 @@ class _DetailAppBarState extends State { ), actions: [ Container( - margin: EdgeInsets.only(right: 10), + padding: EdgeInsets.only(right: 10), child: Center( child: CustomImageButton( // icon: Icon( @@ -117,10 +120,34 @@ class _DetailAppBarState extends State { // size: 16*2.sp, // color: selectedOne ? _itemColor : Colors.black, // ), + dotPosition: DotPosition(right: rSize(0), top: 0), + //dotTextColor: AppColor.themeColor, + dotSize: 12, + dotFontSize: 7.rsp, + dotNum: getStore().state.userBrief.orderCenter.collectionNum == 0 + ? '' + : getStore().state.userBrief.orderCenter.collectionNum > 99 + ? 99 + : getStore() + .state + .userBrief + .orderCenter + .collectionNum + .toString(), + dotColor: AppColor.themeColor, + icon: ImageIcon( + AssetImage( + "assets/navigation_like.png", + ), + size: 18, + color: selectedOne ? _itemColor : Colors.black, + ), buttonSize: rSize(30), borderRadius: BorderRadius.all(Radius.circular(20)), - // backgroundColor: selectedOne ? _itemBgColor : Colors.transparent, - // onPressed: widget.onShareClick, + backgroundColor: selectedOne ? _itemBgColor : Colors.transparent, + onPressed: () { + Get.to(MyFavoritesPage()); + }, ), ), ) diff --git a/lib/pages/user/functions/user_func.dart b/lib/pages/user/functions/user_func.dart index c5790f9..87fe4a5 100644 --- a/lib/pages/user/functions/user_func.dart +++ b/lib/pages/user/functions/user_func.dart @@ -35,7 +35,7 @@ class UserFunc { } //获取金刚区图标 - static Future> getKingCoinList() async { + static Future> getKingCoinList() async {//new ResultData result = await HttpManager.post(APIV2.userAPI.getKingCionNew, { 'user_id': UserManager.instance.user.info.id != null ? UserManager.instance.user.info.id diff --git a/lib/pages/user/widget/order_central_view.dart b/lib/pages/user/widget/order_central_view.dart index 5e27e69..211301f 100644 --- a/lib/pages/user/widget/order_central_view.dart +++ b/lib/pages/user/widget/order_central_view.dart @@ -201,13 +201,13 @@ class _OrderCentralViewState extends BaseStoreState { // dotColor: AppColor.themeColor, padding: EdgeInsets.symmetric(vertical: rSize(10)), dotPosition: DotPosition(right: rSize(8), top: 0), - dotNum: getStore().state.userBrief.orderCenter.evaNum == 0 + dotNum: getStore().state.userBrief.orderCenter.afterNum == 0 ? '' : getStore() .state .userBrief .orderCenter - .evaNum + .afterNum .toString(), dotColor: AppColor.themeColor, icon: Image.asset( diff --git a/lib/pages/user/widget/user_app_bar_v2.dart b/lib/pages/user/widget/user_app_bar_v2.dart index 9d9980d..34bdbe4 100644 --- a/lib/pages/user/widget/user_app_bar_v2.dart +++ b/lib/pages/user/widget/user_app_bar_v2.dart @@ -71,29 +71,29 @@ class _UserAppBarV2State extends BaseStoreState { children: [ Row( children: [ - CustomImageButton( - icon: ImageIcon( - AssetImage( - "assets/navigation_like.png", - ), - size: 18, - ), - title: "收藏", - fontSize: 10, - color: getCurrentAppItemColor(), - onPressed: () { - push(RouteName.MY_FAVORITE_PAGE); - }, - ), - 10.wb, + // CustomImageButton( + // icon: ImageIcon( + // AssetImage( + // "assets/navigation_like.png", + // ), + // size: 18, + // ), + // title: "收藏", + // fontSize: 10, + // color: getCurrentAppItemColor(), + // onPressed: () { + // push(RouteName.MY_FAVORITE_PAGE); + // }, + // ), + // 10.wb, CustomImageButton( // icon: Icon(AppIcons.icon_message), icon: ImageIcon( AssetImage("assets/navigation_msg.png"), - size: 18, + size: 30, ), title: "客服", - fontSize: 10, + fontSize: 12, color: getCurrentAppItemColor(), onPressed: () { MQManager.goToChat( diff --git a/lib/pages/welcome/launch_widget.dart b/lib/pages/welcome/launch_widget.dart index 1d3cb11..0ed6be6 100644 --- a/lib/pages/welcome/launch_widget.dart +++ b/lib/pages/welcome/launch_widget.dart @@ -43,6 +43,7 @@ class _LaunchWidgetState extends BaseStoreState void initState() { super.initState(); + WidgetsBinding.instance.addPostFrameCallback((callback) async { await Future.delayed(Duration(milliseconds: 2450)); if (HiveStore.appBox.get('privacy_init') == null) { @@ -60,6 +61,13 @@ class _LaunchWidgetState extends BaseStoreState } else HiveStore.appBox.put('privacy_init', true); } + Future.delayed(Duration.zero, () async { + UserManager.instance.kingCoinListModelList = + await UserFunc.getKingCoinList(); + setState(() { + + }); + }); PowerLogger.start(context, debug: AppConfig.debug);//AppConfig.debug 在正式服数据下进行调试 cameras = await availableCameras(); PackageInfo _packageInfo = await PackageInfo.fromPlatform(); @@ -75,10 +83,7 @@ class _LaunchWidgetState extends BaseStoreState licenseKey: key, ); }); - Future.delayed(Duration.zero, () async { - UserManager.instance.kingCoinListModelList = - await UserFunc.getKingCoinList(); - }); + AppRouter.fadeAndReplaced(globalContext, RouteName.WELCOME_PAGE); }); diff --git a/lib/widgets/custom_image_button.dart b/lib/widgets/custom_image_button.dart index 289e59f..0cd9722 100644 --- a/lib/widgets/custom_image_button.dart +++ b/lib/widgets/custom_image_button.dart @@ -37,6 +37,7 @@ class CustomImageButton extends StatefulWidget { this.child, this.dotNum = "", this.dotColor = Colors.red, + this.dotTextColor = Colors.white, this.dotPosition = const DotPosition( top: 0, left: null, @@ -73,6 +74,7 @@ class CustomImageButton extends StatefulWidget { final double dotSize; final double dotFontSize; final bool greyWhenTapped; + final Color dotTextColor; @override State createState() { @@ -192,7 +194,7 @@ class _CustomImageButtonState extends State { textAlign: TextAlign.center, style: AppTextStyle.generate( widget.dotFontSize.rw, - color: Colors.white, + color: widget.dotTextColor, fontWeight: FontWeight.w500), ), )) diff --git a/pubspec.yaml b/pubspec.yaml index 5d2cf9d..6d8eb3c 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -2,7 +2,7 @@ name: recook description: Recook Market App. publish_to: "none" -version: 1.13.2-dev+320 +version: 1.13.3-dev+321 environment: sdk: ">=2.10.0 <3.0.0"