fmk
/
huixiang_app
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branches 'dev' and 'master' of https://git.lotus-wallet.com/fmk/huixiang_app 

 Conflicts:
	pubspec.lock
null_safety
fmk 4 years ago
parent
dba658d043 d619962325
commit
b83840ce56
11 changed files with 230 additions and 192 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      lib/generated/intl/messages_en.dart
  2. 3
      lib/generated/intl/messages_zh_CN.dart
  3. 3
      lib/generated/intl/messages_zh_TW.dart
  4. 30
      lib/generated/l10n.dart
  5. 34
      lib/home/points_mall_page.dart
  6. 3
      lib/l10n/intl_en.arb
  7. 3
      lib/l10n/intl_zh_CN.arb
  8. 3
      lib/l10n/intl_zh_TW.arb
  9. 12
      lib/login/login_page.dart
  10. 304
      pubspec.lock
  11. 2
      pubspec.yaml

3
lib/generated/intl/messages_en.dart
Unescape View File

@ -86,6 +86,7 @@ class MessageLookup extends MessageLookupByLibrary {
"bainianchuanjiao" : MessageLookupByLibrary.simpleMessage("百年川椒"),
"baiyinhuiyuan" : MessageLookupByLibrary.simpleMessage("白银会员"),
"banben" : m0,
"bangong" : MessageLookupByLibrary.simpleMessage("办公"),
"bangzhuyufankui" : MessageLookupByLibrary.simpleMessage("帮助与反馈"),
"beizhu" : MessageLookupByLibrary.simpleMessage("备注"),
"brand_yixinhuixiang" : MessageLookupByLibrary.simpleMessage("一心回乡"),
@ -322,6 +323,7 @@ class MessageLookup extends MessageLookupByLibrary {
"shanglajiazai" : MessageLookupByLibrary.simpleMessage("上拉加载"),
"shangpinjifen" : m20,
"shangpinxiangqing" : MessageLookupByLibrary.simpleMessage("商品详情"),
"shenghuoyule" : MessageLookupByLibrary.simpleMessage("生活娱乐"),
"shenmijifendali" : MessageLookupByLibrary.simpleMessage("神秘积分大礼"),
"shenqingtuikuan" : MessageLookupByLibrary.simpleMessage("申请退款"),
"shezhi" : MessageLookupByLibrary.simpleMessage("设置"),
@ -399,6 +401,7 @@ class MessageLookup extends MessageLookupByLibrary {
"yikexiao" : MessageLookupByLibrary.simpleMessage("已核销"),
"yilingqu" : MessageLookupByLibrary.simpleMessage("已领取"),
"yingyeshijian" : m26,
"yinshi" : MessageLookupByLibrary.simpleMessage("饮食"),
"yinsishengming" : MessageLookupByLibrary.simpleMessage("隐私声明"),
"yiqiandao" : MessageLookupByLibrary.simpleMessage("已签到"),
"yiquxiao" : MessageLookupByLibrary.simpleMessage(" 已取消 "),

3
lib/generated/intl/messages_zh_CN.dart
Unescape View File

@ -86,6 +86,7 @@ class MessageLookup extends MessageLookupByLibrary {
"bainianchuanjiao" : MessageLookupByLibrary.simpleMessage("百年川椒"),
"baiyinhuiyuan" : MessageLookupByLibrary.simpleMessage("白银会员"),
"banben" : m0,
"bangong" : MessageLookupByLibrary.simpleMessage("办公"),
"bangzhuyufankui" : MessageLookupByLibrary.simpleMessage("帮助与反馈"),
"beizhu" : MessageLookupByLibrary.simpleMessage("备注"),
"brand_yixinhuixiang" : MessageLookupByLibrary.simpleMessage("一心回乡"),
@ -321,6 +322,7 @@ class MessageLookup extends MessageLookupByLibrary {
"shanglajiazai" : MessageLookupByLibrary.simpleMessage("上拉加载"),
"shangpinjifen" : m20,
"shangpinxiangqing" : MessageLookupByLibrary.simpleMessage("商品详情"),
"shenghuoyule" : MessageLookupByLibrary.simpleMessage("生活娱乐"),
"shenmijifendali" : MessageLookupByLibrary.simpleMessage("神秘积分大礼"),
"shenqingtuikuan" : MessageLookupByLibrary.simpleMessage("申请退款"),
"shezhi" : MessageLookupByLibrary.simpleMessage("设置"),
@ -398,6 +400,7 @@ class MessageLookup extends MessageLookupByLibrary {
"yikexiao" : MessageLookupByLibrary.simpleMessage("已核销"),
"yilingqu" : MessageLookupByLibrary.simpleMessage("已领取"),
"yingyeshijian" : m26,
"yinshi" : MessageLookupByLibrary.simpleMessage("饮食"),
"yinsishengming" : MessageLookupByLibrary.simpleMessage("隐私声明"),
"yiqiandao" : MessageLookupByLibrary.simpleMessage("已签到"),
"yiquxiao" : MessageLookupByLibrary.simpleMessage(" 已取消 "),

3
lib/generated/intl/messages_zh_TW.dart
Unescape View File

@ -86,6 +86,7 @@ class MessageLookup extends MessageLookupByLibrary {
"bainianchuanjiao" : MessageLookupByLibrary.simpleMessage("百年川椒"),
"baiyinhuiyuan" : MessageLookupByLibrary.simpleMessage("白銀會員"),
"banben" : m0,
"bangong" : MessageLookupByLibrary.simpleMessage("辦公"),
"bangzhuyufankui" : MessageLookupByLibrary.simpleMessage("幫助與反饋"),
"beizhu" : MessageLookupByLibrary.simpleMessage("備注"),
"brand_yixinhuixiang" : MessageLookupByLibrary.simpleMessage("一心回鄉"),
@ -321,6 +322,7 @@ class MessageLookup extends MessageLookupByLibrary {
"shanglajiazai" : MessageLookupByLibrary.simpleMessage("上拉加載"),
"shangpinjifen" : m20,
"shangpinxiangqing" : MessageLookupByLibrary.simpleMessage("商品詳情"),
"shenghuoyule" : MessageLookupByLibrary.simpleMessage("生活娛樂"),
"shenmijifendali" : MessageLookupByLibrary.simpleMessage("神秘積分大禮"),
"shenqingtuikuan" : MessageLookupByLibrary.simpleMessage("申請退款"),
"shezhi" : MessageLookupByLibrary.simpleMessage("設置"),
@ -398,6 +400,7 @@ class MessageLookup extends MessageLookupByLibrary {
"yikexiao" : MessageLookupByLibrary.simpleMessage("已核銷"),
"yilingqu" : MessageLookupByLibrary.simpleMessage("已領取"),
"yingyeshijian" : m26,
"yinshi" : MessageLookupByLibrary.simpleMessage("飲食"),
"yinsishengming" : MessageLookupByLibrary.simpleMessage("隱私聲明"),
"yiqiandao" : MessageLookupByLibrary.simpleMessage("已簽到"),
"yiquxiao" : MessageLookupByLibrary.simpleMessage(" 已取消 "),

30
lib/generated/l10n.dart
Unescape View File

@ -3725,6 +3725,36 @@ class S {
);
}
/// `饮食`
String get yinshi {
return Intl.message(
'饮食',
name: 'yinshi',
desc: '',
args: [],
);
}
/// `生活娱乐`
String get shenghuoyule {
return Intl.message(
'生活娱乐',
name: 'shenghuoyule',
desc: '',
args: [],
);
}
/// `办公`
String get bangong {
return Intl.message(
'办公',
name: 'bangong',
desc: '',
args: [],
);
}
/// `并使用本机号码登录`
String get privacy_policy4 {
return Intl.message(

34
lib/home/points_mall_page.dart
Unescape View File

@ -183,34 +183,25 @@ class _PointsMallPage extends State<PointsMallPage>
alignment: Alignment.centerLeft,
child: DefaultTabController(
length: 4,
child:Stack(
children: [
Padding(padding: EdgeInsets.only(top: 39),child:Divider(
// indent: 0.0,
thickness:1.5,
color: Color(0xffE6E6E6),
)),
TabBar(
child: TabBar(
isScrollable: true, //可滚动
indicatorColor: Color(0xff39B54A),
labelColor: Color(0xff32A060),
labelStyle: TextStyle(fontSize: 14),
labelStyle: TextStyle(fontSize: 14,fontWeight: FontWeight.bold),
unselectedLabelStyle: TextStyle(
fontSize: 14,
fontWeight: FontWeight.normal,
fontWeight: FontWeight.w400,
),
// controller: tabController,
//未选中文字颜色
unselectedLabelColor: Color(0xff262626),
unselectedLabelColor: Color(0xff4D4D4D),
indicatorSize: TabBarIndicatorSize.label,
//指示器与文字等宽
tabs: <Widget>[
Tab(text: "全部"),
Tab(text: "饮食"),
Tab(text: "生活娱乐"),
Tab(text: "办公"),
],
),
Tab(text: S.current.quanbu),
Tab(text: S.current.yinshi),
Tab(text: S.current.shenghuoyule),
Tab(text: S.current.bangong),
],
),
),
@ -320,7 +311,7 @@ class _PointsMallPage extends State<PointsMallPage>
),
Container(
margin:
EdgeInsets.only(left: 12.w, right: 12.w, bottom: 10.h, top: 10.h),
EdgeInsets.only(left: 12.w, right: 12.w, top: 10.h),
child: Column(
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
crossAxisAlignment: CrossAxisAlignment.start,
@ -329,8 +320,8 @@ class _PointsMallPage extends State<PointsMallPage>
goods.name,
overflow: TextOverflow.ellipsis,
style: TextStyle(
color: Colors.black,
fontWeight: FontWeight.bold,
color: Color(0xff353535),
fontWeight: FontWeight.w600,
fontSize: 16.sp,
),
),
@ -338,7 +329,7 @@ class _PointsMallPage extends State<PointsMallPage>
height: 8.h,
),
Container(
height: 34.h,
height: 30.h,
child: Text(
goods.description,
maxLines: 2,
@ -474,6 +465,7 @@ class _PointsMallPage extends State<PointsMallPage>
),
Container(
margin: EdgeInsets.only(left: 15),
height: 50.h,
child: Column(
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
crossAxisAlignment: CrossAxisAlignment.end,

3
lib/l10n/intl_en.arb
Unescape View File

@ -386,6 +386,9 @@
"youkedenglu": "游客登录",
"yishouquan": "已授权",
"qingshuruchongzhijine": "请输入充值金额",
"yinshi": "饮食",
"shenghuoyule": "生活娱乐",
"bangong": "办公",

3
lib/l10n/intl_zh_CN.arb
Unescape View File

@ -387,6 +387,9 @@
"youkedenglu": "游客登录",
"yishouquan": "已授权",
"qingshuruchongzhijine": "请输入充值金额",
"yinshi": "饮食",
"shenghuoyule": "生活娱乐",
"bangong": "办公",

3
lib/l10n/intl_zh_TW.arb
Unescape View File

@ -379,6 +379,9 @@
"youkedenglu": "遊客登錄",
"yishouquan": "已授權",
"qingshuruchongzhijine": "請輸入充值金額",
"yinshi": "飲食",
"shenghuoyule": "生活娛樂",
"bangong": "辦公",
"privacy_policy4": "并使用本機號碼登錄"

12
lib/login/login_page.dart
Unescape View File

@ -17,7 +17,7 @@ import 'package:flutter/services.dart';
import 'package:huixiang/generated/l10n.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:dio/dio.dart';
import 'package:photo_view/photo_view.dart';
// import 'package:photo_view/photo_view.dart';
import 'package:shared_preferences/shared_preferences.dart';
class LoginPage extends StatefulWidget {
@ -390,11 +390,11 @@ class _MyLoginPageState extends State<LoginPage> with TickerProviderStateMixin {
child: Stack(
alignment: Alignment.center,
children: [
PhotoView(
imageProvider: AssetImage("assets/image/laoban.png"),
initialScale: Platform.isAndroid ? 1.02 : 1.2,
basePosition: alignmentProgress,
),
// PhotoView(
// imageProvider: AssetImage("assets/image/laoban.png"),
// initialScale: Platform.isAndroid ? 1.02 : 1.2,
// basePosition: alignmentProgress,
// ),
Positioned(
top: 54.h,
left: 28.w,

304
pubspec.lock
View File

File diff suppressed because it is too large Load Diff

2
pubspec.yaml
Unescape View File

@ -87,7 +87,7 @@ dependencies:
cached_network_image: ^2.0.0
flutter_html: ^1.3.0 #2.1.0
photo_view: ^0.11.1
# photo_view: ^0.11.1
chewie: ^0.12.2
video_player: ^1.0.1

Write Preview
Loading…
Cancel
Save