Browse Source

更改

ff_new
w-R 3 years ago
parent
commit
fe70237167
  1. BIN
      assets/image/2x/icon_mine_edit.png
  2. BIN
      assets/image/3x/icon_mine_edit.png
  3. BIN
      assets/image/icon_mine_edit.png
  4. 5
      lib/community/headlines/article_page.dart
  5. 99
      lib/community/release_dynamic.dart
  6. 12
      lib/home/home_page.dart
  7. 3
      lib/main.dart
  8. 3
      lib/mine/mine_page.dart
  9. 193
      lib/mine/personal_page.dart
  10. 8
      lib/retrofit/min_api.dart
  11. 2
      lib/retrofit/min_api.g.dart
  12. 8
      lib/retrofit/retrofit_api.dart
  13. 2
      lib/retrofit/retrofit_api.g.dart

BIN
assets/image/2x/icon_mine_edit.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
assets/image/3x/icon_mine_edit.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.5 KiB

BIN
assets/image/icon_mine_edit.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 576 B

After

Width:  |  Height:  |  Size: 707 B

5
lib/community/headlines/article_page.dart

@ -3,18 +3,13 @@ import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter/rendering.dart';
import 'package:flutter_easyloading/flutter_easyloading.dart';
import 'package:huixiang/community/headlines/headlines_banner.dart';
import 'package:huixiang/community/headlines/headlines_collection.dart';
import 'package:huixiang/main.dart';
import 'package:huixiang/retrofit/data/article.dart';
import 'package:huixiang/retrofit/data/banner.dart';
import 'package:huixiang/retrofit/data/base_data.dart';
import 'package:huixiang/retrofit/data/brand.dart';
import 'package:huixiang/retrofit/data/category_select_list.dart';
import 'package:huixiang/retrofit/data/collect_class_list.dart';
import 'package:huixiang/retrofit/data/course_list.dart';
import 'package:huixiang/retrofit/data/headlines_list.dart';
import 'package:huixiang/retrofit/data/headlines_list_details.dart';
import 'package:huixiang/retrofit/data/page.dart';
import 'package:huixiang/retrofit/retrofit_api.dart';
import 'package:huixiang/utils/event_type.dart';

99
lib/community/release_dynamic.dart

@ -436,35 +436,80 @@ class _ReleaseDynamic extends State<ReleaseDynamic> {
),
),
),
child: TextField(
controller: textEditingController,
maxLines: 5,
style: TextStyle(
fontSize: 14.sp,
fontWeight: MyFontWeight.medium,
color: Color(0xFF4C4C4C),
),
onChanged: (text) {
bool release = text != "" && text != null;
if (release != isRelease) {
isRelease = release;
setState(() {});
}
},
decoration: InputDecoration(
contentPadding: EdgeInsets.symmetric(
vertical: 18.h,
child: Column(
children: [
TextField(
controller: textEditingController,
maxLines: 5,
style: TextStyle(
fontSize: 14.sp,
fontWeight: MyFontWeight.medium,
color: Color(0xFF4C4C4C),
),
onChanged: (text) {
bool release = text != "" && text != null;
if (release != isRelease) {
isRelease = release;
setState(() {});
}
},
decoration: InputDecoration(
contentPadding: EdgeInsets.symmetric(
vertical: 18.h,
),
errorBorder: InputBorder.none,
focusedBorder: InputBorder.none,
enabledBorder: InputBorder.none,
hintText: "此时此刻的想法~",
hintStyle: TextStyle(
fontSize: 14.sp,
color: Color(0xFFA29E9E),
),
),
),
errorBorder: InputBorder.none,
focusedBorder: InputBorder.none,
enabledBorder: InputBorder.none,
hintText: "此时此刻的想法~",
hintStyle: TextStyle(
fontSize: 14.sp,
color: Color(0xFFA29E9E),
Row(
children: [
Container(
margin: EdgeInsets.only(top: 8, right: 8),
padding: EdgeInsets.only(left:10, right:8),
height: 21.h,
alignment: Alignment.center,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(10.5),
color: Color(0xFFF2F2F2),
),
child: Row(
children: [
Image.asset(
"assets/image/icon_union_location_black.png",
color: Color(0xFFB3B2B2),
width: 16,
height: 16,
),
SizedBox(width:2,),
Text(
"你在哪里呢?",
overflow:TextOverflow.ellipsis,
style: TextStyle(
fontSize: 11.sp,
fontWeight: MyFontWeight.medium,
color: Color(0xFFB3B2B2),
),
),
],
)
),
Spacer(),
Align(alignment: Alignment.centerRight,
child:Icon(
Icons.close,
color: Colors.black,
size: 16,
),)
],
),
),
),
],
)
);
}
}

