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) { @@ -11,14 +11,14 @@ if (flutterRoot == null) {
11 throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.") 11 throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
12 } 12 }
13 13
14 -def flutterVersionCode = "252" 14 +def flutterVersionCode = "254"
15 if (flutterVersionCode == null) { 15 if (flutterVersionCode == null) {
16 - flutterVersionCode = '252' 16 + flutterVersionCode = '254'
17 } 17 }
18 18
19 -def flutterVersionName = "2.5.2" 19 +def flutterVersionName = "2.5.4"
20 if (flutterVersionName == null) { 20 if (flutterVersionName == null) {
21 - flutterVersionName = '2.5.2' 21 + flutterVersionName = '2.5.4'
22 } 22 }
23 23
24 apply plugin: 'com.android.application' 24 apply plugin: 'com.android.application'
@@ -5,8 +5,10 @@ import 'package:dio/dio.dart'; @@ -5,8 +5,10 @@ import 'package:dio/dio.dart';
5 import 'package:flutter/material.dart'; 5 import 'package:flutter/material.dart';
6 import 'package:one_key/app.dart'; 6 import 'package:one_key/app.dart';
7 import 'package:one_key/constant/error.dart'; 7 import 'package:one_key/constant/error.dart';
  8 +import 'package:one_key/provider/user_model.dart';
8 import 'package:one_key/utils/utils.dart'; 9 import 'package:one_key/utils/utils.dart';
9 import 'package:one_key/widgets/loading.dart'; 10 import 'package:one_key/widgets/loading.dart';
  11 +import 'package:provider/provider.dart';
10 12
11 import 'base_resp.dart'; 13 import 'base_resp.dart';
12 14
@@ -180,7 +182,7 @@ class DioUtil { @@ -180,7 +182,7 @@ class DioUtil {
180 bool connectivity = await Utils.checkConnectiviy(); 182 bool connectivity = await Utils.checkConnectiviy();
181 if (!connectivity) { 183 if (!connectivity) {
182 Utils.showToast("网络错误，请稍后重试"); 184 Utils.showToast("网络错误，请稍后重试");
183 - throw MyError(type: 1); 185 + throw MyError(type: 1);
184 } 186 }
185 if (showLoading) Loading.showLoading(context); 187 if (showLoading) Loading.showLoading(context);
186 try { 188 try {
@@ -347,8 +349,21 @@ class DioUtil { @@ -347,8 +349,21 @@ class DioUtil {
347 if (App.sp?.getString("unionid") != null && 349 if (App.sp?.getString("unionid") != null &&
348 App.sp?.getString("unionid").isNotEmpty) { 350 App.sp?.getString("unionid").isNotEmpty) {
349 options.headers = {"unionid": App.sp.getString("unionid")}; 351 options.headers = {"unionid": App.sp.getString("unionid")};
  352 +
350 print(App.sp.getString("unionid")); 353 print(App.sp.getString("unionid"));
351 } 354 }
  355 + // String deviceId = await Utils.getUUID();
  356 + // Provider.of<UserModel>(context, listen: false).user.sellerid
  357 + // options.headers = {
  358 + // "operator": {
  359 + // "device": "29d61c1b30911d9bP1C32AH0F3402197",
  360 + // "account": "0003",
  361 + // "uid": "20202",
  362 + // "sid": '4352',
  363 + // "type": "2",
  364 + // "version": "v2.1.9"
  365 + // }
  366 + // };
352 } 367 }
353 368
354 return options; 369 return options;
1 import 'dart:convert'; 1 import 'dart:convert';
2 2
  3 +import 'package:common_utils/common_utils.dart';
3 import 'package:flutter/material.dart'; 4 import 'package:flutter/material.dart';
4 import 'package:flutter_picker/flutter_picker.dart'; 5 import 'package:flutter_picker/flutter_picker.dart';
5 import 'package:flutter_screenutil/flutter_screenutil.dart'; 6 import 'package:flutter_screenutil/flutter_screenutil.dart';
@@ -437,6 +438,12 @@ class NotebookDetailPageState extends State<NotebookDetailPage> { @@ -437,6 +438,12 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
437 }); 438 });
438 } 439 }
439 440
  441 + _getDateTime(String date) {
  442 + DateTime dateTime =
  443 + DateTime.fromMillisecondsSinceEpoch(int.parse(date.toString()) * 1000);
  444 + return DateUtil.formatDate(dateTime, format: DateFormats.y_mo_d_h_m);
  445 + }
  446 +
