Merge branch 'v1.1+' of http://123.56.79.57/xt/Flutter-ReserveApp into v1.1+

@@ -43,8 +43,8 @@ android {
         applicationId "com.naji.one_key"
         applicationId "com.naji.one_key"
         minSdkVersion 21
         minSdkVersion 21
         targetSdkVersion 28
         targetSdkVersion 28
-        versionCode 113
-        versionName "1.1.3"
+        versionCode 114
+        versionName "1.1.4"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
 
         ndk {
         ndk {

@@ -145,7 +145,7 @@ class HandleOnlinePageState extends State<HandleOnlinePage> {
       "mid": widget.mid,
       "mid": widget.mid,
       "cause": json.encode(causeMap)
       "cause": json.encode(causeMap)
     };
     };
-    detailModel.setReserveStatus(context, params);
+    detailModel.setReserveStatus(context, params,showLoading: true);
   }
   }
 
 
   //处理在线预订
   //处理在线预订

@@ -42,7 +42,7 @@ class ContactModel{
       contacts.forEach((contact){
       contacts.forEach((contact){
         String phoneNum="";
         String phoneNum="";
         if(contact.phones.isNotEmpty){
         if(contact.phones.isNotEmpty){
-          phoneNum=contact.phones.first.value.trim();
+          phoneNum=contact.phones.first.value.replaceAll(new RegExp(r"\s+\b|\b\s"), "");
         }
         }
           Map<String,String> callLog={
           Map<String,String> callLog={
             "phoneNum":"${phoneNum.trim()}",
             "phoneNum":"${phoneNum.trim()}",

@@ -62,11 +62,11 @@ class NotebookDetailModel extends ChangeNotifier {
 
 
   //安排在线预订
   //安排在线预订
   setReserveStatus(BuildContext context, Map<String, String> params,
   setReserveStatus(BuildContext context, Map<String, String> params,
-      {ifPush = true}) async {
+      {ifPush = true,showLoading=false}) async {
     BaseResp<Map<String, dynamic>> baseResp = await DioUtil()
     BaseResp<Map<String, dynamic>> baseResp = await DioUtil()
         .request<Map<String, dynamic>>(
         .request<Map<String, dynamic>>(
             context, Method.get, HttpUrl.set_reserve_status,
             context, Method.get, HttpUrl.set_reserve_status,
-            data: params, showLoading: false)
+            data: params, showLoading: showLoading)
         .catchError((error) {
         .catchError((error) {
       print(error.toString());
       print(error.toString());
     });
     });