xt / Flutter-ReserveApp · Commits

Go to a project

Commit 6f0f52779fb62df6bd42e9fd1effd7448129fe84

Authored by wdn127929
1 parent dd714d84
build: skipped

订单详情信息变更和免费短信标注

Inline Side-by-side
Showing 5 changed files with 132 additions and 76 deletions
... ... @@ -11,14 +11,14 @@ if (flutterRoot == null) {
throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
}
def flutterVersionCode = "252"
def flutterVersionCode = "254"
if (flutterVersionCode == null) {
flutterVersionCode = '252'
flutterVersionCode = '254'
}
def flutterVersionName = "2.5.2"
def flutterVersionName = "2.5.4"
if (flutterVersionName == null) {
flutterVersionName = '2.5.2'
flutterVersionName = '2.5.4'
}
apply plugin: 'com.android.application'
... ...
... ... @@ -5,8 +5,10 @@ import 'package:dio/dio.dart';
import 'package:flutter/material.dart';
import 'package:one_key/app.dart';
import 'package:one_key/constant/error.dart';
import 'package:one_key/provider/user_model.dart';
import 'package:one_key/utils/utils.dart';
import 'package:one_key/widgets/loading.dart';
import 'package:provider/provider.dart';
import 'base_resp.dart';
... ... @@ -180,7 +182,7 @@ class DioUtil {
bool connectivity = await Utils.checkConnectiviy();
if (!connectivity) {
Utils.showToast("网络错误，请稍后重试");
throw MyError(type: 1);
throw MyError(type: 1);
}
if (showLoading) Loading.showLoading(context);
try {
... ... @@ -347,8 +349,21 @@ class DioUtil {
if (App.sp?.getString("unionid") != null &&
App.sp?.getString("unionid").isNotEmpty) {
options.headers = {"unionid": App.sp.getString("unionid")};
print(App.sp.getString("unionid"));
}
// String deviceId = await Utils.getUUID();
// Provider.of<UserModel>(context, listen: false).user.sellerid
// options.headers = {
// "operator": {
// "device": "29d61c1b30911d9bP1C32AH0F3402197",
// "account": "0003",
// "uid": "20202",
// "sid": '4352',
// "type": "2",
// "version": "v2.1.9"
// }
// };
}
return options;
... ...
import 'dart:convert';
import 'package:common_utils/common_utils.dart';
import 'package:flutter/material.dart';
import 'package:flutter_picker/flutter_picker.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
... ... @@ -437,6 +438,12 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
});
}
_getDateTime(String date) {
DateTime dateTime =
DateTime.fromMillisecondsSinceEpoch(int.parse(date.toString()) * 1000);
return DateUtil.formatDate(dateTime, format: DateFormats.y_mo_d_h_m);
}
@override
Widget build(BuildContext context) {
if (MediaQuery.of(context).viewInsets.bottom == 0) {
... ... @@ -685,6 +692,8 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
child: RowMultiText("记录人",
detailEntity.note_name ?? ""),
),
RowMultiText("下单时间",
_getDateTime(detailEntity.cdate)),
Offstage(
offstage: (detailEntity.status ==
"4" &&
... ...
... ... @@ -825,77 +825,109 @@ class InvicationPageState extends State<InvicationPage> {
},
),
VEmptyView(20),
RoundButton(
text: '发短信',
width: double.infinity,
height: ScreenUtil().setWidth(84),
gradientStart: MyColours.color_ffffff,
gradientEnd: MyColours.color_ffffff,
textColor: MyColours.color_199095,
borderColor: MyColours.color_199095,
fontSize: 34,
radius: ScreenUtil().setWidth(10),
isBold: false,
onPressed: () async {
if (widget.phone.isEmpty) {
Utils.showToast("没有预订人电话信息");
return;
}
if (!couponProvider.sendSMS) {
String dateSoltStr = '';
if (widget.dateSolt == '1') {
dateSoltStr = '早餐';
} else if (widget.dateSolt == '2') {
dateSoltStr = '午餐';
} else if (widget.dateSolt == '3') {
dateSoltStr = '晚餐';
}
DateTime dateTimeTemp =
DateTime.fromMillisecondsSinceEpoch(
int.parse(widget.ddate) * 1000);
String dateTimeStrTemp =
"${Utils.addZeroNumber(dateTimeTemp.month)}月${Utils.addZeroNumber(dateTimeTemp.day)}日";
Map<String, String> params = {
"id": widget.rid,
"uid": Provider.of<UserModel>(context,
listen: false)
.user
.openid,
"phone": widget.phone,
// "Strtext": user.sellername +
// dateTimeStrTemp +
// dateSoltStr +
// '，' +
// '餐厅经理' +
// _baseIndoProvider.baseInfoSunModel.name +
// '已为您安排在' +
// widget.tableInfo.replaceAll("\n", "")
};
if (ObjectUtil.isNotEmpty(
_baseIndoProvider.baseInfoSunModel) &&
ObjectUtil.isNotEmpty(_baseIndoProvider
.baseInfoSunModel.name)) {
params['Strtext'] = user.sellername +
_baseIndoProvider.baseInfoSunModel.name;
} else {
params['Strtext'] = user.sellername;
}
bool success = await couponProvider
.sendSMSWxSendSms(context, params);
print(success);
if (success) {
Utils.showToast('短信已经发送成功！');
} else {
Utils.showToast('发送次数太频繁！');
}
} else {
Utils.showToast('短信已经发送成功！');
}
// NavigatorUtil.goSmsPage(context, widget.rid);
},
),
Stack(children: [
Container(
margin: EdgeInsets.only(
top: ScreenUtil().setWidth(10),
right: ScreenUtil().setWidth(6)),
child: RoundButton(
text: '发短信',
width: double.infinity,
height: ScreenUtil().setWidth(84),
gradientStart: MyColours.color_ffffff,
gradientEnd: MyColours.color_ffffff,
textColor: MyColours.color_199095,
borderColor: MyColours.color_199095,
fontSize: 34,
radius: ScreenUtil().setWidth(10),
isBold: false,
onPressed: () async {
if (widget.phone.isEmpty) {
Utils.showToast("没有预订人电话信息");
return;
}
if (!couponProvider.sendSMS) {
String dateSoltStr = '';
if (widget.dateSolt == '1') {
dateSoltStr = '早餐';
} else if (widget.dateSolt == '2') {
dateSoltStr = '午餐';
} else if (widget.dateSolt == '3') {
dateSoltStr = '晚餐';
}
DateTime dateTimeTemp =
DateTime.fromMillisecondsSinceEpoch(
int.parse(widget.ddate) * 1000);
String dateTimeStrTemp =
"${Utils.addZeroNumber(dateTimeTemp.month)}月${Utils.addZeroNumber(dateTimeTemp.day)}日";
Map<String, String> params = {
"id": widget.rid,
"uid": Provider.of<UserModel>(context,
listen: false)
.user
.openid,
"phone": widget.phone,
// "Strtext": user.sellername +
// dateTimeStrTemp +
// dateSoltStr +
// '，' +
// '餐厅经理' +
// _baseIndoProvider.baseInfoSunModel.name +
// '已为您安排在' +
// widget.tableInfo.replaceAll("\n", "")
};
if (ObjectUtil.isNotEmpty(_baseIndoProvider
.baseInfoSunModel) &&
ObjectUtil.isNotEmpty(_baseIndoProvider
.baseInfoSunModel.name)) {
params['Strtext'] = user.sellername +
_baseIndoProvider
.baseInfoSunModel.name;
} else {
params['Strtext'] = user.sellername;
}
bool success = await couponProvider
.sendSMSWxSendSms(context, params);
print(success);
if (success) {
Utils.showToast('短信已经发送成功！');
} else {
Utils.showToast('发送次数太频繁！');
}
} else {
Utils.showToast('短信已经发送成功！');
}
// NavigatorUtil.goSmsPage(context, widget.rid);
},
)),
Positioned(
top: 0,
right: 0,
child: Container(
// padding: EdgeInsets.symmetric(horizontal: ScreenUtil().setWidth(16),vertical: ScreenUtil().setWidth(4)),
padding: EdgeInsets.only(bottom: ScreenUtil().setWidth(6)),
alignment: Alignment.center,
width: ScreenUtil().setWidth(62 * 2),
height: ScreenUtil().setWidth(42),
decoration: BoxDecoration(
// color: Colors.red,
image: DecorationImage(
image: ExactAssetImage(
Utils.getImgPath('sms_bg'),
),
fit: BoxFit.cover,
),
),
child: Text(
'免费短信',
style: TextStyle(
color: MyColours.color_fefefe,
fontSize: ScreenUtil().setSp(24)),
)),
)
])
])),
]),
Positioned(
... ...