Merge branch 'newHost' of https://git.oa00.com/1281228557/aku_new_community into newHost

.fvm/fvm_config.json

@@ -1,4 +1,4 @@
 {
-  "flutterSdkVersion": "2.8.0",
+  "flutterSdkVersion": "2.10.2",
   "flavors": {}
 }

ios/Runner/AppDelegate.swift

@@ -7,10 +7,10 @@ import Flutter
     _ application: UIApplication,
     didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?
   ) -> Bool {
-    // if #available(iOS 10.0, *) {
-    //   UNUserNotificationCenter.current().delegate = self as? UNUserNotificationCenterDelegate
-    // }
-    AMapServices.shared().apiKey ="84041703f7ecb242685325796897eff4"
+//     if #available(iOS 10.0, *) {
+//       UNUserNotificationCenter.current().delegate = self as? UNUserNotificationCenterDelegate
+//     }
+    AMapServices.shared().apiKey = "84041703f7ecb242685325796897eff4"
     GeneratedPluginRegistrant.register(with: self)
     return super.application(application, didFinishLaunchingWithOptions: launchOptions)
   }

ios/Runner/Runner-Bridging-Header.h

@@ -1 +1,3 @@
 #import "GeneratedPluginRegistrant.h"
+#import <AMapFoundationKit/AMapFoundationKit.h>
+#import <AMapLocationKit/AMapLocationKit.h>

lib/pages/home/home_page.dart

@@ -20,7 +20,7 @@ import 'package:aku_new_community/ui/home/public_infomation/public_information_d
 import 'package:aku_new_community/ui/market/search/good_detail_page.dart';
 import 'package:aku_new_community/utils/headers.dart';
 import 'package:aku_new_community/utils/login_util.dart';
-import 'package:aku_new_community/widget/beeImageNetwork.dart';
+import 'package:aku_new_community/widget/bee_image_network.dart';
 import 'package:aku_new_community/widget/bee_divider.dart';
 import 'package:aku_new_community/widget/others/rectIndicator.dart';
 import 'package:aku_new_community/widget/others/user_tool.dart';

lib/pages/message_center_page/announce/announce_card.dart

@@ -3,7 +3,7 @@ import 'package:aku_new_community/extensions/widget_list_ext.dart';
 import 'package:aku_new_community/models/home/home_announce_model.dart';
 import 'package:aku_new_community/pages/message_center_page/announce/announce_view.dart';
 import 'package:aku_new_community/ui/community/notice/notice_detail_page.dart';
-import 'package:aku_new_community/widget/beeImageNetwork.dart';
+import 'package:aku_new_community/widget/bee_image_network.dart';
 import 'package:common_utils/common_utils.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';

lib/pages/message_center_page/reply/reply_card.dart

@@ -2,7 +2,7 @@ import 'package:aku_new_community/base/base_style.dart';
 import 'package:aku_new_community/models/message/reply_list_model.dart';
 import 'package:aku_new_community/pages/message_center_page/message_func.dart';
 import 'package:aku_new_community/ui/community/community_views/event_detail_page.dart';
-import 'package:aku_new_community/widget/beeImageNetwork.dart';
+import 'package:aku_new_community/widget/bee_image_network.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';

lib/pages/message_center_page/thumbs_up/thumbs_up_card.dart

@@ -3,7 +3,7 @@ import 'package:aku_new_community/gen/assets.gen.dart';
 import 'package:aku_new_community/models/message/reply_list_model.dart';
 import 'package:aku_new_community/models/message/thumbs_up_list_model.dart';
 import 'package:aku_new_community/pages/message_center_page/message_func.dart';
-import 'package:aku_new_community/widget/beeImageNetwork.dart';
+import 'package:aku_new_community/widget/bee_image_network.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:velocity_x/velocity_x.dart';

lib/pages/opening_code_page/opening_code_page.dart

@@ -5,7 +5,7 @@ import 'package:aku_new_community/ui/profile/new_house/certification/certificati
 import 'package:aku_new_community/utils/headers.dart';
 import 'package:aku_new_community/utils/network/base_model.dart';
 import 'package:aku_new_community/utils/network/net_util.dart';
