更改社群抬头,举报,首页净弼商城

lib/community/community_page.dart

@@ -24,10 +24,10 @@ class _CommunityPage extends State<CommunityPage>
 
   List<String> lables = [
     "关注",
-    "推荐",
-    "头条",
-    "课程",
-    "关于我们",
+    "分享健康",
+    "了解健康",
+    "学习健康",
+    "关于回乡",
     // "直播",
   ];
 
@@ -94,16 +94,16 @@ class _CommunityPage extends State<CommunityPage>
         child: TabBarView(
           physics: BouncingScrollPhysics(),
           children: lables.map((e) {
-            if (e == "关于我们") {
+            if (e == "关于回乡") {
               return BrandPage();
-            }else if(e == "头条"){
+            }else if(e == "了解健康"){
               return ArticlePage();
-            }else if(e == "课程"){
+            }else if(e == "学习健康"){
               return CommunityCourse();
             }
-            else if(e == "推荐"){
+            else if(e == "分享健康"){
               if (tuijian == null){
-                tuijian = CommunityChildPage("推荐");
+                tuijian = CommunityChildPage("分享健康");
               }
               return tuijian;
             }else if(e == "关注"){

lib/community/community_view/community_dynamic.dart

@@ -410,26 +410,27 @@ class _CommunityDynamic extends State<CommunityDynamic> {
                         ],
                       ),
                     ),
-                    // if (widget?.article?.author != widget.userId ?? "")
-                    // Expanded(
-                    //     child: GestureDetector(
-                    //         behavior: HitTestBehavior.opaque,
-                    //         onTap: () {
-                    //           setState(() {
-                    //             choiceShowBottomSheet();
-                    //           });
-                    //         },
-                    //         child: Container(
-                    //           alignment: Alignment.center,
-                    //           child: Text(
-                    //             "...",
-                    //             style: TextStyle(
-                    //               fontSize: 18.sp,
-                    //               fontWeight: MyFontWeight.medium,
-                    //               color: Colors.black,
-                    //             ),
-                    //           ),
-                    //         ))),
+                    if (widget?.article?.author != widget.userId ?? "")
+                    Expanded(
+                        child: GestureDetector(
+                            behavior: HitTestBehavior.opaque,
+                            onTap: () {
+                              setState(() {
+                                choiceShowBottomSheet();
+                              });
+                            },
+                            child: Container(
+                              padding: EdgeInsets.only(top:3),
+                              alignment: Alignment.center,
+                              child: Text(
+                                "...",
+                                style: TextStyle(
+                                  fontSize: 18.sp,
+                                  fontWeight: MyFontWeight.medium,
+                                  color: Colors.black,
+                                ),
+                              ),
+                            ))),
                   ],
                 ),
             ],

lib/community/report/report_page.dart

@@ -27,7 +27,7 @@ class _ReportPage extends State<ReportPage> {
   ApiService apiService;
   int textLength = 0;
   final TextEditingController editingController = TextEditingController();
-  String textContext;
+  String textCon;
   String userName;
   String authorId;
 
@@ -48,12 +48,11 @@ class _ReportPage extends State<ReportPage> {
       );
     }
     BaseData baseData = await apiService.complaint({
-      "content": editingController.text,
+      "content": checkIndex == 9 ? editingController.text : textCon,
       "informationId": authorId,
     }).catchError((onError) {});
     if (baseData != null && baseData.isSuccess) {
-      Navigator.of(context)
-          .pushNamed('/router/report_success');
+      Navigator.of(context).popAndPushNamed('/router/report_success');
     } else {
       SmartDialog.showToast(baseData.msg, alignment: Alignment.center);
     }
@@ -121,7 +120,8 @@ class _ReportPage extends State<ReportPage> {
                     Container(
                         width: double.infinity,
                         height: 186.h,
-                      margin: EdgeInsets.only(right: 16, left: 40, bottom: 100),
+                        margin:
+                            EdgeInsets.only(right: 16, left: 40, bottom: 100),
                         decoration: new BoxDecoration(
                           color: Color(0xFFF7F7F7),
                           borderRadius: BorderRadius.circular(4.0),
@@ -180,6 +180,10 @@ class _ReportPage extends State<ReportPage> {
                       Expanded(
                           child: GestureDetector(
                         onTap: () {
+                          if(checkIndex == 9 && editingController.text == ""){
+                            SmartDialog.showToast("请输入举报原因", alignment: Alignment.center);
+                            return;
+                          }
                           report();
                         },
                         child: Opacity(
@@ -215,131 +219,39 @@ class _ReportPage extends State<ReportPage> {
         padding: EdgeInsets.only(left: 16, right: 16, top: 20),
         child: Column(
           children: [
-            GestureDetector(
-              behavior: HitTestBehavior.opaque,
-              onTap: () {
-                setState(() {
-                  checkIndex = 1;
-                });
-              },
-              child:
-              content(
-                  "色情低俗",
-                  1
-              ),
-            ),
-            SizedBox(height: 18,),
-            GestureDetector(
-              behavior: HitTestBehavior.opaque,
-              onTap: () {
-                setState(() {
-                  checkIndex = 2;
-                });
-              },
-              child:
-              content(
-                  "政治宗教",
-                  2
-              ),
-            ),
-            SizedBox(height: 18,),
-            GestureDetector (
-              behavior: HitTestBehavior.opaque,
-              onTap: () {
-                setState(() {
-                  checkIndex = 3;
-                });
-              },
-              child:
-              content(
-                  "广告骚扰",
-                  3
-              ),
-            ),
-            SizedBox(height: 18,),
-            GestureDetector(
-              behavior: HitTestBehavior.opaque,
-              onTap: () {
-                setState(() {
-                  checkIndex = 4;
-                });
-              },
-              child:
-              content(
-                  "虚假欺骗",
-                  4
-              ),
-            ),
-            SizedBox(height: 18,),
-            GestureDetector(
-              behavior: HitTestBehavior.opaque,
-              onTap: () {
-                setState(() {
-                  checkIndex = 5;
-                });
-              },
-              child:
-              content(
-                  "侵权（诽谤、抄袭、冒用）",
-                  5
+            content("色情低俗", 1),
+            SizedBox(
+              height: 18,
             ),
+            content("政治宗教", 2),
+            SizedBox(
+              height: 18,
             ),
-            SizedBox(height: 18,),
-            GestureDetector(
-              behavior: HitTestBehavior.opaque,
-              onTap: () {
-                setState(() {
-                  checkIndex = 6;
-                });
-              },
-              child:
-              content(
-                  "不良封面/标题",
-                  6
+            content("广告骚扰", 3),
+            SizedBox(
+              height: 18,
             ),
+            content("虚假欺骗", 4),
+            SizedBox(
+              height: 18,
             ),
-            SizedBox(height: 18,),
-            GestureDetector(
-              behavior: HitTestBehavior.opaque,
-              onTap: () {
-                setState(() {
-                  checkIndex = 7;
-                });
-              },
-              child:
-              content(
-                 "赌博诈骗",
-                  7
+            content("侵权（诽谤、抄袭、冒用）", 5),
+            SizedBox(
+              height: 18,
             ),
+            content("不良封面/标题", 6),
+            SizedBox(
+              height: 18,
             ),
-            SizedBox(height: 18,),
-            GestureDetector(
-              behavior: HitTestBehavior.opaque,
-              onTap: () {
-                setState(() {
-                  checkIndex = 8;
-                });
-              },
-              child:
-              content(
-                 "违禁内容（暴利恐怖、令人不适、宣言仇恨）",
-                  8
-              ),
-            ),
-            SizedBox(height: 18,),
-            GestureDetector(
-              behavior: HitTestBehavior.opaque,
-              onTap: () {
-                setState(() {
-                  checkIndex = 9;
-                });
-              },
-              child:
-              content(
-                "其他",
-                  9
+            content("赌博诈骗", 7),
+            SizedBox(
+              height: 18,
             ),
+            content("违禁内容（暴利恐怖、令人不适、宣言仇恨）", 8),
+            SizedBox(
+              height: 18,
             ),
+            content("其他", 9),
           ],
         ));
   }
@@ -362,7 +274,15 @@ class _ReportPage extends State<ReportPage> {
   }
 
   Widget content(textContext, var index) {
-    return Container(
+    return GestureDetector(
+        behavior: HitTestBehavior.opaque,
+        onTap: () {
+          setState(() {
+            checkIndex = index;
+            textCon = textContext;
+          });
+        },
+        child: Container(
           alignment: Alignment.center,
           child: Row(
             mainAxisAlignment: MainAxisAlignment.start,
@@ -370,17 +290,18 @@ class _ReportPage extends State<ReportPage> {
             children: [
               checkView(index),
               Container(),
-          Expanded(child:
-          Text(
+              Expanded(
+                child: Text(
                   textContext,
                   style: TextStyle(
                     fontSize: 16.sp,
                     color: Color(0xFF353535),
                     fontWeight: MyFontWeight.regular,
                   ),
-          ),)
+                ),
+              )
             ],
           ),
-    );
+        ));
   }
 }

lib/generated/intl/messages_en.dart

@@ -290,7 +290,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "jifendejisuanshuoming" : MessageLookupByLibrary.simpleMessage("积分的计算说明"),
     "jifendidaogao" : MessageLookupByLibrary.simpleMessage("积分从低到高"),
     "jifengaodaodi" : MessageLookupByLibrary.simpleMessage("积分从高到低"),
-    "jifenshangcheng" : MessageLookupByLibrary.simpleMessage("积分商城"),
+    "jifenshangcheng" : MessageLookupByLibrary.simpleMessage("净弼积分商城"),
     "jifenxiangqing" : MessageLookupByLibrary.simpleMessage("积分详情"),
     "jingbilianmenghuiyuandian" : MessageLookupByLibrary.simpleMessage("净弼联盟会员店"),
     "jinkahuiyuan" : MessageLookupByLibrary.simpleMessage("金卡会员"),

lib/generated/intl/messages_zh_CN.dart

@@ -288,7 +288,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "jifendejisuanshuoming" : MessageLookupByLibrary.simpleMessage("积分的计算说明"),
     "jifendidaogao" : MessageLookupByLibrary.simpleMessage("积分从低到高"),
     "jifengaodaodi" : MessageLookupByLibrary.simpleMessage("积分从高到低"),
-    "jifenshangcheng" : MessageLookupByLibrary.simpleMessage("积分商城"),
+    "jifenshangcheng" : MessageLookupByLibrary.simpleMessage("净弼积分商城"),
     "jifenxiangqing" : MessageLookupByLibrary.simpleMessage("积分详情"),
     "jingbilianmenghuiyuandian" : MessageLookupByLibrary.simpleMessage("净弼联盟会员店"),
     "jinkahuiyuan" : MessageLookupByLibrary.simpleMessage("金卡会员"),

lib/generated/intl/messages_zh_Hans_CN.dart

@@ -288,7 +288,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "jifendejisuanshuoming" : MessageLookupByLibrary.simpleMessage("积分的计算说明"),
     "jifendidaogao" : MessageLookupByLibrary.simpleMessage("积分从低到高"),
     "jifengaodaodi" : MessageLookupByLibrary.simpleMessage("积分从高到低"),
-    "jifenshangcheng" : MessageLookupByLibrary.simpleMessage("积分商城"),
+    "jifenshangcheng" : MessageLookupByLibrary.simpleMessage("净弼积分商城"),
     "jifenxiangqing" : MessageLookupByLibrary.simpleMessage("积分详情"),
     "jingbilianmenghuiyuandian" : MessageLookupByLibrary.simpleMessage("净弼联盟会员店"),
     "jinkahuiyuan" : MessageLookupByLibrary.simpleMessage("金卡会员"),

lib/generated/intl/messages_zh_Hant_CN.dart

@@ -288,7 +288,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "jifendejisuanshuoming" : MessageLookupByLibrary.simpleMessage("積分的計算説明"),
     "jifendidaogao" : MessageLookupByLibrary.simpleMessage("積分從低到高"),
     "jifengaodaodi" : MessageLookupByLibrary.simpleMessage("積分從高到低"),
-    "jifenshangcheng" : MessageLookupByLibrary.simpleMessage("積分商城"),
+    "jifenshangcheng" : MessageLookupByLibrary.simpleMessage("淨弼積分商城"),
     "jifenxiangqing" : MessageLookupByLibrary.simpleMessage("積分詳情"),
     "jingbilianmenghuiyuandian" : MessageLookupByLibrary.simpleMessage("淨弼聯盟會員店"),
     "jinkahuiyuan" : MessageLookupByLibrary.simpleMessage("金卡会员"),

lib/generated/intl/messages_zh_TW.dart

@@ -288,7 +288,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "jifendejisuanshuoming" : MessageLookupByLibrary.simpleMessage("積分的計算説明"),
     "jifendidaogao" : MessageLookupByLibrary.simpleMessage("積分從低到高"),
     "jifengaodaodi" : MessageLookupByLibrary.simpleMessage("積分從高到低"),
-    "jifenshangcheng" : MessageLookupByLibrary.simpleMessage("積分商城"),
+    "jifenshangcheng" : MessageLookupByLibrary.simpleMessage("淨弼積分商城"),
     "jifenxiangqing" : MessageLookupByLibrary.simpleMessage("積分詳情"),
     "jingbilianmenghuiyuandian" : MessageLookupByLibrary.simpleMessage("淨弼聯盟會員店"),
     "jinkahuiyuan" : MessageLookupByLibrary.simpleMessage("金卡会员"),

lib/generated/l10n.dart

@@ -225,10 +225,10 @@ class S {
     );
   }
 
-  /// `积分商城`
+  /// `净弼积分商城`
   String get jifenshangcheng {
     return Intl.message(
-      '积分商城',
+      '净弼积分商城',
       name: 'jifenshangcheng',
       desc: '',
       args: [],

lib/l10n/intl_en.arb

@@ -18,7 +18,7 @@
   "main_menu4": "我的",
   "shouye": "首页",
   "huodongliebiao": "活动列表",
-  "jifenshangcheng": "积分商城",
+  "jifenshangcheng": "净弼积分商城",
   "jinrihuiyuanrenwu": "今日会员任务",
   "renwuzhongxin": "任务中心",
   "qiandaolingqujinfen": "签到领取积分",

lib/l10n/intl_zh_CN.arb

@@ -18,7 +18,7 @@
   "main_menu4": "我的",
   "shouye": "首页",
   "huodongliebiao": "活动列表",
-  "jifenshangcheng": "积分商城",
+  "jifenshangcheng": "净弼积分商城",
   "jinrihuiyuanrenwu": "今日会员任务",
   "renwuzhongxin": "任务中心",
   "qiandaolingqujinfen": "签到领取积分",

lib/l10n/intl_zh_Hans_CN.arb

@@ -18,7 +18,7 @@
   "main_menu4": "我的",
   "shouye": "首页",
   "huodongliebiao": "活动列表",
-  "jifenshangcheng": "积分商城",
+  "jifenshangcheng": "净弼积分商城",
   "jinrihuiyuanrenwu": "今日会员任务",
   "renwuzhongxin": "任务中心",
   "qiandaolingqujinfen": "签到领取积分",

lib/l10n/intl_zh_Hant_CN.arb

@@ -18,7 +18,7 @@
   "main_menu4": "我的",
   "shouye": "首頁",
   "huodongliebiao": "活動列表",
-  "jifenshangcheng": "積分商城",
+  "jifenshangcheng": "淨弼積分商城",
   "jinrihuiyuanrenwu": "今日會員任務",
   "renwuzhongxin": "任務中心",
   "qiandaolingqujinfen": "簽到領取積分",

lib/l10n/intl_zh_TW.arb

@@ -18,7 +18,7 @@
   "main_menu4": "我的",
   "shouye": "首頁",
   "huodongliebiao": "活動列表",
-  "jifenshangcheng": "積分商城",
+  "jifenshangcheng": "淨弼積分商城",
   "jinrihuiyuanrenwu": "今日會員任務",
   "renwuzhongxin": "任務中心",
   "qiandaolingqujinfen": "簽到領取積分",

lib/message/system_details.dart

@@ -198,7 +198,7 @@ class _SystemDetails extends State<SystemDetails> {
         children: [
           (messages == null || messages.length == 0)
               ? NoDataView(
-            src: "assets/image/icon_empty.png",
+            src: "assets/image/icon_empty.webp",
             isShowBtn: false,
             text: S.of(context).haimeiyouxiaoxi,
             fontSize: 16.sp,
@@ -323,7 +323,7 @@ class _SystemDetails extends State<SystemDetails> {
           children: [
             (messages == null || messages.length == 0)
                 ? NoDataView(
-              src:"assets/image/icon_empty.png",
+              src:"assets/image/icon_empty.webp",
               isShowBtn: false,
               text: S.of(context).haimeiyouxiaoxi,
               fontSize: 16.sp,
@@ -459,7 +459,7 @@ class _SystemDetails extends State<SystemDetails> {
           children: [
             (messages == null || messages.length == 0)
                 ? NoDataView(
-              src:"assets/image/icon_empty.png",
+              src:"assets/image/icon_empty.webp",
               isShowBtn: false,
               text: S.of(context).haimeiyouxiaoxi,
               fontSize: 16.sp,
@@ -606,7 +606,7 @@ class _SystemDetails extends State<SystemDetails> {
               children: [
                 (messages == null || messages.length == 0)
                     ? NoDataView(
-                  src:"assets/image/icon_empty.png",
+                  src:"assets/image/icon_empty.webp",
                   isShowBtn: false,
                   text: S.of(context).haimeiyouxiaoxi,
                   fontSize: 16.sp,
@@ -850,7 +850,7 @@ class _SystemDetails extends State<SystemDetails> {
           children: [
             (messages == null || messages.length == 0)
                 ? NoDataView(
-              src:"assets/image/icon_empty.png",
+              src:"assets/image/icon_empty.webp",
               isShowBtn: false,
               text: S.of(context).haimeiyouxiaoxi,
               fontSize: 16.sp,