Pārlūkot izejas kodu

发件电话提示逻辑

daxu0403 7 gadi atpakaļ
vecāks
revīzija
60366b0ec1

BIN
android/.gradle/4.10.2/fileHashes/fileHashes.bin


BIN
android/.gradle/4.10.2/fileHashes/fileHashes.lock


BIN
android/.gradle/4.10.2/fileHashes/resourceHashesCache.bin


BIN
android/.gradle/4.10.2/javaCompile/classAnalysis.bin


BIN
android/.gradle/4.10.2/javaCompile/jarAnalysis.bin


BIN
android/.gradle/4.10.2/javaCompile/javaCompile.lock


BIN
android/.gradle/4.10.2/javaCompile/taskHistory.bin


BIN
android/.gradle/4.10.2/taskHistory/taskHistory.bin


BIN
android/.gradle/4.10.2/taskHistory/taskHistory.lock


BIN
android/.gradle/buildOutputCleanup/buildOutputCleanup.lock


BIN
android/.gradle/buildOutputCleanup/outputFiles.bin


+ 1 - 1
lib/pages/my_page.dart

@@ -65,7 +65,7 @@ class _MyPageState extends State < MyPage > with AutomaticKeepAliveClientMixin {
             child: Padding(
               padding: EdgeInsets.only(bottom: ScreenUtil.getInstance().setWidth(24), ),
               child: ClipOval(
-                child: Image.network('https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1551526964140&di=5c6270bf8b43e9ce83427b01da959481&imgtype=jpg&src=http%3A%2F%2Fimg0.imgtn.bdimg.com%2Fit%2Fu%3D3327849645%2C2696105688%26fm%3D214%26gp%3D0.jpg',
+                child: Image.asset('lib/images/icon_logo.png',
                   fit: BoxFit.cover,
                   width: ScreenUtil.getInstance().setWidth(120),
                   height: ScreenUtil.getInstance().setWidth(120), ),

+ 33 - 0
lib/pages/order_management_page.dart

@@ -391,6 +391,39 @@ class _QueryWidgetState extends State < QueryWidget > {
                       print("作废");
                     },
                   ),
+                  GestureDetector(
+                    child: Offstage(
+                      offstage: false,
+                      child: Container(
+                        width: ScreenUtil.getInstance().setWidth(94),
+                        height: ScreenUtil.getInstance().setHeight(48),
+                        decoration: BoxDecoration(
+                          color: Color.fromRGBO(239, 243, 249, 1),
+                          borderRadius: BorderRadius.all(Radius.circular(4.0))
+                        ),
+                        child: Center(
+                          child: Text('寄件', style: TextStyle(fontSize: ScreenUtil.getInstance().setSp(24), color: Color.fromRGBO(64, 98, 254, 1))),
+                        ),
+                      ),
+                    ),
+                    onTap: () {
+                      showDialog < Null > (
+                      context: context, //BuildContext对象
+                      barrierDismissible: false,
+                      builder: (BuildContext context) {
+                        return new LoadingDialog( //调用对话框
+                          text:'是否确认拒收',childCallback: (val){
+                            if(val){
+                              //widget.callback(widget.index);
+                            }else{
+                              return;
+                            }
+                          },
+                        );
+                      });
+                      print("寄件");
+                    },
+                  ),
                   GestureDetector(
                     child: Offstage(
                       offstage: false,

+ 17 - 13
lib/pages/order_taking_page.dart

@@ -31,11 +31,11 @@ class _OrderTakingPageState extends State < OrderTakingPage > with AutomaticKeep
     _scrollController.addListener(() {
       if (_scrollController.position.pixels == _scrollController.position.maxScrollExtent) {
         print("滑到底部了");
-        getOrderList().then((resp) {
-          setState(() {
-            listObj.addAll(resp.orderList);
-          });
-        });
+        // getOrderList().then((resp) {
+        //   setState(() {
+        //     listObj.addAll(resp.orderList);
+        //   });
+        // });
       }
       //print(_scrollController.position.pixels);
     });
@@ -122,9 +122,13 @@ class _OrderTakingPageState extends State < OrderTakingPage > with AutomaticKeep
               '加载中...',
               style: TextStyle(fontSize: 16.0),
             ),
-            CircularProgressIndicator(
-              strokeWidth: 1.0,
+            Container(
+              width: ScreenUtil.getInstance().setWidth(50),
+              height: ScreenUtil.getInstance().setHeight(50),
+              child:CircularProgressIndicator(
+            )
             )
+            
           ],
         ),
       ),
@@ -143,12 +147,12 @@ class _OrderTakingPageState extends State < OrderTakingPage > with AutomaticKeep
     setState(() {
       listObj.removeAt(val);
       if(listObj.length<4){
-        getOrderList().then((resp) {
-          setState(() {
-            listObj.addAll(resp.orderList);
-          });
-        });
-      }
+        // getOrderList().then((resp) {
+        //   setState(() {
+        //     listObj.addAll(resp.orderList);
+        //   });
+        // });
+      } 
     });
   }
 

