From 23f56c2b2d9591e92d7304cc1c36661818523fd2 Mon Sep 17 00:00:00 2001
From: laiiihz <laiiihz@outlook.com>
Date: Wed, 20 Jan 2021 14:52:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=89=E5=8D=93=E8=BF=94=E5=9B=9E=E6=A1=8C?=
 =?UTF-8?q?=E9=9D=A2=E7=9A=84=E5=BC=B9=E7=AA=97=EF=BC=8C=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E6=96=87=E6=A1=88=E4=B8=8E=E5=8A=9F=E8=83=BD=E4=B8=8D=E4=B8=80?=
 =?UTF-8?q?=E8=87=B4=20=E6=89=8B=E6=9C=BA=E5=8F=B7=E8=BE=93=E5=85=A5?=
 =?UTF-8?q?=E4=B8=8D=E5=81=9A=E5=8F=B7=E6=AE=B5=E9=99=90=E5=88=B6=20?=
 =?UTF-8?q?=E5=94=AE=E5=90=8E=E8=AF=A6=E6=83=85=E9=A1=B5=EF=BC=8C=E2=80=9C?=
 =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E9=80=80=E8=B4=A7=E5=9C=B0=E5=9D=80=E2=80=9D?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA=E2=80=9C=E4=B8=8A=E4=BC=A0=E9=80=80=E8=B4=A7?=
 =?UTF-8?q?=E5=8D=95=E5=8F=B7=E2=80=9D=20=E6=81=A2=E5=A4=8D=E5=BC=80?=
 =?UTF-8?q?=E5=8F=91=E7=A5=A8=E5=8A=9F=E8=83=BD=201.3.38-dev+231?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/pages/home/home_page.dart                 |  2 +-
 lib/pages/user/order/order_center_page.dart   | 26 +++++++++----------
 .../user/order/order_return_status_page.dart  |  2 +-
 lib/utils/text_utils.dart                     |  4 +--
 pubspec.yaml                                  |  2 +-
 5 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/lib/pages/home/home_page.dart b/lib/pages/home/home_page.dart
index a27617d..a410325 100644
--- a/lib/pages/home/home_page.dart
+++ b/lib/pages/home/home_page.dart
@@ -284,7 +284,7 @@ class _HomePageState extends BaseStoreState<HomePage>
                 items: ["取消", "确认"],
                 listener: (index) {
                   switch (index) {
-                    case 0:
+                    case 1:
                       AndroidBackTop.backDeskTop();
                   }
                   Alert.dismiss(context);
diff --git a/lib/pages/user/order/order_center_page.dart b/lib/pages/user/order/order_center_page.dart
index 8697221..28f3c6b 100644
--- a/lib/pages/user/order/order_center_page.dart
+++ b/lib/pages/user/order/order_center_page.dart
@@ -114,19 +114,19 @@ class _OrderCenterPageState extends BaseStoreState<OrderCenterPage>
         appBackground: Colors.white,
         elevation: 0,
         actions: [
-          // MaterialButton(
-          //   minWidth: rSize(74),
-          //   onPressed: () {
-          //     AppRouter.push(context, RouteName.USER_INVOICE);
-          //   },
-          //   child: Text(
-          //     '开发票',
-          //     style: TextStyle(
-          //       color: AppColor.blackColor,
-          //       fontSize: ScreenAdapterUtils.setSp(14),
-          //     ),
-          //   ),
-          // ),
+          MaterialButton(
+            minWidth: rSize(74),
+            onPressed: () {
+              AppRouter.push(context, RouteName.USER_INVOICE);
+            },
+            child: Text(
+              '开发票',
+              style: TextStyle(
+                color: AppColor.blackColor,
+                fontSize: ScreenAdapterUtils.setSp(14),
+              ),
+            ),
+          ),
         ],
       ),
       body: _newBuildBody(),
diff --git a/lib/pages/user/order/order_return_status_page.dart b/lib/pages/user/order/order_return_status_page.dart
index df97e1c..999d56e 100644
--- a/lib/pages/user/order/order_return_status_page.dart
+++ b/lib/pages/user/order/order_return_status_page.dart
@@ -428,7 +428,7 @@ class _OrderReturnStatusPageState
             borderRadius: BorderRadius.all(Radius.circular(3)),
           ),
           child: Text(
-            '查看退货地址',
+            '上传退货单号',
             style: TextStyle(
                 fontWeight: FontWeight.w400,
                 color: Colors.white,
diff --git a/lib/utils/text_utils.dart b/lib/utils/text_utils.dart
index 90c5e10..bdd255f 100644
--- a/lib/utils/text_utils.dart
+++ b/lib/utils/text_utils.dart
@@ -23,8 +23,6 @@ class TextUtils {
   }
 
   static bool verifyPhone(phone) {
-    return new RegExp(
-            "^^((13[0-9])|(14[5,7])|(15[0-3,5-9])|(17[0,3,5-8])|(18[0-9])|166|198|199|(147))\\d{8}\$")
-        .hasMatch(phone);
+    return new RegExp("^^1\\d{10}\$").hasMatch(phone);
   }
 }
diff --git a/pubspec.yaml b/pubspec.yaml
index 3682f0f..2cb4a8b 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -2,7 +2,7 @@ name: recook
 description: Recook Market App.
 publish_to: "none"
 
-version: 1.3.35-dev+228
+version: 1.3.38-dev+231
 environment:
   sdk: ">=2.10.0 <3.0.0"