safety

lib/generated/intl/messages_en.dart

@@ -458,6 +458,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "tongzhitishixinxi" : MessageLookupByLibrary.simpleMessage("为了您可以及时收到我们的活动信息，推荐您在使用HISAPP时打开通知的接收"),
     "touxiang" : MessageLookupByLibrary.simpleMessage("头像"),
     "tuichudenglu" : MessageLookupByLibrary.simpleMessage("退出登录"),
+    "tuiguangma" : MessageLookupByLibrary.simpleMessage("推广码"),
     "tuikuan" : MessageLookupByLibrary.simpleMessage("退款"),
     "waimai" : MessageLookupByLibrary.simpleMessage("外卖"),
     "waisong" : MessageLookupByLibrary.simpleMessage("外送"),
@@ -482,6 +483,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "wenzhang" : MessageLookupByLibrary.simpleMessage("文章"),
     "wenzhangxiangqing" : MessageLookupByLibrary.simpleMessage("文章详情"),
     "weulingqu" : MessageLookupByLibrary.simpleMessage("未领取"),
+    "wodegongju" : MessageLookupByLibrary.simpleMessage("我的工具"),
     "wodehuiyuandengji" : MessageLookupByLibrary.simpleMessage("我的会员等级"),
     "wodejifenzhi" : MessageLookupByLibrary.simpleMessage("我的积分值"),
     "wodekaquan" : MessageLookupByLibrary.simpleMessage("我的卡券"),

lib/generated/intl/messages_zh_CN.dart

@@ -457,6 +457,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "tongzhitishixinxi" : MessageLookupByLibrary.simpleMessage("为了您可以及时收到我们的活动信息，推荐您在使用HISAPP时打开通知的接收"),
     "touxiang" : MessageLookupByLibrary.simpleMessage("头像"),
     "tuichudenglu" : MessageLookupByLibrary.simpleMessage("退出登录"),
+    "tuiguangma" : MessageLookupByLibrary.simpleMessage("推广码"),
     "tuikuan" : MessageLookupByLibrary.simpleMessage("退款"),
     "waimai" : MessageLookupByLibrary.simpleMessage("外卖"),
     "waisong" : MessageLookupByLibrary.simpleMessage("外送"),
@@ -481,6 +482,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "wenzhang" : MessageLookupByLibrary.simpleMessage("文章"),
     "wenzhangxiangqing" : MessageLookupByLibrary.simpleMessage("文章详情"),
     "weulingqu" : MessageLookupByLibrary.simpleMessage("未领取"),
+    "wodegongju" : MessageLookupByLibrary.simpleMessage("我的工具"),
     "wodehuiyuandengji" : MessageLookupByLibrary.simpleMessage("我的会员等级"),
     "wodejifenzhi" : MessageLookupByLibrary.simpleMessage("我的积分值"),
     "wodekaquan" : MessageLookupByLibrary.simpleMessage("我的卡券"),

lib/generated/intl/messages_zh_Hans_CN.dart

@@ -457,6 +457,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "tongzhitishixinxi" : MessageLookupByLibrary.simpleMessage("为了您可以及时收到我们的活动信息，推荐您在使用HISAPP时打开通知的接收"),
     "touxiang" : MessageLookupByLibrary.simpleMessage("头像"),
     "tuichudenglu" : MessageLookupByLibrary.simpleMessage("退出登录"),
+    "tuiguangma" : MessageLookupByLibrary.simpleMessage("推广码"),
     "tuikuan" : MessageLookupByLibrary.simpleMessage("退款"),
     "waimai" : MessageLookupByLibrary.simpleMessage("外卖"),
     "waisong" : MessageLookupByLibrary.simpleMessage("外送"),
@@ -481,6 +482,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "wenzhang" : MessageLookupByLibrary.simpleMessage("文章"),
     "wenzhangxiangqing" : MessageLookupByLibrary.simpleMessage("文章详情"),
     "weulingqu" : MessageLookupByLibrary.simpleMessage("未领取"),
+    "wodegongju" : MessageLookupByLibrary.simpleMessage("我的工具"),
     "wodehuiyuandengji" : MessageLookupByLibrary.simpleMessage("我的会员等级"),
     "wodejifenzhi" : MessageLookupByLibrary.simpleMessage("我的积分值"),
     "wodekaquan" : MessageLookupByLibrary.simpleMessage("我的卡券"),

lib/generated/intl/messages_zh_Hant_CN.dart

@@ -457,6 +457,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "tongzhitishixinxi" : MessageLookupByLibrary.simpleMessage("為了您可以及時收到我們的活動資訊，推薦您在使用HISAPP時打開通知的接收 "),
     "touxiang" : MessageLookupByLibrary.simpleMessage("頭像"),
     "tuichudenglu" : MessageLookupByLibrary.simpleMessage("退出登錄"),
+    "tuiguangma" : MessageLookupByLibrary.simpleMessage("推廣碼"),
     "tuikuan" : MessageLookupByLibrary.simpleMessage("退款"),
     "waimai" : MessageLookupByLibrary.simpleMessage("外賣"),
     "waisong" : MessageLookupByLibrary.simpleMessage("外送"),
@@ -481,6 +482,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "wenzhang" : MessageLookupByLibrary.simpleMessage("文章"),
     "wenzhangxiangqing" : MessageLookupByLibrary.simpleMessage("文章詳情"),
     "weulingqu" : MessageLookupByLibrary.simpleMessage("未領取"),
+    "wodegongju" : MessageLookupByLibrary.simpleMessage("我的工具"),
     "wodehuiyuandengji" : MessageLookupByLibrary.simpleMessage("我的會員等級"),
     "wodejifenzhi" : MessageLookupByLibrary.simpleMessage("我的積分值"),
     "wodekaquan" : MessageLookupByLibrary.simpleMessage("我的卡券"),

lib/generated/intl/messages_zh_TW.dart

@@ -457,6 +457,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "tongzhitishixinxi" : MessageLookupByLibrary.simpleMessage("為了您可以及時收到我們的活動資訊，推薦您在使用HISAPP時打開通知的接收 "),
     "touxiang" : MessageLookupByLibrary.simpleMessage("頭像"),
     "tuichudenglu" : MessageLookupByLibrary.simpleMessage("退出登錄"),
+    "tuiguangma" : MessageLookupByLibrary.simpleMessage("推廣碼"),
     "tuikuan" : MessageLookupByLibrary.simpleMessage("退款"),
     "waimai" : MessageLookupByLibrary.simpleMessage("外賣"),
     "waisong" : MessageLookupByLibrary.simpleMessage("外送"),
@@ -481,6 +482,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "wenzhang" : MessageLookupByLibrary.simpleMessage("文章"),
     "wenzhangxiangqing" : MessageLookupByLibrary.simpleMessage("文章詳情"),
     "weulingqu" : MessageLookupByLibrary.simpleMessage("未領取"),
+    "wodegongju" : MessageLookupByLibrary.simpleMessage("我的工具"),
     "wodehuiyuandengji" : MessageLookupByLibrary.simpleMessage("我的會員等級"),
     "wodejifenzhi" : MessageLookupByLibrary.simpleMessage("我的積分值"),
     "wodekaquan" : MessageLookupByLibrary.simpleMessage("我的卡券"),

lib/generated/l10n.dart

@@ -5015,6 +5015,26 @@ class S {
     );
   }
 
