Merge branch 'newHost' of https://git.oa00.com/1281228557/aku_new_community into newHost

lib/pages/personal/intergral/integral_center_page.dart

@@ -168,7 +168,7 @@ class _integralCenterPageState extends State<integralCenterPage> {
             child: Assets.icons.vipFont.image(height: 32.w),
           ),
           TextSpan(
-              text: ' 积分中心',
+              text: ' 会员中心',
               style: TextStyle(
                   color: Colors.white.withOpacity(0.85),
                   fontSize: 36.w,

lib/pages/tab_navigator.dart

@@ -91,7 +91,7 @@ class _TabNavigatorState extends State<TabNavigator>
         R.ASSETS_ICONS_TABBAR_MARKET_NO_PNG,
         R.ASSETS_ICONS_TABBAR_MARKET_PNG,
       ),
-      BottomNavigationBarItem(icon: Container()),
+      // BottomNavigationBarItem(icon: Container()),
       _buildBottomBar(
         '社区',
         Assets.home.icShequNor.path,

lib/ui/community/activity/activity_detail_page.dart

@@ -239,40 +239,40 @@ class _ActivityDetailPageState extends State<ActivityDetailPage> {
                     format: 'yyyy.MM.dd HH:mm',
                   )}',
                 ),
-                16.hb,
+                // 16.hb,
-                Row(
+                // Row(
-                  children: [
+                //   children: [
-                    '活动方式'.text.size(28.sp).make().box.width(136.w).make(),
+                //     '活动方式'.text.size(28.sp).make().box.width(136.w).make(),
-                    '本次活动介绍'
+                //     '本次活动介绍'
-                        .richText
+                //         .richText
-                        .tap(() {
+                //         .tap(() {
-                          var bottomSheet = Container(
+                //           var bottomSheet = Container(
-                            width: double.infinity,
+                //             width: double.infinity,
-                            padding: EdgeInsets.all(32.w),
+                //             padding: EdgeInsets.all(32.w),
-                            decoration: BoxDecoration(
+                //             decoration: BoxDecoration(
-                                color: Colors.white,
+                //                 color: Colors.white,
-                                borderRadius: BorderRadius.circular(16.w)),
+                //                 borderRadius: BorderRadius.circular(16.w)),
-                            child: Column(
+                //             child: Column(
-                              children: [
+                //               children: [
-                                '活动介绍'.text.size(32.sp).black.bold.make(),
+                //                 '活动介绍'.text.size(32.sp).black.bold.make(),
-                                32.w.heightBox,
+                //                 32.w.heightBox,
-                                _model!.content.text
+                //                 _model!.content.text
-                                    .size(28.sp)
+                //                     .size(28.sp)
-                                    .color(Colors.black.withOpacity(0.65))
+                //                     .color(Colors.black.withOpacity(0.65))
-                                    .make(),
+                //                     .make(),
-                              ],
+                //               ],
-                            ),
+                //             ),
-                          );
+                //           );
-                          Get.bottomSheet(
+                //           Get.bottomSheet(
-                            bottomSheet,
+                //             bottomSheet,
-                          );
+                //           );
-                        })
+                //         })
-                        .size(28.sp)
+                //         .size(28.sp)
-                        .color(Colors.blue)
+                //         .color(Colors.blue)
-                        .make(),
+                //         .make(),
-                    Spacer(),
+                //     Spacer(),
-                  ],
+                //   ],
-                ),
+                // ),
                 16.hb,
                 Row(
                   children: [

lib/ui/market/search/good_detail_page.dart

@@ -611,29 +611,29 @@ class _GoodDetailPageState extends State<GoodDetailPage> {
         crossAxisAlignment: CrossAxisAlignment.center,
         children: [
           40.wb,
-          GestureDetector(
+          // GestureDetector(
-            onTap: () async {
+          //   onTap: () async {
-              await CollectionFunc.collection(_goodDetail!.id);
+          //     await CollectionFunc.collection(_goodDetail!.id);
-              _refreshController.callRefresh();
+          //     _refreshController.callRefresh();
-            },
+          //   },
-            child: Column(
+          //   child: Column(
-              crossAxisAlignment: CrossAxisAlignment.center,
+          //     crossAxisAlignment: CrossAxisAlignment.center,
-              mainAxisAlignment: MainAxisAlignment.center,
+          //     mainAxisAlignment: MainAxisAlignment.center,
-              children: [
+          //     children: [
-                Image.asset(
+          //       Image.asset(
-                  _goodDetail!.isCollection == 0
+          //         _goodDetail!.isCollection == 0
-                      ? R.ASSETS_ICONS_ICON_GOOD_FAVOR_PNG
+          //             ? R.ASSETS_ICONS_ICON_GOOD_FAVOR_PNG
-                      : R.ASSETS_ICONS_SHOP_FAVORFILL_PNG,
+          //             : R.ASSETS_ICONS_SHOP_FAVORFILL_PNG,
-                  width: 48.w,
+          //         width: 48.w,
-                  height: 48.w,
+          //         height: 48.w,
-                ),
+          //       ),
-                Text(
+          //       Text(
-                  '加入收藏',
+          //         '加入收藏',
-                  style: TextStyle(fontSize: 20.sp, color: ktextPrimary),
+          //         style: TextStyle(fontSize: 20.sp, color: ktextPrimary),
-                ),
+          //       ),
-              ],
+          //     ],
-            ),
+          //   ),
-          ),
+          // ),
           40.wb,
           GestureDetector(
             onTap: () async {
@@ -656,7 +656,7 @@ class _GoodDetailPageState extends State<GoodDetailPage> {
               ],
             ),
           ),
-          40.wb,
+          80.wb,
           Row(
             children: [
               GestureDetector(