合并了全部的代码

黄学彪

2019-11-04 c7698e163e43cea9e7f8ee45f8e3f91c9265cca4

 ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserManagement.cs

@@ -97,7 +97,11 @@

        async void MidFrameLayoutContent()
        {
            var SubAccounList = await ZigBee.Device.DoorLock.GetSubAccountByDistributedMark();
            List<Shared.Phone.UserCenter.MemberInfoRes> SubAccounList = null;
            if (UserCenterResourse.UserInfo.AuthorityNo == 1 || UserCenterResourse.UserInfo.AuthorityNo == 2)
            {
                SubAccounList = await ZigBee.Device.DoorLock.GetSubAccountByDistributedMark();
            }

            var masterAccount = new Shared.Phone.UserCenter.MemberInfoRes();
            masterAccount.Account = Shared.Common.Config.Instance.Account;
@@ -185,15 +189,8 @@
                        Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
                        masterManagementPage.Show();
                    }
                    else if (currentIndex == 3)
                    {
                        var userDoorLockPage = new UserDoorLockPage(doorLock, currentAccount);
                        Shared.Phone.UserView.HomePage.Instance.AddChidren(userDoorLockPage);
                        Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
                        userDoorLockPage.Show();
                    }
                    else
                    {
                    {

                        var memberFrozenPage = new Shared.Phone.UserCenter.DoorLock.MemberFrozenPage(doorLock, currentAccount);
                        Shared.Phone.UserView.HomePage.Instance.AddChidren(memberFrozenPage);
                        Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;