diff --git a/code.py b/code.py
index 00be009..0d81680 100644
--- a/code.py
+++ b/code.py
@@ -21,11 +21,11 @@ def reg_to_login():   # 注册界面转登录界面
 def register():     # 注册验证
     name,password1,password2 = app_reg.get_input()
     if name =="" or password2 == "" or password1=="":
-        messagebox.showwarning("警告", "请填写完整的注册资料")
+        messagebox.showerror("错误", "请填写完整的注册资料")
     elif name in users:
-        messagebox.showwarning("错误", "用户名已经存在!")
+        messagebox.showerror("错误", "用户名已经存在!")
     elif password1 != password2:
-        messagebox.showwarning("错误", "两次密码不一致!")
+        messagebox.showerror("错误", "两次密码不一致!")
     else:
         users[name] = password1
         content = json.dumps(users)
diff --git a/my_client.py b/my_client.py
index 3159e58..e776fdf 100644
--- a/my_client.py
+++ b/my_client.py
@@ -1,8 +1,7 @@
 import tkinter
 from tkinter import *
-
-alist = ["星期六下午打篮球", "星期天下午和小美一起看电影",
-         "12月18日给蒂法过生日", "12.24送妈妈圣诞礼物"]
+from tkinter import messagebox
+import json
 
 class Note():  # 便签、笔记
     def __init__(self):
@@ -11,6 +10,7 @@ class Note():  # 便签、笔记
         self.root.title("我的便签-待办事项")
         self.root.resizable(width=False, height=False)  
         self.bg_img = tkinter.PhotoImage(file="bg.png")
+        self.box = tkinter.PhotoImage(file = 'box.png')
 
     def show(self):  # 布置窗口界面
         # 画布
@@ -27,22 +27,180 @@ class Note():  # 便签、笔记
         self.but.place(x=240, y=305)
         # 展示所有的文字
         self.y = 20
+        self.val = 0
+        self.v = IntVar()
+
         for info in alist:
             self.canvas.create_text(40, self.y, text=info,
                         font=("宋体", 11), anchor=W, fill='#FF9900')
+            self.an = tkinter.Radiobutton(self.canvas,image = self.box,value = self.val,variable = self.v,command = self.remove)
+            self.an.place(x = -30,y = self.y-15)
+            self.val += 1
             self.y += 30
+    
+    def remove(self):
+        num = self.v.get()
+        alist.pop(num)
+        content = json.dumps(users)
+        with open("user.txt", "w", encoding="utf-8") as f:
+            f.write(content)
+        self.canvas.destroy()
+        app.show()
 
     def get_info(self):
         info = self.ent.get()
         self.ent.delete("0", END)
         if info != "":
             alist.append(info)
+            content = json.dumps(users)
+            with open("user.txt", "w", encoding="utf-8") as f:
+                f.write(content)
             self.canvas.create_text(40,self.y,text=info,font=("宋体",11),
                          anchor=W, fill='#FF9900')
+            self.an = tkinter.Radiobutton(self.canvas,image = self.box,value = self.val,variable = self.v,command = self.remove)
+            self.an.place(x = -30,y = self.y-15)
+            self.val += 1
             self.y += 30
 
