1281228557
/
aku_new_community
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix bugs

Browse Source
pull/1/head
张萌 3 years ago
parent 0b3566cc5d
commit 43a341237a
9 changed files with 56 additions and 88 deletions
Show Stats Download Patch File Download Diff File

16
lib/pages/home/home_page.dart
Unescape View File

@ -129,14 +129,14 @@ class _HomePageState extends State<HomePage>
),
textAlign: TextAlign.center,
),
Text(
'(${appProvider.weatherType} ${appProvider.weatherTemp}℃)',
style: TextStyle(
fontSize: 28.sp,
color: Color(0xff999999),
),
textAlign: TextAlign.center,
),
// Text(
// '(${appProvider.weatherType} ${appProvider.weatherTemp}℃)',
// style: TextStyle(
// fontSize: 28.sp,
// color: Color(0xff999999),
// ),
// textAlign: TextAlign.center,
// ),
Spacer(),
// GestureDetector(
// onTap: () {

47
lib/pages/personal/personal_page.dart
Unescape View File

@ -109,7 +109,7 @@ class _PersonalIndexState extends State<PersonalIndex>
height: 40.w,
alignment: Alignment.center,
child: Image.asset(
R.ASSETS_ICONS_ICON_MY_SETTING_PNG,
Assets.newIcon.imgShezhi.path,
width: 40.w,
height: 40.w),
),
@ -402,13 +402,13 @@ class _PersonalIndexState extends State<PersonalIndex>
),
24.hb,
_function('我的积分', Assets.newIcon.icJifen.path,
() => ClockInPage(), ''),
() => Get.to(() => ClockInPage()), ''),
_function(
'我的房屋',
R.ASSETS_ICONS_ICON_MY_HOUSE_PNG,
(){
Get.to(() => MyHousePage());
},
Assets.newIcon.icWdfw.path,
() {
Get.to(() => MyHousePage());
},
// () => HouseOwnersPage(
// identify: 4,
// ),
@ -417,39 +417,26 @@ class _PersonalIndexState extends State<PersonalIndex>
'${UserTool.userProvider.defaultHouse?.unitName ?? ''}'
'${UserTool.userProvider.defaultHouse?.estateName ?? ''}',
),
36.hb,
_function(
'我的家庭',
R.ASSETS_ICONS_ICON_MY_HOUSE_PNG,
(){
Get.to(() => MyFamilyPage());
}
,
''),
36.hb,
_function('我的家庭', Assets.newIcon.icWdjt.path, () {
Get.to(() => MyFamilyPage());
}, ''),
// _function('我的车位', R.ASSETS_ICONS_ICON_MY_CARSEAT_PNG,
// () => CarParkingPage(), ''),
// 36.hb,
// _function('我的车', R.ASSETS_ICONS_ICON_MY_CAR_PNG,
// () => CarManagePage(), ''),
// 36.hb,
_function(
'我的访客',
R.ASSETS_ICONS_ICON_MY_VISITOR_PNG,
(){
BotToast.showText(text: '当前小区尚未连接设备', align: Alignment(0, 0.5));
}
,
''),
36.hb,
_function('我的访客', Assets.newIcon.icWdfk.path, () {
BotToast.showText(
text: '当前小区尚未连接设备',
align: Alignment(0, 0.5));
}, ''),
_function(
'收货地址',
R.ASSETS_ICONS_ICON_MY_LOCATION_PNG,
() => AddressListPage(
Assets.newIcon.icShdz.path,
() => Get.to(() => AddressListPage(
canBack: false,
),
)),
''),
],
),

33
lib/pages/setting_page/settings_page.dart
Unescape View File