+  /// `推广码`
+  String get tuiguangma {
+    return Intl.message(
+      '推广码',
+      name: 'tuiguangma',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `我的工具`
+  String get wodegongju {
+    return Intl.message(
+      '我的工具',
+      name: 'wodegongju',
+      desc: '',
+      args: [],
+    );
+  }
+
   /// `并使用本机号码登录`
   String get privacy_policy4 {
     return Intl.message(

lib/home/home_view/home_integral_store.dart

@@ -102,7 +102,7 @@ class _HomeIntegralStore extends State<HomeIntegralStore> {
 
   Widget integralStore() {
     return GridView.builder(
-      itemCount: widget.gooods != null ? widget.gooods.length : 0,
+      itemCount: (widget.gooods != null && widget.gooods.length > 0) ? (widget.gooods.length > 2 ? 2 : widget.gooods.length) : 0,
       padding: EdgeInsets.all(13.w),
       shrinkWrap: true,
       physics: NeverScrollableScrollPhysics(),
@@ -118,7 +118,7 @@ class _HomeIntegralStore extends State<HomeIntegralStore> {
             ? (1 - ((AppUtils.textScale(context) - 1)))
             : 0.85,
       ),
-      itemBuilder: (contetx, index) {
+      itemBuilder: (context, index) {
         return GestureDetector(
           onTap: () {
             Navigator.of(context).pushNamed('/router/integral_store_page',

lib/l10n/intl_en.arb

@@ -519,6 +519,8 @@
   "diandan": "点单",
   "pingtaiyue": "平台余额",
   "dianpuyue": "店铺余额",
+  "tuiguangma": "推广码",
+  "wodegongju": "我的工具",
 
 
 

lib/l10n/intl_zh_CN.arb

@@ -521,6 +521,8 @@
   "diandan": "点单",
   "pingtaiyue": "平台余额",
   "dianpuyue": "店铺余额",
+  "tuiguangma": "推广码",
+  "wodegongju": "我的工具",
 
 
 

lib/l10n/intl_zh_Hans_CN.arb

@@ -521,6 +521,8 @@
   "diandan": "点单",
   "pingtaiyue": "平台余额",
   "dianpuyue": "店铺余额",
+  "tuiguangma": "推广码",
+  "wodegongju": "我的工具",
 
 
 

lib/l10n/intl_zh_Hant_CN.arb

@@ -514,6 +514,8 @@
   "diandan": "點單",
   "pingtaiyue": "平臺餘額",
   "dianpuyue": "店鋪餘額",
+  "tuiguangma": "推廣碼",
+  "wodegongju": "我的工具",
 
 
 

lib/l10n/intl_zh_TW.arb

@@ -513,6 +513,8 @@
   "diandan": "點單",
   "pingtaiyue": "平臺餘額",
   "dianpuyue": "店鋪餘額",
+  "tuiguangma": "推廣碼",
+  "wodegongju": "我的工具",
 
 
 

lib/mine/mine_view/mine_item.dart

@@ -52,7 +52,7 @@ class _MineItem extends State<MineItem> {
           Container(
             padding: EdgeInsets.symmetric(vertical: 4.h),
             child: Text(
-              "我的工具",
+              S.of(context).wodegongju,
               style: TextStyle(
                 color: Color(0xFF353535),
                 fontWeight: MyFontWeight.semi_bold,
@@ -109,15 +109,15 @@ class _MineItem extends State<MineItem> {
               "assets/image/icon_location_address.png",
             ),
           ),
-          // InkWell(
+          InkWell(
-          //   onTap: () {
+            onTap: () {
-          //     Navigator.of(context).pushNamed('/router/setting_page');
+              Navigator.of(context).pushNamed('/router/qr_share', arguments: {});
-          //   },
+            },
-          //   child: mineItem(
+            child: mineItem(
-          //     S.of(context).shezhi,
+              S.of(context).tuiguangma,
-          //     "assets/image/icon_mine_setting.png",
+              "assets/image/icon_mine_promotion_code.png",
-          //   ),
+            ),
-          // ),
+          ),
           // mineItem(
           //   S.of(context).bangzhuyufankui,
           //   "assets/image/icon_mine_feedback.png",

lib/mine/mine_view/mine_view.dart

@@ -64,12 +64,7 @@ class _MineView extends State<MineView> {
             ],
           ),
         ),
-        InkWell(
+        mineView(),
-          onTap: () {
-            widget.toUserInfo();
-          },
-          child: mineView(),
-        ),
         SizedBox(
           height: 12.h,
         ),
@@ -111,27 +106,32 @@ class _MineView extends State<MineView> {
         mainAxisAlignment: MainAxisAlignment.spaceEvenly,
         crossAxisAlignment: CrossAxisAlignment.start,
         children: [
-          Stack(
+          InkWell(
-            children: [
+              onTap: () {
-              MImage(
+                widget.toUserInfo();
-                widget.userInfo == null ? "" : widget.userInfo.headimg,
+              },
-                isCircle: true,
+              child: Stack(
-                width: 50,
+                children: [
-                height: 50,
+                  MImage(
-                fit: BoxFit.cover,
+                    widget.userInfo == null ? "" : widget.userInfo.headimg,
-                errorSrc: "assets/image/default_user.png",
+                    isCircle: true,
-                fadeSrc: "assets/image/default_user.png",
+                    width: 50,
-              ),
+                    height: 50,
-              Positioned(
+                    fit: BoxFit.cover,
-                bottom: 0,
+                    errorSrc: "assets/image/default_user.png",
-                right: 2.w,
+                    fadeSrc: "assets/image/default_user.png",
-                child: Image.asset(
+                  ),
-                  "assets/image/icon_mine_edit.png",
+                  Positioned(
-                  width: 17.w,
+                    bottom: 0,
-                  height: 17.w,
+                    right: 2.w,
-                ),
+                    child: Image.asset(
+                      "assets/image/icon_mine_edit.png",
+                      width: 17.w,
+                      height: 17.w,
+                    ),
+                  ),
+                ],
               ),
-            ],
           ),
           SizedBox(
             width: 10.w,

lib/qr/qr_share_image.dart

@@ -199,10 +199,10 @@ class _QrShareImagePage extends State<QrShareImagePage> {
 
       SharesdkPlugin.share(ShareSDKPlatforms.wechatSession, params,
           (state, userData, contentEntity, error) {
-        print("share  state  ！$state");
+        print("share  state           ！$state");
-        print("share  userData  ！$userData");
+        print("share  userData        ！$userData");
-        print("share  contentEntity  ！$contentEntity");
+        print("share  contentEntity   ！$contentEntity");
-        print("share  error  ！$error");
+        print("share  error           ！$error");
       });
     }
   }

lib/retrofit/retrofit_api.dart

@@ -37,8 +37,12 @@ import 'data/wx_pay.dart';
 
 part 'retrofit_api.g.dart';
 
-const base_url = "https://pos.platform.lotus-wallet.com/app/"; ///正式
+const base_url = "https://pos.platform.lotus-wallet.com/app/";
-const baseUrl = "https://pos.platform.lotus-wallet.com/app/"; ///正式
+
+///正式
+const baseUrl = "https://pos.platform.lotus-wallet.com/app/";
+
+///正式
 
 // const base_url = "http://192.168.10.236:8766/app/";   ///费韬
 // const baseUrl = "http://192.168.10.236:8766/app/";    ///费韬
@@ -48,12 +52,14 @@ const baseUrl = "https://pos.platform.lotus-wallet.com/app/"; ///正式
 
 @RestApi(baseUrl: baseUrl)
 abstract class ApiService {
-  factory ApiService(Dio dio,
+  factory ApiService(
-      {String baseUrl,
+    Dio dio, {
-      BuildContext context,
+    String baseUrl,
-      String token,
+    BuildContext context,
-      bool showLoading = true,
+    String token,
-      bool pay = false}) {
+    bool showLoading = true,
+    bool pay = false,
+  }) {
     Map<String, dynamic> headers =
         (token == null || token == "") ? {} : {'token': "Bearer $token"};
     if (pay) {
@@ -356,5 +362,5 @@ abstract class ApiService {
 
   ///继续付款？
   @POST("/order/settlement")
-  Future<BaseData<String>>  settlement(@Body() Map<String, String> map);
+  Future<BaseData<String>> settlement(@Body() Map<String, String> map);
 }

lib/store/store_order.dart

@@ -145,7 +145,7 @@ class _StoreOrderPage extends State<StoreOrderPage>
                                   child: Column(
                                     children: [
                                       ///门店信息
-                                      StoreInfoView(),
+                                      StoreInfoView(storeInfo),
 
                                       ///门店对应优惠券
                                       if (storeInfo != null && storeInfo.couponVOList != null)
@@ -224,7 +224,7 @@ class _StoreOrderPage extends State<StoreOrderPage>
                       color: Colors.white,
                       width: MediaQuery.of(context).size.width,
                       height: MediaQuery.of(context).size.width,
-                    )
+                    ),
                   ],
                   controller: tabcontroller,
                 ),

lib/store/store_view/store_info.dart

@@ -1,11 +1,17 @@
 import 'package:flutter/material.dart';
 import 'package:huixiang/generated/l10n.dart';
+import 'package:huixiang/retrofit/data/store_info.dart';
 import 'package:huixiang/utils/flutter_utils.dart';
 import 'package:huixiang/utils/font_weight.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:huixiang/view_widget/round_button.dart';
 
 class StoreInfoView extends StatefulWidget {
+
+  final StoreInfo storeInfo;
+
+  StoreInfoView(this.storeInfo);
+
   @override
   State<StatefulWidget> createState() {
     return _StoreInfoView();
@@ -49,7 +55,7 @@ class _StoreInfoView extends State<StoreInfoView> {
                       Container(
                         alignment: Alignment.centerLeft,
                         child: Text(
-                          "百年川椒",
+                          widget.storeInfo != null ? (widget.storeInfo.storeName ?? "") : "",
                           overflow: TextOverflow.ellipsis,
                           style: TextStyle(
                             fontSize: 18.sp,

lib/view_widget/sign_in_widget.dart

@@ -68,28 +68,28 @@ class _SignInWidget extends State<SignInWidget> {
                         fontWeight: MyFontWeight.regular,
                       ),
                     ),
-                      Row(
+                    Row(
-                        mainAxisAlignment: MainAxisAlignment.center,
+                      mainAxisAlignment: MainAxisAlignment.center,
-                        crossAxisAlignment: CrossAxisAlignment.center,
+                      crossAxisAlignment: CrossAxisAlignment.center,
-                        children: [
+                      children: [
-                          Image.asset(
+                        Image.asset(
-                            "assets/image/icon_gold_coin.png",
+                          "assets/image/icon_gold_coin.png",
-                            width: 16,
+                          width: 16,
-                            height: 16,
+                          height: 16,
+                        ),
+                        SizedBox(
+                          width: 4.h,
+                        ),
+                        Text(
+                          S.of(context).jiajifen(widget.integral),
+                          style: TextStyle(
+                            color: Color(0xFFEE9905),
+                            fontSize: 14.sp,
+                            fontWeight: MyFontWeight.semi_bold,
                           ),
-                          SizedBox(
+                        ),
-                            width: 4.h,
+                      ],
-                          ),
+                    ),
-                          Text(
-                            S.of(context).jiajifen(widget.integral),
-                            style: TextStyle(
-                              color: Color(0xFFEE9905),
-                              fontSize: 14.sp,
-                              fontWeight: MyFontWeight.semi_bold,
-                            ),
-                          ),
-                        ],
-                      ),
                     // Text(
                     //   S.of(context).jiajifen(widget.integral),
                     //   style: TextStyle(