440 @override 447 @override
441 Widget build(BuildContext context) { 448 Widget build(BuildContext context) {
442 if (MediaQuery.of(context).viewInsets.bottom == 0) { 449 if (MediaQuery.of(context).viewInsets.bottom == 0) {
@@ -685,6 +692,8 @@ class NotebookDetailPageState extends State<NotebookDetailPage> { @@ -685,6 +692,8 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
685 child: RowMultiText("记录人", 692 child: RowMultiText("记录人",
686 detailEntity.note_name ?? ""), 693 detailEntity.note_name ?? ""),
687 ), 694 ),
  695 + RowMultiText("下单时间",
  696 + _getDateTime(detailEntity.cdate)),
688 Offstage( 697 Offstage(
689 offstage: (detailEntity.status == 698 offstage: (detailEntity.status ==
690 "4" && 699 "4" &&
@@ -825,77 +825,109 @@ class InvicationPageState extends State<InvicationPage> { @@ -825,77 +825,109 @@ class InvicationPageState extends State<InvicationPage> {
825 }, 825 },
826 ), 826 ),
827 VEmptyView(20), 827 VEmptyView(20),
828 - RoundButton(  
829 - text: '发短信',  
830 - width: double.infinity,  
831 - height: ScreenUtil().setWidth(84),  
832 - gradientStart: MyColours.color_ffffff,  
833 - gradientEnd: MyColours.color_ffffff,  
834 - textColor: MyColours.color_199095,  
835 - borderColor: MyColours.color_199095,  
836 - fontSize: 34,  
837 - radius: ScreenUtil().setWidth(10),  
838 - isBold: false,  
839 - onPressed: () async {  
840 - if (widget.phone.isEmpty) {  
841 - Utils.showToast("没有预订人电话信息");  
842 - return;  
843 - }  
844 - if (!couponProvider.sendSMS) {  
845 - String dateSoltStr = '';  
846 - if (widget.dateSolt == '1') {  
847 - dateSoltStr = '早餐';  
848 - } else if (widget.dateSolt == '2') {  
849 - dateSoltStr = '午餐';  
850 - } else if (widget.dateSolt == '3') {  
851 - dateSoltStr = '晚餐';  
852 - }  
853 - DateTime dateTimeTemp =  
854 - DateTime.fromMillisecondsSinceEpoch(  
855 - int.parse(widget.ddate) * 1000);  
856 - String dateTimeStrTemp =  
857 - "${Utils.addZeroNumber(dateTimeTemp.month)}月${Utils.addZeroNumber(dateTimeTemp.day)}日";  
858 - Map<String, String> params = {  
859 - "id": widget.rid,  
860 - "uid": Provider.of<UserModel>(context,  
861 - listen: false)  
862 - .user  
863 - .openid,  
864 - "phone": widget.phone,  
865 -  
866 - // "Strtext": user.sellername +  
867 - // dateTimeStrTemp +  
868 - // dateSoltStr +  
869 - // '，' +  
870 - // '餐厅经理' +  
871 - // _baseIndoProvider.baseInfoSunModel.name +  
872 - // '已为您安排在' +  
873 - // widget.tableInfo.replaceAll("\n", "")  
874 - };  
875 - if (ObjectUtil.isNotEmpty(  
876 - _baseIndoProvider.baseInfoSunModel) &&  
877 - ObjectUtil.isNotEmpty(_baseIndoProvider  
878 - .baseInfoSunModel.name)) {  
879 - params['Strtext'] = user.sellername +  
880 - _baseIndoProvider.baseInfoSunModel.name;  
881 - } else {  
882 - params['Strtext'] = user.sellername;  
883 - }  
884 - bool success = await couponProvider  
885 - .sendSMSWxSendSms(context, params);  
886 - print(success);  
887 - if (success) {  
888 - Utils.showToast('短信已经发送成功！');  
889 - } else {  
890 - Utils.showToast('发送次数太频繁！');  
891 - }  
892 - } else {  
893 - Utils.showToast('短信已经发送成功！');  
894 - }  
895 -  
896 - // NavigatorUtil.goSmsPage(context, widget.rid);  
897 - },  
898 - ), 828 + Stack(children: [
  829 + Container(
  830 + margin: EdgeInsets.only(
  831 + top: ScreenUtil().setWidth(10),
  832 + right: ScreenUtil().setWidth(6)),
  833 + child: RoundButton(
  834 + text: '发短信',
  835 + width: double.infinity,
  836 + height: ScreenUtil().setWidth(84),
  837 + gradientStart: MyColours.color_ffffff,
  838 + gradientEnd: MyColours.color_ffffff,
  839 + textColor: MyColours.color_199095,
  840 + borderColor: MyColours.color_199095,
  841 + fontSize: 34,
  842 + radius: ScreenUtil().setWidth(10),
  843 + isBold: false,
  844 + onPressed: () async {
  845 + if (widget.phone.isEmpty) {
  846 + Utils.showToast("没有预订人电话信息");
  847 + return;
  848 + }
  849 + if (!couponProvider.sendSMS) {
  850 + String dateSoltStr = '';
  851 + if (widget.dateSolt == '1') {
  852 + dateSoltStr = '早餐';
  853 + } else if (widget.dateSolt == '2') {
  854 + dateSoltStr = '午餐';
  855 + } else if (widget.dateSolt == '3') {
  856 + dateSoltStr = '晚餐';
  857 + }
  858 + DateTime dateTimeTemp =
  859 + DateTime.fromMillisecondsSinceEpoch(
  860 + int.parse(widget.ddate) * 1000);
  861 + String dateTimeStrTemp =
  862 + "${Utils.addZeroNumber(dateTimeTemp.month)}月${Utils.addZeroNumber(dateTimeTemp.day)}日";
  863 + Map<String, String> params = {
  864 + "id": widget.rid,
  865 + "uid": Provider.of<UserModel>(context,
  866 + listen: false)
  867 + .user
  868 + .openid,
  869 + "phone": widget.phone,
  870 +
  871 + // "Strtext": user.sellername +
  872 + // dateTimeStrTemp +
  873 + // dateSoltStr +
  874 + // '，' +
  875 + // '餐厅经理' +
  876 + // _baseIndoProvider.baseInfoSunModel.name +
  877 + // '已为您安排在' +
  878 + // widget.tableInfo.replaceAll("\n", "")
  879 + };
  880 + if (ObjectUtil.isNotEmpty(_baseIndoProvider
  881 + .baseInfoSunModel) &&
  882 + ObjectUtil.isNotEmpty(_baseIndoProvider
  883 + .baseInfoSunModel.name)) {
  884 + params['Strtext'] = user.sellername +
  885 + _baseIndoProvider
  886 + .baseInfoSunModel.name;
  887 + } else {
  888 + params['Strtext'] = user.sellername;
  889 + }
  890 + bool success = await couponProvider
  891 + .sendSMSWxSendSms(context, params);
  892 + print(success);
  893 + if (success) {
  894 + Utils.showToast('短信已经发送成功！');
  895 + } else {
  896 + Utils.showToast('发送次数太频繁！');
  897 + }
  898 + } else {
  899 + Utils.showToast('短信已经发送成功！');
  900 + }
  901 +
  902 + // NavigatorUtil.goSmsPage(context, widget.rid);
  903 + },
  904 + )),
  905 + Positioned(
  906 + top: 0,
  907 + right: 0,
  908 + child: Container(
  909 + // padding: EdgeInsets.symmetric(horizontal: ScreenUtil().setWidth(16),vertical: ScreenUtil().setWidth(4)),
  910 + padding: EdgeInsets.only(bottom: ScreenUtil().setWidth(6)),
  911 + alignment: Alignment.center,
  912 + width: ScreenUtil().setWidth(62 * 2),
  913 + height: ScreenUtil().setWidth(42),
  914 + decoration: BoxDecoration(
  915 + // color: Colors.red,
  916 + image: DecorationImage(
  917 + image: ExactAssetImage(
  918 + Utils.getImgPath('sms_bg'),
  919 + ),
  920 + fit: BoxFit.cover,
  921 + ),
  922 + ),
  923 + child: Text(
  924 + '免费短信',
  925 + style: TextStyle(
  926 + color: MyColours.color_fefefe,
  927 + fontSize: ScreenUtil().setSp(24)),
  928 + )),
  929 + )
  930 + ])
899 ])), 931 ])),
900 ]), 932 ]),
901 Positioned( 933 Positioned(