Merge branch 'master' of http://192.168.0.138:3000/FnuoOS_ZhiYing/zhiying_base_widget

.dart_tool/package_config.json

@@ -249,7 +249,7 @@
     },
     {
       "name": "intl",
-      "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/intl-0.15.7",
+      "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/intl-0.16.0",
       "packageUri": "lib/",
       "languageVersion": "2.0"
     },
@@ -614,7 +614,7 @@
       "languageVersion": "2.1"
     }
   ],
-  "generated": "2020-09-30T07:17:10.550088Z",
+  "generated": "2020-09-30T08:02:13.932440Z",
   "generator": "pub",
   "generatorVersion": "2.7.2"
 }

lib/dialog/global_dialog/intellect_search_goods_dialog/intellect_search_goods_dialog.dart

@@ -275,7 +275,7 @@ class _IntellectSearchGoodsDialogState
                   child: Text(
                     (_styleModel?.moduleList?.saveBtn?.content ?? "") +
                         " ¥" +
-                        (double.tryParse(widget?.model?.couponPrice ?? '0') +
+                        ((double.tryParse(widget?.model?.couponPrice??"0.0")??0) +
                                 double.tryParse(
                                     widget?.model?.commission ?? '0'))
                             .toString()

lib/register.dart

@@ -1,6 +1,5 @@
 import 'package:sharesdk_plugin/sharesdk_interface.dart';
 import 'package:sharesdk_plugin/sharesdk_register.dart';
-import 'package:zhiying_base_widget/pages/bil_detail_page/bil_detail_page.dart';
 import 'package:zhiying_base_widget/pages/favorite_page/favorite_page.dart';
 import 'package:zhiying_base_widget/pages/goods_details_page/goods_details_page.dart';
 import 'package:zhiying_base_widget/pages/invited_friends/invited_friends.dart';
@@ -46,6 +45,7 @@ import 'package:zhiying_comm/util/defalut_widget_creater.dart';
 import 'package:zhiying_comm/zhiying_comm.dart';
 
 import 'pages/search_page/search_page.dart';
+import 'pages/wallet_page/wallet_page.dart';
 import 'widgets/goods_details/coupon/counpon_widget.dart';
 import 'widgets/goods_details/detail_img/goods_details_img.dart';
 import 'widgets/goods_details/evaluate/goods_details_evaluate_widget.dart';
@@ -116,13 +116,13 @@ class BaseWidgetRegister {
     PageFactory.regist(
         'pub.flutter.account_security', (model) => SecurityPage(model));
     PageFactory.regist('pub.flutter.account_security_alipay',
-            (model) => SecurityBindAlipayPage(model));
+        (model) => SecurityBindAlipayPage(model));
     // 登录密码
     PageFactory.regist('pub.flutter.account_security_password',
-            (model) => SecurityPassword(model));
+        (model) => SecurityPassword(model));
     // 修改手机号
     PageFactory.regist('pub.flutter.account_security_mobile',
-            (model) => SecurityMobile(model));
+        (model) => SecurityMobile(model));
     // 邀请好友
     PageFactory.regist(
         'pub.flutter.invite_friends', (model) => InvitedFriendsPage(model));
@@ -275,8 +275,7 @@ class BaseWidgetRegister {
     // ==================== 钱包
     WidgetFactory.regist(
         'my_wallet_appbar',
-        DefaultWidgetCreater((model) =>
-            WalletAppbar(
+        DefaultWidgetCreater((model) => WalletAppbar(
               data: model,
             )));
     WidgetFactory.regist(