Commit 4b881fc843818bbc5b437ba09b369798bf19fb6e

Authored by wdn127929
2 parents dda96b5f f5ec962d

Merge branch 'v5.0.5+' into v5.0.2+

@@ -1887,6 +1887,7 @@ class _NoteBookChangeFPageState extends State<NoteBookChangeFPage> { @@ -1887,6 +1887,7 @@ class _NoteBookChangeFPageState extends State<NoteBookChangeFPage> {
1887 1887
1888 ///添加进度条 1888 ///添加进度条
1889 child: ListView.builder( 1889 child: ListView.builder(
  1890 + controller: _scrollCrl,
1890 itemBuilder: (context, index) { 1891 itemBuilder: (context, index) {
1891 return GestureDetector( 1892 return GestureDetector(
1892 onTap: () { 1893 onTap: () {
@@ -2050,7 +2051,8 @@ class _NoteBookChangeFPageState extends State<NoteBookChangeFPage> { @@ -2050,7 +2051,8 @@ class _NoteBookChangeFPageState extends State<NoteBookChangeFPage> {
2050 "1" 2051 "1"
2051 ? //判断是否在线预订 2052 ? //判断是否在线预订
2052 await _notebookDetailChangeModel 2053 await _notebookDetailChangeModel
2053 - .updateOnlineReserveInfo(context, nameStr,widget.detailEntity.uid) 2054 + .updateOnlineReserveInfo(context, nameStr,
  2055 + widget.detailEntity.uid)
2054 : await _notebookDetailChangeModel 2056 : await _notebookDetailChangeModel
2055 .setReserveInfo(context, nameStr, 2057 .setReserveInfo(context, nameStr,
2056 widget.detailEntity.uid); 2058 widget.detailEntity.uid);
@@ -506,6 +506,32 @@ class _RechargeSettingPageState extends State<RechargeSettingPage> { @@ -506,6 +506,32 @@ class _RechargeSettingPageState extends State<RechargeSettingPage> {
506 select: false, 506 select: false,
507 ) 507 )
508 : SizedBox(), 508 : SizedBox(),
  509 + VEmptyView(24),
  510 + InkWell(
  511 + onTap: () {
  512 + setState(() {
  513 + isLink = !isLink;
  514 + });
  515 + },
  516 + child: Container(
  517 + margin: EdgeInsets.only(
  518 + left: w(21), top: w(12), right: w(21)),
  519 + child: Row(
  520 + children: [
  521 + Image.asset(
  522 + Utils.getImgPath(
  523 + isLink ? 'f_select' : 'f_select_not'),
  524 + width: w(20),
  525 + ),
  526 + HEmptyView(20),
  527 + Text(
  528 + '推荐店内充值优惠活动链接',
  529 + style: TextStyle(
  530 + fontSize: font(14),
  531 + color: MyColours.color_515151),
  532 + )
  533 + ],
  534 + ))),
509 ], 535 ],
510 ), 536 ),
511 ), 537 ),
@@ -698,10 +698,11 @@ class NotebookDetailChangeModel with ChangeNotifier { @@ -698,10 +698,11 @@ class NotebookDetailChangeModel with ChangeNotifier {
698 params['phone'] = phoneController.text.replaceAll(' ', ''); //预订人电话 698 params['phone'] = phoneController.text.replaceAll(' ', ''); //预订人电话
699 699
700 } 700 }
701 - if (customController.text.trim().length > 0) {  
702 - params['cusdem'] = customController.text; //预订人需求:25汉字 701 + // if (customController.text.trim().length > 0) {
  702 + // params['cusdem'] = customController.text; //预订人需求:25汉字
703 703
704 - } 704 + // }
  705 + params['cusdem'] = customController.text; //预订人需求:25汉字
705 print(params); 706 print(params);
706 BaseResp<Map<String, dynamic>> baseResp = await DioUtil() 707 BaseResp<Map<String, dynamic>> baseResp = await DioUtil()
707 .request<Map<String, dynamic>>( 708 .request<Map<String, dynamic>>(