Merge branch 'master' into dev

# Conflicts:
#	lib/home/home_page.dart
#	lib/main.dart

lib/article/hot_article_item.dart

@@ -80,7 +80,7 @@ class _HotArticlePage extends State<HotArticlePage> {
         backgroundColor: Color(0xFFF7F7F7),
         elevation: 0,
         title: Text(
-          S.of(context).remenwenzhangshipinliebiao,
+          S.of(context).huixiangtoutiao,
           style: TextStyle(
             color: Colors.black,
             fontWeight: FontWeight.bold,

lib/generated/intl/messages_en.dart

@@ -165,11 +165,13 @@ class MessageLookup extends MessageLookupByLibrary {
     "guanyuchuangshiren" : MessageLookupByLibrary.simpleMessage("关于创始人"),
     "guojiankangyoujishenghuo" : MessageLookupByLibrary.simpleMessage("过健康有机生活"),
     "haixiajiemei" : MessageLookupByLibrary.simpleMessage("海峡姐妹"),
+    "haowu" : MessageLookupByLibrary.simpleMessage("好物"),
     "heji" : MessageLookupByLibrary.simpleMessage("合计:"),
     "hexiaochenggong" : MessageLookupByLibrary.simpleMessage("核销成功"),
     "hexiaomaxiangqing" : MessageLookupByLibrary.simpleMessage("核销码详情"),
     "huangjinhuiyuan" : MessageLookupByLibrary.simpleMessage("黄金会员"),
     "huixiangrenyimendian" : MessageLookupByLibrary.simpleMessage("适用于：一心回乡任意门店"),
+    "huixiangtoutiao" : MessageLookupByLibrary.simpleMessage("回乡头条"),
     "huiyuandengji" : MessageLookupByLibrary.simpleMessage("会员等级"),
     "huiyuandengjishuoming" : MessageLookupByLibrary.simpleMessage("会员等级说明"),
     "huiyuanjifen" : MessageLookupByLibrary.simpleMessage("会员积分"),

lib/generated/intl/messages_zh_CN.dart

@@ -164,11 +164,13 @@ class MessageLookup extends MessageLookupByLibrary {
     "guanyu" : MessageLookupByLibrary.simpleMessage("关于"),
     "guojiankangyoujishenghuo" : MessageLookupByLibrary.simpleMessage("过健康有机生活"),
     "haixiajiemei" : MessageLookupByLibrary.simpleMessage("海峡姐妹"),
+    "haowu" : MessageLookupByLibrary.simpleMessage("好物"),
     "heji" : MessageLookupByLibrary.simpleMessage("合计:"),
     "hexiaochenggong" : MessageLookupByLibrary.simpleMessage("核销成功"),
     "hexiaomaxiangqing" : MessageLookupByLibrary.simpleMessage("核销码详情"),
     "huangjinhuiyuan" : MessageLookupByLibrary.simpleMessage("黄金会员"),
     "huixiangrenyimendian" : MessageLookupByLibrary.simpleMessage("适用于：一心回乡任意门店"),
+    "huixiangtoutiao" : MessageLookupByLibrary.simpleMessage("回乡头条"),
     "huiyuandengji" : MessageLookupByLibrary.simpleMessage("会员等级"),
     "huiyuandengjishuoming" : MessageLookupByLibrary.simpleMessage("会员等级说明"),
     "huiyuanjifen" : MessageLookupByLibrary.simpleMessage("会员积分"),

lib/generated/intl/messages_zh_Hans_CN.dart

@@ -164,11 +164,13 @@ class MessageLookup extends MessageLookupByLibrary {
     "guanyu" : MessageLookupByLibrary.simpleMessage("关于"),
     "guojiankangyoujishenghuo" : MessageLookupByLibrary.simpleMessage("过健康有机生活"),
     "haixiajiemei" : MessageLookupByLibrary.simpleMessage("海峡姐妹"),
+    "haowu" : MessageLookupByLibrary.simpleMessage("好物"),
     "heji" : MessageLookupByLibrary.simpleMessage("合计:"),
     "hexiaochenggong" : MessageLookupByLibrary.simpleMessage("核销成功"),
     "hexiaomaxiangqing" : MessageLookupByLibrary.simpleMessage("核销码详情"),
     "huangjinhuiyuan" : MessageLookupByLibrary.simpleMessage("黄金会员"),
     "huixiangrenyimendian" : MessageLookupByLibrary.simpleMessage("适用于：一心回乡任意门店"),
+    "huixiangtoutiao" : MessageLookupByLibrary.simpleMessage("回乡头条"),
     "huiyuandengji" : MessageLookupByLibrary.simpleMessage("会员等级"),
     "huiyuandengjishuoming" : MessageLookupByLibrary.simpleMessage("会员等级说明"),
     "huiyuanjifen" : MessageLookupByLibrary.simpleMessage("会员积分"),

lib/generated/intl/messages_zh_Hant_CN.dart

@@ -164,11 +164,13 @@ class MessageLookup extends MessageLookupByLibrary {
     "guanyu" : MessageLookupByLibrary.simpleMessage("關於"),
     "guojiankangyoujishenghuo" : MessageLookupByLibrary.simpleMessage("過健康有機生活"),
     "haixiajiemei" : MessageLookupByLibrary.simpleMessage("海峽姐妹"),
+    "haowu" : MessageLookupByLibrary.simpleMessage("好物"),
     "heji" : MessageLookupByLibrary.simpleMessage("合計:"),
     "hexiaochenggong" : MessageLookupByLibrary.simpleMessage("核銷成功"),
     "hexiaomaxiangqing" : MessageLookupByLibrary.simpleMessage("核銷碼詳情"),
     "huangjinhuiyuan" : MessageLookupByLibrary.simpleMessage("黃金會員"),
     "huixiangrenyimendian" : MessageLookupByLibrary.simpleMessage("适用于：一心回乡任意门店"),
+    "huixiangtoutiao" : MessageLookupByLibrary.simpleMessage("回鄉頭條"),
     "huiyuandengji" : MessageLookupByLibrary.simpleMessage("會員等級"),
     "huiyuandengjishuoming" : MessageLookupByLibrary.simpleMessage("會員等級説明"),
     "huiyuanjifen" : MessageLookupByLibrary.simpleMessage("會員積分"),

lib/generated/intl/messages_zh_TW.dart

@@ -164,11 +164,13 @@ class MessageLookup extends MessageLookupByLibrary {
     "guanyu" : MessageLookupByLibrary.simpleMessage("關於"),
     "guojiankangyoujishenghuo" : MessageLookupByLibrary.simpleMessage("過健康有機生活"),
     "haixiajiemei" : MessageLookupByLibrary.simpleMessage("海峽姐妹"),
+    "haowu" : MessageLookupByLibrary.simpleMessage("好物"),
     "heji" : MessageLookupByLibrary.simpleMessage("合計:"),
     "hexiaochenggong" : MessageLookupByLibrary.simpleMessage("核銷成功"),
     "hexiaomaxiangqing" : MessageLookupByLibrary.simpleMessage("核銷碼詳情"),
     "huangjinhuiyuan" : MessageLookupByLibrary.simpleMessage("黃金會員"),
     "huixiangrenyimendian" : MessageLookupByLibrary.simpleMessage("适用于：一心回乡任意门店"),
+    "huixiangtoutiao" : MessageLookupByLibrary.simpleMessage("回鄉頭條"),
     "huiyuandengji" : MessageLookupByLibrary.simpleMessage("會員等級"),
     "huiyuandengjishuoming" : MessageLookupByLibrary.simpleMessage("會員等級説明"),
     "huiyuanjifen" : MessageLookupByLibrary.simpleMessage("會員積分"),

lib/generated/l10n.dart

@@ -3755,6 +3755,26 @@ class S {
     );
   }
 
+  /// `好物`
+  String get haowu {
+    return Intl.message(
+      '好物',
+      name: 'haowu',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `回乡头条`
+  String get huixiangtoutiao {
+    return Intl.message(
+      '回乡头条',
+      name: 'huixiangtoutiao',
+      desc: '',
+      args: [],
+    );
+  }
+
   /// `并使用本机号码登录`
   String get privacy_policy4 {
     return Intl.message(

lib/home/guide_page.dart

@@ -0,0 +1,356 @@
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
+import 'package:huixiang/view_widget/border_text.dart';
+
+class GuidePage extends StatefulWidget {
+  @override
+  State<StatefulWidget> createState() {
+    return _GuidePage();
+  }
+}
+
+class _GuidePage extends State<GuidePage> {
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      body: PageView(
+        scrollDirection: Axis.horizontal,
+        reverse: false,
+        controller: PageController(
+          initialPage: 0,
+          viewportFraction: 1,
+          keepPage: true,
+        ),
+        physics: BouncingScrollPhysics(),
+        pageSnapping: true,
+        onPageChanged: (index) {
+          //监听事件
+          print('index=====$index');
+        },
+        children: <Widget>[
+          Container(
+            alignment: Alignment.center,
+            color: Colors.white,
+            child: Center(
+              child: Container(
+                margin: EdgeInsets.only(top: 125, left: 19, right: 19),
+                child: Stack(
+                  children: [
+                    Column(
+                      children: [
+                        Align(
+                          alignment: Alignment.center,
+                          child: Image.asset(
+                            "assets/image/icon_guide_1.png",
+                            // height: 307,
+                          ),
+                        ),
+                        SizedBox(
+                          height: 66,
+                        ),
+                        Padding(
+                          padding: EdgeInsets.only(left: 37, right: 37),
+                          child: Text(
+                            "会员最新资讯抢先看",
+                            style: TextStyle(
+                                fontSize: 24,
+                                fontWeight: FontWeight.bold,
+                                color: Color(0XFF32A060)),
+                          ),
+                        ),
+                        SizedBox(
+                          height: 23,
+                        ),
+                        Padding(
+                          padding: EdgeInsets.only(left: 19, right: 19),
+                          child: Text(
+                            "新增多项功能，海量优惠资讯实时推送",
+                            textAlign: TextAlign.center,
+                            style: TextStyle(
+                                fontSize: 16,
+                                height:1.5,
+                                fontWeight: FontWeight.w600,
+                                color: Color(0XFF727272)),
+                          ),
+                        ),
+                      ],
+                    ),
+                    Container(
+                      alignment: Alignment.bottomCenter,
+                      child: Row(
+                        mainAxisAlignment: MainAxisAlignment.center,
+                        crossAxisAlignment: CrossAxisAlignment.center,
+                        children: [
+                          Text(
+                            "●",
+                            style: TextStyle(fontSize: 8, color: Colors.black),
+                          ),
+                          SizedBox(
+                            width: 10,
+                          ),
+                          Text(
+                            "●",
+                            style: TextStyle(
+                                fontSize: 8, color: Color(0xffB2B2B2)),
+                          ),
+                          SizedBox(
+                            width: 10,
+                          ),
+                          Text(
+                            "●",
+                            style: TextStyle(
+                                fontSize: 8, color: Color(0xffB2B2B2)),
+                          ),
+                          SizedBox(
+                            height: 98,
+                          ),
+                        ],
+                      ),
+                    ),
+                  ],
+                ),
+              ),
+            ),
+          ),
+          Container(
+            alignment: Alignment.center,
+            color: Colors.white,
+            child: Center(
+              child: Container(
+                margin: EdgeInsets.only(top: 125, left: 19, right: 19),
+                child: Stack(
+                  children: [
+                    Column(
+                      children: [
+                        Align(
+                          alignment: Alignment.center,
+                          child: Image.asset(
+                            "assets/image/icon_guide_2.png",
+                            // height: 307,
+                          ),
+                        ),
+                        SizedBox(
+                          height: 66,
+                        ),
+                        Padding(
+                          padding: EdgeInsets.only(left: 37, right: 37),
+                          child: Text(
+                            "全新集团联盟店会员点餐",
+                            style: TextStyle(
+                                fontSize: 24,
+                                fontWeight: FontWeight.bold,
+                                color: Color(0XFF32A060)),
+                          ),
+                        ),
+                        SizedBox(
+                          height: 23,
+                        ),
+                        Padding(
+                          padding: EdgeInsets.only(left: 19, right: 19),
+                          child: Text(
+                            "新增多项功能，使用平台钱包优惠多多，更有充值优惠享不停",
+                            textAlign: TextAlign.center,
+                            style: TextStyle(
+                                fontSize: 16,
+                                height:1.5,
+                                fontWeight: FontWeight.w600,
+                                color: Color(0XFF727272)),
+                          ),
+                        ),
+                      ],
+                    ),
+                    Container(
+                      alignment: Alignment.bottomCenter,
+                      child: Row(
+                        mainAxisAlignment: MainAxisAlignment.center,
+                        crossAxisAlignment: CrossAxisAlignment.center,
+                        children: [
+                          Text(
+                            "●",
+                            style: TextStyle(
+                                fontSize: 8, color: Color(0xffB2B2B2)),
+                          ),
+                          SizedBox(
+                            width: 10,
+                          ),
+                          Text(
+                            "●",
+                            style: TextStyle(fontSize: 8, color: Colors.black),
+                          ),
+                          SizedBox(
+                            width: 10,
+                          ),
+                          Text(
+                            "●",
+                            style: TextStyle(
+                                fontSize: 8, color: Color(0xffB2B2B2)),
+                          ),
+                          SizedBox(
+                            height: 98,
+                          ),
+                        ],
+                      ),
+                    ),
+                  ],
+                ),
+              ),
+            ),
+          ),
+          Container(
+            alignment: Alignment.center,
+            color: Colors.white,
+            child: Center(
+              child: Container(
+                margin: EdgeInsets.only(top: 125, left: 19, right: 19),
+                child: Stack(
+                  children: [
+                    Column(
+                      children: [
+                        Align(
+                          alignment: Alignment.center,
+                          child: Image.asset(
+                            "assets/image/icon_guide_3.png",
+                            // height: 307,
+                          ),
+                        ),
+                        SizedBox(
+                          height: 66,
+                        ),
+                        Padding(
+                          padding: EdgeInsets.only(left: 37, right: 37),
+                          child: Text(
+                            "会员活动专区",
+                            style: TextStyle(
+                                fontSize: 24,
+                                fontWeight: FontWeight.bold,
+                                color: Color(0XFF32A060)),
+                          ),
+                        ),
+                        SizedBox(
+                          height: 23,
+                        ),
+                        Padding(
+                          padding: EdgeInsets.only(left: 19, right: 19),
+                          child: Text(
+                            "新增会员任务得积分，消费可得绿金、积分商城换购",
+                            textAlign: TextAlign.center,
+                            style: TextStyle(
+                                fontSize: 16,
+                                height:1.5,
+                                fontWeight: FontWeight.w600,
+                                color: Color(0XFF727272)),
+                          ),
+                        ),
+                      ],
+                    ),
+                    Container(
+                      alignment: Alignment.bottomCenter,
+                      child: Row(
+                        mainAxisAlignment: MainAxisAlignment.center,
+                        crossAxisAlignment: CrossAxisAlignment.center,
+                        children: [
+                          Text(
+                            "●",
+                            style: TextStyle(
+                                fontSize: 8, color: Color(0xffB2B2B2)),
+                          ),
+                          SizedBox(
+                            width: 10,
+                          ),
+                          Text(
+                            "●",
+                            style: TextStyle(
+                                fontSize: 8, color: Color(0xffB2B2B2)),
+                          ),
+                          SizedBox(
+                            width: 10,
+                          ),
+                          Text(
+                            "●",
+                            style: TextStyle(fontSize: 8, color: Colors.black),
+                          ),
+                          SizedBox(
+                            height: 98,
+                          ),
+                        ],
+                      ),
+                    ),
+                  ],
+                ),
+              ),
+            ),
+          ),
+          Container(
+            alignment: Alignment.center,
+            color: Colors.white,
+            child: Center(
+              child: Container(
+                margin: EdgeInsets.only(top: 108),
+                child:
+                    Column(
+                      children: [
+                      Image.asset(
+                            "assets/image/icon_guide_4.png",
+                            width: double.infinity,
+                            fit: BoxFit.fill,
+                          ),
+                        SizedBox(
+                          height: 66,
+                        ),
+                        Padding(
+                          padding: EdgeInsets.only(left: 104, right: 104),
+                          child: Text(
+                            "会员活动专区",
+                            style: TextStyle(
+                                fontSize: 24,
+                                fontWeight: FontWeight.bold,
+                                color: Color(0XFF32A060)),
+                          ),
+                        ),
+                        SizedBox(
+                          height: 23,
+                        ),
+                        Padding(
+                          padding: EdgeInsets.only(left: 52, right: 52),
+                          child: Text(
+                            "传递友爱纯净健康有机环保智慧理念",
+                            textAlign: TextAlign.center,
+                            style: TextStyle(
+                                fontSize: 16,
+                                height:1.5,
+                                fontWeight: FontWeight.w600,
+                                color: Color(0XFF727272)),
+                          ),
+                        ),
+                        SizedBox(
+                          height: 50,
+                        ),
+                        GestureDetector(
+                          onTap: (){
+                            Navigator.of(context).pushNamed('/router/login_page');
+                          },
+                          child:Container(
+                            margin: EdgeInsets.only(left: 71,right: 71),
+                            alignment: Alignment.bottomCenter,
+                            child:BorderText(
+                              padding: EdgeInsets.all(11),
+                              text: "立即体验",
+                              fontSize: 20,
+                              textColor: Color(0xFF32A060),
+                              borderColor: Color(0xFF32A060),
+                              borderWidth: 1,
+                              radius: 26.5,
+                            ),
+                          ),
+                        ),
+                      ],
+                    ),
+              ),
+            ),
+          )
+        ],
+      ),
+    );
+  }
+}

lib/home/home_page.dart

@@ -195,7 +195,7 @@ class _HomePage extends State<HomePage> with AutomaticKeepAliveClientMixin {
                 child: signIn(),
               ),
               ItemTitle(
-                text: S.of(context).remenwenzhangshipin,
+                text: S.of(context).huixiangtoutiao,
                 imgPath: "assets/image/icon_today_video.png",
                 moreText: S.of(context).chakangengduo,
                 onTap: () {
@@ -203,10 +203,10 @@ class _HomePage extends State<HomePage> with AutomaticKeepAliveClientMixin {
                 },
               ),
               hotList(),
-              ItemTitle(
-                text: S.of(context).chuangshirendegushi,
-                imgPath: "assets/image/icon_founder.png",
-              ),
+              // ItemTitle(
+              //   text: S.of(context).chuangshirendegushi,
+              //   imgPath: "assets/image/icon_founder.png",
+              // ),
               GestureDetector(
                 onTap: () {
                   Navigator.of(context).pushNamed('/router/founder_story_page');
@@ -332,7 +332,7 @@ class _HomePage extends State<HomePage> with AutomaticKeepAliveClientMixin {
           MImage(
             founder != null ? founder.imgUrl : "",
             aspectRatio: 2,
-            radius: BorderRadius.circular(4),
+            // radius: BorderRadius.circular(4),
             fit: BoxFit.cover,
             errorSrc: "assets/image/default_2_1.png",
             fadeSrc: "assets/image/default_2_1.png",
@@ -357,49 +357,48 @@ class _HomePage extends State<HomePage> with AutomaticKeepAliveClientMixin {
                     crossAxisAlignment: CrossAxisAlignment.baseline,
                     textBaseline: TextBaseline.alphabetic,
                     children: [
-                      Text(
-                        founder != null ? founder.name : "",
-                        style: TextStyle(
-                          fontSize: 14.sp,
-                          fontWeight: FontWeight.bold,
-                          color: Colors.white,
-                        ),
-                      ),
-                      SizedBox(
-                        width: 10.w,
-                      ),
-                      Text(
-                        S.of(context).jituanchuangshiren,
-                        style: TextStyle(
-                          fontSize: 8.sp,
-                          color: Colors.white,
+                      Expanded(
+                        child:
+                        Row(
+                          children: [
+                            Text(
+                              "创始人的故事-",
+                              style: TextStyle(
+                                fontSize: 14.sp,
+                                color: Colors.white,
+                              ),
+                            ),
+                            Text(
+                              founder != null ? founder.name : "",
+                              style: TextStyle(
+                                fontSize: 14.sp,
+                                color: Colors.white,
+                              ),
+                            ),
+                          ],
                         ),
+                        flex: 1,
                       ),
-                      SizedBox(
-                        width: 20.w,
-                      ),
-                      Expanded(
-                        child: Text(
-                          S.of(context).jianjie(
-                              "${founder != null ? founder.description : ""}"),
-                          maxLines: 1,
-                          overflow: TextOverflow.ellipsis,
-                          style: TextStyle(
-                            fontSize: 10.sp,
+                      Row(
+                        children: [
+                          Text(
+                            "查看详情",
+                            style: TextStyle(
+                              fontSize: 10.sp,
+                              color: Colors.white,
+                            ),
+                          ),
+                          Icon(
+                            Icons.keyboard_arrow_right,
+                            size: 12,
                             color: Colors.white,
                           ),
-                        ),
-                        flex: 1,
-                      )
+                        ],
+                      ),
                     ],
                   ),
                   flex: 1,
                 ),
-                Icon(
-                  Icons.keyboard_arrow_right,
-                  size: 12,
-                  color: Colors.white,
-                ),
               ],
             ),
           ),
@@ -490,7 +489,7 @@ class _HomePage extends State<HomePage> with AutomaticKeepAliveClientMixin {
               bottomRight: Radius.circular(4),
               bottomLeft: Radius.circular(4),
             ),
-            fit: BoxFit.fill,
+            fit: BoxFit.cover,
             errorSrc: "assets/image/default_1.png",
             fadeSrc: "assets/image/default_1.png",
           ),
@@ -506,7 +505,7 @@ class _HomePage extends State<HomePage> with AutomaticKeepAliveClientMixin {
                 SizedBox(height: 14,),
                 Row(
                   children: [
-                    Text(
+                    Expanded(flex: 1,child:Text(
                       goods.name,
                       overflow: TextOverflow.ellipsis,
                       style: TextStyle(
@@ -514,11 +513,11 @@ class _HomePage extends State<HomePage> with AutomaticKeepAliveClientMixin {
                         fontWeight: FontWeight.bold,
                         fontSize: 14.sp,
                       ),
-                    ),
-                    SizedBox(width: 8,),
+                    ) )
+                    ,
                     BorderText(
                       padding: EdgeInsets.all(2.h),
-                      text: "好物",
+                      text: S.of(context).haowu,
                       fontSize: 12.sp,
                       fontWeight: FontWeight.bold,
                       textColor: Color(0xFF32A060),

lib/integral_store/integral_store_details_page.dart

@@ -226,7 +226,7 @@ class _IntegralStoreDetailsPage extends State {
                     Text(
                       goods == null
                           ? ""
-                          : S.of(context).yiduihuanjian("${goods.sales}万"),
+                          : S.of(context).yiduihuanjian("${goods.sales}"),
                       style: TextStyle(
                         fontSize: 10,
                         color: Color(0xFFA29E9E),

lib/l10n/intl_en.arb

@@ -389,6 +389,9 @@
   "yinshi": "饮食",
   "shenghuoyule": "生活娱乐",
   "bangong": "办公",
+  "haowu": "好物",
+  "huixiangtoutiao": "回乡头条",
+
 
 
 

lib/l10n/intl_zh_CN.arb

@@ -390,6 +390,9 @@
   "yinshi": "饮食",
   "shenghuoyule": "生活娱乐",
   "bangong": "办公",
+  "haowu": "好物",
+  "huixiangtoutiao": "回乡头条",
+
 
 
 

lib/l10n/intl_zh_Hans_CN.arb

@@ -390,7 +390,8 @@
   "yinshi": "饮食",
   "shenghuoyule": "生活娱乐",
   "bangong": "办公",
-
+  "haowu": "好物",
+  "huixiangtoutiao": "回乡头条",
 
 
 

lib/l10n/intl_zh_Hant_CN.arb

@@ -382,6 +382,9 @@
   "yinshi": "飲食",
   "shenghuoyule": "生活娛樂",
   "bangong": "辦公",
+  "haowu": "好物",
+  "huixiangtoutiao": "回鄉頭條",
+
 
 
   "privacy_policy4": "并使用本機號碼登錄"

lib/l10n/intl_zh_TW.arb

@@ -382,6 +382,9 @@
   "yinshi": "飲食",
   "shenghuoyule": "生活娛樂",
   "bangong": "辦公",
+  "haowu": "好物",
+  "huixiangtoutiao": "回鄉頭條",
+
 
 
   "privacy_policy4": "并使用本機號碼登錄"

lib/main.dart

@@ -55,7 +55,8 @@ import 'package:shared_preferences/shared_preferences.dart';
 import 'package:sharesdk_plugin/sharesdk_interface.dart';
 import 'package:sharesdk_plugin/sharesdk_register.dart';
 import 'package:tpns_flutter_plugin/tpns_flutter_plugin.dart';
-import 'home/points_mall_page.dart';
+
+import 'home/guide_page.dart';
 import 'main_page.dart';
 import 'mine/manage_address_page.dart';
 import 'mine/roll_center_page.dart';
@@ -139,7 +140,7 @@ class MyApp extends StatelessWidget {
           return appLocale ?? locales[0];
         },
         supportedLocales: S.delegate.supportedLocales,
-        home: LoginPage(),
+        home: GuidePage(),
         // home: MainPage(),
         builder: (context, widget) {
           double textScaleFactor = MediaQuery.of(context).textScaleFactor;
@@ -167,7 +168,7 @@ class MyApp extends StatelessWidget {
           return MaterialPageRoute(
             //未找到页面配置进入登录页
             builder: (context) {
-              return LoginPage();
+              return GuidePage();
             },
             settings: settings,
           );
@@ -180,6 +181,7 @@ class MyApp extends StatelessWidget {
 Map<String, WidgetBuilder> routers = <String, WidgetBuilder>{
   '/router/login_page': (context, {arguments}) => LoginPage(arguments: arguments),
   '/router/main_page': (context, {arguments}) => MainPage(),
+  '/router/guide_Page': (context, {arguments}) => GuidePage(),
   '/router/msg_page': (context, {arguments}) => MainMessagePage(),
   '/router/system_msg_page': (context, {arguments}) => SystemMessagePage(),
   '/router/exchange_order_details': (context, {arguments}) =>

lib/mine/mine_page.dart

@@ -52,6 +52,12 @@ class _MinePage extends State<MinePage> with AutomaticKeepAliveClientMixin {
     );
   }
 
+  @override
+  void dispose() {
+    super.dispose();
+    _refreshController.dispose();
+  }
+
   @override
   void initState() {
     super.initState();
@@ -521,6 +527,7 @@ class _MinePage extends State<MinePage> with AutomaticKeepAliveClientMixin {
                       Expanded(
                         child: InkWell(
                           onTap: () {
+                            if(userinfo == null)
                             SmartDialog.show(
                               widget: LoginTips(
                                 click: () {

lib/mine/user_info_page.dart

@@ -196,7 +196,7 @@ class _UserInfoPage extends State<UserInfoPage> {
                 (modifyInfo["nickname"]) == "" ? "回乡" : modifyInfo["nickname"]),
           ),
           InkWell(
-            onTap: showDateSelector,
+            onTap:(modifyInfo["birth"] == "")?showDateSelector:(){},
             child: avatarItem(
                 2,
                 (modifyInfo["birth"] != null && modifyInfo["birth"] != "")
@@ -239,7 +239,7 @@ class _UserInfoPage extends State<UserInfoPage> {
         builder: (_) {
           return CupertinoDatePickerWidget();
         });
-    if (dateTime != null) {
+    if (dateTime != null ) {
       modifyInfo["birth"] = DateFormat("yyyy-MM-dd").format(dateTime);
       user.birth = modifyInfo["birth"];
       age = AppUtils.getAge(dateTime);

lib/view_widget/hot_item.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:flutter/widgets.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:huixiang/generated/l10n.dart';
 import 'package:huixiang/retrofit/data/article.dart';
@@ -104,17 +105,28 @@ class HotArticleItem extends StatelessWidget {
                   crossAxisAlignment: CrossAxisAlignment.center,
                   children: [
                     Expanded(
-                      child: IconText(
-                        article != null
-                            ? (article.createTime.split(" ")[0])
-                            : "",
-                        textStyle: TextStyle(
-                          fontSize: 10.sp,
-                          color: Color(0xFFB2B2B2),
-                        ),
-                        leftIcon: Icons.access_time_rounded,
-                        iconSize: 10,
-                        iconColor: Color(0xFFB2B2B2),
+                      child: Row(
+                        children: [
+                          IconText(
+                            article != null
+                                ? (article.createTime.split(" ")[0])
+                                : "",
+                            textStyle: TextStyle(
+                              fontSize: 10.sp,
+                              color: Color(0xFFB2B2B2),
+                            ),
+                            leftIcon: Icons.access_time_rounded,
+                            iconSize: 10,
+                            iconColor: Color(0xFFB2B2B2),
+                          ),
+                          SizedBox(width: 8,),
+                          Image.asset(
+                            "assets/image/icon_zan.png",
+                            width: 14.w,
+                            height: 14.h,
+                          ),
+                          Text("58",style: TextStyle(fontSize:10,color:Color(0xffB9B9B9)),)
+                        ],
                       ),
                       flex: 1,
                     ),

pubspec.lock

@@ -56,7 +56,7 @@ packages:
       name: async
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.5.0"
+    version: "2.6.1"
   barcode:
     dependency: transitive
     description:
@@ -594,7 +594,7 @@ packages:
       name: path_provider_linux
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.0.0"
+    version: "2.0.2"
   path_provider_platform_interface:
     dependency: transitive
     description:
@@ -608,7 +608,7 @@ packages:
       name: path_provider_windows
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.0.1"
+    version: "2.0.3"
   pedantic:
     dependency: transitive
     description:
@@ -637,13 +637,6 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "4.1.0"
-  photo_view:
-    dependency: "direct main"
-    description:
-      name: photo_view
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "0.11.1"
   platform:
     dependency: transitive
     description:
@@ -741,14 +734,14 @@ packages:
       name: shared_preferences_linux
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.0.0"
+    version: "2.0.2"
   shared_preferences_macos:
     dependency: transitive
     description:
       name: shared_preferences_macos
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.0.0"
+    version: "2.0.2"
   shared_preferences_platform_interface:
     dependency: transitive
     description:
@@ -762,14 +755,14 @@ packages:
       name: shared_preferences_web
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.0.0"
+    version: "2.0.1"
   shared_preferences_windows:
     dependency: transitive
     description:
       name: shared_preferences_windows
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.0.0"
+    version: "2.0.2"
   sharesdk_plugin:
     dependency: "direct main"
     description:
@@ -872,7 +865,7 @@ packages:
       name: test_api
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.2.19"
+    version: "0.3.0"
   timing:
     dependency: transitive
     description:
@@ -886,7 +879,7 @@ packages:
       path: "."
       ref: "V1.1.2"
       resolved-ref: b814d62f4b82422459f786671f23dd535062d503
-      url: "https://github.com/TencentCloud/TPNS-Flutter-Plugin"
+      url: "git://github.com/TencentCloud/TPNS-Flutter-Plugin"
     source: git
     version: "1.1.2"
   transformer_page_view:
@@ -993,7 +986,7 @@ packages:
       name: win32
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.0.5"
+    version: "2.2.5"
   xdg_directories:
     dependency: transitive
     description:
@@ -1016,5 +1009,5 @@ packages:
     source: hosted
     version: "3.1.0"
 sdks:
-  dart: ">=2.12.0 <3.0.0"
+  dart: ">=2.13.0 <3.0.0"
   flutter: ">=2.0.0"