From 715caaa4014dd949ab0c87d2fc0847c692764de4 Mon Sep 17 00:00:00 2001 From: w-R <953969641@qq.com> Date: Wed, 12 Jan 2022 10:11:59 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=A8=E6=80=81=E5=8F=91=E5=B8=83=E6=9B=B4?= =?UTF-8?q?=E6=96=B0;=20=E5=95=86=E5=9F=8E=E6=B4=BB=E5=8A=A8=E5=95=86?= =?UTF-8?q?=E5=93=81=E9=80=89=E8=A7=84=E6=A0=BC;=20=E6=88=91=E7=9A=84?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=88=91=E7=9A=84=E7=A0=8D=E4=BB=B7=E7=A7=92?= =?UTF-8?q?=E6=9D=80=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8=E8=AF=A6=E6=83=85?= =?UTF-8?q?;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/community/release_dynamic.dart | 2 + lib/mine/user_info_page.dart | 2 +- lib/order/bargain_group_order.dart | 113 +++++++++++------- lib/retrofit/data/activity_order_list.dart | 44 ++++--- lib/retrofit/min_api.g.dart | 2 +- lib/retrofit/retrofit_api.dart | 2 +- lib/retrofit/retrofit_api.g.dart | 6 +- .../shopping/activity_prefecture_details.dart | 1 + .../shopping/shopping_goods_details.dart | 69 ++++++++--- .../shopping/shopping_home/group_details.dart | 45 ++++--- pubspec.lock | 22 ++-- pubspec.yaml | 8 +- 12 files changed, 209 insertions(+), 107 deletions(-) diff --git a/lib/community/release_dynamic.dart b/lib/community/release_dynamic.dart index cacbb575..1ac329e9 100644 --- a/lib/community/release_dynamic.dart +++ b/lib/community/release_dynamic.dart @@ -196,6 +196,7 @@ class _ReleaseDynamic extends State { BaseData baseData = await apiService.upload( File(thumbnail), 123123123, + dynamicType == 2 ); if (baseData != null && baseData.isSuccess) { UploadResult uploadResult = baseData.data; @@ -207,6 +208,7 @@ class _ReleaseDynamic extends State { BaseData baseData = await apiService.upload( file, 123123123, + dynamicType == 2 ); if (baseData != null && baseData.isSuccess) { UploadResult uploadResult = baseData.data; diff --git a/lib/mine/user_info_page.dart b/lib/mine/user_info_page.dart index 72bd318d..e774a7aa 100644 --- a/lib/mine/user_info_page.dart +++ b/lib/mine/user_info_page.dart @@ -356,7 +356,7 @@ class _UserInfoPage extends State { ///文件上传 fileUpload() async { if (filePath != null && filePath != "" && await File(filePath).exists()) { - BaseData baseData = await apiService.upload(File(filePath), 123123123).catchError((onError) {}); + BaseData baseData = await apiService.upload(File(filePath), 123123123,false).catchError((onError) {}); if (baseData != null && baseData.isSuccess) { UploadResult uploadResult = baseData.data; modifyInfo["headimg"] = uploadResult.url; diff --git a/lib/order/bargain_group_order.dart b/lib/order/bargain_group_order.dart index a339b78c..7aae5c6c 100644 --- a/lib/order/bargain_group_order.dart +++ b/lib/order/bargain_group_order.dart @@ -2,9 +2,11 @@ import 'package:dio/dio.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:huixiang/generated/l10n.dart'; +import 'package:huixiang/retrofit/data/activity_order_list.dart'; import 'package:huixiang/retrofit/data/base_data.dart'; import 'package:huixiang/retrofit/data/exchange_order.dart'; import 'package:huixiang/retrofit/data/page.dart'; +import 'package:huixiang/retrofit/min_api.dart'; import 'package:huixiang/retrofit/retrofit_api.dart'; import 'package:huixiang/utils/font_weight.dart'; import 'package:huixiang/view_widget/classic_header.dart'; @@ -37,6 +39,9 @@ class _BargainGroupOrder extends State super.initState(); } + ///查看我的拼团、砍价、列表 + + @override void didChangeDependencies() { super.didChangeDependencies(); @@ -118,24 +123,55 @@ class ExchangeHistoryList extends StatefulWidget { } class _ExchangeHistoryList extends State { - ApiService apiService; - + MinApiService minService; + List activityOrderList = []; RefreshController _refreshController = RefreshController(initialRefresh: false); @override void initState() { super.initState(); - SharedPreferences.getInstance().then((value) => { - apiService = ApiService(Dio(), - context: context, token: value.getString('token')), - }); + SharedPreferences.getInstance().then((value) { + String minToken = value.getString("minToken"); + String tenant = value.getString("tenant"); + String storeId = value.getString("storeId"); + minService = MinApiService( + Dio(), + context: context, + token: minToken, + tenant: tenant, + storeId: storeId, + ); + queryShowMyActList(); + }); + } + + queryShowMyActList() async { + BaseData> baseData = + await minService.showMyActList({ + "state":0, + "type" :1, + }).catchError((error) { + _refreshController.loadFailed(); + _refreshController.refreshFailed(); + }); + if (baseData != null && baseData.isSuccess) { + _refreshController.refreshCompleted(); + setState(() { + activityOrderList.clear(); + if(baseData.data.length > 0) + activityOrderList.addAll(baseData.data); + }); + } else { + _refreshController.refreshFailed(); + } } - int pageNum = 1; + // int pageNum = 1; _refresh() { - pageNum = 1; + // pageNum = 1; + queryShowMyActList(); } @override @@ -151,21 +187,20 @@ class _ExchangeHistoryList extends State { ), controller: _refreshController, onRefresh: _refresh, - // onLoading: queryHistory, + onLoading: queryShowMyActList, child: - // orders == null || orders.length == 0 - // ? NoDataView( - // isShowBtn: false, - // text: "还没有订单，快去下一单吧～", - // fontSize: 16.sp, - // margin: EdgeInsets.only(top: 120.h), - // ) - // : + (activityOrderList?.length ?? 0) < 0 + ? NoDataView( + isShowBtn: false, + text: "还没有订单，快去下一单吧～", + fontSize: 16.sp, + margin: EdgeInsets.only(top: 120.h), + ) + : ListView.builder( - // itemCount: orders == null ? 0 : orders.length, - itemCount: 5, + itemCount: activityOrderList?.length ?? 0, itemBuilder: (context, position) { - return bargainOrder(); + return bargainOrder(activityOrderList[position]); }, ), ); @@ -187,7 +222,7 @@ class _ExchangeHistoryList extends State { return orderStatus; } - Widget bargainOrder() { + Widget bargainOrder(ActivityOrderList activityOrderList) { return Container( margin: EdgeInsets.fromLTRB(16.w, 8.h, 16.w, 8.h), decoration: BoxDecoration( @@ -235,8 +270,7 @@ class _ExchangeHistoryList extends State { margin: EdgeInsets.only(left: 6.w, top: 12.h), alignment: Alignment.centerLeft, child: Text( - // (orderInfo != null) ? orderInfo.storeName : "", - "一心回乡商城", + activityOrderList?.storeName ?? "", style: TextStyle( fontWeight: FontWeight.bold, fontSize: 14.sp, @@ -260,7 +294,8 @@ class _ExchangeHistoryList extends State { // orderInfo.sendStatus, // orderInfo.isTakeOut) // : "", - "还差￥23.4砍价成功", + // "还差￥{activityOrderList?.howManyMoney ?? ""}砍价成功", + "还差${activityOrderList?.howManyMore ?? 0}人拼团成功", style: TextStyle( fontSize: 14.sp, fontWeight: FontWeight.bold, @@ -286,7 +321,7 @@ class _ExchangeHistoryList extends State { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - S.of(context).xiadanshijian_("下单时间:2020.01.20 10:50:22"), + S.of(context).xiadanshijian_(activityOrderList?.joinTime ?? ""), style: TextStyle( fontSize: 10.sp, color: Color(0xFF727272), @@ -302,18 +337,13 @@ class _ExchangeHistoryList extends State { mainAxisAlignment: MainAxisAlignment.spaceBetween, crossAxisAlignment: CrossAxisAlignment.start, children: [ - // MImage( - // "", - // width: 81.w, - // height: 81.h, - // fit: BoxFit.cover, - // errorSrc: "assets/image/default_1.png", - // fadeSrc: "assets/image/default_1.png", - // ), - Image.asset( - "assets/image/icon_story_td.png", - width: 81, - height: 81, + MImage( + activityOrderList?.productImg ?? "", + width: 81.w, + height: 81.h, + fit: BoxFit.cover, + errorSrc: "assets/image/default_1.png", + fadeSrc: "assets/image/default_1.png", ), SizedBox( width: 10, @@ -324,7 +354,7 @@ class _ExchangeHistoryList extends State { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - "[生态小农]山林放养鸡蛋30枚/盒", + activityOrderList?.storeName ?? "", maxLines: 2, overflow: TextOverflow.ellipsis, style: TextStyle( @@ -334,7 +364,7 @@ class _ExchangeHistoryList extends State { ), ), Text( - "套盒装", + activityOrderList?.productSkuName ?? "", style: TextStyle( fontSize: 10.sp, fontWeight: MyFontWeight.medium, @@ -357,7 +387,8 @@ class _ExchangeHistoryList extends State { TextSpan( children: [ TextSpan( - text: "已砍至:", + // text: "已砍至:", + text: S.of(context).heji, style: TextStyle( fontSize: 12.sp, fontWeight: MyFontWeight.regular, @@ -365,7 +396,7 @@ class _ExchangeHistoryList extends State { ), ), TextSpan( - text: "58.2", + text:activityOrderList?.orderSum ?? "0", style: TextStyle( fontSize: 14.sp, fontWeight: MyFontWeight.semi_bold, diff --git a/lib/retrofit/data/activity_order_list.dart b/lib/retrofit/data/activity_order_list.dart index b53690d9..c709420c 100644 --- a/lib/retrofit/data/activity_order_list.dart +++ b/lib/retrofit/data/activity_order_list.dart @@ -3,9 +3,11 @@ /// productImg : "https://pos.upload.gznl.top/1179/2021/11/e50b00a1-09a2-4bab-b71f-e26e80006459.png" /// productName : "无花果礼盒" /// productSkuName : "" -/// actRecordstate : 4 -/// actRecordJoinState : null -/// howManyMore : null +/// actRecordId : "1479399513473941504" +/// actRecordState : 4 +/// actRecordJoinState : false +/// howManyMore : 2 +/// orderSum : null /// bargainMoney : null /// howManyMoney : null @@ -16,9 +18,11 @@ class ActivityOrderList { String productImg, String productName, String productSkuName, - int actRecordstate, - dynamic actRecordJoinState, - dynamic howManyMore, + String actRecordId, + int actRecordState, + bool actRecordJoinState, + int howManyMore, + dynamic orderSum, dynamic bargainMoney, dynamic howManyMoney,}){ _storeName = storeName; @@ -26,9 +30,11 @@ class ActivityOrderList { _productImg = productImg; _productName = productName; _productSkuName = productSkuName; - _actRecordstate = actRecordstate; + _actRecordId = actRecordId; + _actRecordState = actRecordState; _actRecordJoinState = actRecordJoinState; _howManyMore = howManyMore; + _orderSum = orderSum; _bargainMoney = bargainMoney; _howManyMoney = howManyMoney; } @@ -39,9 +45,11 @@ class ActivityOrderList { _productImg = json['productImg']; _productName = json['productName']; _productSkuName = json['productSkuName']; - _actRecordstate = json['actRecordstate']; + _actRecordId = json['actRecordId']; + _actRecordState = json['actRecordState']; _actRecordJoinState = json['actRecordJoinState']; _howManyMore = json['howManyMore']; + _orderSum = json['orderSum']; _bargainMoney = json['bargainMoney']; _howManyMoney = json['howManyMoney']; } @@ -50,9 +58,11 @@ class ActivityOrderList { String _productImg; String _productName; String _productSkuName; - int _actRecordstate; - dynamic _actRecordJoinState; - dynamic _howManyMore; + String _actRecordId; + int _actRecordState; + bool _actRecordJoinState; + int _howManyMore; + dynamic _orderSum; dynamic _bargainMoney; dynamic _howManyMoney; @@ -61,9 +71,11 @@ class ActivityOrderList { String get productImg => _productImg; String get productName => _productName; String get productSkuName => _productSkuName; - int get actRecordstate => _actRecordstate; - dynamic get actRecordJoinState => _actRecordJoinState; - dynamic get howManyMore => _howManyMore; + String get actRecordId => _actRecordId; + int get actRecordState => _actRecordState; + bool get actRecordJoinState => _actRecordJoinState; + int get howManyMore => _howManyMore; + dynamic get orderSum => _orderSum; dynamic get bargainMoney => _bargainMoney; dynamic get howManyMoney => _howManyMoney; @@ -74,9 +86,11 @@ class ActivityOrderList { map['productImg'] = _productImg; map['productName'] = _productName; map['productSkuName'] = _productSkuName; - map['actRecordstate'] = _actRecordstate; + map['actRecordId'] = _actRecordId; + map['actRecordState'] = _actRecordState; map['actRecordJoinState'] = _actRecordJoinState; map['howManyMore'] = _howManyMore; + map['orderSum'] = _orderSum; map['bargainMoney'] = _bargainMoney; map['howManyMoney'] = _howManyMoney; return map; diff --git a/lib/retrofit/min_api.g.dart b/lib/retrofit/min_api.g.dart index 06470f2b..5ea71d25 100644 --- a/lib/retrofit/min_api.g.dart +++ b/lib/retrofit/min_api.g.dart @@ -561,7 +561,7 @@ class _MinApiService implements MinApiService { final queryParameters = {}; final _data = {}; _data.addAll(param ?? {}); - final _result = await _dio.request>('actTemplate/launchAct', + final _result = await _dio.request>('actTemplate/showMyActList', queryParameters: queryParameters, options: RequestOptions( method: 'POST', diff --git a/lib/retrofit/retrofit_api.dart b/lib/retrofit/retrofit_api.dart index 9a42e5ed..e63121a6 100644 --- a/lib/retrofit/retrofit_api.dart +++ b/lib/retrofit/retrofit_api.dart @@ -165,7 +165,7 @@ abstract class ApiService { @POST("/file/upload") @MultiPart() Future> upload( - @Part(name: "file") File data, @Part(name: "folderId") int folderId); + @Part(name: "file") File data, @Part(name: "folderId") int folderId,bool isVideo); /// 周边搜索 @GET( diff --git a/lib/retrofit/retrofit_api.g.dart b/lib/retrofit/retrofit_api.g.dart index 50bf5722..1e3aebc3 100644 --- a/lib/retrofit/retrofit_api.g.dart +++ b/lib/retrofit/retrofit_api.g.dart @@ -17,15 +17,17 @@ class _ApiService implements ApiService { String baseUrl; @override - Future> upload(data, folderId) async { + Future> upload(data, folderId,bool isVideo) async { ArgumentError.checkNotNull(data, 'data'); ArgumentError.checkNotNull(folderId, 'folderId'); const _extra = {}; final queryParameters = {}; final _data = FormData(); String fileName = data.path.split(Platform.pathSeparator).last; - if(!fileName.contains(".jpeg") && !fileName.contains(".mp4") && !fileName.contains(".png")) + if(!isVideo && !fileName.contains(".jpeg") && !fileName.contains(".png")) fileName += ".jpeg"; + else if(isVideo && !fileName.contains(".mp4")) + fileName += ".mp4"; _data.files.add(MapEntry( 'file', MultipartFile.fromFileSync(data.path, diff --git a/lib/store/shopping/activity_prefecture_details.dart b/lib/store/shopping/activity_prefecture_details.dart index bb921b3c..e90ba6cf 100644 --- a/lib/store/shopping/activity_prefecture_details.dart +++ b/lib/store/shopping/activity_prefecture_details.dart @@ -632,6 +632,7 @@ class _ActivityPrefectureDetails extends State { '/router/shopping_goods_details', arguments: { "actProductId": productList[position].id, + "productId":productList[position].productId, "type":pageType, "storeId": storeId, "tenant": tenant, diff --git a/lib/store/shopping/shopping_goods_details.dart b/lib/store/shopping/shopping_goods_details.dart index 5b251fc0..4da30bc1 100644 --- a/lib/store/shopping/shopping_goods_details.dart +++ b/lib/store/shopping/shopping_goods_details.dart @@ -13,21 +13,15 @@ import 'package:huixiang/generated/l10n.dart'; import 'package:huixiang/retrofit/data/activity.dart'; import 'package:huixiang/retrofit/data/activity_details.dart'; import 'package:huixiang/retrofit/data/base_data.dart'; -import 'package:huixiang/retrofit/data/findMiNiGroupList.dart'; -import 'package:huixiang/retrofit/data/goods.dart'; -import 'package:huixiang/retrofit/data/activity_order_list.dart'; import 'package:huixiang/retrofit/data/miNiDetail.dart'; import 'package:huixiang/retrofit/data/shoppingCart.dart'; import 'package:huixiang/retrofit/data/store_info.dart'; -import 'package:huixiang/retrofit/data/user_info.dart'; import 'package:huixiang/retrofit/min_api.dart'; import 'package:huixiang/retrofit/retrofit_api.dart'; import 'package:huixiang/store/store_view/product_sku.dart'; -import 'package:huixiang/store/store_view/store_order_list.dart'; import 'package:huixiang/utils/font_weight.dart'; import 'package:huixiang/view_widget/classic_header.dart'; import 'package:huixiang/view_widget/custom_image.dart'; -import 'package:huixiang/view_widget/my_appbar.dart'; import 'package:huixiang/view_widget/my_footer.dart'; import 'package:pull_to_refresh/pull_to_refresh.dart'; import 'package:shared_preferences/shared_preferences.dart'; @@ -67,15 +61,16 @@ class _ShoppingGoodsDetails extends State { List activitys; ProductSkuVOListBean productSku; String actProductId; + String productId; String pageType = "1"; ActivityDetails activityDetails; int limitNumber = 0; int limitTime = 0; String bannerImg; - // String pName; - // String pid; - // String cName; - // String cid; + String pName; + String pid; + String cName; + String cid; bool isDispose = false; Timer _timer; String testTime = "2021-12-30 10:00:00"; @@ -101,6 +96,7 @@ class _ShoppingGoodsDetails extends State { limitNumber = widget.arguments["limitNumber"]; limitTime = widget.arguments["limitTime"]; bannerImg = widget.arguments["bannerImg"]; + productId =widget.arguments["productId"]; startCountdownTimer(); debugPrint("store_param tenant:$tenant storeId:$storeId"); @@ -144,10 +140,9 @@ class _ShoppingGoodsDetails extends State { if (pageType == null) { queryMiNiDetail(id); } else { + queryMiNiDetail(productId); queryViewProduct(actProductId, pageType); } - - EasyLoading.dismiss(); } }); @@ -363,6 +358,7 @@ class _ShoppingGoodsDetails extends State { var callback = ((timer) { if (isDispose) return; setState(() { + if((activityDetails?.actRecordAndJoinlDTOList) != null) activityDetails.actRecordAndJoinlDTOList.forEach((element) { var tempDateTime = DateTime.parse(element.actRecord.endTime).difference(DateTime.now()); @@ -383,6 +379,44 @@ class _ShoppingGoodsDetails extends State { _timer = Timer.periodic(oneSec, callback); } + ///去下单结算页面 + toDownOrder() async { + // int num = count(); + + if (count1 == 0) { + SmartDialog.showToast("请先选择您要购买的商品！～"); + return; + } + await Navigator.of(context).pushNamed( + '/router/settlement', + arguments: { + "storeInfo": storeInfo, + "tableId": tableId, + // "parentCode": parentCode, + // "parentId": parentId, + "pName":pName, + "pid":pid, + "cName":cName, + "cid":cid, + "shoppingCartSkuItemList": [ + { + "buyNum": count1, + "id": skuId1, + "productId": miNiDetail.id, + "productName": miNiDetail.productName, + "skuName": skuValue1, + "storeId": storeId, + "skuPrice": productSku.skuPrice, + "skuStock": productSku.skuStock, + "tableId": tableId, + }, + ], + // "numberOfPeople": numberOfPeople, + }, + ); + + } + @override Widget build(BuildContext context) { @@ -420,6 +454,7 @@ class _ShoppingGoodsDetails extends State { buildColumn(), ///拼团 + if (pageType == "1") groupOption(), ///拼团规则 @@ -602,7 +637,7 @@ class _ShoppingGoodsDetails extends State { ), GestureDetector( onTap: () { - // toDownOrder(); + toDownOrder(); }, child: Container( alignment: Alignment.center, @@ -1325,7 +1360,11 @@ class _ShoppingGoodsDetails extends State { GestureDetector( onTap: () { setState(() { - showStoreSelector(miNiDetail, id, 1); + if(pageType == null){ + showStoreSelector(miNiDetail, id, 1); + }else { + showStoreSelector(miNiDetail, productId, 1); + } }); }, child: Icon( @@ -1519,7 +1558,7 @@ class _ShoppingGoodsDetails extends State { ), ), Text( - "剩余${(actRecordAndJoinlDTOList.actRecord.tempDay != 0)?actRecordAndJoinlDTOList.actRecord.tempDay : ""}:${actRecordAndJoinlDTOList.actRecord.tempHour}:${actRecordAndJoinlDTOList.actRecord.tempM}:${actRecordAndJoinlDTOList.actRecord.tempS}", + "剩余${(actRecordAndJoinlDTOList?.actRecord?.tempDay != 0)?actRecordAndJoinlDTOList.actRecord.tempDay : ""}:${actRecordAndJoinlDTOList?.actRecord?.tempHour ?? 0}:${actRecordAndJoinlDTOList?.actRecord?.tempM ?? 0}:${actRecordAndJoinlDTOList?.actRecord?.tempS ?? 0}", style: TextStyle( fontSize: 10.sp, fontWeight: MyFontWeight.regular, diff --git a/lib/store/shopping/shopping_home/group_details.dart b/lib/store/shopping/shopping_home/group_details.dart index 577d7cb4..d7081544 100644 --- a/lib/store/shopping/shopping_home/group_details.dart +++ b/lib/store/shopping/shopping_home/group_details.dart @@ -39,6 +39,17 @@ class _GroupDetails extends State { int tempM = 0; int tempS = 0; + @override + void dispose() { + super.dispose(); + if (refreshController != null) refreshController.dispose(); + isDispose = true; + if (_timer != null) { + _timer.cancel(); + } + + } + @override void initState() { super.initState(); @@ -70,7 +81,7 @@ class _GroupDetails extends State { if (isDispose) return; setState(() { var tempDateTime = - DateTime.parse(activityActRecordDetails.actRecord.endTime).difference(DateTime.now()); + DateTime.parse(activityActRecordDetails?.actRecord?.endTime).difference(DateTime.now()); if (tempDateTime.inSeconds < 0) { tempDay = 0; tempHour = 0; @@ -104,12 +115,6 @@ class _GroupDetails extends State { } } - @override - void dispose() { - super.dispose(); - if (refreshController != null) refreshController.dispose(); - } - final RefreshController refreshController = RefreshController(); @override @@ -150,7 +155,9 @@ class _GroupDetails extends State { header: MyHeader(), physics: BouncingScrollPhysics(), onRefresh: () { - setState(() {}); + setState(() { + queryShowOneAct(actRecordId); + }); }, child: SingleChildScrollView( physics: NeverScrollableScrollPhysics(), @@ -373,7 +380,8 @@ class _GroupDetails extends State { height: 28, alignment: Alignment.center, decoration: BoxDecoration( - color: Color(0xFFD2D2D2), + // color: Color(0xFFD2D2D2), + color: Color(0xFFF8961E), borderRadius: BorderRadius.circular(4)), child: Text( tempDay.toString(), @@ -392,7 +400,8 @@ class _GroupDetails extends State { style: TextStyle( fontSize: 16.sp, fontWeight: MyFontWeight.medium, - color: Color(0xFFD2D2D2), + // color: Color(0xFFD2D2D2), + color: Color(0xFFF8961E), ), )), ], @@ -404,7 +413,8 @@ class _GroupDetails extends State { height: 28, alignment: Alignment.center, decoration: BoxDecoration( - color: Color(0xFFD2D2D2), + // color: Color(0xFFD2D2D2), + color: Color(0xFFF8961E), borderRadius: BorderRadius.circular(4)), child: Text( tempHour.toString(), @@ -423,7 +433,8 @@ class _GroupDetails extends State { style: TextStyle( fontSize: 16.sp, fontWeight: MyFontWeight.medium, - color: Color(0xFFD2D2D2), + // color: Color(0xFFD2D2D2), + color: Color(0xFFF8961E), ), )), InkWell( @@ -433,7 +444,8 @@ class _GroupDetails extends State { height: 28, alignment: Alignment.center, decoration: BoxDecoration( - color: Color(0xFFD2D2D2), + // color: Color(0xFFD2D2D2), + color: Color(0xFFF8961E), borderRadius: BorderRadius.circular(4)), child: Text( tempM.toString(), @@ -452,7 +464,8 @@ class _GroupDetails extends State { style: TextStyle( fontSize: 16.sp, fontWeight: MyFontWeight.medium, - color: Color(0xFFD2D2D2), + // color: Color(0xFFD2D2D2), + color: Color(0xFFF8961E), ), )), InkWell( @@ -462,7 +475,8 @@ class _GroupDetails extends State { height: 28, alignment: Alignment.center, decoration: BoxDecoration( - color: Color(0xFFD2D2D2), + // color: Color(0xFFD2D2D2), + color: Color(0xFFF8961E), borderRadius: BorderRadius.circular(4)), child: Text( tempS.toString(), @@ -608,6 +622,7 @@ class _GroupDetails extends State { // ], // )), // ), + // // InkWell( // onTap: () { // setState(() { diff --git a/pubspec.lock b/pubspec.lock index e9e32916..81da05a4 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -482,7 +482,7 @@ packages: name: path_provider_linux url: "https://pub.flutter-io.cn" source: hosted - version: "2.1.4" + version: "2.1.5" path_provider_platform_interface: dependency: transitive description: @@ -496,7 +496,7 @@ packages: name: path_provider_windows url: "https://pub.flutter-io.cn" source: hosted - version: "2.0.4" + version: "2.0.5" pedantic: dependency: transitive description: @@ -629,7 +629,7 @@ packages: name: shared_preferences_linux url: "https://pub.flutter-io.cn" source: hosted - version: "2.0.3" + version: "2.0.4" shared_preferences_macos: dependency: transitive description: @@ -650,14 +650,14 @@ packages: name: shared_preferences_web url: "https://pub.flutter-io.cn" source: hosted - version: "2.0.2" + version: "2.0.3" shared_preferences_windows: dependency: transitive description: name: shared_preferences_windows url: "https://pub.flutter-io.cn" source: hosted - version: "2.0.3" + version: "2.0.4" sharesdk_plugin: dependency: "direct main" description: @@ -743,12 +743,10 @@ packages: tpns_flutter_plugin: dependency: "direct main" description: - path: "." - ref: "V1.1.2" - resolved-ref: b814d62f4b82422459f786671f23dd535062d503 - url: "git://github.com/TencentCloud/TPNS-Flutter-Plugin" - source: git - version: "1.1.2" + name: tpns_flutter_plugin + url: "https://pub.flutter-io.cn" + source: hosted + version: "1.0.8" transformer_page_view: dependency: transitive description: @@ -846,7 +844,7 @@ packages: name: video_player_web url: "https://pub.flutter-io.cn" source: hosted - version: "2.0.5" + version: "2.0.6" wakelock: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index e15d0ed5..39444ec3 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -19,10 +19,10 @@ dependencies: keframe: ^2.0.2 #滑动组件卡顿优化 - tpns_flutter_plugin: - git: - url: git://github.com/TencentCloud/TPNS-Flutter-Plugin - ref: V1.1.2 + tpns_flutter_plugin: 1.0.8 +# git: +# url: git://github.com/TencentCloud/TPNS-Flutter-Plugin +# ref: V1.0.7 like_button: ^2.0.2 cupertino_icons: ^1.0.2