Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
flutter_1.5_therapist
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
享易移动端项目
flutter_1.5_therapist
Commits
d7799985
Commit
d7799985
authored
Feb 27, 2020
by
779285112
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
优化版本显示,订单详情时间选择器改为24小时选择
parent
cd3ae05d
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
26 additions
and
9 deletions
+26
-9
index.dart
lib/api/index.dart
+3
-2
order_center_item_page.dart
lib/ui/pages/order_center/order_center_item_page.dart
+0
-1
order_detail_page.dart
...ui/pages/order_center/order_detail/order_detail_page.dart
+1
-1
setting_page.dart
lib/ui/pages/setting/setting_page.dart
+11
-3
date_model.dart
lib/ui/widgets/datepicker/src/date_model.dart
+1
-1
pubspec.lock
pubspec.lock
+7
-0
pubspec.yaml
pubspec.yaml
+3
-1
No files found.
lib/api/index.dart
View file @
d7799985
...
...
@@ -21,6 +21,7 @@ class DioUtil {
static
final
DioUtil
_singleton
=
DioUtil
.
_init
();
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/";
bool
_isDebug
=
!
bool
.
fromEnvironment
(
"dart.vm.product"
);
...
...
@@ -113,10 +114,10 @@ class DioUtil {
}
else
{
B
b
=
baseProcessor
.
success
(
response
);
BaseResp
res
=
b
as
BaseResp
;
if
(
res
.
code
==
tokenError
)
{
if
(
res
?
.
code
==
tokenError
)
{
refreshToken
();
}
if
(
res
.
code
==
successCode
)
{
if
(
res
?
.
code
==
successCode
)
{
if
(
success
!=
null
)
{
success
(
b
);
}
...
...
lib/ui/pages/order_center/order_center_item_page.dart
View file @
d7799985
...
...
@@ -127,7 +127,6 @@ class _OrderCenterItemPageState extends State<OrderCenterItemPage>
},
failed:
(
res
)
{
_controller
.
loadFailed
();
_controller
.
refreshFailed
();
print
(
res
.
msg
);
},
data:
{
"nurseId"
:
UserManager
.
manager
.
user
.
nurseId
,
'receiveState'
:
receiveState
,
...
...
lib/ui/pages/order_center/order_detail/order_detail_page.dart
View file @
d7799985
...
...
@@ -414,7 +414,7 @@ class OrderDetailPageState extends State<OrderDetailPage> {
DateCustomPicker
.
showDatePicker
(
context
,
title:
'设置时间'
,
showTitleActions:
true
,
minTime:
now
.
add
(
Duration
(
hours:
4
)
),
minTime:
DateTime
(
now
.
year
,
now
.
month
,
now
.
day
,
0
),
maxTime:
maxTime
,
onChanged:
(
date
)
{},
onConfirm:
(
date
)
{
var
time
=
...
...
lib/ui/pages/setting/setting_page.dart
View file @
d7799985
...
...
@@ -10,6 +10,7 @@ import 'package:app/ui/widgets/widget_index.dart';
import
'package:app/utils/navigator_util.dart'
;
import
'package:flutter/material.dart'
;
import
'package:fluttertoast/fluttertoast.dart'
;
import
'package:package_info/package_info.dart'
;
import
'package:path_provider/path_provider.dart'
;
import
'../webview.dart'
;
...
...
@@ -23,12 +24,19 @@ class SettingPage extends BaseView {
String
_cacheSize
=
'0'
;
class
SettingPageState
extends
BaseState
<
SettingViewModel
>
{
String
version
=
'1.0.0'
;
@override
void
initState
()
{
super
.
initState
();
loadCache
();
viewModel
.
dataStream
.
listen
((
user
)
{},
onError:
(
error
)
{
//Toast.toast(context, error);
initVersion
();
}
void
initVersion
()
async
{
PackageInfo
packageInfo
=
await
PackageInfo
.
fromPlatform
();
setState
(()
{
version
=
packageInfo
.
version
;
});
}
...
...
@@ -192,7 +200,7 @@ class SettingPageState extends BaseState<SettingViewModel> {
GestureDetector
(
onTap:
()
{},
child:
TextCustom
(
text:
'V
1.0
'
,
text:
'V
$version
'
,
),
),
false
),
...
...
lib/ui/widgets/datepicker/src/date_model.dart
View file @
d7799985
...
...
@@ -227,7 +227,7 @@ class DatePickerModel extends CommonPickerModel {
currentTime
.
month
==
minTime
.
month
&&
currentTime
.
day
==
minTime
.
day
?
minTime
.
hour
:
1
;
:
0
;
}
void
_fillMiddleLists
()
{
...
...
pubspec.lock
View file @
d7799985
...
...
@@ -263,6 +263,13 @@ packages:
url: "https://pub.flutter-io.cn"
source: hosted
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:
dependency: transitive
description:
...
...
pubspec.yaml
View file @
d7799985
...
...
@@ -11,7 +11,7 @@ description: A new Flutter application.
# In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
# Read more about iOS versioning at
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
version
:
1.0.1+
1
version
:
1.0.1+
2
environment
:
sdk
:
"
>=2.1.0
<3.0.0"
...
...
@@ -76,6 +76,8 @@ dependencies:
keyboard_visibility
:
any
#获取设备信息
device_info
:
^0.4.0+4
#版本信息
package_info
:
0.4.0+12
flutter_drag_scale
:
git
:
https://github.com/LiuC520/flutter_drag_scale.git
#tabBar
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment