1.扫码增加根据http或者https跳转对应网页；

2.回乡钱包-消费列表-消费名字改为type（最详细名称字段） 3.支付方式名字修改； 4.部分优化修改
2 years ago · db9c79b8b6
29 changed files with 444 additions and 353 deletions
--- a/lib/community/community_details.dart
+++ b/lib/community/community_details.dart
@ -26,9 +26,11 @@ class CommunityDetails extends StatefulWidget {
  }
 }

-class _CommunityDetails extends State<CommunityDetails> with WidgetsBindingObserver {
+class _CommunityDetails extends State<CommunityDetails>
+    with WidgetsBindingObserver {
  double height = 0;
  double commentHeight = 60.h;
+
  // ComunityComment comunity;
  String parenId = "0";
  final GlobalKey commentKey = GlobalKey();
@ -44,15 +46,11 @@ class _CommunityDetails extends State<CommunityDetails> with WidgetsBindingObser
  Article article;
  String businessId;

-
  @override
  void didChangeMetrics() {
    WidgetsBinding.instance.addPostFrameCallback((_) {
      if (!mounted) return;
-      if (MediaQuery
-          .of(context)
-          .viewInsets
-          .bottom == 0) {
+      if (MediaQuery.of(context).viewInsets.bottom == 0) {
        if (isKeyBoardShow) {
          FocusScope.of(context).requestFocus(FocusNode());
          if (mounted)
@ -90,8 +88,8 @@ class _CommunityDetails extends State<CommunityDetails> with WidgetsBindingObser
        context: context,
        token: value.getString("token"),
      );
-    BaseData<Article> baseData = await apiService.informationInfo(id)
-        .catchError((onError) {
+    BaseData<Article> baseData =
+        await apiService.informationInfo(id).catchError((onError) {
      debugPrint(onError.toString());
    });
    if (baseData != null && baseData.isSuccess) {
@ -132,15 +130,14 @@ class _CommunityDetails extends State<CommunityDetails> with WidgetsBindingObser
                            exitFull: () {
                              setState(() {});
                            },
-                      userId:widget.arguments !=null ? widget.arguments["userId"] :widget.arguments["mid"],
+                            userId: widget.arguments != null
+                                ? widget.arguments["userId"]
+                                : widget.arguments["mid"],
                            itemCount: 3,
                            isDetails: true,
                            heightFun: (height) {
                              this.height = height +
-                            MediaQuery
-                                .of(context)
-                                .padding
-                                .top +
+                                  MediaQuery.of(context).padding.top +
                                  kToolbarHeight +
                                  24;
                              if (mounted) setState(() {});
@ -155,9 +152,11 @@ class _CommunityDetails extends State<CommunityDetails> with WidgetsBindingObser
                          _reply,
                          _delCommentTips,
                          12.sp,
-                      requestApiFinish: (total){setState(() {
+                          requestApiFinish: (total) {
+                            setState(() {
                              commentTotal = total;
-                      });},
+                            });
+                          },
                        ),
                        if (memberList == null || memberList.length == 0)
                          Container(
@ -166,8 +165,7 @@ class _CommunityDetails extends State<CommunityDetails> with WidgetsBindingObser
                            margin: EdgeInsets.only(top: 40),
                            padding: EdgeInsets.all(22.h),
                            child: Text(
-                          S.of(context)
-                              .zanwupinglun,
+                              S.of(context).zanwupinglun,
                              style: TextStyle(
                                fontSize: 12,
                                fontWeight: FontWeight.bold,
@ -201,7 +199,8 @@ class _CommunityDetails extends State<CommunityDetails> with WidgetsBindingObser

  ///给文章/活动点赞
  _queryInformationLikes() async {
-    BaseData baseData = await apiService.informationLikes(businessId).catchError((onError) {});
+    BaseData baseData =
+        await apiService.informationLikes(businessId).catchError((onError) {});
    if (baseData != null && baseData.isSuccess) {
      commentKey.currentState.setState(() {});
      setState(() {
@ -241,10 +240,7 @@ class _CommunityDetails extends State<CommunityDetails> with WidgetsBindingObser
    scrollController.animateTo(
      first.dy +
          scrollController.offset -
-          (kToolbarHeight + MediaQuery
-              .of(context)
-              .padding
-              .top),
+          (kToolbarHeight + MediaQuery.of(context).padding.top),
      duration: Duration(milliseconds: 300),
      curve: Curves.easeIn,
    );
@ -254,15 +250,9 @@ class _CommunityDetails extends State<CommunityDetails> with WidgetsBindingObser
  final TextEditingController commentTextController = TextEditingController();

  contentHeight() {
-    double contentHeight = MediaQuery
-        .of(context)
-        .size
-        .height -
+    double contentHeight = MediaQuery.of(context).size.height -
        kToolbarHeight -
-        MediaQuery
-            .of(context)
-            .padding
-            .top -
+        MediaQuery.of(context).padding.top -
        160.h;
    if ((contentHeight - 60.h) > (128.h * memberList.length)) {
      commentHeight = contentHeight - (128.h * memberList.length);
--- a/lib/community/community_list.dart
+++ b/lib/community/community_list.dart
@ -24,16 +24,8 @@ class CommunityList extends StatefulWidget {
  final Function exitFull;
  final Function removalDynamic;

-  CommunityList(
-    this.comments,
-      this.userId,
-       this.commentType,{
-        this.isList = false,
-        this.exitFull,
-        this.removalDynamic
-  }
-
-  );
+  CommunityList(this.comments, this.userId, this.commentType,
+      {this.isList = false, this.exitFull, this.removalDynamic});

  @override
  State<StatefulWidget> createState() {
@ -88,13 +80,17 @@ class _CommunityList extends State<CommunityList> {
      children: [
        (widget.comments == null || widget.comments.length == 0)
            ? NoDataView(
-          src: widget.commentType == 1 ? "assets/image/dong_tai.webp" :"assets/image/guan_zhu.webp",
+                src: widget.commentType == 1
+                    ? "assets/image/dong_tai.webp"
+                    : "assets/image/guan_zhu.webp",
                isShowBtn: false,
-          text:widget.commentType == 1 ? "目前暂无发布动态，要把开心的事讲出来哦~" :"目前暂无添加关注，可在推荐中关注自己喜欢的人哦~",
+                text: widget.commentType == 1
+                    ? "目前暂无发布动态，要把开心的事讲出来哦~"
+                    : "目前暂无添加关注，可在推荐中关注自己喜欢的人哦~",
                fontSize: 16.sp,
                margin: EdgeInsets.only(top: 120.h, left: 60.w, right: 60.w),
-        ):
-        ListView.builder(
+              )
+            : ListView.builder(
                padding: EdgeInsets.zero,
                itemCount: widget.comments.length,
                scrollDirection: Axis.vertical,
@ -103,8 +99,9 @@ class _CommunityList extends State<CommunityList> {
                itemBuilder: (context, position) {
                  return GestureDetector(
                    onTap: () {
-                Navigator.of(context)
-                    .pushNamed('/router/new_community_details', arguments: {
+                      Navigator.of(context).pushNamed(
+                          '/router/new_community_details',
+                          arguments: {
                            "commentsId": widget.comments[position].id,
                            "userId": widget.userId,
                            // exitFull: () {
@ -112,8 +109,7 @@ class _CommunityList extends State<CommunityList> {
                            // },
                          }).then((value) {
                        widget.exitFull();
-                  setState(() {
-                  });
+                        setState(() {});
                      });
                      setState(() {});
                    },
@ -319,16 +315,17 @@ class _CommunityList extends State<CommunityList> {
                        onTap: () {
                          setState(() {
                            if (widget.commentType == 0) {
-                            comments.selfFollow = !(comments.selfFollow ?? false);
-                            _vipFollow(comments?.memberInfo?.mid,comments?.selfFollow ?? false);
+                              comments.selfFollow =
+                                  !(comments.selfFollow ?? false);
+                              _vipFollow(comments?.memberInfo?.mid,
+                                  comments?.selfFollow ?? false);
                            } else {
                              showDeleteDialog(position);
                            }
                          });
                        },
-                      child:
-                      (widget.commentType == 0) ?
-                      Container(
+                        child: (widget.commentType == 0)
+                            ? Container(
                                width: 56.w,
                                height: 25.h,
                                alignment: Alignment.center,
--- a/lib/community/community_view/community_dynamic.dart
+++ b/lib/community/community_view/community_dynamic.dart
@ -476,8 +476,7 @@ class _CommunityDynamic extends State<CommunityDynamic> {
                                ),
                              ],
                            )),
-                              )
-                      ),
+                      )),
                      if ((widget?.article?.author != widget.userId ?? "") &&
                          widget.commentType == 0)
                        Expanded(
--- a/lib/generated/intl/messages_en.dart
+++ b/lib/generated/intl/messages_en.dart
@ -409,6 +409,7 @@ class MessageLookup extends MessageLookupByLibrary {
    "login_splash" : MessageLookupByLibrary.simpleMessage("欢迎来到一心回乡"),
    "lvbiyue" : MessageLookupByLibrary.simpleMessage("绿币余额"),
    "lvbiyue_" : m18,
+    "lvbizhifu" : MessageLookupByLibrary.simpleMessage("绿币支付"),
    "main_menu1" : MessageLookupByLibrary.simpleMessage("净弼"),
    "main_menu2" : MessageLookupByLibrary.simpleMessage("联盟"),
    "main_menu3" : MessageLookupByLibrary.simpleMessage("有机生活"),
@ -423,6 +424,7 @@ class MessageLookup extends MessageLookupByLibrary {
    "meizhousangengxin" : MessageLookupByLibrary.simpleMessage("每周三更新"),
    "meizhousanquanbao" : MessageLookupByLibrary.simpleMessage("每周三更新劵包"),
    "mendianxuanzhe" : MessageLookupByLibrary.simpleMessage("门店选择"),
+    "mendianyue" : MessageLookupByLibrary.simpleMessage("门店余额"),
    "menpaihao" : MessageLookupByLibrary.simpleMessage("请输入门牌号"),
    "mi" : m21,
    "mingxi" : MessageLookupByLibrary.simpleMessage("明细"),
--- a/lib/generated/intl/messages_en_US.dart
+++ b/lib/generated/intl/messages_en_US.dart
@ -409,6 +409,7 @@ class MessageLookup extends MessageLookupByLibrary {
    "login_splash" : MessageLookupByLibrary.simpleMessage("Welcome Back Home"),
    "lvbiyue" : MessageLookupByLibrary.simpleMessage("balance of green currency"),
    "lvbiyue_" : m18,
+    "lvbizhifu" : MessageLookupByLibrary.simpleMessage("green payment"),
    "main_menu1" : MessageLookupByLibrary.simpleMessage("Jing Bi"),
    "main_menu2" : MessageLookupByLibrary.simpleMessage("Union"),
    "main_menu3" : MessageLookupByLibrary.simpleMessage("Organic Life"),
@ -423,6 +424,7 @@ class MessageLookup extends MessageLookupByLibrary {
    "meizhousangengxin" : MessageLookupByLibrary.simpleMessage("updated every Wednesday"),
    "meizhousanquanbao" : MessageLookupByLibrary.simpleMessage("Wednesday renewal coupon"),
    "mendianxuanzhe" : MessageLookupByLibrary.simpleMessage("Store Selection"),
+    "mendianyue" : MessageLookupByLibrary.simpleMessage("store balance"),
    "menpaihao" : MessageLookupByLibrary.simpleMessage("Please enter the house number"),
    "mi" : m21,
    "mingxi" : MessageLookupByLibrary.simpleMessage("Details"),
--- a/lib/generated/intl/messages_zh_CN.dart
+++ b/lib/generated/intl/messages_zh_CN.dart
@ -409,6 +409,7 @@ class MessageLookup extends MessageLookupByLibrary {
    "login_splash" : MessageLookupByLibrary.simpleMessage("欢迎来到一心回乡"),
    "lvbiyue" : MessageLookupByLibrary.simpleMessage("绿币余额"),
    "lvbiyue_" : m18,
+    "lvbizhifu" : MessageLookupByLibrary.simpleMessage("绿币支付"),
    "main_menu1" : MessageLookupByLibrary.simpleMessage("净弼"),
    "main_menu2" : MessageLookupByLibrary.simpleMessage("联盟"),
    "main_menu3" : MessageLookupByLibrary.simpleMessage("有机生活"),
@ -423,6 +424,7 @@ class MessageLookup extends MessageLookupByLibrary {
    "meizhousangengxin" : MessageLookupByLibrary.simpleMessage("每周三更新"),
    "meizhousanquanbao" : MessageLookupByLibrary.simpleMessage("每周三更新劵包"),
    "mendianxuanzhe" : MessageLookupByLibrary.simpleMessage("门店选择"),
+    "mendianyue" : MessageLookupByLibrary.simpleMessage("门店余额"),
    "menpaihao" : MessageLookupByLibrary.simpleMessage("请输入门牌号"),
    "mi" : m21,
    "mingxi" : MessageLookupByLibrary.simpleMessage("明细"),
--- a/lib/generated/intl/messages_zh_Hans_CN.dart
+++ b/lib/generated/intl/messages_zh_Hans_CN.dart
@ -409,6 +409,7 @@ class MessageLookup extends MessageLookupByLibrary {
    "login_splash" : MessageLookupByLibrary.simpleMessage("欢迎来到一心回乡"),
    "lvbiyue" : MessageLookupByLibrary.simpleMessage("绿币余额"),
    "lvbiyue_" : m18,
+    "lvbizhifu" : MessageLookupByLibrary.simpleMessage("绿币支付"),
    "main_menu1" : MessageLookupByLibrary.simpleMessage("净弼"),
    "main_menu2" : MessageLookupByLibrary.simpleMessage("联盟"),
    "main_menu3" : MessageLookupByLibrary.simpleMessage("有机生活"),
@ -423,6 +424,7 @@ class MessageLookup extends MessageLookupByLibrary {
    "meizhousangengxin" : MessageLookupByLibrary.simpleMessage("每周三更新"),
    "meizhousanquanbao" : MessageLookupByLibrary.simpleMessage("每周三更新劵包"),
    "mendianxuanzhe" : MessageLookupByLibrary.simpleMessage("门店选择"),
+    "mendianyue" : MessageLookupByLibrary.simpleMessage("门店余额"),
    "menpaihao" : MessageLookupByLibrary.simpleMessage("请输入门牌号"),
    "mi" : m21,
    "mingxi" : MessageLookupByLibrary.simpleMessage("明细"),
--- a/lib/generated/intl/messages_zh_Hant_CN.dart
+++ b/lib/generated/intl/messages_zh_Hant_CN.dart
@ -405,6 +405,7 @@ class MessageLookup extends MessageLookupByLibrary {
    "login_splash" : MessageLookupByLibrary.simpleMessage("歡迎來到一心回鄉"),
    "lvbiyue" : MessageLookupByLibrary.simpleMessage("綠幣餘額"),
    "lvbiyue_" : m18,
+    "lvbizhifu" : MessageLookupByLibrary.simpleMessage("綠幣支付"),
    "main_menu1" : MessageLookupByLibrary.simpleMessage("淨弼"),
    "main_menu2" : MessageLookupByLibrary.simpleMessage("聯盟"),
    "main_menu3" : MessageLookupByLibrary.simpleMessage("有機生活"),
@ -419,6 +420,7 @@ class MessageLookup extends MessageLookupByLibrary {
    "meizhousangengxin" : MessageLookupByLibrary.simpleMessage("每週三更新"),
    "meizhousanquanbao" : MessageLookupByLibrary.simpleMessage("每週三更新劵包"),
    "mendianxuanzhe" : MessageLookupByLibrary.simpleMessage("门店选择"),
+    "mendianyue" : MessageLookupByLibrary.simpleMessage("門店餘額"),
    "menpaihao" : MessageLookupByLibrary.simpleMessage("請輸入門牌號"),
    "mi" : m21,
    "mingxi" : MessageLookupByLibrary.simpleMessage("明細"),
--- a/lib/generated/intl/messages_zh_TW.dart
+++ b/lib/generated/intl/messages_zh_TW.dart
@ -407,6 +407,7 @@ class MessageLookup extends MessageLookupByLibrary {
    "login_splash" : MessageLookupByLibrary.simpleMessage("歡迎來到一心回鄉"),
    "lvbiyue" : MessageLookupByLibrary.simpleMessage("綠幣餘額"),
    "lvbiyue_" : m18,
+    "lvbizhifu" : MessageLookupByLibrary.simpleMessage("綠幣支付"),
    "main_menu1" : MessageLookupByLibrary.simpleMessage("淨弼"),
    "main_menu2" : MessageLookupByLibrary.simpleMessage("聯盟"),
    "main_menu3" : MessageLookupByLibrary.simpleMessage("有機生活"),
@ -421,6 +422,7 @@ class MessageLookup extends MessageLookupByLibrary {
    "meizhousangengxin" : MessageLookupByLibrary.simpleMessage("每週三更新"),
    "meizhousanquanbao" : MessageLookupByLibrary.simpleMessage("每週三更新劵包"),
    "mendianxuanzhe" : MessageLookupByLibrary.simpleMessage("门店选择"),
+    "mendianyue" : MessageLookupByLibrary.simpleMessage("門店餘額"),
    "menpaihao" : MessageLookupByLibrary.simpleMessage("請輸入門牌號"),
    "mi" : m21,
    "mingxi" : MessageLookupByLibrary.simpleMessage("明細"),
--- a/lib/generated/l10n.dart
+++ b/lib/generated/l10n.dart
@ -6935,6 +6935,26 @@ class S {
    );
  }

+  /// `门店余额`
+  String get mendianyue {
+    return Intl.message(
+      '门店余额',
+      name: 'mendianyue',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `绿币支付`
+  String get lvbizhifu {
+    return Intl.message(
+      '绿币支付',
+      name: 'lvbizhifu',
+      desc: '',
+      args: [],
+    );
+  }
+
  /// `并使用本机号码登录`
  String get privacy_policy4 {
    return Intl.message(
--- a/lib/l10n/intl_en.arb
+++ b/lib/l10n/intl_en.arb
@ -721,6 +721,8 @@
  "lijishiyong":"立即使用",
  "wangjimima":"忘记密码",
  "xuanzeshangpinlingqufangshi":"请选择商品的领取方式",
+  "mendianyue":"门店余额",
+  "lvbizhifu":"绿币支付",



--- a/lib/l10n/intl_en_US.arb
+++ b/lib/l10n/intl_en_US.arb
@ -722,6 +722,8 @@
  "lijishiyong":"Use Now",
  "wangjimima":"Forgot password",
  "xuanzeshangpinlingqufangshi":"Please select the picking method of goods",
+  "mendianyue":"store balance",
+  "lvbizhifu":"green payment",



--- a/lib/l10n/intl_zh_CN.arb
+++ b/lib/l10n/intl_zh_CN.arb
@ -722,6 +722,8 @@
  "lijishiyong":"立即使用",
  "wangjimima":"忘记密码",
  "xuanzeshangpinlingqufangshi":"请选择商品的领取方式",
+  "mendianyue":"门店余额",
+  "lvbizhifu":"绿币支付",



--- a/lib/l10n/intl_zh_Hans_CN.arb
+++ b/lib/l10n/intl_zh_Hans_CN.arb
@ -722,6 +722,8 @@
  "lijishiyong":"立即使用",
  "wangjimima":"忘记密码",
  "xuanzeshangpinlingqufangshi":"请选择商品的领取方式",
+  "mendianyue":"门店余额",
+  "lvbizhifu":"绿币支付",



--- a/lib/l10n/intl_zh_Hant_CN.arb
+++ b/lib/l10n/intl_zh_Hant_CN.arb
@ -713,6 +713,8 @@
  "lijishiyong":"立即使用",
  "wangjimima":"忘記密碼",
  "xuanzeshangpinlingqufangshi":"請選擇商品的領取方式",
+  "mendianyue":"門店餘額",
+  "lvbizhifu":"綠幣支付",



--- a/lib/l10n/intl_zh_TW.arb
+++ b/lib/l10n/intl_zh_TW.arb
@ -715,6 +715,8 @@
  "lijishiyong":"立即使用",
  "wangjimima":"忘記密碼",
  "xuanzeshangpinlingqufangshi":"請選擇商品的領取方式",
+  "mendianyue":"門店餘額",
+  "lvbizhifu":"綠幣支付",



--- a/lib/main.dart
+++ b/lib/main.dart
@ -110,6 +110,7 @@ import 'mine/mine_vip/binding_assistant_card.dart';
 import 'mine/mine_vip/legal_right_details.dart';
 import 'mine/mine_vip/mine_attainment_page.dart';
 import 'mine/mine_vip/mine_vip_core.dart';
+import 'mine/scan_web.dart';
 import 'order/bargain_group_order.dart';
 import 'mine/personal_page.dart';
 import 'order/exchange_write_off_page.dart';
@ -417,4 +418,6 @@ Map<String, WidgetBuilder> routers = <String, WidgetBuilder>{
      UserVipServicePage(),
  '/router/help_farmers_page': (context, {arguments}) =>
      HelpFarmersPage(),
+  '/router/scan_web': (context, {arguments}) =>
+      ScanWeb(arguments:arguments),
 };
--- a/lib/mine/mine_page.dart
+++ b/lib/mine/mine_page.dart
@ -259,7 +259,7 @@ class MinePageState extends State<MinePage> with AutomaticKeepAliveClientMixin {

                          // ///关注度/粉丝/发布
                          // attention(),
-                          //
+
                          // /// 钱包或领券中心
                          // WalletCoupon(),
                        ],
--- a/lib/mine/mine_view/mine_view.dart
+++ b/lib/mine/mine_view/mine_view.dart
@ -21,6 +21,7 @@ import 'package:huixiang/view_widget/request_permission.dart';
 import 'package:huixiang/view_widget/round_button.dart';
 import 'package:permission_handler/permission_handler.dart';
 import 'package:shared_preferences/shared_preferences.dart';
+import 'package:webview_flutter/webview_flutter.dart';
 // import 'package:qrscan/qrscan.dart' as scanner;

 class MineView extends StatefulWidget {
@ -31,7 +32,8 @@ class MineView extends StatefulWidget {
  final int totalMsg;
  final SocialInfo infoNumber;

-  MineView(this.userInfo, this.toUserInfo, this.toIntegralPage,this.messageZero,this.totalMsg,this.infoNumber);
+  MineView(this.userInfo, this.toUserInfo, this.toIntegralPage,
+      this.messageZero, this.totalMsg, this.infoNumber);

  @override
  State<StatefulWidget> createState() {
@ -60,8 +62,6 @@ class _MineView extends State<MineView> {
    }
  }

-
-
  @override
  Widget build(BuildContext context) {
    return Column(
@ -77,7 +77,9 @@ class _MineView extends State<MineView> {
                  alignment: Alignment.center,
                  child: GestureDetector(
                      onTap: () {
-                        Navigator.of(context).pushNamed('/router/system_msg_page').then((value) {
+                        Navigator.of(context)
+                            .pushNamed('/router/system_msg_page')
+                            .then((value) {
                          widget.messageZero();
                        });
                      },
@ -115,14 +117,11 @@ class _MineView extends State<MineView> {
                                      backgroup: Color(0xFFFF441A),
                                      fontSize: 8.sp,
                                      radius: 100,
-                                    )
-                                ),
+                                    )),
                              )
                          ],
                        ),
-                      )
-                  )
-              ),
+                      ))),
              InkWell(
                onTap: () {
                  toScan();
@ -188,7 +187,8 @@ class _MineView extends State<MineView> {
        ///活动优惠券赠送弹窗
        activityShowAlertDialog(result.toString());
        return;
-      }if(result.toString().contains("type\":\"wiped")){
+      }
+      if (result.toString().contains("type\":\"wiped")) {
        ///核销券
        queryWiped(jsonDecode(result.toString())["memberCouponId"]);
        return;
@ -213,6 +213,17 @@ class _MineView extends State<MineView> {
            "tableId": int.tryParse(tableId),
          },
        );
+        return;
+      }
+      if (result.toString().contains("http:") ||
+          result.toString().contains("https:")) {
+        ///扫码跳转任意网页
+        Navigator.of(context).pushNamed(
+          '/router/scan_web',
+          arguments: {
+            "result": result,
+          },
+        );
      }
    } else {
      await Permission.camera.request();
@ -375,12 +386,12 @@ class _MineView extends State<MineView> {
                        widget.toIntegralPage();
                      },
                      child: Container(
-                        padding: EdgeInsets.only(top: 4.h, bottom: 4.h, right: 16.w,left: 7.w),
+                        padding: EdgeInsets.only(
+                            top: 4.h, bottom: 4.h, right: 16.w, left: 7.w),
                        margin: EdgeInsets.only(right: 14.w),
                        decoration: BoxDecoration(
                            borderRadius: BorderRadius.circular(12),
-                        color: Colors.white
-                            ),
+                            color: Colors.white),
                        child: Row(
                          mainAxisAlignment: MainAxisAlignment.end,
                          children: [
--- a/lib/mine/mine_wallet_page.dart
+++ b/lib/mine/mine_wallet_page.dart
@ -458,7 +458,7 @@ class _MineWalletPage extends State<MineWalletPage> {
              Expanded(
                  flex: 7,
                  child: Text(
-                    userBill.title,
+                    userBill.type,
                    style: TextStyle(
                      color: Colors.black,
                      fontSize: 12.sp,
--- a/lib/mine/scan_web.dart
+++ b/lib/mine/scan_web.dart
@ -0,0 +1,49 @@
+import 'dart:io';
+
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_easyloading/flutter_easyloading.dart';
+import 'package:huixiang/generated/l10n.dart';
+import 'package:huixiang/utils/font_weight.dart';
+import 'package:huixiang/view_widget/my_appbar.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:webview_flutter/webview_flutter.dart';
+
+class ScanWeb extends StatefulWidget {
+  final Map<String, dynamic> arguments;
+
+  ScanWeb({this.arguments});
+  @override
+  State<StatefulWidget> createState() {
+    return _ScanWeb();
+  }
+}
+
+class _ScanWeb extends State<ScanWeb> {
+  var controller = new ScrollController();
+  String result;
+
+  @override
+  void initState() {
+    super.initState();
+    result = widget.arguments["result"];
+    EasyLoading.show(status: S.current.zhengzaijiazai);
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return  Container(
+      margin: EdgeInsets.only(top:MediaQuery.of(context).padding.top),
+        width: MediaQuery.of(context).size.width,
+        height: MediaQuery.of(context).size.height,
+        alignment: Alignment.center,
+        child:
+        WebView(
+          initialUrl:result,
+          javascriptMode: JavascriptMode.unrestricted,
+          onPageFinished: (initialUrl){
+            EasyLoading.dismiss();
+          },
+        ));
+  }
+}
--- a/lib/order/order_history_page.dart
+++ b/lib/order/order_history_page.dart
@ -212,6 +212,7 @@ class _OrderHistoryList extends State<OrderHistoryList>
      }
      setState(() {});
    } else {
+      SmartDialog.showToast(baseData?.msg ?? "",alignment: Alignment.center);
      refreshController.refreshFailed();
      refreshController.loadFailed();
    }
@ -568,16 +569,11 @@ class _OrderHistoryList extends State<OrderHistoryList>
  queryDetails(id) async {
    if (apiService == null) {
      SharedPreferences value = await SharedPreferences.getInstance();
-      apiService = ApiService(
-          Dio(),
-          context: context,
-          token: value.getString("token"),
-          showLoading: true
-      );
+      apiService = ApiService(Dio(),
+          context: context, token: value.getString("token"), showLoading: true);
    }
-    BaseData<OrderInfo> baseData = await apiService
-        .orderDetail(id)
-        .catchError((error) {});
+    BaseData<OrderInfo> baseData =
+        await apiService.orderDetail(id).catchError((error) {});
    if (baseData != null && baseData.isSuccess) {
      return baseData.data;
    }
@ -598,7 +594,9 @@ class _OrderHistoryList extends State<OrderHistoryList>
        minService,
        orderInfo,
        (BaseData baseData) {
-          SmartDialog.showToast(baseData?.msg == "ok" ?"订单支付成功" :baseData?.msg,alignment: Alignment.center);
+          SmartDialog.showToast(
+              baseData?.msg == "ok" ? "订单支付成功" : baseData?.msg,
+              alignment: Alignment.center);
          Future.delayed(Duration(seconds: 3), () {
            _onRefresh();
          });
--- a/lib/order/order_view/order_pay_selected.dart
+++ b/lib/order/order_view/order_pay_selected.dart
@ -70,7 +70,7 @@ class _OrderPaySelected extends State<OrderPaySelected> {
                    Expanded(child:  Padding(
                      padding: EdgeInsets.only(left: 8.w),
                      child:Text(
-                        "助农积分",
+                        S.of(context).zhunongjifen,
                        style: TextStyle(
                          fontSize: 14.sp,
                          color: Color(0xff353535),
@ -101,7 +101,7 @@ class _OrderPaySelected extends State<OrderPaySelected> {
                    Expanded(child:  Padding(
                      padding: EdgeInsets.only(left: 8.w),
                      child: Text(
-                        S.of(context).pingtaiyue,
+                        S.of(context).huixiangqianbao,
                        style: TextStyle(
                          fontSize: 14.sp,
                          color: Color(0xff353535),
@ -132,7 +132,7 @@ class _OrderPaySelected extends State<OrderPaySelected> {
                    Expanded(child:  Padding(
                      padding: EdgeInsets.only(left: 8.w),
                      child:Text(
-                        S.of(context).dianpuyue,
+                        S.of(context).mendianyue,
                        style: TextStyle(
                          fontSize: 14.sp,
                          color: Color(0xff353535),
@ -164,7 +164,7 @@ class _OrderPaySelected extends State<OrderPaySelected> {
                    Expanded(child:  Padding(
                      padding: EdgeInsets.only(left: 8.w),
                      child:Text(
-                        "绿币余额",
+                        S.of(context).lvbizhifu,
                        style: TextStyle(
                          fontSize: 14.sp,
                          color: Color(0xff353535),
--- a/lib/retrofit/min_api.dart
+++ b/lib/retrofit/min_api.dart
@ -26,7 +26,7 @@ import 'data/shopping_home_config.dart';

 part 'min_api.g.dart';

-const localBaseUrl = "http://192.168.10.78:8765/app/";///本地
+const localBaseUrl = "https://pos.api.lotus-wallet.com/app/";///本地
 // const localBaseUrl = "https://2946-27-19-77-115.jp.ngrok.io/app/";///本地
 const serviceBaseUrl = "https://pos.api.lotus-wallet.com/app/";///线上

--- a/lib/retrofit/retrofit_api.dart
+++ b/lib/retrofit/retrofit_api.dart
@ -64,7 +64,7 @@ import 'data/wx_pay.dart';

 part 'retrofit_api.g.dart';

-const localBaseUrl = "http://192.168.10.78:8766/app/";///本地
+const localBaseUrl = "https://pos.platform.lotus-wallet.com/app/";///本地
 // const localBaseUrl = "https://2946-27-19-77-115.jp.ngrok.io/app/";///本地
 const serviceBaseUrl = "https://pos.platform.lotus-wallet.com/app/";///线上

--- a/lib/retrofit/retrofit_api.g.dart
+++ b/lib/retrofit/retrofit_api.g.dart
@ -866,7 +866,7 @@ class _ApiService implements ApiService {
        data: _data);
    final value = BaseData<PageInfo<OrderInfo>>.fromJson(
      _result.data,
-      (json) => PageInfo<OrderInfo>.fromJson(
+      (json) => ((json??"") == "")?null:PageInfo<OrderInfo>.fromJson(
        json,
        (json) => OrderInfo.fromJson(json),
      ),
--- a/lib/settlement/settlement_view/activity_coupon_remarks.dart
+++ b/lib/settlement/settlement_view/activity_coupon_remarks.dart
@ -84,7 +84,7 @@ class _ActivityCouponRemarks extends State<ActivityCouponRemarks> {
              Expanded(
                flex: 1,
                child: Text(
-                  "VIP价格",
+                  "VIP权益",
                  style: TextStyle(
                    fontWeight: MyFontWeight.regular,
                    fontSize: 14.sp,
--- a/lib/settlement/settlement_view/pay_method.dart
+++ b/lib/settlement/settlement_view/pay_method.dart
@ -118,7 +118,7 @@ class _PayMethod extends State<PayMethod> {
                  width: 10,
                ),
                Text(
-                  S.of(context).pingtaiyue,
+                  S.of(context).huixiangqianbao,
                  style: TextStyle(
                    fontSize: 14.sp,
                    color: Color(0xff353535),
@ -162,7 +162,7 @@ class _PayMethod extends State<PayMethod> {
                  width: 10,
                ),
                Text(
-                  S.of(context).dianpuyue,
+                  S.of(context).mendianyue,
                  style: TextStyle(
                    fontSize: 14.sp,
                    color: Color(0xff353535),
@ -215,7 +215,7 @@ class _PayMethod extends State<PayMethod> {
                  width: 10,
                ),
                Text(
-                  "绿币余额",
+                  S.of(context).lvbizhifu,
                  style: TextStyle(
                    fontSize: 14.sp,
                    color: Color(0xff353535),