|
|
@@ -1,5 +1,6 @@
|
|
|
import 'package:flutter/material.dart';
|
|
|
import 'package:flutter_screenutil/flutter_screenutil.dart';
|
|
|
+import 'package:url_launcher/url_launcher.dart';
|
|
|
import '../util/api.dart';
|
|
|
import '../util/models.dart';
|
|
|
import '../showDialog.dart';
|
|
|
@@ -99,7 +100,7 @@ class _OrderTakingPageState extends State < OrderTakingPage > with AutomaticKeep
|
|
|
itemCount: listObj.length + 1,
|
|
|
itemBuilder: (BuildContext context, int index) { //itemBuilder实际上就是一个map的循环
|
|
|
if (index < listObj.length) {
|
|
|
- return OrderCardContainer(order:listObj[index],index:index,callback:(val)=>deleteOrder(val));
|
|
|
+ return OrderCardContainer(order: listObj[index], index: index, callback: (val) => deleteOrder(val));
|
|
|
}
|
|
|
return _getMoreWidget();
|
|
|
},
|
|
|
@@ -125,10 +126,9 @@ class _OrderTakingPageState extends State < OrderTakingPage > with AutomaticKeep
|
|
|
Container(
|
|
|
width: ScreenUtil.getInstance().setWidth(50),
|
|
|
height: ScreenUtil.getInstance().setHeight(50),
|
|
|
- child:CircularProgressIndicator(
|
|
|
+ child: CircularProgressIndicator()
|
|
|
)
|
|
|
- )
|
|
|
-
|
|
|
+
|
|
|
],
|
|
|
),
|
|
|
),
|
|
|
@@ -143,16 +143,16 @@ class _OrderTakingPageState extends State < OrderTakingPage > with AutomaticKeep
|
|
|
});
|
|
|
}
|
|
|
|
|
|
- void deleteOrder(val){
|
|
|
+ void deleteOrder(val) {
|
|
|
setState(() {
|
|
|
listObj.removeAt(val);
|
|
|
- if(listObj.length<4){
|
|
|
+ if (listObj.length < 4) {
|
|
|
getOrderList().then((resp) {
|
|
|
setState(() {
|
|
|
listObj.addAll(resp.orderList);
|
|
|
});
|
|
|
});
|
|
|
- }
|
|
|
+ }
|
|
|
});
|
|
|
}
|
|
|
|
|
|
@@ -210,8 +210,8 @@ class _OrderCardContainerState extends State < OrderCardContainer > with SingleT
|
|
|
padding: EdgeInsets.fromLTRB(ScreenUtil.getInstance().setWidth(30), ScreenUtil.getInstance().setWidth(30), ScreenUtil.getInstance().setWidth(30), 0),
|
|
|
child: Column(
|
|
|
children: < Widget > [
|
|
|
- orderNoRow(widget.order.orderNo,widget.order.createTime),
|
|
|
- orderAddress(widget.order.startAddress,widget.order.endAddress),
|
|
|
+ orderNoRow(widget.order.orderNo, widget.order.createTime),
|
|
|
+ orderAddress(widget.order.startAddress, widget.order.endAddress),
|
|
|
orderItem('货物名称', widget.order.itemName, 15),
|
|
|
orderItem('货物件数', '${widget.order.itemNo}件', 30),
|
|
|
orderCutLine(),
|
|
|
@@ -271,10 +271,10 @@ class _OrderCardContainerState extends State < OrderCardContainer > with SingleT
|
|
|
barrierDismissible: false,
|
|
|
builder: (BuildContext context) {
|
|
|
return new LoadingDialog( //调用对话框
|
|
|
- text:'是否确认接单',childCallback: (val){
|
|
|
- if(val){
|
|
|
- widget.callback(widget.index);
|
|
|
- }else{
|
|
|
+ text: '是否确认接单', childCallback: (val) {
|
|
|
+ if (val) {
|
|
|
+ widget.callback(widget.index);
|
|
|
+ } else {
|
|
|
return;
|
|
|
}
|
|
|
},
|
|
|
@@ -362,11 +362,23 @@ Widget orderItem(String key, String value, int marginBottom) { //货物名称,
|
|
|
}
|
|
|
|
|
|
Widget orderPhone(String key, String value, int marginBottom) {
|
|
|
- return Container(
|
|
|
- margin: EdgeInsets.only(bottom: ScreenUtil.getInstance().setHeight(marginBottom)),
|
|
|
- child: Row(children: < Widget > [
|
|
|
- Text('${key}:', style: TextStyle(color: Color.fromRGBO(153, 153, 153, 1), fontSize: ScreenUtil.getInstance().setSp(24)), ),
|
|
|
- Text('${value}', style: TextStyle(color: Color.fromRGBO(64, 98, 254, 1), fontSize: ScreenUtil.getInstance().setSp(24)), ),
|
|
|
- ], )
|
|
|
+ return InkWell(
|
|
|
+ child: Container(
|
|
|
+ margin: EdgeInsets.only(bottom: ScreenUtil.getInstance().setHeight(marginBottom)),
|
|
|
+ child: Row(children: < Widget > [
|
|
|
+ Text('${key}:', style: TextStyle(color: Color.fromRGBO(153, 153, 153, 1), fontSize: ScreenUtil.getInstance().setSp(24)), ),
|
|
|
+ Text('${value}', style: TextStyle(color: Color.fromRGBO(64, 98, 254, 1), fontSize: ScreenUtil.getInstance().setSp(24)), ),
|
|
|
+ ], )
|
|
|
+ ),
|
|
|
+ onLongPress: () async {
|
|
|
+ String phone = 'tel:${value}';
|
|
|
+ print(phone);
|
|
|
+ if(await canLaunch(phone)){
|
|
|
+ await (launch(phone));
|
|
|
+ }else{
|
|
|
+ throw 'Could not launch $value';
|
|
|
+ }
|
|
|
+ },
|
|
|
);
|
|
|
-}
|
|
|
+}
|
|
|
+
|