@ -1,12 +1,9 @@
import 'package:aku_new_community/base/base_style.dart';
import 'package:aku_new_community/extensions/num_ext.dart';
import 'package:aku_new_community/extensions/widget_list_ext.dart';
import 'package:aku_new_community/pages/setting_page/about_page/about_page.dart';
import 'package:aku_new_community/pages/setting_page/account_manager_page.dart';
import 'package:aku_new_community/pages/setting_page/agreement_page/agreement_page.dart';
import 'package:aku_new_community/pages/setting_page/agreement_page/privacy_page.dart';
import 'package:aku_new_community/pages/setting_page/feedback_page/feedback_page.dart';
import 'package:aku_new_community/pages/tab_navigator.dart';
import 'package:aku_new_community/pages/sign/login/other_login_page.dart';
import 'package:aku_new_community/provider/user_provider.dart';
import 'package:aku_new_community/utils/developer_util.dart';
import 'package:aku_new_community/utils/websocket/web_socket_util.dart';
@ -81,7 +78,7 @@ class _SettingsPageState extends State<SettingsPage> {
),
onPressed: () {
userProvider.logout();
Get.offAll(() => TabNavigator());
Get.to(() => OtherLoginPage());
},
),
],
@ -106,7 +103,7 @@ class _SettingsPageState extends State<SettingsPage> {
body: ListView(
padding: EdgeInsets.zero,
children: [
...[
...<Widget>[
// _buildTile(
// title: '是否接受信息通知',
// suffix: CupertinoSwitch(
@ -114,10 +111,10 @@ class _SettingsPageState extends State<SettingsPage> {
// onChanged: (state) {},
// ),
// ),
_buildTile(
title: '关于小蜜蜂智慧小区',
onTap: () => Get.to(() => AboutPage()),
),
// _buildTile(
// title: '关于小蜜蜂智慧小区',
// onTap: () => Get.to(() => AboutPage()),
// ),
//TODO 邀请注册
// _buildTile(
// title: '邀请注册',
@ -137,14 +134,14 @@ class _SettingsPageState extends State<SettingsPage> {
// title: '清除缓存',
// onTap: () {},
// ),
_buildTile(
title: '意见反馈',
onTap: () => Get.to(() => FeedBackPage()),
),
_buildTile(
title: '账号管理',
onTap: () => Get.to(() => AccountManagerPage()),
),
// _buildTile(
// title: '意见反馈',
// onTap: () => Get.to(() => FeedBackPage()),
// ),
// _buildTile(
// title: '账号管理',
// onTap: () => Get.to(() => AccountManagerPage()),
// ),
_buildTile(
title: '小蜜蜂用户协议',
onTap: () => Get.to(() => AgreementPage()),

6
lib/pages/sign/login/other_login_page.dart
Unescape View File

@ -113,8 +113,10 @@ class _OtherLoginPageState extends State<OtherLoginPage> {
await UserTool.dataProvider.addHistories();
await UserTool.userProvider.setLogin(response.data['data']);
} else {
// BotToast.showText(text: response.data['message']);
BotToast.showText(text: '账号尚未注册，请使用验证码登陆');
BotToast.showText(text: response.data['msg']);
if (response.data['msg'] == '该账户未设置密码，请使用验证码登录') {
_controller.jumpToPage(0);
}
}
} catch (e) {
print(e.toString());

3
lib/ui/community/community_views/community_page.dart
Unescape View File

@ -97,6 +97,9 @@ class _CommunityPageState extends State<CommunityPage>
child: TabBar(
onTap: (index) {
setState(() {});
if (_tabController?.index == 1) {
myKey.currentState?.refresh();
}
},
controller: _tabController,
indicatorColor: Color(0xffffc40c),

1
lib/ui/community/community_views/my_community_view.dart
Unescape View File

@ -131,6 +131,7 @@ class MyCommunityViewState extends State<MyCommunityView>
return EasyRefresh(
firstRefresh: true,
header: MaterialHeader(),
footer: MaterialFooter(),
controller: _refreshController,
onRefresh: () async {
BaseListModel model = await NetUtil().getList(

2
lib/ui/function_and_service/task/hall/hall_card.dart
Unescape View File

@ -122,7 +122,7 @@ class HallCard extends StatelessWidget {
24.w.heightBox,
Row(
children: [
Assets.icons.environment.image(width: 36.w, height: 36.w),
Assets.icons.environment.image(width: 40.w, height: 40.w),
24.w.widthBox,
'${model.accessAddress}'
.text

25
lib/ui/function_and_service/task/my_take_task/my_take_task_card.dart
Unescape View File

@ -80,29 +80,6 @@ class MyTakeTaskCard extends StatelessWidget {
24.w.heightBox,
appointment,
20.w.heightBox,
Row(
children: [
Assets.icons.clockCircle.image(width: 36.w, height: 36.w),
24.w.widthBox,
'${DateUtil.formatDateStr(model.readyEndTime)}'
.text
.size(24.sp)
.color(Colors.black.withOpacity(0.65))
.make(),
],
),
20.w.heightBox,
Row(
children: [
Assets.icons.environment.image(width: 36.w, height: 36.w),
24.w.widthBox,
'${model.accessAddress}'
.text
.size(24.sp)
.color(Colors.black.withOpacity(0.65))
.make(),
],
),
Row(
children: [
Assets.icons.watch.image(width: 40.w, height: 40.w),
@ -120,7 +97,7 @@ class MyTakeTaskCard extends StatelessWidget {
24.w.heightBox,
Row(
children: [
Assets.icons.environment.image(width: 36.w, height: 36.w),
Assets.icons.environment.image(width: 40.w, height: 40.w),
24.w.widthBox,
'${model.accessAddress}'
.text

11
lib/ui/function_and_service/task/task_map.dart
Unescape View File

@ -8,15 +8,16 @@ class TaskMap {
9: '其他'
};
static Map<int, String> statusToString = {
1: '未接单',
2: '待处理',
3: '已完成',
4: '已取消'
1: '已发布',
2: '服务中',
3: '待确认',
4: '已完成',
5: '已评价',
9: '已取消'
};
static Map<int, String> typeToString = {1: '跑腿', 2: '代驾', 3: '装修', 4: '陪玩'};
static Map<int, String> serviceObject = {1: '住户', 2: '物业', 3: '不限'};
static Map<int, String> rewardType = {1: '赏金', 2: '积分'};
}

Write Preview
Loading…
Cancel
Save