From 3e4f92c624cd453523476df13689823d8b50b8a1 Mon Sep 17 00:00:00 2001 From: laiiihz Date: Wed, 24 Mar 2021 09:43:09 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BD=BF=E7=94=A8=E5=BA=97=E9=93=BA?= =?UTF-8?q?=E8=A7=92=E8=89=B2=E5=8D=A1=E5=90=8E=E7=9A=84CheckProgressBar?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=AE=8C=E5=85=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/pages/user/user_page.dart | 17 +++++++++++--- pubspec.lock | 43 ++++++++++++++++++++--------------- 2 files changed, 39 insertions(+), 21 deletions(-) diff --git a/lib/pages/user/user_page.dart b/lib/pages/user/user_page.dart index 3aae9a4..578f9ce 100644 --- a/lib/pages/user/user_page.dart +++ b/lib/pages/user/user_page.dart @@ -66,10 +66,18 @@ class _UserPageState extends BaseStoreState { double _target = 100; double _amount = 0; + int _cardType = 0; int _cardCount = 0; + bool get _fullCheck { + // bool isGold = UserLevelTool.currentRoleLevelEnum() == UserRoleLevel.Gold; + // bool isSilver = UserLevelTool.currentRoleLevelEnum() == UserRoleLevel.Silver; - GlobalKey _shopBenefitKey = - GlobalKey(); + if (_cardType == 1 || _cardType == 2) return true; + return false; + } + + // GlobalKey _shopBenefitKey = + // GlobalKey(); UseerIncomeDataModel _userIncomeDataModel; @override bool get wantKeepAlive => true; @@ -292,7 +300,10 @@ class _UserPageState extends BaseStoreState { UserLevelTool.currentRoleLevelEnum() == UserRoleLevel.Gold || UserLevelTool.currentRoleLevelEnum() == UserRoleLevel.Silver - ? ShopCheckView(target: _target, amount: _amount) + ? ShopCheckView( + target: _fullCheck ? _amount : _target, + amount: _amount, + ) : SizedBox(), ShopManagerView(), OrderCentralView( diff --git a/pubspec.lock b/pubspec.lock index a2ff279..f03a302 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -112,7 +112,7 @@ packages: name: build_daemon url: "https://pub.flutter-io.cn" source: hosted - version: "2.1.6" + version: "2.1.7" build_resolvers: dependency: transitive description: @@ -210,7 +210,7 @@ packages: name: code_builder url: "https://pub.flutter-io.cn" source: hosted - version: "3.6.0" + version: "3.7.0" collection: dependency: transitive description: @@ -224,7 +224,7 @@ packages: name: common_utils url: "https://pub.flutter-io.cn" source: hosted - version: "1.2.1" + version: "1.2.4" convert: dependency: transitive description: @@ -411,7 +411,7 @@ packages: name: flutter_datetime_picker url: "https://pub.flutter-io.cn" source: hosted - version: "1.4.0" + version: "1.5.0" flutter_ffmpeg: dependency: transitive description: @@ -521,7 +521,7 @@ packages: name: flutter_txugcupload url: "https://pub.flutter-io.cn" source: hosted - version: "0.0.2" + version: "0.0.3" flutter_union_pay: dependency: "direct main" description: @@ -663,14 +663,14 @@ packages: name: image_picker url: "https://pub.flutter-io.cn" source: hosted - version: "0.6.7+21" + version: "0.6.7+22" image_picker_platform_interface: dependency: transitive description: name: image_picker_platform_interface url: "https://pub.flutter-io.cn" source: hosted - version: "1.1.1" + version: "1.1.6" intl: dependency: transitive description: @@ -684,7 +684,7 @@ packages: name: io url: "https://pub.flutter-io.cn" source: hosted - version: "0.3.4" + version: "0.3.5" js: dependency: transitive description: @@ -812,7 +812,7 @@ packages: name: openinstall_flutter_plugin url: "https://pub.flutter-io.cn" source: hosted - version: "1.3.2" + version: "1.4.1" package_config: dependency: transitive description: @@ -870,7 +870,7 @@ packages: name: path_provider url: "https://pub.flutter-io.cn" source: hosted - version: "1.6.27" + version: "1.6.28" path_provider_linux: dependency: transitive description: @@ -912,7 +912,7 @@ packages: name: percent_indicator url: "https://pub.flutter-io.cn" source: hosted - version: "2.1.9" + version: "2.1.9+1" permission_handler: dependency: "direct main" description: @@ -947,7 +947,7 @@ packages: name: pin_input_text_field url: "https://pub.flutter-io.cn" source: hosted - version: "3.3.0" + version: "3.3.1" platform: dependency: transitive description: @@ -982,7 +982,7 @@ packages: name: power_logger url: "https://pub.flutter-io.cn" source: hosted - version: "0.1.2" + version: "0.1.3" pretty_json: dependency: transitive description: @@ -1010,7 +1010,7 @@ packages: name: pubspec_parse url: "https://pub.flutter-io.cn" source: hosted - version: "0.1.7" + version: "0.1.8" pull_to_refresh: dependency: "direct main" description: @@ -1089,7 +1089,7 @@ packages: name: shelf_web_socket url: "https://pub.flutter-io.cn" source: hosted - version: "0.2.3" + version: "0.2.4+1" sky_engine: dependency: transitive description: flutter @@ -1245,7 +1245,7 @@ packages: name: url_launcher_web url: "https://pub.flutter-io.cn" source: hosted - version: "0.1.5+1" + version: "0.1.5+3" url_launcher_windows: dependency: transitive description: @@ -1266,7 +1266,7 @@ packages: name: velocity_x url: "https://pub.flutter-io.cn" source: hosted - version: "1.3.1" + version: "1.4.1" video_player: dependency: "direct main" description: @@ -1302,6 +1302,13 @@ packages: url: "https://pub.flutter-io.cn" source: hosted version: "0.2.7" + vxstate: + dependency: transitive + description: + name: vxstate + url: "https://pub.flutter-io.cn" + source: hosted + version: "1.0.1" wakelock: dependency: transitive description: @@ -1343,7 +1350,7 @@ packages: name: win32 url: "https://pub.flutter-io.cn" source: hosted - version: "1.7.4" + version: "1.7.4+1" xdg_directories: dependency: transitive description: From 25de741b8613252730616c8efc64021549f346f5 Mon Sep 17 00:00:00 2001 From: laiiihz Date: Wed, 24 Mar 2021 17:29:46 +0800 Subject: [PATCH 2/2] =?UTF-8?q?update=20powerlogger=20version,=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E6=89=8B=E6=9C=BA=E5=8F=B7=E6=98=BE=E7=A4=BA=E5=BC=80?= =?UTF-8?q?=E5=85=B3=E5=AF=B9=E6=8E=A5=EF=BC=8C=E6=88=91=E7=9A=84=E5=BA=97?= =?UTF-8?q?=E9=93=BA=E6=88=90=E5=91=98=E6=89=8B=E6=9C=BA=E5=8F=B7=E3=80=81?= =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E5=8F=B7=E5=92=8C=E9=94=80=E5=94=AE=E9=A2=9D?= =?UTF-8?q?=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/constants/api_v2.dart | 3 ++ .../account_and_safety_page.dart | 28 ++++++++++++------- lib/pages/user/invite/group_invite_card.dart | 12 ++++++-- lib/pages/user/model/user_common_model.dart | 24 +++++++++------- pubspec.lock | 9 +++++- pubspec.yaml | 2 +- 6 files changed, 54 insertions(+), 24 deletions(-) diff --git a/lib/constants/api_v2.dart b/lib/constants/api_v2.dart index ea499dd..e7e1b20 100644 --- a/lib/constants/api_v2.dart +++ b/lib/constants/api_v2.dart @@ -85,6 +85,9 @@ class UserAPI { ///确认角色卡变动 String get confirmUserCardChange => '/v2/app/user/welfare/notice/look'; + + ///会员隐私开关 + String get securePhone => '/v2/app/user/secret'; } class BenefitAPI { diff --git a/lib/pages/user/account_and_safety/account_and_safety_page.dart b/lib/pages/user/account_and_safety/account_and_safety_page.dart index 5f85140..1928bf8 100644 --- a/lib/pages/user/account_and_safety/account_and_safety_page.dart +++ b/lib/pages/user/account_and_safety/account_and_safety_page.dart @@ -1,6 +1,8 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; +import 'package:recook/constants/api_v2.dart'; import 'package:recook/constants/header.dart'; +import 'package:recook/manager/http_manager.dart'; import 'package:recook/widgets/custom_app_bar.dart'; import 'package:recook/widgets/progress/re_toast.dart'; import 'package:recook/widgets/sc_tile.dart'; @@ -14,7 +16,13 @@ class AccountAndSafetyPage extends StatefulWidget { } class _AccountAndSafetyPageState extends State { - bool switchTest = false; + bool secureValue = false; + @override + void initState() { + super.initState(); + //TODO 初始化手机号显示开关数值 + } + @override Widget build(BuildContext context) { return Scaffold( @@ -48,11 +56,11 @@ class _AccountAndSafetyPageState extends State { materialTapTargetSize: MaterialTapTargetSize.shrinkWrap, onPressed: () async { final cancel = ReToast.loading(text: '修改中'); - await Future.delayed(Duration(seconds: 2)); + secureValue = !secureValue; + await HttpManager.post( + APIV2.userAPI.securePhone, {'secure': secureValue ? 1 : 0}); cancel(); - setState(() { - switchTest = !switchTest; - }); + setState(() {}); }, child: Row( children: [ @@ -68,15 +76,15 @@ class _AccountAndSafetyPageState extends State { ], ).expand(), CupertinoSwitch( - value: switchTest, + value: secureValue, trackColor: Color(0xFFDB2D2D), onChanged: (state) async { final cancel = ReToast.loading(text: '修改中'); - await Future.delayed(Duration(seconds: 2)); + secureValue = !secureValue; + await HttpManager.post(APIV2.userAPI.securePhone, + {'secure': secureValue ? 1 : 0}); cancel(); - setState(() { - switchTest = !switchTest; - }); + setState(() {}); }, ), ], diff --git a/lib/pages/user/invite/group_invite_card.dart b/lib/pages/user/invite/group_invite_card.dart index fe16cdf..d4ade90 100644 --- a/lib/pages/user/invite/group_invite_card.dart +++ b/lib/pages/user/invite/group_invite_card.dart @@ -16,10 +16,15 @@ class GroupInviteCard extends StatelessWidget { final UserCommonModel model; const GroupInviteCard({Key key, @required this.model}) : super(key: key); _renderItem(String asset, String value) { + String displayValue = value; + if (displayValue?.isEmpty ?? true) { + displayValue = ' —'; + } return Row( children: [ Image.asset(asset, width: 10.w, height: 10.w), - value.text.size(11.sp).color(Color(0xFF999999)).make().expand(), + 2.wb, + displayValue.text.size(11.sp).color(Color(0xFF999999)).make().expand(), ], ).expand(); } @@ -184,7 +189,10 @@ class GroupInviteCard extends StatelessWidget { children: [ _renderItem( R.ASSETS_USER_ICON_GROUP_PNG, model.count.toString()), - _renderItem(R.ASSETS_USER_ICON_MONEY_PNG, 'TODO 销售额'), + _renderItem( + R.ASSETS_USER_ICON_MONEY_PNG, + model.amount.toStringAsFixed(2), + ), ], ), 16.hb, diff --git a/lib/pages/user/model/user_common_model.dart b/lib/pages/user/model/user_common_model.dart index 75a7df6..a3289ce 100644 --- a/lib/pages/user/model/user_common_model.dart +++ b/lib/pages/user/model/user_common_model.dart @@ -10,21 +10,24 @@ class UserCommonModel { int count; int roleLevel; int flag; + num amount; UserRoleLevel get roleLevelEnum => UserLevelTool.roleLevelEnum(roleLevel); bool get isRecommand => flag == 1; - UserCommonModel( - {this.userId, - this.headImgUrl, - this.nickname, - this.phone, - this.wechatNo, - this.remarkName, - this.count, - this.roleLevel, - this.flag}); + UserCommonModel({ + this.userId, + this.headImgUrl, + this.nickname, + this.phone, + this.wechatNo, + this.remarkName, + this.count, + this.roleLevel, + this.flag, + this.amount, + }); UserCommonModel.fromJson(Map json) { userId = json['userId']; @@ -36,6 +39,7 @@ class UserCommonModel { count = json['count']; roleLevel = json['roleLevel']; flag = json['flag']; + amount = json['amount']; } Map toJson() { diff --git a/pubspec.lock b/pubspec.lock index f03a302..da49b3b 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -713,6 +713,13 @@ packages: url: "https://pub.flutter-io.cn" source: hosted version: "0.3.19" + logger: + dependency: transitive + description: + name: logger + url: "https://pub.flutter-io.cn" + source: hosted + version: "0.9.4" logging: dependency: transitive description: @@ -982,7 +989,7 @@ packages: name: power_logger url: "https://pub.flutter-io.cn" source: hosted - version: "0.1.3" + version: "0.1.4" pretty_json: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 3b0989d..aebbf6d 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -222,7 +222,7 @@ dependencies: animations: - power_logger: ^0.1.2 + power_logger: ^0.1.4 pin_input_text_field: ^3.3.0 device_info: ^1.0.0