diff --git a/assets/svg/qiandao.svg b/assets/svg/qiandao.svg new file mode 100644 index 00000000..5ce65e44 --- /dev/null +++ b/assets/svg/qiandao.svg @@ -0,0 +1,11 @@ + + + 位图 + + + + + + + + \ No newline at end of file diff --git a/lib/community/headlines/article_page.dart b/lib/community/headlines/article_page.dart index ded44c87..9dabdec0 100644 --- a/lib/community/headlines/article_page.dart +++ b/lib/community/headlines/article_page.dart @@ -160,6 +160,7 @@ class _ArticlePage extends State _onRefresh(){ queryHeadlinesBanner(); queryHeadlinesList();//分类列表 + queryArticleList(); } @override diff --git a/lib/community/headlines/headlines_collection.dart b/lib/community/headlines/headlines_collection.dart index 8b493968..a80a2bfe 100644 --- a/lib/community/headlines/headlines_collection.dart +++ b/lib/community/headlines/headlines_collection.dart @@ -46,10 +46,12 @@ class _HeadlinesCollection extends State { itemBuilder: (context, position) { return GestureDetector( onTap: () { + List
articles = []; + articles.addAll(widget.articles); Navigator.of(context).pushNamed( '/router/headlines_column_details', - arguments: {"categoryId":widget.articles[position].categoryId, - "articles":widget.articles}); + arguments: {"id":widget.headlines[position].id, + "articles":articles}); }, child: headlinesCollectionItem(widget.headlines[position]), ); diff --git a/lib/community/headlines/headlines_column_details.dart b/lib/community/headlines/headlines_column_details.dart index 66676bc8..6f41fc03 100644 --- a/lib/community/headlines/headlines_column_details.dart +++ b/lib/community/headlines/headlines_column_details.dart @@ -10,7 +10,6 @@ import 'package:huixiang/retrofit/data/page.dart'; import 'package:huixiang/retrofit/retrofit_api.dart'; import 'package:huixiang/utils/font_weight.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; -import 'package:huixiang/view_widget/classic_header.dart'; import 'package:huixiang/view_widget/custom_image.dart'; import 'package:pull_to_refresh/pull_to_refresh.dart'; import 'package:shared_preferences/shared_preferences.dart'; @@ -34,15 +33,14 @@ class _HeadlinesColumnDetails extends State List headlines = []; final RefreshController refreshController = RefreshController(); int pageNum = 1; - final ScrollController scrollController = ScrollController(); @override void initState() { super.initState(); articles = widget.arguments["articles"]; WidgetsBinding.instance.addObserver(this); - queryHeadlinesDetails(widget.arguments["categoryId"]); - queryArticleList(widget.arguments["categoryId"]); + queryHeadlinesDetails(widget.arguments["id"]); + queryArticleList(widget.arguments["id"]); } ///文章合集详情 @@ -80,7 +78,7 @@ class _HeadlinesColumnDetails extends State "searchKey": "", "state": 1, "type": 2, - "categoryId":widget.arguments["categoryId"] + "categoryId":categoryId }).catchError((onError){ refreshController.refreshFailed(); refreshController.loadFailed(); @@ -104,24 +102,11 @@ class _HeadlinesColumnDetails extends State } } - _onRefresh(){ - queryHeadlinesDetails(widget.arguments["categoryId"]); - queryArticleList(widget.arguments["categoryId"]);//分类列表 - } - @override Widget build(BuildContext context) { return Scaffold( body: Container( - child: SmartRefresher( - controller: refreshController, - enablePullDown: true, - enablePullUp: false, - header: MyHeader(), - physics: ClampingScrollPhysics(), - onRefresh: _onRefresh, - scrollController: scrollController, - child:Column( + child: Column( children: [ Expanded( child: SingleChildScrollView( @@ -251,7 +236,7 @@ class _HeadlinesColumnDetails extends State ), ListView.builder( padding: EdgeInsets.zero, - itemCount:articles.length, + itemCount:articles == null ? 0 : articles.length, scrollDirection: Axis.vertical, shrinkWrap: true, physics: NeverScrollableScrollPhysics(), @@ -276,7 +261,7 @@ class _HeadlinesColumnDetails extends State ), ], ), - ),) + ), ); } diff --git a/lib/home/home_view/shortcut_operation.dart b/lib/home/home_view/shortcut_operation.dart index 2cfdaa20..82e76630 100644 --- a/lib/home/home_view/shortcut_operation.dart +++ b/lib/home/home_view/shortcut_operation.dart @@ -35,12 +35,12 @@ class _ShortcutOperation extends State { Widget build(BuildContext context) { return Container( height: 150.h, - margin: EdgeInsets.only(bottom:15), + margin: EdgeInsets.only(bottom:15,left: 16,right: 16), child: Row( crossAxisAlignment: CrossAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center, children: [ - GestureDetector( + Expanded(child:GestureDetector( onTap: (){ widget.goToOrder(); }, @@ -77,8 +77,8 @@ class _ShortcutOperation extends State { ], ), ), - ), - GestureDetector( + ) ), + Expanded(child:GestureDetector( onTap: (){ Navigator.of(context).pushNamed('/router/recharge_page'); }, @@ -115,8 +115,8 @@ class _ShortcutOperation extends State { ], ), ), - ), - GestureDetector( + ), ), + Expanded(child: GestureDetector( onTap: (){ Navigator.of(context).pushNamed('/router/roll_center_page'); }, @@ -153,7 +153,7 @@ class _ShortcutOperation extends State { ], ), ), - ), + ),), ], ), ); diff --git a/lib/integral/intergra_view/in_for_points.dart b/lib/integral/intergra_view/in_for_points.dart index 316c4640..9bc5e9b5 100644 --- a/lib/integral/intergra_view/in_for_points.dart +++ b/lib/integral/intergra_view/in_for_points.dart @@ -1,5 +1,6 @@ import 'package:flutter/material.dart'; import 'package:flutter_staggered_grid_view/flutter_staggered_grid_view.dart'; +import 'package:flutter_svg/svg.dart'; import 'package:huixiang/generated/l10n.dart'; import 'package:huixiang/retrofit/data/sign_info.dart'; import 'package:huixiang/utils/font_weight.dart'; @@ -164,8 +165,8 @@ class _InForPoints extends State { alignment: Alignment.center, child: Image.asset( "assets/image/icon_gold_blessing.png", - width: 59.w, - height: 59.h, + width: 59, + height: 59, ), ), ], @@ -200,10 +201,10 @@ class _InForPoints extends State { ), Container( alignment: Alignment.center, - child: Image.asset( - "assets/image/icon_gold_coin.png", - width: 30.w, - height: 30.h, + child: SvgPicture.asset( + "assets/svg/qiandao.svg", + width: 30, + height: 30, ), ), Container( diff --git a/lib/integral/intergra_view/integral_task.dart b/lib/integral/intergra_view/integral_task.dart index 637b0959..ecb3ce43 100644 --- a/lib/integral/intergra_view/integral_task.dart +++ b/lib/integral/intergra_view/integral_task.dart @@ -106,20 +106,20 @@ class _IntegralTask extends State { taskImg(String taskType) { switch (taskType) { - case "bill_type_point_login": + case "bill_type_point_order": return "assets/image/icon_integral_login.png"; break; case "bill_type_point_share": return "assets/image/icon_integral_share.png"; break; - case "bill_type_point_order": + case "bill_type_point_login": return "assets/image/icon_integral_order.png"; break; case "bill_type_point_signin": return "assets/image/icon_integral_sign.png"; break; } - return "assets/image/icon_integral_share.png"; + return "assets/image/icon_integral_login.png"; } Widget taskItem(Task task) { @@ -202,7 +202,7 @@ class _IntegralTask extends State { ), ) : RoundButton( - text: "x10", + text: "x${double.tryParse(task.rewardValue).toInt()}", textColor: task.limitDay == (task.complateNum ?? task.conplateNum) ? Color(0xFF808080) diff --git a/lib/integral/intergra_view/integral_vip.dart b/lib/integral/intergra_view/integral_vip.dart index 79ce636e..813aac89 100644 --- a/lib/integral/intergra_view/integral_vip.dart +++ b/lib/integral/intergra_view/integral_vip.dart @@ -1,4 +1,5 @@ import 'package:flutter/material.dart'; +import 'package:flutter_svg/svg.dart'; import 'package:huixiang/generated/l10n.dart'; import 'package:huixiang/retrofit/data/sign_info.dart'; import 'package:huixiang/retrofit/data/user_info.dart'; @@ -76,8 +77,8 @@ class _IntegralVip extends State { mainAxisAlignment: MainAxisAlignment.spaceEvenly, crossAxisAlignment: CrossAxisAlignment.center, children: [ - Image.asset( - "assets/image/icon_gold_coin.png", + SvgPicture.asset( + "assets/svg/qiandao.svg", width: 20, height: 20, ), diff --git a/lib/integral_store/integral_store_details_page.dart b/lib/integral_store/integral_store_details_page.dart index 0681a11a..d8792447 100644 --- a/lib/integral_store/integral_store_details_page.dart +++ b/lib/integral_store/integral_store_details_page.dart @@ -117,29 +117,30 @@ class _IntegralStoreDetailsPage extends State { ), GestureDetector( onTap: () { - if(payType > 0){ - toExchangeOrder(); - }else{ - SmartDialog.showToast("您的积分不足!", alignment: Alignment.center); - return; - } + // if(payType > 0){ + // toExchangeOrder(); + // }else{ + // SmartDialog.showToast("您的积分不足!", alignment: Alignment.center); + // return; + // } }, child: Container( padding: EdgeInsets.only(top: 16.h, bottom: 16.h), decoration: BoxDecoration( - color: (payType > 0) - ? Color(0xFF32A060) - : Color(0xFFD8D8D8), + color: Color(0xFFD8D8D8), + // (payType > 0) + // ? Color(0xFF32A060) + // : Color(0xFFD8D8D8), borderRadius: BorderRadius.vertical( top: Radius.circular(4), ), ), alignment: Alignment.center, child: Text( - (payType > 0) - ? S.of(context).duihuan - : S.of(context).jifenbuzu, - // "兑换功能暂未开放", + // (payType > 0) + // ? S.of(context).duihuan + // : S.of(context).jifenbuzu, + "兑换功能暂未开放", style: TextStyle( fontSize: 16.sp, color: Color(0xFFFFFFFF), diff --git a/lib/retrofit/retrofit_api.dart b/lib/retrofit/retrofit_api.dart index 699cf918..aac0a961 100644 --- a/lib/retrofit/retrofit_api.dart +++ b/lib/retrofit/retrofit_api.dart @@ -53,11 +53,11 @@ import 'data/wx_pay.dart'; part 'retrofit_api.g.dart'; -// const base_url = "https://pos.platform.lotus-wallet.com/app/"; ///正式 -// const baseUrl = "https://pos.platform.lotus-wallet.com/app/"; ///正式 +const base_url = "https://pos.platform.lotus-wallet.com/app/"; ///正式 +const baseUrl = "https://pos.platform.lotus-wallet.com/app/"; ///正式 -const base_url = "http://192.168.10.236:8766/app/"; ///费韬 -const baseUrl = "http://192.168.10.236:8766/app/"; ///费韬 +// const base_url = "http://192.168.10.236:8766/app/"; ///费韬 +// const baseUrl = "http://192.168.10.236:8766/app/"; ///费韬 // const base_url = "http://192.168.10.37:8766/app/"; // const baseUrl = "http://192.168.10.37:8766/app/"; diff --git a/lib/retrofit/retrofit_api.g.dart b/lib/retrofit/retrofit_api.g.dart index 1eb48e20..d1a64c02 100644 --- a/lib/retrofit/retrofit_api.g.dart +++ b/lib/retrofit/retrofit_api.g.dart @@ -9,7 +9,7 @@ part of 'retrofit_api.dart'; class _ApiService implements ApiService { _ApiService(this._dio, {this.baseUrl}) { ArgumentError.checkNotNull(_dio, '_dio'); - baseUrl ??= 'http://192.168.10.236:8766/app/'; + baseUrl ??= 'https://pos.platform.lotus-wallet.com/app/'; } final Dio _dio;