diff --git a/.fvm/fvm_config.json b/.fvm/fvm_config.json index 0031fb0..05cb49a 100644 --- a/.fvm/fvm_config.json +++ b/.fvm/fvm_config.json @@ -1 +1 @@ -{"flutterSdkVersion":"1.20.2"} \ No newline at end of file +{"flutterSdkVersion":"1.22.0"} \ No newline at end of file diff --git a/lib/pages/home/classify/coupon_list_page.dart b/lib/pages/home/classify/coupon_list_page.dart index 41cec21..561a58c 100644 --- a/lib/pages/home/classify/coupon_list_page.dart +++ b/lib/pages/home/classify/coupon_list_page.dart @@ -16,7 +16,7 @@ import 'package:recook/models/coupon_list_model.dart'; import 'package:recook/pages/home/classify/mvp/coupon_list_model_impl.dart'; import 'package:recook/pages/home/items/item_coupon.dart'; import 'package:recook/constants/header.dart'; -import 'package:recook/widgets/text_button.dart'; +import 'package:recook/widgets/text_button.dart' as TButton; import 'package:recook/widgets/toast.dart'; class CouponListPage extends StatefulWidget { @@ -80,7 +80,7 @@ class _CouponListPageState extends BaseStoreState { ); }), ), - TextButton( + TButton.TextButton( margin: EdgeInsets.only(top: 8, left: 20, right: 20), radius: BorderRadius.all(Radius.circular(30)), height: rSize(35), diff --git a/lib/pages/home/classify/goods_param_page.dart b/lib/pages/home/classify/goods_param_page.dart index 0284c39..43c420d 100644 --- a/lib/pages/home/classify/goods_param_page.dart +++ b/lib/pages/home/classify/goods_param_page.dart @@ -11,7 +11,7 @@ import 'package:flutter/material.dart'; import 'package:recook/base/base_store_state.dart'; import 'package:recook/models/goods_detail_model.dart'; import 'package:recook/constants/header.dart'; -import 'package:recook/widgets/text_button.dart'; +import 'package:recook/widgets/text_button.dart' as TButton; class GoodsParamPage extends StatefulWidget { // final List skus; @@ -147,7 +147,7 @@ class _GoodsParamPageState extends BaseStoreState { ], ), ), - TextButton( + TButton.TextButton( margin: EdgeInsets.only(top: 8, left: 20, right: 20), radius: BorderRadius.all(Radius.circular(30)), height: rSize(35), diff --git a/lib/pages/home/classify/goods_service_guarantee.dart b/lib/pages/home/classify/goods_service_guarantee.dart index b3471eb..f005fc1 100644 --- a/lib/pages/home/classify/goods_service_guarantee.dart +++ b/lib/pages/home/classify/goods_service_guarantee.dart @@ -12,7 +12,7 @@ import 'package:flutter/material.dart'; import 'package:recook/base/base_store_state.dart'; import 'package:recook/constants/header.dart'; import 'package:recook/widgets/custom_image_button.dart'; -import 'package:recook/widgets/text_button.dart'; +import 'package:recook/widgets/text_button.dart' as TButton; class GoodsServiceGuarantee extends StatefulWidget { // final List skus; @@ -68,7 +68,7 @@ class _GoodsServiceGuaranteeState _contentView('支持七天无理由退换货', '该商品支持七天无理由退货(未使用)'), ], )), - TextButton( + TButton.TextButton( margin: EdgeInsets.only(top: 8, left: 20, right: 20), radius: BorderRadius.all(Radius.circular(30)), height: rSize(35), diff --git a/lib/pages/home/items/item_coupon.dart b/lib/pages/home/items/item_coupon.dart index 7ab4819..26753a0 100644 --- a/lib/pages/home/items/item_coupon.dart +++ b/lib/pages/home/items/item_coupon.dart @@ -14,8 +14,7 @@ import 'package:recook/manager/user_manager.dart'; import 'package:recook/models/base_model.dart'; import 'package:recook/pages/home/classify/mvp/coupon_list_model_impl.dart'; import 'package:recook/utils/time_transition_util.dart'; -import 'package:recook/widgets/custom_app_bar.dart'; -import 'package:recook/widgets/text_button.dart'; +import 'package:recook/widgets/text_button.dart' as TButton; import 'package:recook/models/coupon_list_model.dart'; import 'package:recook/widgets/toast.dart'; @@ -143,7 +142,7 @@ class _CouponItemState extends State { ), ], ), - TextButton( + TButton.TextButton( padding: EdgeInsets.symmetric(horizontal: rSize(20)), radius: BorderRadius.horizontal(right: Radius.circular(11)), height: double.infinity, diff --git a/lib/pages/login/input_invitation_code_page.dart b/lib/pages/login/input_invitation_code_page.dart index a251438..0d12b79 100644 --- a/lib/pages/login/input_invitation_code_page.dart +++ b/lib/pages/login/input_invitation_code_page.dart @@ -13,11 +13,10 @@ import 'package:flutter/services.dart'; import 'package:recook/base/base_store_state.dart'; import 'package:recook/daos/user_dao.dart'; import 'package:recook/manager/user_manager.dart'; -import 'package:recook/redux/user_redux.dart'; import 'package:recook/widgets/custom_app_bar.dart'; import 'package:recook/constants/header.dart'; import 'package:recook/widgets/progress/sc_dialog.dart'; -import 'package:recook/widgets/text_button.dart'; +import 'package:recook/widgets/text_button.dart' as TButton; import 'package:recook/widgets/toast.dart'; class InvitationCodePage extends StatefulWidget { @@ -56,7 +55,7 @@ class InvitationCodePage extends StatefulWidget { class _InvitationCodePageState extends BaseStoreState { TextEditingController _controller; - + bool _loginEnable = false; @override @@ -92,12 +91,15 @@ class _InvitationCodePageState extends BaseStoreState { )), Container( margin: EdgeInsets.only(top: 8, left: 20, right: 20), - child: getStore().state.openinstall.code.length>0 ? Container() : Text( - "检测到您是第一次登录,请输入邀请码", - style: AppTextStyle.generate(16, color: Colors.grey[700]), - )), + child: getStore().state.openinstall.code.length > 0 + ? Container() + : Text( + "检测到您是第一次登录,请输入邀请码", + style: + AppTextStyle.generate(16, color: Colors.grey[700]), + )), _invitationInput(context), - TextButton( + TButton.TextButton( title: "登录", textColor: Colors.white, unableBackgroundColor: Colors.grey[300], @@ -110,7 +112,7 @@ class _InvitationCodePageState extends BaseStoreState { GSDialog.of(context).showLoadingDialog(context, ""); if (phoneLogin) { _phoneRegister(context); - }else { + } else { // _weChatRegister(context); } }, @@ -123,7 +125,7 @@ class _InvitationCodePageState extends BaseStoreState { Container _invitationInput(BuildContext context) { String bindData = getStore().state.openinstall.code; - if (bindData.length > 0){ + if (bindData.length > 0) { setState(() { _loginEnable = true; }); @@ -133,17 +135,21 @@ class _InvitationCodePageState extends BaseStoreState { child: Theme( data: ThemeData(primaryColor: Theme.of(context).primaryColor), // child: _invitationTF(), - child: bindData.length > 0 ? _invitationText(bindData) : _invitationTF(), + child: + bindData.length > 0 ? _invitationText(bindData) : _invitationTF(), ), ); } - Text _invitationText(bindData) { - return Text("邀请码: $bindData", style: AppTextStyle.generate(30, color: Colors.black), maxLines: 1,); + return Text( + "邀请码: $bindData", + style: AppTextStyle.generate(30, color: Colors.black), + maxLines: 1, + ); } - TextField _invitationTF(){ + TextField _invitationTF() { return TextField( enableInteractiveSelection: true, maxLength: 8, @@ -168,8 +174,7 @@ class _InvitationCodePageState extends BaseStoreState { textAlign: TextAlign.center, cursorColor: Colors.grey[400], style: AppTextStyle.generate(30, - fontWeight: FontWeight.w700, - color: Theme.of(context).primaryColor), + fontWeight: FontWeight.w700, color: Theme.of(context).primaryColor), decoration: InputDecoration( hintText: "请输入邀请码", hintStyle: AppTextStyle.generate(30, color: Colors.grey[400])), @@ -178,11 +183,10 @@ class _InvitationCodePageState extends BaseStoreState { _phoneRegister(BuildContext context) { String bindData = getStore().state.openinstall.code; - if (bindData.length <= 0){ + if (bindData.length <= 0) { bindData = _controller.text.toUpperCase(); } - UserDao.phoneRegister( - widget.argument["mobile"], bindData, + UserDao.phoneRegister(widget.argument["mobile"], bindData, success: (data, code, msg) { GSDialog.of(context).dismiss(context); AppRouter.pushAndRemoveUntil(context, RouteName.TAB_BAR); diff --git a/lib/pages/login/phone_login_page.dart b/lib/pages/login/phone_login_page.dart index 7234ca8..80e867e 100644 --- a/lib/pages/login/phone_login_page.dart +++ b/lib/pages/login/phone_login_page.dart @@ -20,7 +20,7 @@ import 'package:recook/pages/login/input_invitation_code_page.dart'; import 'package:recook/utils/share_preference.dart'; import 'package:recook/widgets/custom_app_bar.dart'; import 'package:recook/widgets/progress/sc_dialog.dart'; -import 'package:recook/widgets/text_button.dart'; +import 'package:recook/widgets/text_button.dart' as TButton; import 'package:recook/widgets/toast.dart'; class PhoneLoginPage extends StatefulWidget { @@ -215,7 +215,7 @@ class _PhoneLoginPageState extends BaseStoreState { suffixIcon: _clearButton(_smsCodeController, _smsCodeNode)), ), ), - TextButton( + TButton.TextButton( title: _countDownStr, width: rSize(120), textColor: Colors.grey[700], @@ -257,7 +257,7 @@ class _PhoneLoginPageState extends BaseStoreState { // highlightTextColor: Colors.grey[400], // onTap: () {}, // ), - TextButton( + TButton.TextButton( title: "收不到验证码?", font: ScreenAdapterUtils.setSp(14), textColor: Colors.grey[500], @@ -270,8 +270,8 @@ class _PhoneLoginPageState extends BaseStoreState { } /// 登录按钮 - TextButton _loginButton(BuildContext context) { - return TextButton( + TButton.TextButton _loginButton(BuildContext context) { + return TButton.TextButton( height: 45, title: "登录", textColor: Colors.white, diff --git a/lib/pages/login/wechat_bind_page.dart b/lib/pages/login/wechat_bind_page.dart index b306724..d0d1472 100644 --- a/lib/pages/login/wechat_bind_page.dart +++ b/lib/pages/login/wechat_bind_page.dart @@ -9,7 +9,7 @@ import 'package:recook/daos/user_dao.dart'; import 'package:recook/manager/user_manager.dart'; import 'package:recook/pages/login/wechat_input_invitecode_page.dart'; import 'package:recook/widgets/custom_app_bar.dart'; -import 'package:recook/widgets/text_button.dart'; +import 'package:recook/widgets/text_button.dart' as TButton; import 'package:recook/widgets/toast.dart'; class WeChatBindPage extends StatefulWidget { @@ -227,7 +227,7 @@ class _WeChatBindPageState extends BaseStoreState { ), ), ), - TextButton( + TButton.TextButton( title: _countDownStr, // title: '获取验证码', // width: rSize(120), @@ -367,7 +367,7 @@ class _WeChatBindPageState extends BaseStoreState { _loginBtnWidget() { return Container( - child: TextButton( + child: TButton.TextButton( title: '登录', textColor: Colors.white, unableBackgroundColor: Colors.grey[300], diff --git a/lib/pages/login/wechat_input_invitecode_page.dart b/lib/pages/login/wechat_input_invitecode_page.dart index c1aaa4f..b92351f 100644 --- a/lib/pages/login/wechat_input_invitecode_page.dart +++ b/lib/pages/login/wechat_input_invitecode_page.dart @@ -9,7 +9,7 @@ import 'package:recook/constants/styles.dart'; import 'package:recook/daos/user_dao.dart'; import 'package:recook/manager/user_manager.dart'; import 'package:recook/widgets/custom_app_bar.dart'; -import 'package:recook/widgets/text_button.dart'; +import 'package:recook/widgets/text_button.dart' as TButton; import 'package:recook/widgets/toast.dart'; class WeChatInputInviteCodePage extends StatefulWidget { @@ -165,7 +165,7 @@ class _WeChatInputInviteCodePageState _loginBtnWidget() { return Container( - child: TextButton( + child: TButton.TextButton( title: '登录', textColor: Colors.white, unableBackgroundColor: Colors.grey[300], diff --git a/lib/pages/user/review/widgets/review_card.dart b/lib/pages/user/review/widgets/review_card.dart index a19d979..0a76885 100644 --- a/lib/pages/user/review/widgets/review_card.dart +++ b/lib/pages/user/review/widgets/review_card.dart @@ -2,7 +2,6 @@ import 'package:flutter/material.dart'; import 'package:recook/constants/api.dart'; import 'package:recook/constants/constants.dart'; import 'package:recook/constants/header.dart'; -import 'package:recook/manager/http_manager.dart'; import 'package:recook/pages/user/review/add_review_page.dart'; import 'package:recook/pages/user/review/models/order_review_list_model.dart'; import 'package:recook/pages/user/review/review_detail_page.dart';