Commit d7799985 authored by 779285112's avatar 779285112

优化版本显示,订单详情时间选择器改为24小时选择

parent cd3ae05d
...@@ -21,6 +21,7 @@ class DioUtil { ...@@ -21,6 +21,7 @@ class DioUtil {
static final DioUtil _singleton = DioUtil._init(); static final DioUtil _singleton = DioUtil._init();
static final String baseUrl = "http://59.110.141.131:4042/"; static final String baseUrl = "http://59.110.141.131:4042/";
//static final String baseUrl = "http://192.168.1.116:4042/";
//static final String baseUrl = "http://192.168.0.106:4042/"; //static final String baseUrl = "http://192.168.0.106:4042/";
bool _isDebug = !bool.fromEnvironment("dart.vm.product"); bool _isDebug = !bool.fromEnvironment("dart.vm.product");
...@@ -113,10 +114,10 @@ class DioUtil { ...@@ -113,10 +114,10 @@ class DioUtil {
} else { } else {
B b = baseProcessor.success(response); B b = baseProcessor.success(response);
BaseResp res = b as BaseResp; BaseResp res = b as BaseResp;
if (res.code == tokenError) { if (res?.code == tokenError) {
refreshToken(); refreshToken();
} }
if (res.code == successCode) { if (res?.code == successCode) {
if (success != null) { if (success != null) {
success(b); success(b);
} }
......
...@@ -127,7 +127,6 @@ class _OrderCenterItemPageState extends State<OrderCenterItemPage> ...@@ -127,7 +127,6 @@ class _OrderCenterItemPageState extends State<OrderCenterItemPage>
}, failed: (res) { }, failed: (res) {
_controller.loadFailed(); _controller.loadFailed();
_controller.refreshFailed(); _controller.refreshFailed();
print(res.msg);
}, data: { }, data: {
"nurseId": UserManager.manager.user.nurseId, "nurseId": UserManager.manager.user.nurseId,
'receiveState': receiveState, 'receiveState': receiveState,
......
...@@ -414,7 +414,7 @@ class OrderDetailPageState extends State<OrderDetailPage> { ...@@ -414,7 +414,7 @@ class OrderDetailPageState extends State<OrderDetailPage> {
DateCustomPicker.showDatePicker(context, DateCustomPicker.showDatePicker(context,
title: '设置时间', title: '设置时间',
showTitleActions: true, showTitleActions: true,
minTime: now.add(Duration(hours: 4)), minTime: DateTime(now.year, now.month, now.day, 0),
maxTime: maxTime, maxTime: maxTime,
onChanged: (date) {}, onConfirm: (date) { onChanged: (date) {}, onConfirm: (date) {
var time = var time =
......
...@@ -10,6 +10,7 @@ import 'package:app/ui/widgets/widget_index.dart'; ...@@ -10,6 +10,7 @@ import 'package:app/ui/widgets/widget_index.dart';
import 'package:app/utils/navigator_util.dart'; import 'package:app/utils/navigator_util.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:fluttertoast/fluttertoast.dart'; import 'package:fluttertoast/fluttertoast.dart';
import 'package:package_info/package_info.dart';
import 'package:path_provider/path_provider.dart'; import 'package:path_provider/path_provider.dart';
import '../webview.dart'; import '../webview.dart';
...@@ -23,12 +24,19 @@ class SettingPage extends BaseView { ...@@ -23,12 +24,19 @@ class SettingPage extends BaseView {
String _cacheSize = '0'; String _cacheSize = '0';
class SettingPageState extends BaseState<SettingViewModel> { class SettingPageState extends BaseState<SettingViewModel> {
String version = '1.0.0';
@override @override
void initState() { void initState() {
super.initState(); super.initState();
loadCache(); loadCache();
viewModel.dataStream.listen((user) {}, onError: (error) { initVersion();
//Toast.toast(context, error); }
void initVersion() async {
PackageInfo packageInfo = await PackageInfo.fromPlatform();
setState(() {
version = packageInfo.version;
}); });
} }
...@@ -192,7 +200,7 @@ class SettingPageState extends BaseState<SettingViewModel> { ...@@ -192,7 +200,7 @@ class SettingPageState extends BaseState<SettingViewModel> {
GestureDetector( GestureDetector(
onTap: () {}, onTap: () {},
child: TextCustom( child: TextCustom(
text: 'V1.0', text: 'V$version',
), ),
), ),
false), false),
......
...@@ -227,7 +227,7 @@ class DatePickerModel extends CommonPickerModel { ...@@ -227,7 +227,7 @@ class DatePickerModel extends CommonPickerModel {
currentTime.month == minTime.month && currentTime.month == minTime.month &&
currentTime.day == minTime.day currentTime.day == minTime.day
? minTime.hour ? minTime.hour
: 1; : 0;
} }
void _fillMiddleLists() { void _fillMiddleLists() {
......
...@@ -263,6 +263,13 @@ packages: ...@@ -263,6 +263,13 @@ packages:
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "1.1.7" version: "1.1.7"
package_info:
dependency: "direct main"
description:
name: package_info
url: "https://pub.flutter-io.cn"
source: hosted
version: "0.4.0+12"
path: path:
dependency: transitive dependency: transitive
description: description:
......
...@@ -11,7 +11,7 @@ description: A new Flutter application. ...@@ -11,7 +11,7 @@ description: A new Flutter application.
# In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion. # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
# Read more about iOS versioning at # Read more about iOS versioning at
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
version: 1.0.1+1 version: 1.0.1+2
environment: environment:
sdk: ">=2.1.0 <3.0.0" sdk: ">=2.1.0 <3.0.0"
...@@ -76,6 +76,8 @@ dependencies: ...@@ -76,6 +76,8 @@ dependencies:
keyboard_visibility: any keyboard_visibility: any
#获取设备信息 #获取设备信息
device_info: ^0.4.0+4 device_info: ^0.4.0+4
#版本信息
package_info: 0.4.0+12
flutter_drag_scale: flutter_drag_scale:
git: https://github.com/LiuC520/flutter_drag_scale.git git: https://github.com/LiuC520/flutter_drag_scale.git
#tabBar #tabBar
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment