6.18 ios

ios/Runner.xcodeproj/project.pbxproj

@@ -375,7 +375,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/RunnerProfile.entitlements;
-				CURRENT_PROJECT_VERSION = 24;
+				CURRENT_PROJECT_VERSION = 25;
 				DEVELOPMENT_TEAM = 4699C5C3US;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -391,7 +391,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 1.1.02;
+				MARKETING_VERSION = 1.1.03;
 				PRODUCT_BUNDLE_IDENTIFIER = com.bh.bbyyy;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -514,7 +514,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = 24;
+				CURRENT_PROJECT_VERSION = 25;
 				DEVELOPMENT_TEAM = 4699C5C3US;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -530,7 +530,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 1.1.02;
+				MARKETING_VERSION = 1.1.03;
 				PRODUCT_BUNDLE_IDENTIFIER = com.bh.bbyyy;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -547,7 +547,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = 24;
+				CURRENT_PROJECT_VERSION = 25;
 				DEVELOPMENT_TEAM = 4699C5C3US;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -563,7 +563,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 1.1.02;
+				MARKETING_VERSION = 1.1.03;
 				PRODUCT_BUNDLE_IDENTIFIER = com.bh.bbyyy;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";

lib/paegs/mine_page/mine_page.dart

@@ -78,14 +78,17 @@ class _MinePageState extends State<MinePage> {
                         left: 20,
                         right: 20,
                       ),