12
lib/home/home_page.dart

@ -321,12 +321,12 @@ class HomePageState extends State<HomePage> with AutomaticKeepAliveClientMixin {
),
child: GestureDetector(
onTap: () {
Navigator.of(context).pushNamed('/router/system_msg_page').then((value) {
setState(() {
totalMsg = 0;
});
});
// Navigator.of(context).pushNamed('/router/web_turntable_activity');
// Navigator.of(context).pushNamed('/router/system_msg_page').then((value) {
// setState(() {
// totalMsg = 0;
// });
// });
Navigator.of(context).pushNamed('/router/web_turntable_activity');
},
child: Container(
height: 24,

3
lib/main.dart

@ -85,6 +85,7 @@ import 'mine/mine_vip/binding_assistant_card.dart';
import 'mine/mine_vip/legal_right_details.dart';
import 'mine/mine_vip/mine_attainment_page.dart';
import 'mine/mine_vip/mine_vip_core.dart';
import 'mine/personal_page.dart';
import 'order/exchange_write_off_page.dart';
import 'mine/release_page.dart';
import 'mine/roll_center_page.dart';
@ -346,4 +347,6 @@ Map<String, WidgetBuilder> routers = <String, WidgetBuilder>{
SystemDetails(arguments: arguments),
'/router/invitation_record': (context, {arguments}) =>
InvitationRecord(),
'/router/personal_page': (context, {arguments}) =>
PersonalPage(),
};

3
lib/mine/mine_page.dart

@ -46,7 +46,8 @@ class _MinePage extends State<MinePage> with AutomaticKeepAliveClientMixin {
.pushNamed('/router/login_page', arguments: {"login": "login"});
return;
}
await Navigator.of(context).pushNamed('/router/user_info_page');
// await Navigator.of(context).pushNamed('/router/user_info_page');
await Navigator.of(context).pushNamed('/router/personal_page');
setState(() {});
}

193
lib/mine/personal_page.dart

@ -0,0 +1,193 @@
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:huixiang/retrofit/retrofit_api.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:huixiang/utils/font_weight.dart';
import 'package:huixiang/view_widget/classic_header.dart';
import 'package:huixiang/view_widget/custom_image.dart';
import 'package:huixiang/view_widget/my_footer.dart';
import 'package:pull_to_refresh/pull_to_refresh.dart';
class PersonalPage extends StatefulWidget {
@override
State<StatefulWidget> createState() {
return _PersonalPage();
}
}
class _PersonalPage extends State<PersonalPage>
with WidgetsBindingObserver {
ApiService apiService;
final RefreshController refreshController = RefreshController();
final ScrollController scrollController = ScrollController();
@override
void initState() {
super.initState();
WidgetsBinding.instance.addObserver(this);
_onRefresh();
}
_onRefresh() {
}
@override
Widget build(BuildContext context) {
return Stack(
children: [
Positioned(
child: Container(
color: Colors.white,
child: SmartRefresher(
controller: refreshController,
enablePullDown: true,
enablePullUp: true,
header: MyHeader(),
footer: CustomFooter(
builder: (context, mode) {
return MyFooter(mode);
},
),
onRefresh: _onRefresh,
onLoading: () {
_onRefresh();
},
physics: BouncingScrollPhysics(),
scrollController: scrollController,
child: Container(
child: SingleChildScrollView(
physics: BouncingScrollPhysics(),
child: Container(
color: Color(0xFFF7F7F7),
child:Column(
children: [
Stack(
alignment: Alignment.bottomLeft,
children: [
Container(
// height: 286,
child:
Stack(
alignment: Alignment.bottomCenter,
children: [
Stack(
children: [
Positioned(
child: Container(
color: Colors.black,
child:Opacity(
opacity:0.9,
child: MImage(
"",
width: double.infinity,
height: 260.h,
fit: BoxFit.cover,
errorSrc: "assets/image/default_1.png",
fadeSrc: "assets/image/default_1.png",
)
)
)
),
Container(
margin: EdgeInsets.only(
top: 50.h, left: 16.w, right: 16.w),
decoration: BoxDecoration(
color: Colors.transparent,
),
child: Column(
mainAxisAlignment:
MainAxisAlignment.spaceBetween,
crossAxisAlignment:
CrossAxisAlignment.center,
children: [
GestureDetector(
child: Image.asset(
"assets/image/integral_return.png",
width: 24,
height: 24,
),
onTap: () {
Navigator.of(context).pop();
},
),
],
),
),
],
),
Container(
child: Column(
children: [
Padding(padding:EdgeInsets.only(right:16.w,bottom:16.h),
child: Row(
children: [
Spacer(),
Container(
margin: EdgeInsets.only(top: 8, right: 8),
padding: EdgeInsets.only(left: 2, right: 2),
width: 59.w,
height: 21.h,
alignment: Alignment.center,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(2),
color: Color(0x80000000),
),
child: Text(
"更换背景",
overflow:TextOverflow.ellipsis,
style: TextStyle(
fontSize: 12.sp,
fontWeight: MyFontWeight.regular,
color: Color(0xFFFFFFFF),
),
),
),
],
)),
],
),
),
],
),
),
// homeInfo(),
],
),
],
),
),
),
),
),
),
bottom: 0,
top: 0,
left: 0,
right: 0,
),
],
);
}
Widget homeInfo(){
return Container(
margin: EdgeInsets.only(left: 16),
child: Row(
children: [
MImage(
"",
isCircle: true,
width: 66,
height: 66,
fit: BoxFit.cover,
errorSrc: "assets/image/default_user.png",
fadeSrc: "assets/image/default_user.png",
),
],
),
);
}
}

