huxiaoqiang 4 роки тому
батько
коміт
3c4c1164d7

+ 21 - 0
lib/my_tools/dims.dart

@@ -89,6 +89,27 @@ var userDims = [
   "forbid_withdraw_by_shop_uid",
   "wx_picture"
 ];
+var otherUserDims = [
+  "id",
+  "uid",
+  // "mobile",
+  "name",
+  "picture",
+  // "register_time",
+  // "verify_time",
+  "ban_time",
+  // "remove_time",
+  "state",
+  // "last_login",
+  // "balance",
+  // "alipay_account",
+  // "alipay_name",
+  // "wx_openid",
+  // "wx_name",
+  "forbid_withdraw",
+  "forbid_withdraw_by_shop_uid",
+  "wx_picture"
+];
 
 var orderDims = [
   'id',

+ 1 - 1
lib/paegs/gang_page/gang_in_page/gang_information_page/add_member_page/add_member_page.dart

@@ -193,7 +193,7 @@ class _AddMemberPageState extends State<AddMemberPage> {
       "filters": {
         "conditions": ["uid == ${_description.text.toString()}"]
       },
-      "dims": userDims,
+      "dims": otherUserDims,
       "paging": [1, 20]
     }, (response, hasError) {
       if (!hasError) {

+ 1 - 1
lib/paegs/gang_page/gang_in_page/gang_information_page/member_list_page/member_details_page.dart

@@ -539,7 +539,7 @@ class _MemberDetailsPageState extends State<MemberDetailsPage> {
       "filters": {
         "conditions": ["uid == ${widget.member.userUid}"]
       },
-      "dims": userDims,
+      "dims": otherUserDims,
       "paging": [1, 20]
     }, (response, hasError) {
       if (!hasError) {

+ 6 - 6
lib/paegs/mine_page/wallet_page/withdraw_page/withdraw_page.dart

@@ -173,12 +173,12 @@ class _WithdrawPageState extends State<WithdrawPage> {
                     if (showWeChat)
                       GestureDetector(
                         onTap: () {
-                          // if (!payWays[payWays
-                          //         .indexWhere((element) => element.way == 2)]
-                          //     .withdraw) {
-                          //   showToast('微信提现暂时维护中');
-                          //   return;
-                          // }
+                          if (!payWays[payWays
+                                  .indexWhere((element) => element.way == 2)]
+                              .withdraw) {
+                            showToast('微信提现暂时维护中');
+                            return;
+                          }
                           if (MyCookie().userBean.wxOpenid.isEmpty) {
                             showToast('未绑定微信');
                           } else {

+ 44 - 35
lib/paegs/pay_page/order_information_page.dart

@@ -58,7 +58,7 @@ class OrderInformationPage extends StatefulWidget {
       this.commodityCover,
       this.commodityTitle,
       this.commodityCount,
-      this.discountAmount=0.0});
+      this.discountAmount = 0.0});
 
   @override
   _OrderInformationPageState createState() => _OrderInformationPageState();
@@ -90,10 +90,17 @@ class _OrderInformationPageState extends State<OrderInformationPage> {
               MyCookie().balance = balance.data;
               this.balance = balanceDisplay(balance.data);
               if (widget.amount > balance.data) {
-                if(MyCookie().prefs.getInt('payWay')!=null){
-                  if(MyCookie().prefs.getInt('payWay')==payWayAliPay){
+                if (MyCookie().prefs.getInt('payWay') != null) {
+                  if (MyCookie().prefs.getInt('payWay') == payWayAliPay &&
+                      payWays[payWays.indexWhere(
+                              (element) => element.way == payWayAliPay)]
+                          .pay) {
                     payWay = payWayAliPay;
-                  }else if(MyCookie().prefs.getInt('payWay')==payWayWeChat){
+                  } else if (MyCookie().prefs.getInt('payWay') ==
+                          payWayWeChat &&
+                      payWays[payWays.indexWhere(
+                              (element) => element.way == payWayWeChat)]
+                          .pay) {
                     payWay = payWayWeChat;
                   }
                 }
@@ -222,34 +229,36 @@ class _OrderInformationPageState extends State<OrderInformationPage> {
                     alignment: Alignment.centerLeft,
                     padding: EdgeInsets.all(10),
                   ),
-                  if(widget.discountAmount!=null&&widget.discountAmount!=0)
-                  Container(
-                    height: 10,
-                    color: MyColors.cEFEFEF,
-                  ),
-                  if(widget.discountAmount!=null&&widget.discountAmount!=0)
-                  Container(
-                    color: Colors.white,
-                    child: Row(
-                      children: [
-                        MyViews().myText('店铺折扣', MyColors.c333333, 16),
-                        Row(
-                          children: [
-                            Container(
-                              child: MyViews().myText(
-                                  widget.discountAmount.toStringAsFixed(2),
-                                  MyColors.c333333,
-                                  13),
-                              margin: EdgeInsets.only(left: 6, right: 6),
-                            ),
-                          ],
-                        )
-                      ],
-                      mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                  if (widget.discountAmount != null &&
+                      widget.discountAmount != 0)
+                    Container(
+                      height: 10,
+                      color: MyColors.cEFEFEF,
+                    ),
+                  if (widget.discountAmount != null &&
+                      widget.discountAmount != 0)
+                    Container(
+                      color: Colors.white,
+                      child: Row(
+                        children: [
+                          MyViews().myText('店铺折扣', MyColors.c333333, 16),
+                          Row(
+                            children: [
+                              Container(
+                                child: MyViews().myText(
+                                    widget.discountAmount.toStringAsFixed(2),
+                                    MyColors.c333333,
+                                    13),
+                                margin: EdgeInsets.only(left: 6, right: 6),
+                              ),
+                            ],
+                          )
+                        ],
+                        mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                      ),
+                      alignment: Alignment.centerLeft,
+                      padding: EdgeInsets.all(10),
                     ),
-                    alignment: Alignment.centerLeft,
-                    padding: EdgeInsets.all(10),
-                  ),
                 ],
               ),
             ),
@@ -647,9 +656,8 @@ class _OrderInformationPageState extends State<OrderInformationPage> {
   void toPayPage() {
     MyTools().toPage(
         context,
-        PayPage(
-            widget.uid, widget.cancelOrder, widget.amount, payWay, couponData,widget.discountAmount),
-        (then) {
+        PayPage(widget.uid, widget.cancelOrder, widget.amount, payWay,
+            couponData, widget.discountAmount), (then) {
       if (then is int) {
         if (then == 1) {
           Navigator.pop(context, then);
@@ -875,7 +883,8 @@ class _ChooseACouponState extends State<ChooseACoupon> {
       "paging": [page, 20]
     }, (response, hasError) {
       if (!hasError) {
-        MyCouponBeanEntity entity = MyCouponBeanEntity.fromJson(json.decode(response.data.toString()));
+        MyCouponBeanEntity entity =
+            MyCouponBeanEntity.fromJson(json.decode(response.data.toString()));
         if (page == 1) {
           coupons.clear();
         }

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