-                      child: GestureDetector(
-                        onTap: () {
-
-                        },
-                        behavior: HitTestBehavior.translucent,
-                        child: Row(
-                          children: [
-                            Container(
+                      child: Row(
+                        children: [
+                          GestureDetector(
+                            onTap:(){
+                              MyTools().toPage(context, MyInformationPage(),
+                                      (then) {
+                                    queryPersonalInformation();
+                                  });
+                            },behavior: HitTestBehavior.translucent,
+                            child: Container(
+                              margin: EdgeInsets.only(right: 10),
                               decoration: BoxDecoration(
                                 color: Colors.white,
                                 borderRadius: BorderRadius.all(
@@ -109,96 +112,90 @@ class _MinePageState extends State<MinePage> {
                               ),
                               alignment: Alignment.center,
                             ),
-                            Expanded(
-                              child: Container(
-                                margin: EdgeInsets.only(left: 10),
-                                height: 68,
-                                child: Column(
-                                  children: [
-                                    GestureDetector(
-                                      onTap: (){
-                                        MyTools().toPage(context, MyInformationPage(),
+                          ),
+                          Expanded(
+                            child: Container(
+                              height: 60,
+                              child: Column(children: [
+                                Row(children: [
+                                  Expanded(
+                                    child: GestureDetector(
+                                      onTap: () {
+                                        MyTools().toPage(
+                                            context, MyInformationPage(),
                                                 (then) {
                                               queryPersonalInformation();
                                             });
                                       },
+                                      child: Container(
+                                        margin: EdgeInsets.only(right: 10),
+                                        child: Text(
+                                          MyCookie()
+                                              .loginInformation
+                                              .data
+                                              .extra
+                                              .name,
+                                          style: TextStyle(
+                                              color: Colors.white,
+                                              fontSize: 18),
+                                          maxLines: 1,
+                                          overflow: TextOverflow.ellipsis,
+                                          softWrap: true,
+                                        ),
+                                      ),
+                                    ),
+                                  ),
+                                  Container(
+                                    margin: EdgeInsets.only(left: 20),
+                                    child: MyViews().myText(
+                                        '¥${MyCookie().userBean.balance}',
+                                        Colors.white,
+                                        24),
+                                  ),
+                                ],mainAxisAlignment: MainAxisAlignment.spaceBetween,),
+                                Row(children: [
+                                  Text(
+                                    'ID：${MyCookie().getUID()}',
+                                    style: TextStyle(
+                                      color: Colors.white,
+                                      fontSize: 14,
+                                    ),
+                                    maxLines: 1,
+                                    overflow: TextOverflow.ellipsis,
+                                    softWrap: true,
+                                  ),
+                                  GestureDetector(
+                                    onTap: () {
+                                      MyTools().toPage(
+                                          context, MyQRPage(), (then) {});
+                                    },
+                                    behavior: HitTestBehavior.translucent,
+                                    child: Container(
                                       child: Row(
                                         children: [
+                                          SvgPicture.asset(
+                                            'images/svg/二维码.svg',
+                                            color: Colors.white,
+                                          ),
                                           Container(
-                                            margin: EdgeInsets.only(right: 10),
-                                            child: Text(
-                                              MyCookie()
-                                                  .loginInformation
-                                                  .data
-                                                  .extra
-                                                  .name,
-                                              style: TextStyle(
-                                                  color: Colors.white,
-                                                  fontSize: 18),
-                                              maxLines: 1,
-                                              overflow: TextOverflow.ellipsis,
-                                              softWrap: true,
-                                            ),
+                                            width: 20,
                                           ),
                                           SvgPicture.asset(
                                             'images/svg/箭头.svg',
                                             color: Colors.white,
-                                            width: 6,
-                                            height: 11,
+                                            height: 12,
+                                            width: 8,
                                           )
                                         ],
                                       ),
                                     ),
-                                    Text(
-                                      'ID：${MyCookie().getUID()}',
-                                      style: TextStyle(
-                                        color: Colors.white,
-                                        fontSize: 14,
-                                      ),
-                                      maxLines: 1,
-                                      overflow: TextOverflow.ellipsis,
-                                      softWrap: true,
-                                    ),
-                                    // Text(
-                                    //   '电话：${MyCookie().userBean.mobile}',
-                                    //   style: TextStyle(
-                                    //     color: Colors.white,
-                                    //     fontSize: 14,
-                                    //   ),
-                                    //   maxLines: 1,
-                                    //   overflow: TextOverflow.ellipsis,
-                                    //   softWrap: true,
-                                    // )
-                                  ],
-                                  crossAxisAlignment: CrossAxisAlignment.start,
-                                  mainAxisAlignment:
-                                      MainAxisAlignment.spaceBetween,
-                                ),
-                              ),
-                            ),
-                            Container(
-                              height: 68,
-                              child: Column(
-                                children: [
-                                  MyViews().myText('¥${MyCookie().userBean.balance}',
-                                      Colors.white, 24),
-                                  GestureDetector(
-                                    onTap: (){
-                                      MyTools().toPage(context, MyQRPage(), (then){});
-                                    },
-                                    child: Row(
-                                      children: [
-                                        SvgPicture.asset('images/svg/二维码.svg',color: Colors.white,),
-                                        Container(width: 10,),
-                                        SvgPicture.asset('images/svg/箭头.svg',color: Colors.white,height: 12,width: 8,)
-                                      ],
-                                    ),
                                   )
-                                ],mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                              ),
-                            )
-                          ],
-                        ),
+                                ],mainAxisAlignment: MainAxisAlignment.spaceBetween,),
+                              ],mainAxisAlignment: MainAxisAlignment.spaceBetween,),
+                            ),
+                          ),
+
+                        ],
                       ),
                     ),
                   ),
@@ -235,7 +232,9 @@ class _MinePageState extends State<MinePage> {
                           ),
                           GestureDetector(
                             onTap: () {
-                              MyTools().toPage(context, CouponPage(), (then) {queryPersonalInformation();});
+                              MyTools().toPage(context, CouponPage(), (then) {
+                                queryPersonalInformation();
+                              });
                             },
                             behavior: HitTestBehavior.translucent,
                             child: Column(
@@ -246,7 +245,8 @@ class _MinePageState extends State<MinePage> {
                                     child: Text(
                                       '优惠券',
                                       style: TextStyle(
-                                          color: MyColors.c333333, fontSize: 14),
+                                          color: MyColors.c333333,
+                                          fontSize: 14),
                                     ))
                               ],
                             ),
@@ -274,7 +274,8 @@ class _MinePageState extends State<MinePage> {
                           ),
                           GestureDetector(
                             onTap: () {
-                              if (MyCookie().userBean.aliPayAccount.isEmpty&&MyCookie().userBean.wxOpenid.isEmpty) {
+                              if (MyCookie().userBean.aliPayAccount.isEmpty &&
+                                  MyCookie().userBean.wxOpenid.isEmpty) {
                                 MyTools().toPage(context, BindAlipayPage(),
                                     (then) {
                                   if (MyCookie()
@@ -344,11 +345,12 @@ class _MinePageState extends State<MinePage> {
                     });
                   }),
                   functionItem('images/svg/推广下载.svg', '推广下载', () {
-                    MyTools().toPage(context, PromotionDownloadPage(), (then) {});
+                    MyTools()
+                        .toPage(context, PromotionDownloadPage(), (then) {});
                   }),
                   GestureDetector(
                     onTap: () {
-                      checkForUpdates(context,showT: true);
+                      checkForUpdates(context, showT: true);
                     },
                     behavior: HitTestBehavior.translucent,
                     child: Container(

lib/paegs/welcome_page/welcome_page.dart

@@ -2,6 +2,7 @@ import 'dart:async';
 import 'dart:convert';
 
 import 'package:bbyyy/beans/login_information_bean_entity.dart';
+import 'package:bbyyy/https/MyDio.dart';
 import 'package:bbyyy/https/my_request.dart';
 import 'package:bbyyy/my_tools/easy_loading/easy_loading.dart';
 import 'package:bbyyy/my_tools/my_cookie.dart';
@@ -36,6 +37,7 @@ class _WelcomePageState extends State<WelcomePage> {
           MyCookie().getLoginInformation().data.token == '') {
         MyTools().toPage(context, LoginPage(), (then) {}, noBack: true);
       } else {
+        MyDio().initDio();
         checkLogin((r, hE) {
           if (!hE) {
             String token = MyCookie().getToken();

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.02+1
+version: 1.1.03+1
 
 environment:
   sdk: ">=2.7.0 <3.0.0"