Browse Source

更改

master
w-R 3 years ago
parent
commit
7851a8c209
  1. 2
      lib/generated/intl/messages_en.dart
  2. 2
      lib/generated/intl/messages_zh_CN.dart
  3. 2
      lib/generated/intl/messages_zh_Hans_CN.dart
  4. 2
      lib/generated/intl/messages_zh_Hant_CN.dart
  5. 2
      lib/generated/intl/messages_zh_TW.dart
  6. 14
      lib/generated/l10n.dart
  7. 67
      lib/view_widget/sign_in_widget.dart
  8. 2
      lib/web/web_page.dart
  9. 2
      lib/web/web_view/input_comment.dart

2
lib/generated/intl/messages_en.dart

@ -41,7 +41,7 @@ class MessageLookup extends MessageLookupByLibrary {
static m10(yuan) => "活动减免${yuan}元配送费";
static m11(jifen) => "+ ${jifen} 积分";
static m11(jifen) => "x${jifen}";
static m12(jianjie) => "简介:${jianjie}";

2
lib/generated/intl/messages_zh_CN.dart

@ -41,7 +41,7 @@ class MessageLookup extends MessageLookupByLibrary {
static m10(yuan) => "活动减免${yuan}元配送费";
static m11(jifen) => "+ ${jifen} 积分";
static m11(jifen) => "x${jifen}";
static m12(jianjie) => "简介:${jianjie}";

2
lib/generated/intl/messages_zh_Hans_CN.dart

@ -41,7 +41,7 @@ class MessageLookup extends MessageLookupByLibrary {
static m10(yuan) => "活动减免${yuan}元配送费";
static m11(jifen) => "+ ${jifen} 积分";
static m11(jifen) => "x${jifen}";
static m12(jianjie) => "简介:${jianjie}";

2
lib/generated/intl/messages_zh_Hant_CN.dart

@ -41,7 +41,7 @@ class MessageLookup extends MessageLookupByLibrary {
static m10(yuan) => "活動減免${yuan}元配送費";
static m11(jifen) => "+ ${jifen} 積分";
static m11(jifen) => "x${jifen}";
static m12(jianjie) => "簡介:${jianjie}";

2
lib/generated/intl/messages_zh_TW.dart

@ -41,7 +41,7 @@ class MessageLookup extends MessageLookupByLibrary {
static m10(yuan) => "活動減免${yuan}元配送費";
static m11(jifen) => "+ ${jifen} 積分";
static m11(jifen) => "x${jifen}";
static m12(jianjie) => "簡介:${jianjie}";

14
lib/generated/l10n.dart

@ -4455,10 +4455,20 @@ class S {
);
}
/// `+ {jifen} `
// /// `+ {jifen} `
// String jiajifen(Object jifen) {
// return Intl.message(
// '+ $jifen 积分',
// name: 'jiajifen',
// desc: '',
// args: [jifen],
// );
// }
/// `x {jifen} `
String jiajifen(Object jifen) {
return Intl.message(
'+ $jifen 积分',
'x$jifen',
name: 'jiajifen',
desc: '',
args: [jifen],

67
lib/view_widget/sign_in_widget.dart

@ -25,7 +25,7 @@ class _SignInWidget extends State<SignInWidget> {
Widget build(BuildContext context) {
return Container(
width: 222.w,
height: 275.h * AppUtils.textScale(context),
height:320.h * AppUtils.textScale(context),
child: Stack(
children: [
Positioned(
@ -40,13 +40,18 @@ class _SignInWidget extends State<SignInWidget> {
color: Colors.white,
borderRadius: BorderRadius.circular(8.w),
),
padding: EdgeInsets.only(top: 45.h),
padding: EdgeInsets.only(top:20.h),
child: Container(
padding: EdgeInsets.symmetric(vertical: 10.h),
child: Column(
mainAxisAlignment: MainAxisAlignment.spaceAround,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Image.asset(
"assets/image/icon_sign_success.png",
width: 80,
height: 80,
),
Text(
S.of(context).qiandaowancheng,
style: TextStyle(
@ -63,14 +68,36 @@ class _SignInWidget extends State<SignInWidget> {
fontWeight: MyFontWeight.regular,
),
),
Text(
S.of(context).jiajifen(widget.integral),
style: TextStyle(
color: Color(0xFFFF7A1A),
fontSize: 14.sp,
fontWeight: MyFontWeight.semi_bold,
Row(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Image.asset(
"assets/image/icon_gold_coin.png",
width: 16,
height: 16,
),
SizedBox(
width: 4.h,
),
Text(
S.of(context).jiajifen(widget.integral),
style: TextStyle(
color: Color(0xFFEE9905),
fontSize: 14.sp,
fontWeight: MyFontWeight.semi_bold,
),
),
],
),
),
// Text(
// S.of(context).jiajifen(widget.integral),
// style: TextStyle(
// color: Color(0xFFFF7A1A),
// fontSize: 14.sp,
// fontWeight: MyFontWeight.semi_bold,
// ),
// ),
RoundButton(
text: S.of(context).queren,
textColor: Colors.white,
@ -89,17 +116,17 @@ class _SignInWidget extends State<SignInWidget> {
),
),
),
Positioned(
top: 0,
child: Container(
child: Image.asset(
"assets/image/icon_sign_ok.png",
fit: BoxFit.contain,
width: 223.w,
height: 110.h * AppUtils.textScale(context),
),
),
),
// Positioned(
// top: 0,
// child: Container(
// child: Image.asset(
// "assets/image/icon_sign_ok.png",
// fit: BoxFit.contain,
// width: 223.w,
// height: 110.h * AppUtils.textScale(context),
// ),
// ),
// ),
],
),
);

2
lib/web/web_page.dart

@ -237,7 +237,7 @@ class _WebPage extends State<WebPage> with WidgetsBindingObserver {
onTap: () {
commentFocus.unfocus();
hintText = S.of(context).liuxianinjingcaidepinglunba;
inputKey.currentState.setState(() {});;
inputKey.currentState.setState(() {});
parenId = "0";
},
child: SingleChildScrollView(

2
lib/web/web_view/input_comment.dart

@ -92,7 +92,7 @@ class _InputComment extends State<InputComment> {
GestureDetector(
onTap: () {
var commentText = widget.commentTextController.text;
if (commentText == "") {
if (commentText.trim() == "") {
return;
}
widget.queryMemberComment(commentText);

Loading…
Cancel
Save