合并了代码

黄学彪

2019-12-30 3dcbd186c42c598c0c08d1cd37034cf2baa09e54

 ZigbeeApp/Shared/Phone/UserCenter/Member/MemberListForm.cs

@@ -42,7 +42,7 @@
            titleIcon.InitControl();

            titleIcon.ButtonClickEvent += (sender, e) =>

            {

                var menuContr = new TopRightMenuControl(2, 449);

                var menuContr = new TopRightMenuControl(2, 2);

                //扫描二维码

                string msg1 = Language.StringByID(R.MyInternationalizationString.uScanQRcode);

                menuContr.AddRowMenu(msg1, "Item/ScanQRcodeIcon.png", "Item/ScanQRcodeIconSelected.png", () =>

@@ -55,7 +55,10 @@
                        }

                        //搜索ID

                        this.SearchMemberInfo(qrCode);

                    });

                    }, 
                    Language.StringByID(R.MyInternationalizationString.uCancel),

                    Language.StringByID(R.MyInternationalizationString.uFlashlamp),

                    msg1);

                });

                //输入账号

                string msg2 = Language.StringByID(R.MyInternationalizationString.uInputAccount);