8
lib/retrofit/min_api.dart

@ -28,12 +28,12 @@ part 'min_api.g.dart';
// const base_url = "http://user.prod.kunqi.lotus-wallet.com/app/"; ///222
// const baseUrl = "http://user.prod.kunqi.lotus-wallet.com/app/"; ///222
// const base_url = "http://192.168.10.236:8765/app/";///
// const baseUrl = "http://192.168.10.236:8765/app/";///
const base_url = "http://192.168.10.236:8765/app/";///
const baseUrl = "http://192.168.10.236:8765/app/";///
const base_url = "http://192.168.10.88:8765/app/";///
const baseUrl = "http://192.168.10.88:8765/app/";///
// const base_url = "http://192.168.10.88:8765/app/";///
// const baseUrl = "http://192.168.10.88:8765/app/";///
// const base_url = "http://192.168.10.37:8766/app/";

2
lib/retrofit/min_api.g.dart

@ -9,7 +9,7 @@ part of 'min_api.dart';
class _MinApiService implements MinApiService {
_MinApiService(this._dio, {this.baseUrl}) {
ArgumentError.checkNotNull(_dio, '_dio');
baseUrl ??= 'http://192.168.10.88:8765/app/';
baseUrl ??= 'http://192.168.10.236:8765/app/';
}
final Dio _dio;

8
lib/retrofit/retrofit_api.dart

@ -62,15 +62,15 @@ part 'retrofit_api.g.dart';
// const base_url = "http://platform.prod.kunqi.lotus-wallet.com/app/"; ///222
// const baseUrl = "http://platform.prod.kunqi.lotus-wallet.com/app/"; ///222
// const base_url = "http://192.168.10.236:8766/app/"; ///
// const baseUrl = "http://192.168.10.236:8766/app/"; ///
const base_url = "http://192.168.10.236:8766/app/"; ///
const baseUrl = "http://192.168.10.236:8766/app/"; ///
// const base_url = "http://192.168.10.37:8766/app/";
// const baseUrl = "http://192.168.10.37:8766/app/";
const base_url = "http://192.168.10.88:8766/app/";///
const baseUrl = "http://192.168.10.88:8766/app/";///
// const base_url = "http://192.168.10.88:8766/app/";///
// const baseUrl = "http://192.168.10.88:8766/app/";///
@RestApi(baseUrl: baseUrl)
abstract class ApiService {

2
lib/retrofit/retrofit_api.g.dart

@ -9,7 +9,7 @@ part of 'retrofit_api.dart';
class _ApiService implements ApiService {
_ApiService(this._dio, {this.baseUrl}) {
ArgumentError.checkNotNull(_dio, '_dio');
baseUrl ??= 'http://192.168.10.88:8766/app/';
baseUrl ??= 'http://192.168.10.236:8766/app/';
}
final Dio _dio;

Loading…
Cancel
Save