+ 38 - 25
lib/pages/send_express_page.dart

@@ -261,33 +261,46 @@ class _SendExpressPageState extends State < SendExpressPage > with AutomaticKeep
                               border: InputBorder.none
                             ),
                             onChanged: ((value) {
-                              print("onchange 了");
                               if (tab == 'sendPhone') {
-                                RenderObject sendPhoneObj = _sendPhoneKey.currentContext.findRenderObject();
-                                setState(() {
-                                  tipWidth = sendPhoneObj.paintBounds.size.width;
-                                  tipHeight = sendPhoneObj.paintBounds.size.height;
-                                  tipPosX = sendPhoneObj.getTransformTo(null).getTranslation().x;
-                                  tipPosY = sendPhoneObj.getTransformTo(null).getTranslation().y - ScreenUtil.getInstance().setHeight(90);
-                                  tipStatus = false;
-                                });
-                                print(tipWidth);
-                                print(tipHeight);
-                                print(tipPosX);
-                                print(tipPosY);
+                                if(value.length>=4){
+                                  RenderObject sendPhoneObj = _sendPhoneKey.currentContext.findRenderObject();
+                                  setState(() {
+                                    tipWidth = sendPhoneObj.paintBounds.size.width;
+                                    tipHeight = sendPhoneObj.paintBounds.size.height;
+                                    tipPosX = sendPhoneObj.getTransformTo(null).getTranslation().x;
+                                    tipPosY = sendPhoneObj.getTransformTo(null).getTranslation().y - ScreenUtil.getInstance().setHeight(90);
+                                    tipStatus = false;
+                                  });
+                                }else{
+                                  setState(() {
+                                    tipStatus = true;
+                                  });
+                                }
+                                
+                                // print(tipWidth);
+                                // print(tipHeight);
+                                // print(tipPosX);
+                                // print(tipPosY);
                               } else if (tab == 'getPhone') {
-                                RenderObject sendPhoneObj = _getPhoneKey.currentContext.findRenderObject();
-                                setState(() {
-                                  tipWidth = sendPhoneObj.paintBounds.size.width;
-                                  tipHeight = sendPhoneObj.paintBounds.size.height;
-                                  tipPosX = sendPhoneObj.getTransformTo(null).getTranslation().x;
-                                  tipPosY = sendPhoneObj.getTransformTo(null).getTranslation().y - ScreenUtil.getInstance().setHeight(90);
-                                  tipStatus = false;
-                                });
-                                print(tipWidth);
-                                print(tipHeight);
-                                print(tipPosX);
-                                print(tipPosY);
+                                if(value.length>=4){
+                                  RenderObject sendPhoneObj = _getPhoneKey.currentContext.findRenderObject();
+                                  setState(() {
+                                    tipWidth = sendPhoneObj.paintBounds.size.width;
+                                    tipHeight = sendPhoneObj.paintBounds.size.height;
+                                    tipPosX = sendPhoneObj.getTransformTo(null).getTranslation().x;
+                                    tipPosY = sendPhoneObj.getTransformTo(null).getTranslation().y - ScreenUtil.getInstance().setHeight(90);
+                                    tipStatus = false;
+                                  });
+                                }else{
+                                  setState(() {
+                                    tipStatus = true;
+                                  });
+                                }
+                                
+                                // print(tipWidth);
+                                // print(tipHeight);
+                                // print(tipPosX);
+                                // print(tipPosY);
                               }
                             }),
                             onEditingComplete: () {