xt / Flutter-ReserveApp · Commits

Go to a project

Commit 1c94d2df2be45f18e7abcac35f3c8585483087e1

Authored by wdn127929
1 parent 4a4bcd18

店铺信息

Inline Side-by-side
Showing 5 changed files with 249 additions and 92 deletions
@@ -12,14 +12,14 @@ if (flutterRoot == null) { @@ -12,14 +12,14 @@ if (flutterRoot == null) {
12 } 12 }
13 13
14 14
15 -def flutterVersionCode = "381" 15 +def flutterVersionCode = "382"
16 if (flutterVersionCode == null) { 16 if (flutterVersionCode == null) {
17 - flutterVersionCode = '381' 17 + flutterVersionCode = '382'
18 } 18 }
19 19
20 -def flutterVersionName = "3.8.1" 20 +def flutterVersionName = "3.8.2"
21 if (flutterVersionName == null) { 21 if (flutterVersionName == null) {
22 - flutterVersionName = '3.8.1' 22 + flutterVersionName = '3.8.2'
23 } 23 }
24 apply plugin: 'com.android.application' 24 apply plugin: 'com.android.application'
25 apply plugin: 'kotlin-android' 25 apply plugin: 'kotlin-android'
  1 +import 'dart:convert';
1 import 'dart:io'; 2 import 'dart:io';
2 import 'dart:ui'; 3 import 'dart:ui';
3 4
@@ -75,7 +76,7 @@ class _StoreBaseInfoPageState extends State<StoreBaseInfoPage> { @@ -75,7 +76,7 @@ class _StoreBaseInfoPageState extends State<StoreBaseInfoPage> {
75 SetTime morning = SetTime(); 76 SetTime morning = SetTime();
76 SetTime noon = SetTime(); 77 SetTime noon = SetTime();
77 SetTime night = SetTime(); 78 SetTime night = SetTime();
78 - BookSetTimeModel bookSetTimeModelCanReceiveTime; 79 + bool onePhone = true;
79 80
80 ///获取接单时间接口 81 ///获取接单时间接口
81 _getReceiveOrdersTime() async { 82 _getReceiveOrdersTime() async {
@@ -271,7 +272,7 @@ class _StoreBaseInfoPageState extends State<StoreBaseInfoPage> { @@ -271,7 +272,7 @@ class _StoreBaseInfoPageState extends State<StoreBaseInfoPage> {
271 await _baseIndoProvider.getSellerById(context); 272 await _baseIndoProvider.getSellerById(context);
272 if (itemModel != null) { 273 if (itemModel != null) {
273 _nameController.text = itemModel.data.sellername; 274 _nameController.text = itemModel.data.sellername;
274 - _phoneController.text = itemModel.data.sellerTel; 275 +
275 _timeController.text = itemModel.data.dailyTime; 276 _timeController.text = itemModel.data.dailyTime;
276 _addressController.text = itemModel.data.realAddress; 277 _addressController.text = itemModel.data.realAddress;
277 _introductionController.text = itemModel.data.sellerdesc; 278 _introductionController.text = itemModel.data.sellerdesc;
@@ -279,6 +280,21 @@ class _StoreBaseInfoPageState extends State<StoreBaseInfoPage> { @@ -279,6 +280,21 @@ class _StoreBaseInfoPageState extends State<StoreBaseInfoPage> {
279 // _uploadImageProvider.notifyListeners(); 280 // _uploadImageProvider.notifyListeners();
280 _countName = _nameController.text.trim().length; 281 _countName = _nameController.text.trim().length;
281 _countAddress = _addressController.text.trim().length; 282 _countAddress = _addressController.text.trim().length;
  283 + if (itemModel.data.sellerTel.contains(',')) {
  284 + List<String> list = itemModel.data.sellerTel.split(',');
  285 + if (list.length == 2) {
  286 + _phoneController.text = list[0];
  287 + _phoneController2.text = list[1];
  288 + onePhone = false;
  289 + } else {
  290 + _phoneController.text = '';
  291 + _phoneController2.text = '';
  292 + onePhone = true;
  293 + }
  294 + } else {
  295 + _phoneController.text = itemModel.data.sellerTel;
  296 + onePhone = true;
  297 + }
282 mapAddress = { 298 mapAddress = {
283 "address": itemModel.data.mapAddress, 299 "address": itemModel.data.mapAddress,
284 'lat': itemModel.data.lat, 300 'lat': itemModel.data.lat,
@@ -294,6 +310,57 @@ class _StoreBaseInfoPageState extends State<StoreBaseInfoPage> { @@ -294,6 +310,57 @@ class _StoreBaseInfoPageState extends State<StoreBaseInfoPage> {
294 await _uploadImageProvider.getQiniuInfo(context, {}); 310 await _uploadImageProvider.getQiniuInfo(context, {});
295 } 311 }
296 312
  313 + _setInfo() async {
  314 + if (_nameController.text.trim().length == 0) {
  315 + Utils.showToast('请输入店铺名称！');
  316 + return;
  317 + }
  318 + if (_phoneController.text.trim().length == 0) {
  319 + Utils.showToast('请输入店铺电话！');
  320 + return;
  321 + }
  322 + if (_timeController.text.trim().length == 0) {
  323 + Utils.showToast('请输入营业时间！');
  324 + return;
  325 + }
  326 +
  327 + if (mapAddress == null || mapAddress['address'] == '') {
  328 + Utils.showToast('请输入店铺地址！');
  329 + return;
  330 + }
  331 +
  332 + if (swichState[0]) {
  333 + if (morning == null || morning.start == '' || morning.start == null) {
  334 + Utils.showToast('请输入选择早市开始时间！');
  335 + return;
  336 + } else if (morning == null || morning.end == '' || morning.end == null) {
  337 + Utils.showToast('请输入选择早市结束时间！');
  338 + return;
  339 + }
  340 + }
  341 + if (swichState[1]) {
  342 + if (noon == null || noon.start == '' || noon.start == null) {
  343 + Utils.showToast('请输入选择午市开始时间！');
  344 + return;
  345 + } else if (noon == null || noon.end == '' || noon.end == null) {
  346 + Utils.showToast('请输入选择午市结束时间！');
  347 + return;
  348 + }
  349 + }
  350 + if (swichState[2]) {
  351 + if (night == null || night.start == '' || night.start == null) {
  352 + Utils.showToast('请输入选择晚市开始时间！');
  353 + return;
  354 + } else if (night == null || night.end == '' || night.end == null) {
  355 + Utils.showToast('请输入选择晚市结束时间！');
  356 + return;
  357 + }
  358 + }
  359 +
  360 + await _setReceiveTime();
  361 + await _setSellerInfoById();
  362 + }
  363 +
297 /// 修改店铺基本信息 364 /// 修改店铺基本信息
298 _setSellerInfoById() async { 365 _setSellerInfoById() async {
299 FocusScope.of(context).requestFocus(FocusNode()); //点击空白处隐藏键盘 366 FocusScope.of(context).requestFocus(FocusNode()); //点击空白处隐藏键盘
@@ -311,7 +378,11 @@ class _StoreBaseInfoPageState extends State<StoreBaseInfoPage> { @@ -311,7 +378,11 @@ class _StoreBaseInfoPageState extends State<StoreBaseInfoPage> {
311 await MultipartFile.fromFile(_uploadImageProvider.mentou.path); 378 await MultipartFile.fromFile(_uploadImageProvider.mentou.path);
312 } 379 }
313 380
314 - params['phone'] = _phoneController.text; 381 + params['seller_tel'] = _phoneController.text;
  382 + if (_phoneController2.text.trim().length > 0) {
  383 + params['seller_tel'] =
  384 + _phoneController.text + ',' + _phoneController2.text;
  385 + }
315 386
316 if (mapAddress != null && mapAddress['address'] != '') { 387 if (mapAddress != null && mapAddress['address'] != '') {
317 params['map_address'] = mapAddress['address']; 388 params['map_address'] = mapAddress['address'];
@@ -329,13 +400,29 @@ class _StoreBaseInfoPageState extends State<StoreBaseInfoPage> { @@ -329,13 +400,29 @@ class _StoreBaseInfoPageState extends State<StoreBaseInfoPage> {
329 400
330 params['daily_time'] = _timeController.text; 401 params['daily_time'] = _timeController.text;
331 402
  403 + String morningStr = '';
  404 + String noonStr = '';
  405 + String nightStr = '';
  406 + if (swichState[0]) {
  407 + morningStr = Utils.getTimelLongString(morning.start, morning.end);
  408 + }
  409 + if (swichState[1]) {
  410 + noonStr = Utils.getTimelLongString(noon.start, noon.end);
  411 + }
  412 + if (swichState[2]) {
  413 + nightStr = Utils.getTimelLongString(night.start, night.end);
  414 + }
  415 +
  416 + params["daily"] =
  417 + jsonEncode({'morning': morningStr, 'noon': noonStr, 'night': nightStr});
  418 +
332 FormData formData = FormData.fromMap(params); 419 FormData formData = FormData.fromMap(params);
333 420
334 SetSellerInfoSunModel sunModel = 421 SetSellerInfoSunModel sunModel =
335 await _baseIndoProvider.setSellerInfoById(context, formData); 422 await _baseIndoProvider.setSellerInfoById(context, formData);
336 if (sunModel != null) { 423 if (sunModel != null) {
337 //修改成功 424 //修改成功
338 - Utils.showToast('保存成功'); 425 + Utils.showToast('保存店铺信息成功');
339 EventBus().emit('changeStatusColor'); 426 EventBus().emit('changeStatusColor');
340 Navigator.pop( 427 Navigator.pop(
341 context, 428 context,
@@ -348,6 +435,46 @@ class _StoreBaseInfoPageState extends State<StoreBaseInfoPage> { @@ -348,6 +435,46 @@ class _StoreBaseInfoPageState extends State<StoreBaseInfoPage> {
348 } 435 }
349 } 436 }
350 437
  438 + _setReceiveTime() async {
  439 + bool isSuccess = await bookSetTimeModel.setReOrderTime(
  440 + context, receiveOrdersTime.start, receiveOrdersTime.end);
  441 + if (isSuccess) {
  442 + ///弹出提示框
  443 + ///
  444 +
  445 + // EventBus().emit('changeStatusColor');
  446 + // Navigator.of(context).pop();
  447 + }
  448 + }
  449 +
  450 + // _setBookTime() async {
  451 + // String morningStr = '';
  452 + // String noonStr = '';
  453 + // String nightStr = '';
  454 + // if (swichState[0]) {
  455 + // morningStr = Utils.getTimelLongString(morning.start, morning.end);
  456 + // }
  457 + // if (swichState[1]) {
  458 + // noonStr = Utils.getTimelLongString(noon.start, noon.end);
  459 + // }
  460 + // if (swichState[2]) {
  461 + // nightStr = Utils.getTimelLongString(night.start, night.end);
  462 + // }
  463 +
  464 + // ///接口
  465 + // ///
  466 + // SetSellerInfoSunModel sunModel = await bookSetTimeModel.setSellerInfoById(
  467 + // context, {'morning': morningStr, 'noon': noonStr, 'night': nightStr});
  468 + // if (sunModel != null) {
  469 + // //修改成功
  470 + // Utils.showToast('保存成功');
  471 + // EventBus().emit('changeStatusColor');
  472 + // Navigator.pop(context);
  473 + // } else {
  474 + // // Utils.showToast('保存失败');
  475 + // }
  476 + // }
  477 +
351 ///输入框 478 ///输入框
352 Widget _textfield(String title, String hintText, 479 Widget _textfield(String title, String hintText,
353 TextEditingController editingController, FocusNode focusNode) { 480 TextEditingController editingController, FocusNode focusNode) {
@@ -1006,6 +1133,7 @@ class _StoreBaseInfoPageState extends State<StoreBaseInfoPage> { @@ -1006,6 +1133,7 @@ class _StoreBaseInfoPageState extends State<StoreBaseInfoPage> {
1006 Provider.of<UploadImageProvider>(context, listen: true); 1133 Provider.of<UploadImageProvider>(context, listen: true);
1007 _baseIndoProvider = 1134 _baseIndoProvider =
1008 Provider.of<StoreBaseIndoProvider>(context, listen: true); 1135 Provider.of<StoreBaseIndoProvider>(context, listen: true);
  1136 + bookSetTimeModel = Provider.of<BookSetTimeModel>(context, listen: true);
1009 return Scaffold( 1137 return Scaffold(
1010 backgroundColor: MyColours.color_F8F9FD, 1138 backgroundColor: MyColours.color_F8F9FD,
1011 appBar: SystemAppBar( 1139 appBar: SystemAppBar(
@@ -1309,12 +1437,22 @@ class _StoreBaseInfoPageState extends State<StoreBaseInfoPage> { @@ -1309,12 +1437,22 @@ class _StoreBaseInfoPageState extends State<StoreBaseInfoPage> {
1309 color: 1437 color:
1310 MyColours.color_E34D59)), 1438 MyColours.color_E34D59)),
1311 ])), 1439 ])),
1312 - Padding(  
1313 - padding: EdgeInsets.only(  
1314 - right: ScreenUtil().setWidth(26)),  
1315 - child: Image.asset(  
1316 - Utils.getImgPath('stoore_add'),  
1317 - width: ScreenUtil().setWidth(44))) 1440 + InkWell(
  1441 + onTap: () {
  1442 + setState(() {
  1443 + onePhone = !onePhone;
  1444 + });
  1445 + },
  1446 + child: Padding(
  1447 + padding: EdgeInsets.only(
  1448 + right:
  1449 + ScreenUtil().setWidth(26)),
  1450 + child: Image.asset(
  1451 + Utils.getImgPath(onePhone
  1452 + ? 'stoore_add'
  1453 + : 'stoore_add_un'),
  1454 + width:
  1455 + ScreenUtil().setWidth(44))))
1318 ], 1456 ],
1319 ), 1457 ),
1320 VEmptyView(44), 1458 VEmptyView(44),
@@ -1392,89 +1530,106 @@ class _StoreBaseInfoPageState extends State<StoreBaseInfoPage> { @@ -1392,89 +1530,106 @@ class _StoreBaseInfoPageState extends State<StoreBaseInfoPage> {
1392 )), 1530 )),
1393 HEmptyView(20), 1531 HEmptyView(20),
1394 Image.asset( 1532 Image.asset(
1395 - Utils.getImgPath('store_jian'), 1533 + Utils.getImgPath('store_jian_un'),
1396 width: ScreenUtil().setWidth(44)) 1534 width: ScreenUtil().setWidth(44))
1397 ], 1535 ],
1398 )), 1536 )),
1399 VEmptyView(32), 1537 VEmptyView(32),
1400 - Padding(  
1401 - padding: EdgeInsets.symmetric(  
1402 - horizontal: ScreenUtil().setWidth(26)),  
1403 - child: Row(  
1404 - children: [  
1405 - Text('电话2：',  
1406 - style: TextStyle(  
1407 - fontSize:  
1408 - ScreenUtil().setSp(28),  
1409 - color: MyColours.color_999999)),  
1410 - HEmptyView(32),  
1411 - Expanded(  
1412 - child: Container(  
1413 - height: ScreenUtil().setWidth(60),  
1414 - padding: EdgeInsets.symmetric(  
1415 - horizontal:  
1416 - ScreenUtil().setWidth(24)),  
1417 - decoration: BoxDecoration(  
1418 - color: MyColours.color_ffffff,  
1419 - borderRadius:  
1420 - BorderRadius.circular(  
1421 - ScreenUtil()  
1422 - .setWidth(26))),  
1423 - child: TextField(  
1424 - controller: _phoneController2,  
1425 - maxLines: 1,  
1426 - // inputFormatters: [  
1427 - // LengthLimitingTextInputFormatter(  
1428 - // 15),  
1429 - // // WhitelistingTextInputFormatter.digitsOnly  
1430 - // ], 1538 + onePhone
  1539 + ? SizedBox()
  1540 + : Padding(
  1541 + padding: EdgeInsets.symmetric(
  1542 + horizontal:
  1543 + ScreenUtil().setWidth(26)),
  1544 + child: Row(
  1545 + children: [
  1546 + Text('电话2：',
  1547 + style: TextStyle(
  1548 + fontSize:
  1549 + ScreenUtil().setSp(28),
  1550 + color: MyColours
  1551 + .color_999999)),
  1552 + HEmptyView(32),
  1553 + Expanded(
  1554 + child: Container(
  1555 + height: ScreenUtil().setWidth(60),
  1556 + padding: EdgeInsets.symmetric(
  1557 + horizontal: ScreenUtil()
  1558 + .setWidth(24)),
  1559 + decoration: BoxDecoration(
  1560 + color: MyColours.color_ffffff,
  1561 + borderRadius:
  1562 + BorderRadius.circular(
  1563 + ScreenUtil()
  1564 + .setWidth(26))),
  1565 + child: TextField(
  1566 + controller: _phoneController2,
  1567 + maxLines: 1,
  1568 + // inputFormatters: [
  1569 + // LengthLimitingTextInputFormatter(
  1570 + // 15),
  1571 + // // WhitelistingTextInputFormatter.digitsOnly
  1572 + // ],
1431 1573
1432 - // //光标颜色  
1433 - // cursorColor:  
1434 - // widget.isSelect ? Colors.white : MyColours.color_199095,  
1435 - //输入文本的样式  
1436 - style: TextStyle(  
1437 - fontSize:  
1438 - ScreenUtil().setSp(24),  
1439 - color: MyColours.color_515151),  
1440 - focusNode: _phoneFocusNode2,  
1441 - decoration: InputDecoration(  
1442 - border: OutlineInputBorder(  
1443 - borderSide: BorderSide.none),  
1444 - hintText: '请输入区号+固定电话或11位手机号',  
1445 - hintStyle: TextStyle(  
1446 - color: MyColours.color_BFC4D4,  
1447 - fontSize:  
1448 - ScreenUtil().setSp(24),  
1449 - ),  
1450 - enabledBorder:  
1451 - new UnderlineInputBorder(  
1452 - borderSide: BorderSide.none,  
1453 - ),  
1454 - focusedBorder:  
1455 - new UnderlineInputBorder(  
1456 - borderSide: BorderSide.none, 1574 + // //光标颜色
  1575 + // cursorColor:
  1576 + // widget.isSelect ? Colors.white : MyColours.color_199095,
  1577 + //输入文本的样式
  1578 + style: TextStyle(
  1579 + fontSize:
  1580 + ScreenUtil().setSp(24),
  1581 + color:
  1582 + MyColours.color_515151),
  1583 + focusNode: _phoneFocusNode2,
  1584 + decoration: InputDecoration(
  1585 + border: OutlineInputBorder(
  1586 + borderSide:
  1587 + BorderSide.none),
  1588 + hintText: '请输入区号+固定电话或11位手机号',
  1589 + hintStyle: TextStyle(
  1590 + color:
  1591 + MyColours.color_BFC4D4,
  1592 + fontSize:
  1593 + ScreenUtil().setSp(24),
  1594 + ),
  1595 + enabledBorder:
  1596 + new UnderlineInputBorder(
  1597 + borderSide: BorderSide.none,
  1598 + ),
  1599 + focusedBorder:
  1600 + new UnderlineInputBorder(
  1601 + borderSide: BorderSide.none,
  1602 + ),
  1603 + ),
  1604 + onChanged: (value) {
  1605 + // if (editingController == _nameController) {
  1606 + // _nameController.text = value;
  1607 + // }
  1608 + },
  1609 + onEditingComplete: () {
  1610 + FocusScope.of(context)
  1611 + .requestFocus(
  1612 + FocusNode()); //点击空白处隐藏键盘
  1613 + },
  1614 + keyboardType:
  1615 + TextInputType.text,
1457 ), 1616 ),
1458 - ),  
1459 - onChanged: (value) {  
1460 - // if (editingController == _nameController) {  
1461 - // _nameController.text = value;  
1462 - // }  
1463 - },  
1464 - onEditingComplete: () {  
1465 - FocusScope.of(context)  
1466 - .requestFocus(  
1467 - FocusNode()); //点击空白处隐藏键盘  
1468 - },  
1469 - keyboardType: TextInputType.text,  
1470 - ), 1617 + )),
  1618 + HEmptyView(20),
  1619 + InkWell(
  1620 + onTap: () {
  1621 + setState(() {
  1622 + onePhone = !onePhone;
  1623 + _phoneController2.text = '';
  1624 + });
  1625 + },
  1626 + child: Image.asset(
  1627 + Utils.getImgPath(
  1628 + 'store_jian'),
  1629 + width: ScreenUtil()
  1630 + .setWidth(44)))
  1631 + ],
1471 )), 1632 )),
1472 - HEmptyView(20),  
1473 - Image.asset(  
1474 - Utils.getImgPath('store_jian'),  
1475 - width: ScreenUtil().setWidth(44))  
1476 - ],  
1477 - )),  
1478 VEmptyView(112), 1633 VEmptyView(112),
1479 RichText( 1634 RichText(
1480 text: TextSpan( 1635 text: TextSpan(
@@ -2010,7 +2165,7 @@ class _StoreBaseInfoPageState extends State<StoreBaseInfoPage> { @@ -2010,7 +2165,7 @@ class _StoreBaseInfoPageState extends State<StoreBaseInfoPage> {
2010 child: RoundButton( 2165 child: RoundButton(
2011 onPressed: () { 2166 onPressed: () {
2012 //接口 2167 //接口
2013 - _setSellerInfoById(); 2168 + _setInfo();
2014 }, 2169 },
2015 text: '保存', 2170 text: '保存',
2016 fontSize: 34, 2171 fontSize: 34,
@@ -763,7 +763,9 @@ var storeBaseInfoPageHandler = new Handler( @@ -763,7 +763,9 @@ var storeBaseInfoPageHandler = new Handler(
763 // SmsInfoData data = SmsInfoData.fromJson(json.decode( 763 // SmsInfoData data = SmsInfoData.fromJson(json.decode(
764 // FluroConvertUtils.fluroCnParamsDecode(params["smsInfoData"].first))); 764 // FluroConvertUtils.fluroCnParamsDecode(params["smsInfoData"].first)));
765 return ChangeNotifierProvider<StoreBaseIndoProvider>( 765 return ChangeNotifierProvider<StoreBaseIndoProvider>(
766 - create: (_) => StoreBaseIndoProvider(), child: StoreBaseInfoPage()); 766 + create: (_) => StoreBaseIndoProvider(),
  767 + child: ChangeNotifierProvider<BookSetTimeModel>(
  768 + create: (_) => BookSetTimeModel(), child: StoreBaseInfoPage()));
767 // return ChangeNotifierProvider<UploadImageProvider>( 769 // return ChangeNotifierProvider<UploadImageProvider>(
768 // create: (_) => UploadImageProvider(), child: EnterStoreFrontPhotoPage()); 770 // create: (_) => UploadImageProvider(), child: EnterStoreFrontPhotoPage());
769 }); 771 });