xt / Flutter-ReserveApp · Commits

Go to a project

Commit aeb70bd4b472389c661612aefeaf885d759612e7

Authored by wdn127929
1 parent afc9a345
build: skipped

粘贴电话号码去除空格

Inline Side-by-side
Showing 4 changed files with 40 additions and 25 deletions
... ... @@ -52,6 +52,8 @@ PODS:
- flutter_inappwebview/Core (0.0.1):
- Flutter
- OrderedSet (~> 5.0)
- flutter_keyboard_visibility (0.0.1):
- Flutter
- flutter_native_image (0.0.1):
- Flutter
- flutter_sms (1.1.0):
... ... @@ -126,6 +128,7 @@ DEPENDENCIES:
- flutter_app_update (from `.symlinks/plugins/flutter_app_update/ios`)
- flutter_bugly (from `.symlinks/plugins/flutter_bugly/ios`)
- flutter_inappwebview (from `.symlinks/plugins/flutter_inappwebview/ios`)
- flutter_keyboard_visibility (from `.symlinks/plugins/flutter_keyboard_visibility/ios`)
- flutter_native_image (from `.symlinks/plugins/flutter_native_image/ios`)
- flutter_sms (from `.symlinks/plugins/flutter_sms/ios`)
- flutter_statusbarcolor (from `.symlinks/plugins/flutter_statusbarcolor/ios`)
... ... @@ -194,6 +197,8 @@ EXTERNAL SOURCES:
:path: ".symlinks/plugins/flutter_bugly/ios"
flutter_inappwebview:
:path: ".symlinks/plugins/flutter_inappwebview/ios"
flutter_keyboard_visibility:
:path: ".symlinks/plugins/flutter_keyboard_visibility/ios"
flutter_native_image:
:path: ".symlinks/plugins/flutter_native_image/ios"
flutter_sms:
... ... @@ -260,6 +265,7 @@ SPEC CHECKSUMS:
flutter_app_update: 65f61da626cb111d1b24674abc4b01728d7723bc
flutter_bugly: c9800f4d5bc5bdc27ffdde3417a26ba44266e0c3
flutter_inappwebview: bfd58618f49dc62f2676de690fc6dcda1d6c3721
flutter_keyboard_visibility: 0339d06371254c3eb25eeb90ba8d17dca8f9c069
flutter_native_image: 9c0b7451838484458e5b0fae007b86a4c2d4bdfe
flutter_sms: 91ce41530f55c85d6524d82307a5d555844c086a
flutter_statusbarcolor: 8afb1071ed8c58be929f1e32b36c629771fd2259
... ...
... ... @@ -312,6 +312,7 @@
"${BUILT_PRODUCTS_DIR}/flutter_app_badger/flutter_app_badger.framework",
"${BUILT_PRODUCTS_DIR}/flutter_app_update/flutter_app_update.framework",
"${BUILT_PRODUCTS_DIR}/flutter_inappwebview/flutter_inappwebview.framework",
"${BUILT_PRODUCTS_DIR}/flutter_keyboard_visibility/flutter_keyboard_visibility.framework",
"${BUILT_PRODUCTS_DIR}/flutter_native_image/flutter_native_image.framework",
"${BUILT_PRODUCTS_DIR}/flutter_sms/flutter_sms.framework",
"${BUILT_PRODUCTS_DIR}/flutter_statusbarcolor/flutter_statusbarcolor.framework",
... ... @@ -345,6 +346,7 @@
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_app_badger.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_app_update.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_inappwebview.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_keyboard_visibility.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_native_image.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_sms.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_statusbarcolor.framework",
... ... @@ -487,7 +489,7 @@
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 393;
CURRENT_PROJECT_VERSION = 400;
DEVELOPMENT_TEAM = 8J59HM8B82;
ENABLE_BITCODE = NO;
FLUTTER_BUILD_MODE = release;
... ... @@ -502,7 +504,7 @@
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
);
MARKETING_VERSION = 3.9.3;
MARKETING_VERSION = 4.0.3;
PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
PRODUCT_NAME = Runner;
PROVISIONING_PROFILE_SPECIFIER = "";
... ... @@ -633,7 +635,7 @@
CODE_SIGN_ENTITLEMENTS = "Runner/一键订Debug.entitlements";
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 393;
CURRENT_PROJECT_VERSION = 400;
DEVELOPMENT_TEAM = 8J59HM8B82;
ENABLE_BITCODE = NO;
FLUTTER_BUILD_MODE = debug;
... ... @@ -648,7 +650,7 @@
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
);
MARKETING_VERSION = 3.9.3;
MARKETING_VERSION = 4.0.3;
PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
PRODUCT_NAME = Runner;
PROVISIONING_PROFILE_SPECIFIER = "";
... ... @@ -669,7 +671,7 @@
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 393;
CURRENT_PROJECT_VERSION = 400;
DEVELOPMENT_TEAM = 8J59HM8B82;
ENABLE_BITCODE = NO;
FLUTTER_BUILD_MODE = release;
... ... @@ -684,7 +686,7 @@
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
);
MARKETING_VERSION = 3.9.3;
MARKETING_VERSION = 4.0.3;
PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
PRODUCT_NAME = Runner;
PROVISIONING_PROFILE_SPECIFIER = "";
... ...
... ... @@ -296,7 +296,7 @@ class InvicationPageState extends State<InvicationPage>
String sex = '';
String remark = '';
if (_baseIndoProvider.phoneController.text.trim().length > 0) {
phone = _baseIndoProvider.phoneController.text;
phone = _baseIndoProvider.phoneController.text.replaceAll(' ', '');
}
if (customController.text.trim().length > 0) {
remark = customController.text;
... ... @@ -332,6 +332,7 @@ class InvicationPageState extends State<InvicationPage>
_baseIndoProvider.phoneController.text =
_baseIndoProvider.userHistorys[index].phone != null
? _baseIndoProvider.userHistorys[index].phone
.replaceAll(' ', '')
: '';
// _homeEnterModel.nameController.text =
// _homeEnterModel
... ... @@ -756,7 +757,8 @@ class InvicationPageState extends State<InvicationPage>
/// 修改预订人信息
_updateReserve() async {
if ((nameStr == null || nameStr.trim().length == 0) &&
_baseIndoProvider.phoneController.text.trim().length == 0 &&
_baseIndoProvider.phoneController.text.replaceAll(' ', '').length ==
0 &&
customController.text.trim().length == 0) {
return;
}
... ... @@ -764,8 +766,8 @@ class InvicationPageState extends State<InvicationPage>
String name;
String sex;
String remark;
if (_baseIndoProvider.phoneController.text.trim().length > 0) {
phone = _baseIndoProvider.phoneController.text;
if (_baseIndoProvider.phoneController.text.replaceAll(' ', '').length > 0) {
phone = _baseIndoProvider.phoneController.text.replaceAll(' ', '');
}
if (nameStr != null && nameStr.trim().length > 0) {
name = nameStr;
... ... @@ -789,7 +791,7 @@ class InvicationPageState extends State<InvicationPage>
bus.emit("refresh_detail");
} else {
reserverPhone = oldPhone;
_baseIndoProvider.phoneController.text = oldPhone;
_baseIndoProvider.phoneController.text = oldPhone.replaceAll(' ', '');
customController.text = oldRemark;
// oldName = nameStr;
// reserverPhone = oldPhone;
... ... @@ -836,7 +838,7 @@ class InvicationPageState extends State<InvicationPage>
ddate = detailEntity.ddate;
ddateStr = detailEntity.ddateStr;
reserverPhone = detailEntity.phone;
_baseIndoProvider.phoneController.text = reserverPhone;
_baseIndoProvider.phoneController.text = reserverPhone.replaceAll(' ', '');
dateSolt = detailEntity.ddate_solt;
nameWidget = detailEntity.rname == null ? '' : detailEntity.rname;
sex = detailEntity.sex == null ? '' : detailEntity.sex;
... ... @@ -1634,7 +1636,8 @@ class InvicationPageState extends State<InvicationPage>
border: OutlineInputBorder(borderSide: BorderSide.none),
),
onChanged: (value) {
if (value.isEmpty || value.length > 11) {
print(value);
if (value.trim().isEmpty || value.trim().length > 11) {
//内容为空，或 超过11位
setState(() {
_baseIndoProvider.userHistorys.clear();
... ... @@ -1642,7 +1645,7 @@ class InvicationPageState extends State<InvicationPage>
return;
}
Map<String, String> params = {
"keywords": value,
"keywords": value.trim(),
"sid": Provider.of<UserModel>(context, listen: false)
.user
.sellerid,
... ... @@ -1667,7 +1670,7 @@ class InvicationPageState extends State<InvicationPage>
_openAddressBook();
},
child: Container(
width: ScreenUtil().setWidth(84) * 3,
width: ScreenUtil().setWidth(74) * 2,
height: ScreenUtil().setWidth(48),
alignment: Alignment.centerRight,
child: Text('一键录入',
... ... @@ -2950,6 +2953,7 @@ class InvicationPageState extends State<InvicationPage>
borderSide: BorderSide.none),
),
onChanged: (value) {
print(value);
if (value.isEmpty || value.length > 11) {
//内容为空，或 超过11位
setState(() {
... ... @@ -3331,8 +3335,9 @@ class InvicationPageState extends State<InvicationPage>
} else {
fullName = contact.fullName;
}
_baseIndoProvider.phoneController.text =
contact.phoneNumber.replaceAll(new RegExp(r"\s+"), "");
_baseIndoProvider.phoneController.text = contact.phoneNumber
.replaceAll(new RegExp(r"\s+"), "")
.replaceAll(' ', '');
nameStr = fullName;
// _homeEnterModel.nameController.text = fullName + _nameSuffix();
_addNameSuffix(fullName, sexStr);
... ...
... ... @@ -520,8 +520,9 @@ class TableManagerPageState extends State<TableManagerPage> {
} else {
fullName = contact.fullName;
}
_baseIndoProvider.phoneController.text =
contact.phoneNumber.replaceAll(new RegExp(r"\s+"), "");
_baseIndoProvider.phoneController.text = contact.phoneNumber
.replaceAll(new RegExp(r"\s+"), "")
.replaceAll(' ', '');
nameStr = fullName;
// _homeEnterModel.nameController.text = fullName + _nameSuffix();
_addNameSuffix(fullName, sexStr);
... ... @@ -754,7 +755,7 @@ class TableManagerPageState extends State<TableManagerPage> {
_openAddressBook();
},
child: Container(
width: ScreenUtil().setWidth(84) * 3,
width: ScreenUtil().setWidth(74) * 2,
height: ScreenUtil().setWidth(48),
alignment: Alignment.centerRight,
child: Text('一键录入',
... ... @@ -1905,10 +1906,11 @@ class TableManagerPageState extends State<TableManagerPage> {
return;
}
if ((_baseIndoProvider.phoneController.text
.trim()
.replaceAll(' ', '')
.isEmpty ||
!Utils.phoneRegExp(
_baseIndoProvider.phoneController.text))) {
!Utils.phoneRegExp(_baseIndoProvider
.phoneController.text
.replaceAll(' ', '')))) {
setState(() {
showErro = '请输入正确的11位手机号码';
});
... ... @@ -1981,8 +1983,8 @@ class TableManagerPageState extends State<TableManagerPage> {
null,
null);
if (widget.guest == null) {
guest.phone =
_baseIndoProvider.phoneController.text; //预订人电话
guest.phone = _baseIndoProvider.phoneController.text
.replaceAll(' ', ''); //预订人电话
if (nameStr != null && nameStr.trim().length > 0) {
String sex = '1';
... ...