1.1.24

images/svg/注销.svg

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="21px" height="21px" viewBox="0 0 21 21" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>注销</title>
+    <g id="注销" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round">
+        <g id="编组" transform="translate(1.000000, 1.000000)" stroke="#000000" stroke-width="1.25">
+            <path d="M16.0134692,2.58435313 C17.8521597,4.31682102 19,6.77438137 19,9.49998922 C19,14.7466778 14.7466767,19.0000108 9.5,19.0000108 C4.25332331,19.0000108 0,14.7466778 0,9.49998922 C0,6.77432745 1.1478942,4.31676709 2.98663867,2.58435313" id="Stroke-1"></path>
+            <line x1="9.52304433" y1="2.30926389e-14" x2="9.52304433" y2="10.3464391" id="Stroke-3"></line>
+        </g>
+    </g>
+</svg>

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

@@ -1336,7 +1336,7 @@ class _GangInformationPageState extends State<GangInformationPage> {
                         ),
                       ),
                     ),
-                    if (widget.data.ownerUid != MyCookie().getUID())
+                    if (widget.data.ownerUid != MyCookie().getUID()&&widget.data.privateShop)
                       GestureDetector(
                         onTap: () {
                           exitGang();

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

@@ -444,8 +444,8 @@ class _MemberDetailsPageState extends State<MemberDetailsPage> {
                                 return;
                               } else {
                                 EasyLoading.show();
-                                updateMemberName();
-                                // saveReferrer();
+                                // updateMemberName();
+                                saveReferrer();
                               }
                             },
                             behavior: HitTestBehavior.translucent,
@@ -557,9 +557,9 @@ class _MemberDetailsPageState extends State<MemberDetailsPage> {
       "key": "shop_user",
       "values": {
         'id': widget.member.id,
-        'recommender_uid': referrer.recommenderUid,
-        'recommender_name': referrer.recommenderName,
-        'recommender_pic': referrer.recommenderPic,
+        // 'recommender_uid': referrer.recommenderUid,
+        // 'recommender_name': referrer.recommenderName,
+        // 'recommender_pic': referrer.recommenderPic,
         'user_remark':_reMak.text.toString()
       }
     }, (response, hasError) {

lib/paegs/mine_page/set_page/logout_page.dart

@@ -0,0 +1,46 @@
+import 'package:bbyyy/my_tools/my_colors.dart';
+import 'package:bbyyy/my_tools/my_views.dart';
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
+
+class LogoutPage extends StatefulWidget {
+  @override
+  _LogoutPageState createState() => _LogoutPageState();
+}
+
+class _LogoutPageState extends State<LogoutPage> {
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      body: Column(
+        children: [
+          MyViews().myAppBar('注销账号', context, []),
+          Expanded(
+            child: Container(
+              child: Text(
+                  '注销账户须知：\n1. 确保当前账户没有剩余积分。\n2. 确保当前账户没有未收取与未支付订单。\n3. 确保当前账户以退出所有加入的货帮并解散自己创建的所有货帮。'),
+              margin: EdgeInsets.all(20),
+            ),
+          ),
+          GestureDetector(
+            onTap: (){
+              showSimpleDialog('确认注销当前账户？', context, (){
+                Navigator.pop(context);
+              });
+            },
+            child: Container(
+              height: 40,
+              decoration: BoxDecoration(
+                color: MyColors.cFF4233,
+                borderRadius: BorderRadius.circular(20),
+              ),
+              child: Text('注销账号',style: TextStyle(color: Colors.white,fontSize: 16),),
+              alignment: Alignment.center,
+              margin: EdgeInsets.all(20),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}

lib/paegs/mine_page/set_page/set_page.dart

@@ -14,6 +14,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_svg/svg.dart';
 
 import 'change_password_page.dart';
+import 'logout_page.dart';
 
 class SetPage extends StatefulWidget {
   @override
@@ -213,6 +214,40 @@ class _SetPageState extends State<SetPage> {
               ],
             ),
           ),
+          // GestureDetector(
+          //   onTap: () {
+          //     MyTools().toPage(context, LogoutPage(), (then) {});
+          //   },
+          //   behavior: HitTestBehavior.translucent,
+          //   child: Container(
+          //     padding: EdgeInsets.only(left: 20, right: 20),
+          //     child: Column(
+          //       children: [
+          //         Row(
+          //           children: [
+          //             Container(
+          //               child: SvgPicture.asset(
+          //                 'images/svg/注销.svg',
+          //                 color: MyColors.c333333,
+          //               ),
+          //               margin: EdgeInsets.only(right: 12, top: 15, bottom: 15),
+          //             ),
+          //             Expanded(
+          //                 child: Text(
+          //                   '注销账号',
+          //                   style: TextStyle(color: MyColors.c333333, fontSize: 15),
+          //                 )),
+          //             SvgPicture.asset('images/svg/箭头.svg')
+          //           ],
+          //         ),
+          //         Container(
+          //           height: 1,
+          //           color: MyColors.cEFEFEF,
+          //         )
+          //       ],
+          //     ),
+          //   ),
+          // ),
           Container(
             margin: EdgeInsets.symmetric(vertical: 101, horizontal: 62),
             child: GestureDetector(

lib/paegs/pay_page/order_information_page.dart

@@ -90,6 +90,13 @@ 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){
+                    payWay = payWayAliPay;
+                  }else if(MyCookie().prefs.getInt('payWay')==payWayWeChat){
+                    payWay = payWayWeChat;
+                  }
+                }
                 payWays.forEach((element) {
                   if (payWay == 0) {
                     if (element.pay) {

lib/paegs/pay_page/pay_page.dart

@@ -429,8 +429,10 @@ class _PayPageState extends State<PayPage> with WidgetsBindingObserver {
             }
           }
         } else if (widget.payWay == payWayAliPay) {
+          MyCookie().prefs.setInt('payWay', payWayAliPay);
           payWithAliPay();
         } else if (widget.payWay == payWayWeChat) {
+          MyCookie().prefs.setInt('payWay', payWayWeChat);
           payByWeChat();
         }
       }