xt / Flutter-ReserveApp · Commits

Go to a project

Commit 1276a2aa3e468f095344e3400d9edc3501e872b3

Authored by wdn127929
1 parent 94c90821
build: skipped

两位消暑

Inline Side-by-side
Showing 8 changed files with 59 additions and 25 deletions
... ... @@ -245,7 +245,7 @@ class _CouponSelectPageState extends State<CouponSelectPage> {
SmsModel smsModel = new SmsModel();
// String sms = await smsModel.getSmsContent(context, params);
String phoneNumber = "";
await Sendsms.onSendSMS(phoneNumber, 'smsfffffff');
await Sendsms.onSendSMS(phoneNumber, '短信内容');
});
} else {
Navigator.pop(context);
... ...
... ... @@ -397,13 +397,16 @@ class NoteBookPageState extends State<NoteBookPage> {
)),
),
Spacer(),
Container(
padding:
EdgeInsets.symmetric(horizontal: ScreenUtil().setWidth(40)),
child: GestureDetector(
onTap: () {
NavigatorUtil.goStatisticsPage(context);
},
GestureDetector(
onTap: () {
NavigatorUtil.goStatisticsPage(context);
},
child: Container(
color: Colors.white,
padding: EdgeInsets.only(
left: ScreenUtil().setWidth(40),
right: ScreenUtil().setWidth(40),
bottom: ScreenUtil().setWidth(30)),
child: Text(
"统计列表",
style: TextStyle(
... ... @@ -431,7 +434,7 @@ class NoteBookPageState extends State<NoteBookPage> {
Container(
color: MyColours.color_ffffff,
width: double.infinity,
padding: EdgeInsets.symmetric(vertical: ScreenUtil().setHeight(16)),
padding: EdgeInsets.only(bottom: ScreenUtil().setWidth(16)),
child: Row(
crossAxisAlignment: CrossAxisAlignment.center,
children: <Widget>[
... ...
... ... @@ -143,12 +143,15 @@ class _StatisticsPageState extends State<StatisticsPage> {
_provider.tableHeaderModel.sortstr = '人均';
for (int i = 0; i < _provider.dataStatics.length; i++) {
_provider.dataStatics[i].select = false;
_provider.dataStatics[i].sortstr =
_provider.dataStatics[i].renjun == null
? ''
: '${_provider.dataStatics[i].renjun}元';
_provider.dataStatics[i].sortstr = _provider
.dataStatics[i].renjun ==
null
? ''
: '${(NumUtil.getNumByValueDouble(double.parse(_provider.dataStatics[i].renjun), 2)).toStringAsFixed(2)}元';
_provider.dataStatics[i].numstr = '${i + 1}';
}
break;
}
_provider.tableHeaderModel.select = false;
... ... @@ -429,7 +432,8 @@ class _StatisticsPageState extends State<StatisticsPage> {
InkWell(
onTap: () {
if (model.selectAny()) {
NavigatorUtil.goStatisticsSmsPage(context);
NavigatorUtil.goStatisticsSmsPage(context,
);
} else {
Utils.showToast('请选择顾客');
}
... ...
import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:one_key/models/statics_model.dart';
import 'package:one_key/provider/statistics_provider.dart';
import 'package:one_key/res/colors.dart';
import 'package:one_key/utils/utils.dart';
import 'package:one_key/widgets/MyDivider.dart';
... ... @@ -7,8 +9,10 @@ import 'package:one_key/widgets/h_empty_view.dart';
import 'package:one_key/widgets/round_button.dart';
import 'package:one_key/widgets/system_app_bar.dart';
import 'package:one_key/widgets/v_empty_view.dart';
import 'package:provider/provider.dart';
class StatisticsSmsPage extends StatefulWidget {
// final List<String> selectData;
StatisticsSmsPage({Key key}) : super(key: key);
@override
... ... @@ -16,6 +20,8 @@ class StatisticsSmsPage extends StatefulWidget {
}
class _StatisticsSmsPageState extends State<StatisticsSmsPage> {
StatisticsProvider _provider;
///文本
Widget _textWidget(String title, {Color textColor = MyColours.color_333333}) {
return Container(
... ... @@ -33,6 +39,7 @@ class _StatisticsSmsPageState extends State<StatisticsSmsPage> {
@override
Widget build(BuildContext context) {
_provider = Provider.of<StatisticsProvider>(context, listen: true);
return Scaffold(
backgroundColor: MyColours.color_f5f5f5,
appBar: SystemAppBar(
... ... @@ -81,7 +88,8 @@ class _StatisticsSmsPageState extends State<StatisticsSmsPage> {
CrossAxisAlignment.center,
children: [
_textWidget('当前已选择'),
_textWidget('33',
_textWidget(
'33',
textColor: MyColours.color_199095),
_textWidget('人/短信剩余条数'),
_textWidget('33',
... ...
... ... @@ -16,7 +16,6 @@ class StatisticsProvider with ChangeNotifier {
String dateE = "结束日期"; //结束时间
DateTime datetimeS; //开始时间
DateTime datetimeE; //结束时间
DateTime dateNow; //当前日期
bool showWidget = true;
int currentIndex = 0;
... ... @@ -34,9 +33,8 @@ class StatisticsProvider with ChangeNotifier {
tableHeaderModel.select = false;
tableHeaderModel.numstr = '序号';
tableHeaderModel.sortstr = '预订次数';
datetimeS = DateTime.now();
datetimeE = datetimeS.add(Duration(days: 1));
dateNow = datetimeS;
// datetimeS = DateTime.now();
// datetimeE = datetimeS.add(Duration(days: 1));
controller.text = '50';
}
... ... @@ -62,8 +60,8 @@ class StatisticsProvider with ChangeNotifier {
sortstr = '排序';
currentIndex = 0;
controller.text = '50';
datetimeS = DateTime.now();
datetimeE = datetimeS.add(Duration(days: 1));
datetimeS = null;
datetimeE = null;
showWidget = true;
notifyListeners();
}
... ... @@ -88,6 +86,16 @@ class StatisticsProvider with ChangeNotifier {
return false;
}
List<String> seletNum() {
List<String> selectStatics = [];
for (StaticsSunModel item in dataStatics) {
if (item.select) {
selectStatics.add(item.rname);
}
}
return selectStatics;
}
//获取统计列表
Future getStatisticsList(BuildContext context, Map<String, String> params,
{needLoading = true}) async {
... ...
... ... @@ -4,6 +4,7 @@ import 'package:one_key/models/coupon_model.dart';
import 'package:one_key/models/integral_model.dart';
import 'package:one_key/models/notebook.dart';
import 'package:one_key/models/notebook_detail.dart';
import 'package:one_key/models/statics_model.dart';
import 'package:one_key/models/table_list.dart';
import 'package:one_key/res/colors.dart';
import 'package:one_key/route/routes.dart';
... ... @@ -328,7 +329,7 @@ class NavigatorUtil {
/// 统计发短信
static Future<dynamic> goStatisticsSmsPage(BuildContext context,
{replace = false}) {
{replace = false, List<String> selectData}) {
return _navigateTo(context, "${Routes.statistics_sms_page}",
replace: replace);
}
... ...
... ... @@ -5,6 +5,7 @@ import 'package:flutter/material.dart';
import 'package:one_key/models/coupon_model.dart';
import 'package:one_key/models/integral_model.dart';
import 'package:one_key/models/notebook_detail.dart';
import 'package:one_key/models/statics_model.dart';
import 'package:one_key/models/table_list.dart';
import 'package:one_key/pages/coupon/coupon_detail_page.dart';
import 'package:one_key/pages/coupon/coupon_edit_page.dart';
... ... @@ -489,13 +490,17 @@ var statisticsPageHandler = new Handler(
///统计
var statisticsSmsPageHandler = new Handler(
handlerFunc: (BuildContext context, Map<String, List<Object>> params) {
handlerFunc: (BuildContext context, Map<dynamic, List<Object>> params) {
// CouponSunModel couponSunModel = CouponSunModel.fromJson(json.decode(
// FluroConvertUtils.fluroCnParamsDecode(params["couponSunModel"].first)));
// String tid = params["tid"].first;
// String tname = params["tname"].first;
// List<String> selectData = params["selectData"].first;
return ChangeNotifierProvider<StatisticsProvider>(
create: (_) => StatisticsProvider(), child: StatisticsSmsPage());
create: (_) => StatisticsProvider(),
child: StatisticsSmsPage(
// selectData: selectData,
));
// return ChangeNotifierProvider<UploadImageProvider>(
// create: (_) => UploadImageProvider(), child: EnterStoreFrontPhotoPage());
});
... ...
import 'dart:convert';
import 'package:one_key/models/statics_model.dart';
import 'package:one_key/models/table_list.dart';
/// fluro 参数编码解码工具类
... ... @@ -48,6 +49,10 @@ class FluroConvertUtils {
return json.decode(fluroCnParamsDecode(str));
}
static List<String> string2dynamic(String str) {
return json.decode(fluroCnParamsDecode(str));
}
/// string json 转为 map
static Map<String, List<TableList>> string2mapTableList(String str) {
return json.decode(fluroCnParamsDecode(str));
... ...