-import 'package:aku_new_community/widget/beeImageNetwork.dart';
+import 'package:aku_new_community/widget/bee_image_network.dart';
 import 'package:aku_new_community/widget/bee_divider.dart';
 import 'package:aku_new_community/widget/bee_scaffold.dart';
 import 'package:aku_new_community/widget/others/user_tool.dart';

lib/pages/personal/user_profile_page.dart

@@ -8,7 +8,7 @@ import 'package:aku_new_community/provider/user_provider.dart';
 import 'package:aku_new_community/utils/headers.dart';
 import 'package:aku_new_community/utils/network/base_model.dart';
 import 'package:aku_new_community/utils/network/net_util.dart';
-import 'package:aku_new_community/widget/beeImageNetwork.dart';
+import 'package:aku_new_community/widget/bee_image_network.dart';
 import 'package:aku_new_community/widget/bee_scaffold.dart';
 import 'package:aku_new_community/widget/others/user_tool.dart';
 import 'package:aku_new_community/widget/picker/bee_custom_picker.dart';

lib/pages/personal/wallet/balance_record_view.dart

@@ -35,6 +35,7 @@ class _BalanceRecordViewState extends State<BalanceRecordView> {
     4: '收入',
     5: '提现',
     6: '抵扣',
+    7: '购买'
   };
 
   @override
