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

首页更新

null_safety
w-R 4 years ago
parent
0d869a7701
commit
1af43ecca4
5 changed files with 204 additions and 205 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      lib/home/founder_story_page.dart
  2. 110
      lib/home/huixiang_brand_page.dart
  3. 12
      lib/login/login_page.dart
  4. 275
      pubspec.lock
  5. 2
      pubspec.yaml

10
lib/home/founder_story_page.dart
Unescape View File

@ -244,9 +244,9 @@ class _FounderStoryPage extends State<FounderStoryPage> {
children: [ children: [
_ideaWidget("友爱", _ideaWidget("友爱",
"https://tva1.sinaimg.cn/large/006y8mN6gy1g7aa03bmfpj3069069mx8.jpg"), "https://tva1.sinaimg.cn/large/006y8mN6gy1g7aa03bmfpj3069069mx8.jpg"),
_ideaWidget("友爱", _ideaWidget("纯净",
"https://tva1.sinaimg.cn/large/006y8mN6gy1g7aa03bmfpj3069069mx8.jpg"), "https://tva1.sinaimg.cn/large/006y8mN6gy1g7aa03bmfpj3069069mx8.jpg"),
_ideaWidget("友爱", _ideaWidget("健康",
"https://tva1.sinaimg.cn/large/006y8mN6gy1g7aa03bmfpj3069069mx8.jpg"), "https://tva1.sinaimg.cn/large/006y8mN6gy1g7aa03bmfpj3069069mx8.jpg"),
], ],
), ),
@ -255,11 +255,11 @@ class _FounderStoryPage extends State<FounderStoryPage> {
), ),
Row( Row(
children: [ children: [
_ideaWidget("友爱", _ideaWidget("有机",
"https://tva1.sinaimg.cn/large/006y8mN6gy1g7aa03bmfpj3069069mx8.jpg"), "https://tva1.sinaimg.cn/large/006y8mN6gy1g7aa03bmfpj3069069mx8.jpg"),
_ideaWidget("友爱", _ideaWidget("环保",
"https://tva1.sinaimg.cn/large/006y8mN6gy1g7aa03bmfpj3069069mx8.jpg"), "https://tva1.sinaimg.cn/large/006y8mN6gy1g7aa03bmfpj3069069mx8.jpg"),
_ideaWidget("友爱", _ideaWidget("智慧",
"https://tva1.sinaimg.cn/large/006y8mN6gy1g7aa03bmfpj3069069mx8.jpg"), "https://tva1.sinaimg.cn/large/006y8mN6gy1g7aa03bmfpj3069069mx8.jpg"),
], ],
), ),

110
lib/home/huixiang_brand_page.dart
Unescape View File

@ -325,65 +325,71 @@ class _BrandPage extends State<BrandPage>
mainAxisAlignment: MainAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Row( GestureDetector(
children: [ onTap: () {
ClipOval( Navigator.of(context).pushNamed('/router/founder_story_page');
child: MImage( },
brandData == null ? "" : brandData.originAvatar, child: Row(
fit: BoxFit.cover, children: [
width: 60, ClipOval(
height: 60, child: MImage(
errorSrc: "assets/image/default_1.png", brandData == null ? "" : brandData.originAvatar,
fadeSrc: "assets/image/default_1.png", fit: BoxFit.cover,
width: 60,
height: 60,
errorSrc: "assets/image/default_1.png",
fadeSrc: "assets/image/default_1.png",
),
clipBehavior: Clip.hardEdge,
), ),
clipBehavior: Clip.hardEdge, SizedBox(
), width: 16,
SizedBox( ),
width: 16, Expanded(
), child: Container(
Expanded( height: 60,
child: Container( child: Column(
height: 60, mainAxisAlignment: MainAxisAlignment.spaceEvenly,
child: Column( crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.spaceEvenly, children: [
crossAxisAlignment: CrossAxisAlignment.start, Text.rich(
children: [ TextSpan(children: [
Text.rich( TextSpan(
TextSpan(children: [ text: brandData == null ? "" : brandData.originator,
TextSpan( style: TextStyle(
text: brandData == null ? "" : brandData.originator, fontWeight: FontWeight.bold,
style: TextStyle( fontSize: 14,
fontWeight: FontWeight.bold, color: Colors.black,
fontSize: 14, ),
color: Colors.black,
), ),
), TextSpan(
TextSpan( text: " 集团创办人",
text: " 集团创办人", style: TextStyle(
style: TextStyle( fontSize: 10,
fontSize: 10, color: Colors.black,
color: Colors.black, ),
), ),
]),
textDirection: TextDirection.ltr,
),
Text(
brandData == null ? "" : brandData.originDesc,
overflow: TextOverflow.ellipsis,
maxLines: 2,
style: TextStyle(
fontSize: 12.sp,
color: Color(0xFF353535),
), ),
]),
textDirection: TextDirection.ltr,
),
Text(
brandData == null ? "" : brandData.originDesc,
overflow: TextOverflow.ellipsis,
maxLines: 2,
style: TextStyle(
fontSize: 12.sp,
color: Color(0xFF353535),
), ),
), ],
], ),
), ),
flex: 1,
), ),
flex: 1, ],
) ),
],
), ),
SizedBox( SizedBox(
height: 40, height: 40,
), ),
@ -410,7 +416,7 @@ class _BrandPage extends State<BrandPage>
height: 40, height: 40,
), ),
Text( Text(
S.of(context).tixian, S.of(context).linian,
style: TextStyle( style: TextStyle(
fontSize: 16.sp, fontSize: 16.sp,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,

12
lib/login/login_page.dart
Unescape View File

@ -15,7 +15,7 @@ import 'package:huixiang/generated/l10n.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:dio/dio.dart'; import 'package:dio/dio.dart';
import 'package:huixiang/view_widget/loading_view.dart'; import 'package:huixiang/view_widget/loading_view.dart';
import 'package:photo_view/photo_view.dart'; // import 'package:photo_view/photo_view.dart';
import 'package:shared_preferences/shared_preferences.dart'; import 'package:shared_preferences/shared_preferences.dart';
class LoginPage extends StatefulWidget { class LoginPage extends StatefulWidget {
@ -375,11 +375,11 @@ class _MyLoginPageState extends State<LoginPage> with TickerProviderStateMixin {
child: Stack( child: Stack(
alignment: Alignment.center, alignment: Alignment.center,
children: [ children: [
PhotoView( // PhotoView(
imageProvider: AssetImage("assets/image/laoban.png"), // imageProvider: AssetImage("assets/image/laoban.png"),
initialScale: Platform.isAndroid ? 1.02 : 1.2, // initialScale: Platform.isAndroid ? 1.02 : 1.2,
basePosition: alignmentProgress, // basePosition: alignmentProgress,
), // ),
Container( Container(
decoration: BoxDecoration( decoration: BoxDecoration(
color: Color(0xFF32A060).withAlpha(changeAlpha), color: Color(0xFF32A060).withAlpha(changeAlpha),

275
pubspec.lock
View File

File diff suppressed because it is too large Load Diff

2
pubspec.yaml
Unescape View File

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

Write Preview
Loading…
Cancel
Save