Merge branches 'dev' and 'master' of https://git.lotus-wallet.com/fmk/huixiang_app

 Conflicts:

	lib/union/store_details_page.dart

lib/home/points_mall_page.dart

@@ -188,7 +188,7 @@ class _PointsMallPage extends State<PointsMallPage>
     super.build(context);
     List<DropdownMenuItem<String>> sortItems = [];
     sortString.forEach((element) {
-      sortItems.add(DropdownMenuItem(value: element, child: Text(element)));
+      sortItems.add(DropdownMenuItem(value: element, child: Text(element,style:TextStyle(fontSize: 12.sp,fontWeight: FontWeight.w400,color: Color(0xff353535)),)));
     });
     return SmartRefresher(
       enablePullDown: true,

lib/union/union_page.dart

@@ -668,6 +668,7 @@ class _UnionPage extends State<UnionPage>
                         width: 14.w,
                         height: 14.h,
                       ),
+                      SizedBox(width: 2.w,),
                       Expanded(
                         flex: 1,
                         child: Text(