+with open("user.txt", "r", encoding="utf-8") as f:
+    info = f.read()
+    users = json.loads(info)
+
+def login_to_reg():    # 登录界面转注册界面
+    app_login.root.destroy()
+    global app_reg
+    app_reg = My_register()
+    app_reg.show()
+
+def reg_to_login():   # 注册界面转登录界面
+    app_reg.root.destroy()
+    global app_login
+    app_login = My_login()
+    app_login.show()
+
+def register():     # 注册验证
+    name,password1,password2 = app_reg.get_input()
+    if name =="" or password2 == "" or password1=="":
+        messagebox.showwarning("警告", "请填写完整的注册资料")
+    elif name in users:
+        messagebox.showwarning("错误", "用户名已经存在!")
+    elif password1 != password2:
+        messagebox.showwarning("错误", "两次密码不一致!")
+    else:
+        user_info = {}
+        user_info["password"] = password1
+        user_info["event"] = ["1,你可以添加你的便签","2,点击事件前面的小方框可以完成事件"]
+        users[name] = user_info
+        content = json.dumps(users)
+        with open("user.txt", "w", encoding="utf-8") as file:    # "w"每次写入都覆盖原来的内容
+            file.write(content)
+        # 注册成功,跳往登陆界面
+        messagebox.showinfo("成功", "注册成功")
+        reg_to_login()
+
+def login():
+    global app,alist        # 登录验证
+    name, password = app_login.get_input()
+    users_name = users.get(name)
+    if users_name != None and users_name["password"] == password:
+        alist = users[name]["event"]
+        messagebox.showinfo("成功", "登录成功")
+        app_login.root.destroy()
+        app = Note()
+        app.show()
+        app.root.mainloop()
+    else:
+        messagebox.showerror("错误", "用户名或密码错误!")
+
+class My_login():       # 登录窗口
+    def __init__(self):
+        self.root = tkinter.Tk()
+        self.root.title("登录窗口")
+        self.root.geometry('400x300+500+300')
+        self.root.resizable(width=False, height=False)  # True可以拉伸,False不能拉伸
+
+    def show(self):         # 登录界面的所有控件
+        # Label文本标签,界面提示信息
+        l = tkinter.Label(self.root, text='您好!请登录', bg='green', 
+            font=('宋体', 15), width=40, height=2)
+        l.place(x=0, y=0)
+        l = tkinter.Label(self.root, text='用户名:', font=("宋体", 12),
+            fg="black")
+        l.place(x=50, y=80)
+        l = tkinter.Label(self.root, text='密  码:', font=("宋体", 12), 
+            fg="black")
+        l.place(x=50, y=140)
+
+        # Entry单行文本输入框:用户名、密码
+        self.e1 = tkinter.Entry(self.root, show=None, font=('宋体', 14), 
+                  bg="light grey", width=18)  # 显示成明文形式
+        self.e2 = tkinter.Entry(self.root, show='*', font=('宋体', 14),
+                  width=18)  # 显示成密文形式
+        self.e1.place(x=120, y=80)
+        self.e2.place(x=120, y=140)
+
+        # 登录、注册按钮
+        button1 = tkinter.Button(self.root, text='登录', bg="lightblue",
+                  fg="black", width=15, command=login)
+        button1.place(x=60, y=220)
+        button2 = tkinter.Button(self.root, text='注册', bg="lightgreen",
+                  fg="black", width=15, command=login_to_reg)
+        button2.place(x=230, y=220)
+        self.root.mainloop()    # 进入消息循环,监听事件
+
+    def get_input(self):      # 获取输入的用户名、密码
+        self.name = self.e1.get()
+        self.password = self.e2.get()
+        return self.name, self.password
+
+class My_register():        # 注册窗口
+    def __init__(self):
+        self.root = tkinter.Tk()
+        self.root.title("注册窗口")
+        self.root.geometry('400x320+500+300')
+        self.root.resizable(width=False, height=False)  # True可以拉伸,False不能拉伸
+   
+    def show(self):     # 注册界面的所有控件
+        # 用户名、密码、确认密码输入框
+        self.e1 = tkinter.Entry(self.root, show=None, font=('宋体', 14), 
+                  bg="light grey", width=18)  # 显示成明文形式
+        self.e1.place(x=140, y=80)
+        self.e2 = tkinter.Entry(self.root, show='*', font=('宋体', 14),
+                  width=18)
+        self.e2.place(x=140, y=140)
+        self.e3 = tkinter.Entry(self.root, show='*', font=('宋体', 14),
+                  width=18)
+        self.e3.place(x=140, y=200)
+
+        # Label文本标签,窗口界面文字:用户名、密码、确认密码
+        lab = tkinter.Label(self.root, text='您好!请填写注册信息',
+              font=('宋体', 15),fg="black", width=40, height=2, bg="green")
+        lab.place(x=0, y=0)
+        lab1 = tkinter.Label(self.root, text='用户名:', font=("宋体", 12),
+               fg="black")
+        lab1.place(x=60, y=80)
+        lab2 = tkinter.Label(self.root, text='密  码:', font=("宋体", 12),
+               fg="black")
+        lab2.place(x=60, y=140)
+        lab3 = tkinter.Label(self.root, text='确认密码:', font=("宋体", 12),
+               fg="black")
+        lab3.place(x=50, y=200)
+
+        # 注册界面的提交、取消按钮
+        button1 = tkinter.Button(self.root, text='提交', bg="lightblue",
+                  width=15,command=register)
+        button1.place(x=230, y=250)
+        button2 = tkinter.Button(self.root, text='取消', bg="lightgreen",
+                  width=15, command=reg_to_login)
+        button2.place(x=80, y=250)
+        # 进入消息循环
+        self.root.mainloop()
 
-app = Note()
-app.show()
-app.root.mainloop()
+    def get_input(self):         # 获取提交的注册信息
+        self.name = self.e1.get()
+        self.password1 = self.e2.get()
+        self.password2 = self.e3.get()
+        return self.name, self.password1, self.password2
 
+app_login = My_login()
+app_login.show()
\ No newline at end of file
diff --git a/user.txt b/user.txt
index adfe7e8..fad62e6 100644
--- a/user.txt
+++ b/user.txt
@@ -1 +1 @@
-{"admin": "admin", "python": "123456"}
\ No newline at end of file
+{"admin": "admin", "python": "123456", "123456": "123456", "1": "1", "123": "123456", "12": {"password": "123", "event": ["1,\u4f60\u53ef\u4ee5\u6dfb\u52a0\u4f60\u7684\u4fbf\u7b7e", "2,\u70b9\u51fb\u4e8b\u4ef6\u524d\u9762\u7684\u5c0f\u65b9\u6846\u53ef\u4ee5\u5b8c\u6210\u4e8b\u4ef6"]}, "1234": {"password": "123", "event": ["2,\u70b9\u51fb\u4e8b\u4ef6\u524d\u9762\u7684\u5c0f\u65b9\u6846\u53ef\u4ee5\u5b8c\u6210\u4e8b\u4ef6", "\u554a\u5b9e\u6253\u5b9e\u6253\u7b97"]}, "\u5929\u5929\u5411\u4e0a": {"password": "321", "event": []}, "\u6f58\u99a8\u60a6": {"password": "456", "event": ["1,\u4f60\u53ef\u4ee5\u6dfb\u52a0\u4f60\u7684\u4fbf\u7b7e", "2,\u70b9\u51fb\u4e8b\u4ef6\u524d\u9762\u7684\u5c0f\u65b9\u6846\u53ef\u4ee5\u5b8c\u6210\u4e8b\u4ef6"]}, "1234567": {"password": "123", "event": []}, "777": {"password": "123456", "event": ["1,\u4f60\u53ef\u4ee5\u6dfb\u52a0\u4f60\u7684\u4fbf\u7b7e", "2,\u70b9\u51fb\u4e8b\u4ef6\u524d\u9762\u7684\u5c0f\u65b9\u6846\u53ef\u4ee5\u5b8c\u6210\u4e8b\u4ef6"]}}
\ No newline at end of file