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

@@ -1887,6 +1887,7 @@ class _NoteBookChangeFPageState extends State<NoteBookChangeFPage> {
 
                                       ///添加进度条
                                       child: ListView.builder(
+                                        controller: _scrollCrl,
                                         itemBuilder: (context, index) {
                                           return GestureDetector(
                                             onTap: () {
@@ -2050,7 +2051,8 @@ class _NoteBookChangeFPageState extends State<NoteBookChangeFPage> {
                                       "1"
                                   ? //判断是否在线预订
                                   await _notebookDetailChangeModel
-                                      .updateOnlineReserveInfo(context, nameStr,widget.detailEntity.uid)
+                                      .updateOnlineReserveInfo(context, nameStr,
+                                          widget.detailEntity.uid)
                                   : await _notebookDetailChangeModel
                                       .setReserveInfo(context, nameStr,
                                           widget.detailEntity.uid);

@@ -506,6 +506,32 @@ class _RechargeSettingPageState extends State<RechargeSettingPage> {
                                 select: false,
                               )
                             : SizedBox(),
+                    VEmptyView(24),
+                    InkWell(
+                        onTap: () {
+                          setState(() {
+                            isLink = !isLink;
+                          });
+                        },
+                        child: Container(
+                            margin: EdgeInsets.only(
+                                left: w(21), top: w(12), right: w(21)),
+                            child: Row(
+                              children: [
+                                Image.asset(
+                                  Utils.getImgPath(
+                                      isLink ? 'f_select' : 'f_select_not'),
+                                  width: w(20),
+                                ),
+                                HEmptyView(20),
+                                Text(
+                                  '推荐店内充值优惠活动链接',
+                                  style: TextStyle(
+                                      fontSize: font(14),
+                                      color: MyColours.color_515151),
+                                )
+                              ],
+                            ))),
                   ],
                 ),
               ),

@@ -698,10 +698,11 @@ class NotebookDetailChangeModel with ChangeNotifier {
       params['phone'] = phoneController.text.replaceAll(' ', ''); //预订人电话
 
     }
-    if (customController.text.trim().length > 0) {
-      params['cusdem'] = customController.text; //预订人需求：25汉字
+    // if (customController.text.trim().length > 0) {
+    //   params['cusdem'] = customController.text; //预订人需求：25汉字
 
-    }
+    // }
+     params['cusdem'] = customController.text; //预订人需求：25汉字
     print(params);
     BaseResp<Map<String, dynamic>> baseResp = await DioUtil()
         .request<Map<String, dynamic>>(