jd
/
app
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

upgrade flutter sdk to 1.22.1

Browse Source
master
laiiihz 5 years ago
parent 511ad1f6aa
commit 3e5ab4bd0a
10 changed files with 42 additions and 40 deletions
Show Stats Download Patch File Download Diff File

2
.fvm/fvm_config.json
Unescape View File

@ -1 +1 @@
{"flutterSdkVersion":"1.20.2"}
{"flutterSdkVersion":"1.22.0"}

4
lib/pages/home/classify/coupon_list_page.dart
Unescape View File

@ -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<CouponListPage> {
);
}),
),
TextButton(
TButton.TextButton(
margin: EdgeInsets.only(top: 8, left: 20, right: 20),
radius: BorderRadius.all(Radius.circular(30)),
height: rSize(35),

4
lib/pages/home/classify/goods_param_page.dart
Unescape View File

@ -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<Sku> skus;
@ -147,7 +147,7 @@ class _GoodsParamPageState extends BaseStoreState<GoodsParamPage> {
],
),
),
TextButton(
TButton.TextButton(
margin: EdgeInsets.only(top: 8, left: 20, right: 20),
radius: BorderRadius.all(Radius.circular(30)),
height: rSize(35),

4
lib/pages/home/classify/goods_service_guarantee.dart
Unescape View File

@ -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<Sku> 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),

5
lib/pages/home/items/item_coupon.dart
Unescape View File

@ -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<CouponItem> {
),
],
),
TextButton(
TButton.TextButton(
padding: EdgeInsets.symmetric(horizontal: rSize(20)),
radius: BorderRadius.horizontal(right: Radius.circular(11)),
height: double.infinity,

42
lib/pages/login/input_invitation_code_page.dart
Unescape View File

@ -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<InvitationCodePage> {
TextEditingController _controller;
bool _loginEnable = false;
@override
@ -92,12 +91,15 @@ class _InvitationCodePageState extends BaseStoreState<InvitationCodePage> {
)),
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<InvitationCodePage> {
GSDialog.of(context).showLoadingDialog(context, "");
if (phoneLogin) {
_phoneRegister(context);
}else {
} else {
// _weChatRegister(context);
}
},
@ -123,7 +125,7 @@ class _InvitationCodePageState extends BaseStoreState<InvitationCodePage> {
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<InvitationCodePage> {
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<InvitationCodePage> {
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<InvitationCodePage> {
_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);

10
lib/pages/login/phone_login_page.dart
Unescape View File

@ -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<PhoneLoginPage> {
suffixIcon: _clearButton(_smsCodeController, _smsCodeNode)),
),
),
TextButton(
TButton.TextButton(
title: _countDownStr,
width: rSize(120),
textColor: Colors.grey[700],
@ -257,7 +257,7 @@ class _PhoneLoginPageState extends BaseStoreState<PhoneLoginPage> {
// 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<PhoneLoginPage> {
}
/// 登录按钮
TextButton _loginButton(BuildContext context) {
return TextButton(
TButton.TextButton _loginButton(BuildContext context) {
return TButton.TextButton(
height: 45,
title: "登录",
textColor: Colors.white,

6
lib/pages/login/wechat_bind_page.dart
Unescape View File

@ -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<WeChatBindPage> {
),
),
),
TextButton(
TButton.TextButton(
title: _countDownStr,
// title: '获取验证码',
// width: rSize(120),
@ -367,7 +367,7 @@ class _WeChatBindPageState extends BaseStoreState<WeChatBindPage> {
_loginBtnWidget() {
return Container(
child: TextButton(
child: TButton.TextButton(
title: '登录',
textColor: Colors.white,
unableBackgroundColor: Colors.grey[300],

4
lib/pages/login/wechat_input_invitecode_page.dart
Unescape View File

@ -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],

1
lib/pages/user/review/widgets/review_card.dart
Unescape View File

@ -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';

Write Preview
Loading…
Cancel
Save