@@ -79,6 +80,7 @@ class _BalanceRecordViewState extends State<BalanceRecordView> {
               MaterialButton(
                 color: Colors.black.withOpacity(0.06),
                 onPressed: () async {
+                  _pickType = _types.keys.toList()[0];
                   await showModalBottomSheet(
                     context: context,
                     builder: (context) {
@@ -139,8 +141,9 @@ class _BalanceRecordViewState extends State<BalanceRecordView> {
                   'pageNum': _pageNum,
                   'size': _size,
                   'modelType': 0,
-                  'type': _pickType,
-                  'createDate': _pickTime,
+                  'type': _pickType == 0 ? null : _pickType,
+                  'createDate':
+                      DateUtil.formatDate(_pickTime, format: DateFormats.full),
                 });
 
                 _models = baseList.rows
@@ -156,8 +159,9 @@ class _BalanceRecordViewState extends State<BalanceRecordView> {
                   'pageNum': _pageNum,
                   'size': _size,
                   'modelType': 0,
-                  'type': _pickType,
-                  'createDate': _pickTime,
+                  'type': _pickType == 0 ? null : _pickType,
+                  'createDate':
+                      DateUtil.formatDate(_pickTime, format: DateFormats.full),
                 });
                 if (baseList.total > _models.length) {
                   _models.addAll(baseList.rows

lib/pages/personal/wallet/pay_way_dialog.dart

@@ -61,10 +61,9 @@ class _PayWayDialogState extends State<PayWayDialog> {
         _payType.add(0);
         setState(() {});
       },
-      child: ClipRect(
-        child: Stack(
-          children: [
-            Material(
+      child: Opacity(
+        opacity: widget.insufficientBalance?0.4:1,
+        child: Material(
           color: Colors.transparent,
           child: Row(
             children: [
@@ -94,14 +93,6 @@ class _PayWayDialogState extends State<PayWayDialog> {
             ],
           ),
         ),
-            BackdropFilter(
-              filter: ImageFilter.blur(
-                  sigmaX: widget.insufficientBalance ? 1 : 0,
-                  sigmaY: widget.insufficientBalance ? 1 : 0),
-              child: Container(),
-            ),
-          ],
-        ),
       ),
     );
     var alipay = GestureDetector(

lib/pages/personal/wallet/point_record_view.dart

@@ -35,6 +35,7 @@ class _PointRecordViewState extends State<PointRecordView> {
     4: '收入',
     5: '提现',
     6: '抵扣',
+    7: '购买'
   };
 
   @override
@@ -79,6 +80,7 @@ class _PointRecordViewState extends State<PointRecordView> {
               MaterialButton(
                 color: Colors.black.withOpacity(0.06),
                 onPressed: () async {
+                  _pickType = _types.keys.toList()[0];
                   await showModalBottomSheet(
                     context: context,
                     builder: (context) {
@@ -139,8 +141,9 @@ class _PointRecordViewState extends State<PointRecordView> {
                   'pageNum': _pageNum,
                   'size': _size,
                   'modelType': 1,
-                  'type': _pickType,
-                  'createDate': _pickTime,
+                  'type': _pickType == 0 ? null : _pickType,
+                  'createDate':
+                      DateUtil.formatDate(_pickTime, format: DateFormats.full),
                 });
 
                 _models = baseList.rows
@@ -155,8 +158,9 @@ class _PointRecordViewState extends State<PointRecordView> {
                   'pageNum': _pageNum,
                   'size': _size,
                   'modelType': 0,
-                  'type': _pickType,
-                  'createDate': _pickTime,
+                  'type': _pickType == 0 ? null : _pickType,
+                  'createDate':
+                      DateUtil.formatDate(_pickTime, format: DateFormats.full),
                 });
                 if (baseList.total > _models.length) {
                   _models.addAll(baseList.rows

lib/pages/personal/wallet/wallet_recharge_page.dart

@@ -2,6 +2,7 @@ import 'package:aku_new_community/extensions/num_ext.dart';
 import 'package:aku_new_community/extensions/widget_list_ext.dart';
 import 'package:aku_new_community/gen/assets.gen.dart';
 import 'package:aku_new_community/pages/personal/wallet/pay_way_dialog.dart';
+import 'package:aku_new_community/pages/personal/wallet/wallet_trade_record_page.dart';
 import 'package:aku_new_community/widget/bee_scaffold.dart';
 import 'package:aku_new_community/widget/buttons/bee_long_button.dart';
 import 'package:aku_new_community/widget/others/user_tool.dart';
@@ -41,7 +42,7 @@ class _WalletRechargePageState extends State<WalletRechargePage>
     _tabController =
         TabController(length: 2, vsync: this, initialIndex: widget.initIndex);
     _currentIndex = widget.initIndex;
-    _rechargeValue = widget.initIndex == 0 ? _balanceValue[0] : _pointValue[0];
+    _rechargeValue = widget.initIndex == 0 ? _balanceValue[0] : (_pointValue[0]~/10);
     super.initState();
   }
 
@@ -51,8 +52,10 @@ class _WalletRechargePageState extends State<WalletRechargePage>
       title: '钱包充值',
       actions: [
         TextButton(
-          onPressed: () {},
-          child: '账单'
+          onPressed: () {
+            Get.to(()=>WalletTradeRecordPage());
+          },
+          child: '交易记录'
               .text
               .size(28.sp)
               .color(Colors.black.withOpacity(0.85))

lib/ui/community/activity/activity_card.dart

@@ -2,7 +2,7 @@ import 'package:aku_new_community/model/common/img_model.dart';
 import 'package:aku_new_community/models/home/home_activity_model.dart';
 import 'package:aku_new_community/ui/community/activity/activity_func.dart';
 import 'package:aku_new_community/utils/headers.dart';
-import 'package:aku_new_community/widget/beeImageNetwork.dart';
+import 'package:aku_new_community/widget/bee_image_network.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 

lib/ui/community/activity/activity_detail_page.dart

@@ -6,7 +6,7 @@ import 'package:aku_new_community/models/home/home_activity_model.dart';
 import 'package:aku_new_community/utils/headers.dart';
 import 'package:aku_new_community/utils/network/base_model.dart';
 import 'package:aku_new_community/utils/network/net_util.dart';
-import 'package:aku_new_community/widget/beeImageNetwork.dart';
+import 'package:aku_new_community/widget/bee_image_network.dart';
 import 'package:aku_new_community/widget/bee_divider.dart';
 import 'package:aku_new_community/widget/bee_scaffold.dart';
 import 'package:aku_new_community/widget/buttons/bottom_button.dart';

lib/ui/community/community_views/topic/topic_community_view.dart

@@ -6,7 +6,7 @@ import 'package:aku_new_community/models/community/topic_list_model.dart';
 import 'package:aku_new_community/pages/things_page/widget/bee_list_view.dart';
 import 'package:aku_new_community/ui/community/community_views/topic/topic_detail_page.dart';
 import 'package:aku_new_community/utils/headers.dart';
-import 'package:aku_new_community/widget/beeImageNetwork.dart';
+import 'package:aku_new_community/widget/bee_image_network.dart';
 import 'package:aku_new_community/widget/bee_scaffold.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_easyrefresh/easy_refresh.dart';

lib/ui/community/notice/notice_card.dart

@@ -2,7 +2,7 @@ import 'package:aku_new_community/model/common/img_model.dart';
 import 'package:aku_new_community/models/home/home_announce_model.dart';
 import 'package:aku_new_community/ui/community/notice/notice_detail_page.dart';
 import 'package:aku_new_community/utils/headers.dart';
-import 'package:aku_new_community/widget/beeImageNetwork.dart';
+import 'package:aku_new_community/widget/bee_image_network.dart';
 import 'package:aku_new_community/widget/picker/bee_image_preview.dart';
 import 'package:common_utils/common_utils.dart';
 import 'package:flutter/material.dart';

lib/ui/community/notice/notice_detail_page.dart

@@ -3,7 +3,7 @@ import 'package:aku_new_community/models/home/announce_detail_model.dart';
 import 'package:aku_new_community/utils/headers.dart';
 import 'package:aku_new_community/utils/network/base_model.dart';
 import 'package:aku_new_community/utils/network/net_util.dart';
-import 'package:aku_new_community/widget/beeImageNetwork.dart';
+import 'package:aku_new_community/widget/bee_image_network.dart';
 import 'package:aku_new_community/widget/bee_scaffold.dart';
 import 'package:aku_new_community/widget/picker/bee_image_preview.dart';
 import 'package:aku_new_community/widget/views/bee_download_view.dart';

lib/ui/function_and_service/task/hall/hall_card.dart

@@ -59,7 +59,9 @@ class HallCard extends StatelessWidget {
           ),
         ),
         Spacer(),
-        Assets.icons.intergral.image(width: 24.w, height: 24.w),
+        model.rewardType == 2
+            ? Assets.icons.intergral.image(width: 24.w, height: 24.w)
+            : '¥'.text.size(28.sp).color(Color(0xFF666666)).make(),
         8.w.widthBox,
         '${model.reward}'.text.size(32.sp).color(Colors.red).make()
       ],

lib/ui/function_and_service/task/publish_task_page.dart

@@ -128,9 +128,11 @@ class _PublishTaskPageState extends State<PublishTaskPage> {
               if (balance >
                   (UserTool.userProvider.userInfoModel!.balance ?? 0)) {
                 BotToast.showText(text: '余额不足，请前往充值');
+                return;
               } else {
                 if (!UserTool.userProvider.userInfoModel!.isBalancePayPwd) {
                   Get.dialog(SetPayPasswordDialog());
+                  return;
                 } else {
                   psdCode = await Get.dialog(InputPayPasswordDialog());
                 }

lib/ui/function_and_service/work_order/publish_work_order_page.dart

@@ -8,7 +8,7 @@ import 'package:aku_new_community/ui/function_and_service/work_order/work_order_
 import 'package:aku_new_community/ui/function_and_service/work_order/work_order_remark_page.dart';
 import 'package:aku_new_community/ui/profile/new_house/my_house_page.dart';
 import 'package:aku_new_community/utils/network/net_util.dart';
-import 'package:aku_new_community/widget/beeImageNetwork.dart';
+import 'package:aku_new_community/widget/bee_image_network.dart';
 import 'package:aku_new_community/widget/bee_divider.dart';
 import 'package:aku_new_community/widget/bee_scaffold.dart';
 import 'package:aku_new_community/widget/buttons/bee_long_button.dart';

lib/ui/home/public_infomation/public_infomation_card.dart

@@ -2,7 +2,7 @@ import 'package:aku_new_community/base/base_style.dart';
 import 'package:aku_new_community/models/community/information_list_model.dart';
 import 'package:aku_new_community/ui/home/public_infomation/public_information_detail_page.dart';
 import 'package:aku_new_community/utils/headers.dart';
-import 'package:aku_new_community/widget/beeImageNetwork.dart';
+import 'package:aku_new_community/widget/bee_image_network.dart';
 import 'package:common_utils/common_utils.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';

lib/ui/home/public_infomation/public_information_detail_page.dart

@@ -6,7 +6,7 @@ import 'package:aku_new_community/utils/bee_date_util.dart';
 import 'package:aku_new_community/utils/link_text_parase.dart';
 import 'package:aku_new_community/utils/network/base_model.dart';
 import 'package:aku_new_community/utils/network/net_util.dart';
-import 'package:aku_new_community/widget/beeImageNetwork.dart';
+import 'package:aku_new_community/widget/bee_image_network.dart';
 import 'package:aku_new_community/widget/bee_scaffold.dart';
 import 'package:bot_toast/bot_toast.dart';
 import 'package:common_utils/common_utils.dart';

lib/ui/market/category/new_category_sub_card.dart

@@ -1,7 +1,7 @@
 import 'package:aku_new_community/models/market/market_all_category_model.dart';
 import 'package:aku_new_community/ui/market/search/search_goods_page.dart';
 import 'package:aku_new_community/utils/headers.dart';
-import 'package:aku_new_community/widget/beeImageNetwork.dart';
+import 'package:aku_new_community/widget/bee_image_network.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 

lib/ui/market/market_page.dart

@@ -22,7 +22,7 @@ import 'package:aku_new_community/ui/market/widget/animated_home_background.dart
 import 'package:aku_new_community/utils/headers.dart';
 import 'package:aku_new_community/utils/network/base_list_model.dart';
 import 'package:aku_new_community/utils/network/net_util.dart';
-import 'package:aku_new_community/widget/beeImageNetwork.dart';
+import 'package:aku_new_community/widget/bee_image_network.dart';
 import 'package:aku_new_community/widget/home/home_sliver_app_bar.dart';
 import 'package:aku_new_community/widget/others/rectIndicator.dart';
 import 'package:card_swiper/card_swiper.dart';

lib/ui/market/order/order_card.dart

@@ -1,5 +1,6 @@
 import 'package:aku_new_community/base/base_style.dart';
 import 'package:aku_new_community/constants/saas_api.dart';
+import 'package:aku_new_community/gen/assets.gen.dart';
 import 'package:aku_new_community/model/order/order_list_model.dart';
 import 'package:aku_new_community/pages/life_pay/pay_finish_page.dart';
 import 'package:aku_new_community/pages/life_pay/pay_util.dart';
@@ -668,8 +669,15 @@ class _OrderCardState extends State<OrderCard> {
         Row(
           children: [
             Spacer(),
-            '商品金额：'.text.size(28.sp).color(Color(0xFF666666)).make(),
-            '¥${((widget.model.payPrice ?? 0) - (widget.model.freightFee ?? 0)).toStringAsFixed(2)}'
+            '${widget.model.payType == 10 ? '商品积分' : '商品金额'}：'
+                .text
+                .size(28.sp)
+                .color(Color(0xFF666666))
+                .make(),
+            widget.model.payType == 10
+                ? Assets.icons.intergral.image(width: 24.w, height: 24.w)
+                : '¥'.text.size(28.sp).color(Color(0xFF666666)).make(),
+            ' ${((widget.model.payPrice ?? 0) - (widget.model.freightFee ?? 0)).toStringAsFixed(widget.model.payType == 10 ? 0 : 2)}'
                 .text
                 .size(28.sp)
                 .color(Color(0xFF666666))
@@ -680,7 +688,7 @@ class _OrderCardState extends State<OrderCard> {
           children: [
             Spacer(),
             '运费：'.text.size(28.sp).color(Color(0xFF666666)).make(),
-            '¥${((widget.model.freightFee ?? 0)).toStringAsFixed(2)}'
+            '¥ ${((widget.model.freightFee ?? 0)).toStringAsFixed(2)}'
                 .text
                 .size(28.sp)
                 .color(Color(0xFF666666))
@@ -690,8 +698,15 @@ class _OrderCardState extends State<OrderCard> {
         Row(
           children: [
             Spacer(),
-            '实付款：'.text.size(32.sp).color(Color(0xFF333333)).make(),
-            '¥${((widget.model.payPrice ?? 0)).toStringAsFixed(2)}'
+            '${widget.model.payType == 10 ? '实付积分' : '实付款'}: '
+                .text
+                .size(32.sp)
+                .color(Color(0xFF333333))
+                .make(),
+            widget.model.payType == 10
+                ? Assets.icons.intergral.image(width: 24.w, height: 24.w)
+                : '¥'.text.size(28.sp).color(Color(0xFF666666)).make(),
+            ' ${((widget.model.payPrice ?? 0)).toStringAsFixed(widget.model.payType == 10 ? 0 : 2)}'
                 .text
                 .size(28.sp)
                 .color(Color(0xFFE52E2E))

lib/ui/market/order/order_detail_page.dart

@@ -4,6 +4,7 @@ import 'package:aku_new_community/base/base_style.dart';
 import 'package:aku_new_community/const/resource.dart';
 import 'package:aku_new_community/constants/api.dart';
 import 'package:aku_new_community/constants/saas_api.dart';
+import 'package:aku_new_community/gen/assets.gen.dart';
 import 'package:aku_new_community/model/order/logistics_model.dart';
 import 'package:aku_new_community/model/order/order_list_model.dart';
 import 'package:aku_new_community/pages/life_pay/pay_util.dart';
@@ -308,8 +309,11 @@ class _OrderDetailPageState extends State<OrderDetailPage> {
         Row(
           children: [
             Spacer(),
-            '商品金额：'.text.size(28.sp).color(Color(0xFF666666)).make(),
-            '¥${((widget.orderModel.payPrice ?? 0) - (widget.orderModel.freightFee ?? 0)).toStringAsFixed(2)}'
+            '${widget.orderModel.payType==10?'商品积分':'商品金额'}：'.text.size(28.sp).color(Color(0xFF666666)).make(),
+            widget.orderModel.payType == 10
+                ? Assets.icons.intergral.image(width: 24.w, height: 24.w)
+                : '¥'.text.size(28.sp).color(Color(0xFF666666)).make(),
+            ' ${((widget.orderModel.payPrice ?? 0) - (widget.orderModel.freightFee ?? 0)).toStringAsFixed(widget.orderModel.payType==10?0: 2)}'
                 .text
                 .size(28.sp)
                 .color(Color(0xFF333333))
@@ -321,7 +325,7 @@ class _OrderDetailPageState extends State<OrderDetailPage> {
           children: [
             Spacer(),
             '运费：'.text.size(28.sp).color(Color(0xFF666666)).make(),
-            '¥${((widget.orderModel.freightFee ?? 0)).toStringAsFixed(2)}'
+            '¥ ${((widget.orderModel.freightFee ?? 0)).toStringAsFixed(2)}'
                 .text
                 .size(28.sp)
                 .color(Color(0xFF666666))
@@ -332,8 +336,11 @@ class _OrderDetailPageState extends State<OrderDetailPage> {
         Row(
           children: [
             Spacer(),
-            '实付款：'.text.size(32.sp).color(Color(0xFF333333)).bold.make(),
-            '¥${((widget.orderModel.payPrice ?? 0)).toStringAsFixed(2)}'
+            '${widget.orderModel.payType==10?'实付积分':'实付款'}：'.text.size(32.sp).color(Color(0xFF333333)).bold.make(),
+            widget.orderModel.payType == 10
+                ? Assets.icons.intergral.image(width: 24.w, height: 24.w)
+                : '¥'.text.size(28.sp).color(Color(0xFF666666)).make(),
+            ' ${((widget.orderModel.payPrice ?? 0)).toStringAsFixed(widget.orderModel.payType==10?0: 2)}'
                 .text
                 .size(28.sp)
                 .color(Color(0xFFE52E2E))

lib/ui/market/search/submit_order_page_normal.dart

@@ -61,7 +61,7 @@ class _SubmitOrderNormalPageState extends State<SubmitOrderNormalPage> {
 
     if (appProvider.defaultAddressModel != null) {
       _addressModel = appProvider.defaultAddressModel!;
-      createOrder(_addressModel!.id!, _goodsList);
+      // createOrder(_addressModel!.id!, _goodsList);
     } else {
       _addressModel = null;
     }
@@ -159,7 +159,7 @@ class _SubmitOrderNormalPageState extends State<SubmitOrderNormalPage> {
                       _goodsList.map((v) => v.toJson()).toList(),
                   "payType": 10, //暂时写死 等待后续补充
                   'points': widget.integral,
-                });
+                },showMessage: true);
                 if (baseModel.success) {
                   Get.off(() => OrderPage(initIndex: 2));
                 }
@@ -234,7 +234,7 @@ class _SubmitOrderNormalPageState extends State<SubmitOrderNormalPage> {
           '当前积分'.text.size(28.sp).color(Color(0xFF4F4F4F)).make(),
           Spacer(),
           // (UserTool.userProvider.userInfoModel!.points ?? 0)
-          (0).text.size(28.sp).color(Colors.red).make(),
+          (widget.integral??0).text.size(28.sp).color(Colors.red).make(),
         ],
       ),
     );
@@ -258,7 +258,7 @@ class _SubmitOrderNormalPageState extends State<SubmitOrderNormalPage> {
               ));
           if (result != null) {
             _addressModel = result;
-            createOrder(_addressModel!.id!, _goodsList);
+            // createOrder(_addressModel!.id!, _goodsList);
           } else {
             _addressModel = null;
           }
@@ -690,7 +690,7 @@ class _SubmitOrderNormalPageState extends State<SubmitOrderNormalPage> {
                   if (num > 1) {
                     _controllers.text = (num - 1).toString();
                     _goodsList[0].num = num - 1;
-                    createOrder(_addressModel!.id!, _goodsList);
+                    // createOrder(_addressModel!.id!, _goodsList);
                   }
 
                   setState(() {});
@@ -736,7 +736,7 @@ class _SubmitOrderNormalPageState extends State<SubmitOrderNormalPage> {
                     _controllers.text =
                         (int.parse(_controllers.text) + 1).toString();
                     _goodsList[0].num = num + 1;
-                    createOrder(_addressModel!.id!, _goodsList);
+                    // createOrder(_addressModel!.id!, _goodsList);
 
                     setState(() {});
                   }

lib/utils/network/net_util.dart

@@ -215,7 +215,7 @@ class NetUtil {
       //暂时隐去一键登录页
       Get.offAll(() => OtherLoginPage());
     }
-    if (model.code==10100) {
+    if (model.msg=='该用户未实名认证') {
       BotToast.showText(text: '请先实名认证');
       Get.dialog(CertificationDialog());
     }

lib/widget/others/stack_avatar.dart

@@ -1,5 +1,5 @@
 import 'package:aku_new_community/utils/headers.dart';
-import 'package:aku_new_community/widget/beeImageNetwork.dart';
+import 'package:aku_new_community/widget/bee_image_network.dart';
 import 'package:flutter/material.dart';
 
 class StackAvatar extends StatelessWidget {

lib/widget/views/bee_hor_image_view.dart

@@ -1,7 +1,7 @@
 import 'package:aku_new_community/extensions/num_ext.dart';
 import 'package:aku_new_community/extensions/widget_list_ext.dart';
 import 'package:aku_new_community/model/common/img_model.dart';
-import 'package:aku_new_community/widget/beeImageNetwork.dart';
+import 'package:aku_new_community/widget/bee_image_network.dart';
 import 'package:aku_new_community/widget/picker/bee_image_preview.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';