修复房屋认证流程 错误提示请选择房屋的问题

修复 发布动态 可以重复添加热门话题
修复签到页 圆角显示问题
修复发布任务时 加载框无法关闭问题
pull/1/head
张萌 3 years ago
parent 13d45555a0
commit c8132478f5

@ -8,6 +8,7 @@ import 'package:aku_new_community/models/integral/clocked_record_list_model.dart
import 'package:aku_new_community/models/integral/integral_info_model.dart'; import 'package:aku_new_community/models/integral/integral_info_model.dart';
import 'package:aku_new_community/pages/personal/clock_in/clock_success_dialog.dart'; import 'package:aku_new_community/pages/personal/clock_in/clock_success_dialog.dart';
import 'package:aku_new_community/utils/network/net_util.dart'; import 'package:aku_new_community/utils/network/net_util.dart';
import 'package:aku_new_community/widget/beeImageNetwork.dart';
import 'package:aku_new_community/widget/bee_back_button.dart'; import 'package:aku_new_community/widget/bee_back_button.dart';
import 'package:aku_new_community/widget/others/user_tool.dart'; import 'package:aku_new_community/widget/others/user_tool.dart';
import 'package:bot_toast/bot_toast.dart'; import 'package:bot_toast/bot_toast.dart';
@ -75,26 +76,11 @@ class _ClockInPageState extends State<ClockInPage> {
Hero( Hero(
tag: 'AVATAR', tag: 'AVATAR',
child: ClipOval( child: ClipOval(
// child: FadeInImage.assetNetwork( child: BeeImageNetwork(
// placeholder: Assets.images.placeholder.path, height: 106.w,
// image: SARSAPI.image( width: 106.w,
// (UserTool.userProvider.userInfoModel?.imgUrls ?? []) ),
// .isNotEmpty ),
// ? UserTool
// .userProvider.userInfoModel!.imgUrls.first.url
// : ''),
// height: 106.w,
// width: 106.w,
// fit: BoxFit.cover,
// imageErrorBuilder: (context, error, stackTrace) {
// return Image.asset(
// Assets.icons.iconMySetting.path,
// height: 106.w,
// width: 106.w,
// );
// },
// ),
),
), ),
Container( Container(
margin: EdgeInsets.only(left: 16.w), margin: EdgeInsets.only(left: 16.w),
@ -254,7 +240,7 @@ class _ClockInPageState extends State<ClockInPage> {
width: double.infinity, width: double.infinity,
decoration: BoxDecoration( decoration: BoxDecoration(
color: Colors.white, color: Colors.white,
borderRadius: BorderRadius.circular(30.w), borderRadius: BorderRadius.vertical(top: Radius.circular(30.w)),
), ),
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,

@ -155,7 +155,10 @@ class _AddNewEventPageState extends State<AddNewEventPage> {
GestureDetector( GestureDetector(
onTap: () async { onTap: () async {
var res = await Get.to(() => TopicSearchPage()); var res = await Get.to(() => TopicSearchPage());
_hotTopicModels.add(res as TopicListModel); var _repeat = _checkRepeatTopic(res as TopicListModel);
if (!_repeat) {
_hotTopicModels.add(res);
}
setState(() {}); setState(() {});
}, },
child: Container( child: Container(
@ -215,6 +218,15 @@ class _AddNewEventPageState extends State<AddNewEventPage> {
), ),
); );
} }
bool _checkRepeatTopic(TopicListModel model) {
for (var item in _hotTopicModels) {
if (item.id == model.id) {
return true;
}
}
return false;
}
} }
class TopicWidgets extends StatelessWidget { class TopicWidgets extends StatelessWidget {
@ -227,8 +239,10 @@ class TopicWidgets extends StatelessWidget {
final List<TopicListModel>? hotTopicModels; final List<TopicListModel>? hotTopicModels;
final List<TopicTag>? topicTags; final List<TopicTag>? topicTags;
List<dynamic> get models => List<dynamic> get models =>
hotTopicModels == null ? topicTags! : hotTopicModels!; hotTopicModels == null ? topicTags! : hotTopicModels!;
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Wrap( return Wrap(

@ -21,9 +21,8 @@ import 'package:common_utils/common_utils.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:get/get.dart'; import 'package:get/get.dart';
import 'package:velocity_x/velocity_x.dart'; import 'package:power_logger/power_logger.dart';
import 'add_appointment_address_page.dart'; import 'add_appointment_address_page.dart';
@ -75,6 +74,7 @@ class _PublishTaskPageState extends State<PublishTaskPage> {
_rewardController.dispose(); _rewardController.dispose();
_nameController.dispose(); _nameController.dispose();
_telController.dispose(); _telController.dispose();
BotToast.closeAllLoading();
super.dispose(); super.dispose();
} }
@ -142,25 +142,30 @@ class _PublishTaskPageState extends State<PublishTaskPage> {
print(e.toString()); print(e.toString());
} }
} }
var re = await TaskFunc.publish( try {
type: _type, var re = await TaskFunc.publish(
sex: _sex, type: _type,
servicePersonnel: _service, sex: _sex,
readyStartTime: _appointDate.toString(), servicePersonnel: _service,
readyEndTime: _appointEndDate.toString(), readyStartTime: _appointDate.toString(),
contact: _nameController.text, readyEndTime: _appointEndDate.toString(),
tel: _telController.text, contact: _nameController.text,
accessAddress: _accessAddress!, tel: _telController.text,
accessAddressDetail: _accessAddressDetail!, accessAddress: _accessAddress!,
serviceAddress: _serviceAddress, accessAddressDetail: _accessAddressDetail!,
serviceAddressDetail: _serviceAddressDetail, serviceAddress: _serviceAddress,
remarks: _content, serviceAddressDetail: _serviceAddressDetail,
voiceUrl: _voiceUrl, remarks: _content,
imgUrls: imgs, voiceUrl: _voiceUrl,
rewardType: _rewardType, imgUrls: imgs,
reward: _rewardController.text); rewardType: _rewardType,
if (re) { reward: _rewardController.text);
Get.back(); if (re) {
Get.back();
}
} catch (e) {
print(e.toString());
LoggerData.addData(e.toString());
} }
cancel(); cancel();
}, },

@ -34,7 +34,7 @@ class _AddHousePageState extends State<AddHousePage> {
TextEditingController _telController = TextEditingController(); TextEditingController _telController = TextEditingController();
List<int> get manageEstateIds { List<int> get manageEstateIds {
if (_otherPickHouse == null || _pickedHouses.first.house == null) { if (_otherPickHouse == null && _pickedHouses.first.house == null) {
return []; return [];
} }
if (_identify == Identify.OWNER) { if (_identify == Identify.OWNER) {

Loading…
Cancel
Save