1.1.15

lib/beans/store_bean_entity.dart

@@ -32,6 +32,8 @@ class StoreBeanDataData with JsonConvert<StoreBeanDataData> {
 	String ownerPic;
 	@JSONField(name: "hide_members")
 	bool hideMembers = true;
+	@JSONField(name: "hide_offline_pay")
+	bool hideOfflinePay = false;
 	@JSONField(name: "fee_type")
 	int feeType;
 	String mobile;

lib/generated/json/store_bean_entity_helper.dart

@@ -81,6 +81,9 @@ storeBeanDataDataFromJson(StoreBeanDataData data, Map<String, dynamic> json) {
 	if (json['hide_members'] != null) {
 		data.hideMembers = json['hide_members'];
 	}
+	if (json['hide_offline_pay'] != null) {
+		data.hideOfflinePay = json['hide_offline_pay'];
+	}
 	if (json['fee_type'] != null) {
 		data.feeType = json['fee_type'] is String
 				? int.tryParse(json['fee_type'])
@@ -150,6 +153,7 @@ Map<String, dynamic> storeBeanDataDataToJson(StoreBeanDataData entity) {
 	data['owner_name'] = entity.ownerName;
 	data['owner_pic'] = entity.ownerPic;
 	data['hide_members'] = entity.hideMembers;
+	data['hide_offline_pay'] = entity.hideOfflinePay;
 	data['fee_type'] = entity.feeType;
 	data['mobile'] = entity.mobile;
 	data['id'] = entity.id;

lib/my_tools/dims.dart

@@ -50,6 +50,7 @@ var shopDims = [
   'mobile', //联系电话
   'introduction', //店铺介绍
   'hide_members',
+  'hide_offline_pay',
   'notice',
   'longitude',
   'latitude',

lib/paegs/gang_page/gang_in_page/gang_information_page/member_list_page/member_details_page.dart

@@ -97,7 +97,7 @@ class _MemberDetailsPageState extends State<MemberDetailsPage> {
                     ),
                     Container(
                       color: Colors.white,
-                      margin: EdgeInsets.only(top: 8,bottom: 30),
+                      margin: EdgeInsets.only(top: 8, bottom: 30),
                       child: Column(
                         children: [
                           Container(
@@ -223,87 +223,86 @@ class _MemberDetailsPageState extends State<MemberDetailsPage> {
                                             child: Container(
                                               height: 50,
                                               alignment: Alignment.centerLeft,
-                                              child:
-                                                  referrer.recommenderName == ''
-                                                      ? Text(
-                                                          '暂无',
-                                                          style: TextStyle(
-                                                              color: MyColors
-                                                                  .c999999,
-                                                              fontSize: 15),
-                                                        )
-                                                      : Row(
+                                              child: referrer.recommenderName ==
+                                                          '' ||
+                                                      referrer.recommenderUid ==
+                                                          0
+                                                  ? Text(
+                                                      '暂无',
+                                                      style: TextStyle(
+                                                          color:
+                                                              MyColors.c999999,
+                                                          fontSize: 15),
+                                                    )
+                                                  : Row(
+                                                      children: [
+                                                        Row(
                                                           children: [
-                                                            Row(
-                                                              children: [
-                                                                ClipRRect(
-                                                                  child: MyViews()
-                                                                      .netImg(
-                                                                          imgURL(
-                                                                              referrer.recommenderPic),
-                                                                          30,
-                                                                          30),
-                                                                  borderRadius:
-                                                                      BorderRadius
-                                                                          .circular(
-                                                                              15),
-                                                                ),
-                                                                Container(
-                                                                  margin: EdgeInsets
-                                                                      .only(
-                                                                          left:
-                                                                              8),
-                                                                  child: Text(
-                                                                    '${referrer.recommenderName}(${referrer.recommenderUid})',
-                                                                    style: TextStyle(
-                                                                        color: MyColors
-                                                                            .c999999,
-                                                                        fontSize:
-                                                                            15),
-                                                                  ),
-                                                                ),
-                                                              ],
+                                                            ClipRRect(
+                                                              child: MyViews().netImg(
+                                                                  imgURL(referrer
+                                                                      .recommenderPic),
+                                                                  30,
+                                                                  30),
+                                                              borderRadius:
+                                                                  BorderRadius
+                                                                      .circular(
+                                                                          15),
                                                             ),
-                                                            GestureDetector(
-                                                              onTap: () {
-                                                                referrer.recommenderPic =
-                                                                    '';
-                                                                referrer.recommenderName =
-                                                                    '';
-                                                                referrer
-                                                                    .recommenderUid = 0;
-                                                                setState(() {});
-                                                              },
-                                                              behavior:
-                                                                  HitTestBehavior
-                                                                      .translucent,
-                                                              child: Container(
-                                                                decoration: BoxDecoration(
+                                                            Container(
+                                                              margin: EdgeInsets
+                                                                  .only(
+                                                                      left: 8),
+                                                              child: Text(
+                                                                '${referrer.recommenderName}(${referrer.recommenderUid})',
+                                                                style: TextStyle(
                                                                     color: MyColors
-                                                                        .cFF4233,
-                                                                    borderRadius:
-                                                                        BorderRadius.circular(
-                                                                            15)),
-                                                                height: 30,
-                                                                width: 60,
-                                                                child: Text(
-                                                                  '移除',
-                                                                  style: TextStyle(
-                                                                      color: Colors
-                                                                          .white,
-                                                                      fontSize:
-                                                                          10),
-                                                                ),
-                                                                alignment:
-                                                                    Alignment
-                                                                        .center,
+                                                                        .c999999,
+                                                                    fontSize:
+                                                                        15),
                                                               ),
-                                                            )
+                                                            ),
                                                           ],
-                                                          mainAxisAlignment:
-                                                              MainAxisAlignment
-                                                                  .spaceBetween,
                                                         ),
+                                                        GestureDetector(
+                                                          onTap: () {
+                                                            referrer.recommenderPic =
+                                                                '';
+                                                            referrer.recommenderName =
+                                                                '';
+                                                            referrer
+                                                                .recommenderUid = 0;
+                                                            setState(() {});
+                                                          },
+                                                          behavior:
+                                                              HitTestBehavior
+                                                                  .translucent,
+                                                          child: Container(
+                                                            decoration: BoxDecoration(
+                                                                color: MyColors
+                                                                    .cFF4233,
+                                                                borderRadius:
+                                                                    BorderRadius
+                                                                        .circular(
+                                                                            15)),
+                                                            height: 30,
+                                                            width: 60,
+                                                            child: Text(
+                                                              '移除',
+                                                              style: TextStyle(
+                                                                  color: Colors
+                                                                      .white,
+                                                                  fontSize: 10),
+                                                            ),
+                                                            alignment: Alignment
+                                                                .center,
+                                                          ),
+                                                        )
+                                                      ],
+                                                      mainAxisAlignment:
+                                                          MainAxisAlignment
+                                                              .spaceBetween,
+                                                    ),
                                             )),
                                       )
                                     ],
@@ -315,67 +314,72 @@ class _MemberDetailsPageState extends State<MemberDetailsPage> {
                         ],
                       ),
                     ),
-                    Row(children: [
-                      Expanded(
-                        child: GestureDetector(
-                          onTap: () {
-                            if (_name.text.isEmpty) {
-                              showToast('昵称为空');
-                              return;
-                            } else {
-                              saveReferrer();
-                            }
-                          },
-                          behavior: HitTestBehavior.translucent,
-                          child: Container(
-                            decoration: BoxDecoration(
-                              color: MyColors.cFF4233,
-                              borderRadius: BorderRadius.all(Radius.circular(22.5)),
-                            ),
-                            height: 45,
-                            margin:
-                            EdgeInsets.symmetric(horizontal: 10),
-                            child: Text(
-                              '保 存',
-                              style: TextStyle(color: Colors.white, fontSize: 15),
+                    Row(
+                      children: [
+                        Expanded(
+                          child: GestureDetector(
+                            onTap: () {
+                              if (_name.text.isEmpty) {
+                                showToast('昵称为空');
+                                return;
+                              } else {
+                                saveReferrer();
+                              }
+                            },
+                            behavior: HitTestBehavior.translucent,
+                            child: Container(
+                              decoration: BoxDecoration(
+                                color: MyColors.cFF4233,
+                                borderRadius:
+                                    BorderRadius.all(Radius.circular(22.5)),
+                              ),
+                              height: 45,
+                              margin: EdgeInsets.symmetric(horizontal: 10),
+                              child: Text(
+                                '保 存',
+                                style: TextStyle(
+                                    color: Colors.white, fontSize: 15),
+                              ),
+                              alignment: Alignment.center,
                             ),
-                            alignment: Alignment.center,
                           ),
                         ),
-                      ),
-                      Expanded(
-                        child: GestureDetector(
-                          onTap: () {
-                            MyShopBeanDataData chatWith = MyShopBeanDataData();
-                            chatWith.userName = widget.member.userName;
-                            chatWith.userUid = widget.member.userUid;
-                            chatWith.userPic = widget.member.userPic;
-                            MyTools().toPage(context, ChatPage(chatWith, null),
-                                    (then) {
-                                  var now = new DateTime.now();
-                                  MyCookie().prefs.setString(
-                                      '${MyCookie().getUID()}_${chatWith.userUid}',
-                                      now.toString().substring(0, 19));
-                                });
-                          },
-                          behavior: HitTestBehavior.translucent,
-                          child: Container(
-                            decoration: BoxDecoration(
-                              color: MyColors.cFF4233,
-                              borderRadius: BorderRadius.all(Radius.circular(22.5)),
-                            ),
-                            height: 45,
-                            margin:
-                            EdgeInsets.symmetric(horizontal: 10),
-                            child: Text(
-                              '联 系',
-                              style: TextStyle(color: Colors.white, fontSize: 15),
+                        Expanded(
+                          child: GestureDetector(
+                            onTap: () {
+                              MyShopBeanDataData chatWith =
+                                  MyShopBeanDataData();
+                              chatWith.userName = widget.member.userName;
+                              chatWith.userUid = widget.member.userUid;
+                              chatWith.userPic = widget.member.userPic;
+                              MyTools().toPage(
+                                  context, ChatPage(chatWith, null), (then) {
+                                var now = new DateTime.now();
+                                MyCookie().prefs.setString(
+                                    '${MyCookie().getUID()}_${chatWith.userUid}',
+                                    now.toString().substring(0, 19));
+                              });
+                            },
+                            behavior: HitTestBehavior.translucent,
+                            child: Container(
+                              decoration: BoxDecoration(
+                                color: MyColors.cFF4233,
+                                borderRadius:
+                                    BorderRadius.all(Radius.circular(22.5)),
+                              ),
+                              height: 45,
+                              margin: EdgeInsets.symmetric(horizontal: 10),
+                              child: Text(
+                                '联 系',
+                                style: TextStyle(
+                                    color: Colors.white, fontSize: 15),
+                              ),
+                              alignment: Alignment.center,
                             ),
-                            alignment: Alignment.center,
                           ),
                         ),
-                      ),
-                    ],)
+                      ],
+                    )
                   ],
                 ),
               ),

lib/paegs/gang_page/gang_in_page/shop_flow_page/shop_flow_page.dart

@@ -42,7 +42,7 @@ class _ShopFlowPageState extends State<ShopFlowPage> {
                 decoration: BoxDecoration(
                   gradient: LinearGradient(colors: MyColors.lg),
                 ),
-                height: 170,
+                height: 220,
               ),
               Column(
                 children: [
@@ -104,6 +104,27 @@ class _ShopFlowPageState extends State<ShopFlowPage> {
                       ),
                     ),
                   ),
+                  Container(
+                    margin: EdgeInsets.only(top: 10),
+                    child: Row(
+                      children: [
+                        ClipRRect(
+                          child: MyViews()
+                              .netImg(imgURL(widget.data.shopPic), 36, 36),
+                          borderRadius: BorderRadius.circular(18),
+                        ),
+                        Container(
+                          margin: EdgeInsets.only(left: 10),
+                          child: Text(
+                            '${widget.data.shopName}(${widget.data.shopUid})',
+                            style: TextStyle(color: Colors.white, fontSize: 15),
+                          ),
+                        ),
+                      ],
+                      mainAxisAlignment: MainAxisAlignment.center,
+                    ),
+                    alignment: Alignment.center,
+                  ),
                   Container(
                     margin: EdgeInsets.only(top: 10),
                     child: Center(

lib/paegs/mine_page/referrer_page/referrer_flow_page.dart

@@ -5,6 +5,7 @@ import 'package:bbyyy/beans/my_shop_bean_entity.dart';
 import 'package:bbyyy/beans/store_bean_entity.dart';
 import 'package:bbyyy/beans/user_balance_entity.dart';
 import 'package:bbyyy/https/MyDio.dart';
+import 'package:bbyyy/https/url.dart';
 import 'package:bbyyy/my_tools/const.dart';
 import 'package:bbyyy/my_tools/dims.dart';
 import 'package:bbyyy/my_tools/my_colors.dart';
@@ -45,7 +46,7 @@ class _ReferrerFlowPageState extends State<ReferrerFlowPage> {
                 decoration: BoxDecoration(
                   gradient: LinearGradient(colors: MyColors.lg),
                 ),
-                height: 170,
+                height: 220,
               ),
               Column(
                 children: [
@@ -107,6 +108,27 @@ class _ReferrerFlowPageState extends State<ReferrerFlowPage> {
                       ),
                     ),
                   ),
+                  Container(
+                    margin: EdgeInsets.only(top: 10),
+                    child: Row(
+                      children: [
+                        ClipRRect(
+                          child: MyViews()
+                              .netImg(imgURL(widget.data.recommenderPic), 36, 36),
+                          borderRadius: BorderRadius.circular(18),
+                        ),
+                        Container(
+                          margin: EdgeInsets.only(left: 10),
+                          child: Text(
+                            '${widget.data.recommenderName}(${widget.data.recommenderUid})',
+                            style: TextStyle(color: Colors.white, fontSize: 15),
+                          ),
+                        ),
+                      ],
+                      mainAxisAlignment: MainAxisAlignment.center,
+                    ),
+                    alignment: Alignment.center,
+                  ),
                   Container(
                     margin: EdgeInsets.only(top: 10),
                     child: Center(

lib/paegs/mine_page/wallet_page/wallet_page.dart

@@ -2,10 +2,10 @@ import 'dart:convert';
 import 'dart:math' as math;
 
 import 'package:bbyyy/beans/flow_bean_entity.dart';
-import 'package:bbyyy/beans/my_shop_bean_entity.dart';
 import 'package:bbyyy/beans/store_bean_entity.dart';
 import 'package:bbyyy/beans/user_balance_entity.dart';
 import 'package:bbyyy/https/MyDio.dart';
+import 'package:bbyyy/https/url.dart';
 import 'package:bbyyy/my_tools/const.dart';
 import 'package:bbyyy/my_tools/dims.dart';
 import 'package:bbyyy/my_tools/my_colors.dart';
@@ -46,7 +46,7 @@ class _WalletPageState extends State<WalletPage> {
                 decoration: BoxDecoration(
                   gradient: LinearGradient(colors: MyColors.lg),
                 ),
-                height: 170,
+                height: 200,
               ),
               Column(
                 children: [
@@ -180,6 +180,27 @@ class _WalletPageState extends State<WalletPage> {
                   //     ],
                   //   ),
                   // ),
+                  Container(
+                    margin: EdgeInsets.only(top: 10),
+                    child: Row(
+                      children: [
+                        ClipRRect(
+                          child: MyViews()
+                              .netImg(imgURL(MyCookie().getPic()), 36, 36),
+                          borderRadius: BorderRadius.circular(18),
+                        ),
+                        Container(
+                          margin: EdgeInsets.only(left: 10),
+                          child: Text(
+                            '${MyCookie().getName()}(${MyCookie().getUID()})',
+                            style: TextStyle(color: Colors.white, fontSize: 15),
+                          ),
+                        ),
+                      ],
+                      mainAxisAlignment: MainAxisAlignment.center,
+                    ),
+                    alignment: Alignment.center,
+                  ),
                   Container(
                     margin: EdgeInsets.only(top: 25),
                     child: Center(

pubspec.lock

@@ -42,7 +42,7 @@ packages:
       name: async
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.5.0"
+    version: "2.6.1"
   audioplayers:
     dependency: "direct main"
     description:
@@ -781,7 +781,7 @@ packages:
       name: source_span
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.8.0"
+    version: "1.8.1"
   sp_util:
     dependency: transitive
     description:
@@ -851,7 +851,7 @@ packages:
       name: test_api
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.2.19"
+    version: "0.3.0"
   timezone:
     dependency: transitive
     description:

pubspec.yaml

@@ -15,7 +15,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
-version: 1.1.14+1
+version: 1.1.15+1
 
 environment:
   sdk: ">=2.7.0 <3.0.0"