feat: better layout

itsHenry35 · Jun 22, 2023 · f507c87 · f507c87
1 parent 6a1b5f8
commit f507c87
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/gui/login1.py b/gui/login1.py
@@ -40,14 +40,14 @@ def login1(username_default=""):
     username = ttk.Entry(bootstyle="primary")
     username.grid(row=1,column=1)
     username.insert(0, username_default)
+    smsswitch = ttk.Button(text='短信验证码登陆', bootstyle="default-outline", command=lambda: switchtosms(username, root))
+    smsswitch.grid(row=1,column=2)
     text2 = ttk.Label(text = '密码：')
     text2.grid(row=2)
     password = ttk.Entry(bootstyle="primary", show="*")
     password.grid(row=2,column=1)
     showpwd = ttk.Button(text='显示/隐藏密码', bootstyle="defaulte", command=lambda: switchshowpwd(password))
     showpwd.grid(row=2,column=2)
-    smsswitch = ttk.Button(text='短信验证码登陆', bootstyle="default-outline", command=lambda: switchtosms(username, root))
-    smsswitch.grid(row=2,column=3)
     submit = ttk.Button(text='提交', bootstyle="primary", command=lambda: nextpage(username, password, root))
     submit.grid(row=3, column=2)
     root.mainloop()

diff --git a/gui/login1_sms.py b/gui/login1_sms.py
@@ -106,14 +106,14 @@ def login1_sms(phonenum):
     zonevar.set("请选择区号")
     zone = ttk.OptionMenu(root,  zonevar, *zonelist)
     zone.grid (row=1,column=1)
+    smsswitch = ttk.Button(text='返回账号密码登陆', bootstyle="default-outline", command=lambda: switch_to_pwd(username, root))
+    smsswitch.grid(row=1,column=3)
     text2 = ttk.Label(text = '验证码：')
     text2.grid(row=2)
     password = ttk.Entry(bootstyle="primary")
     password.grid(row=2,column=2)
     send = ttk.Button(text='发送验证码', bootstyle="default", command=lambda: send_msg(username, zonevar, send, thread_))
     send.grid(row=2,column=3)
-    smsswitch = ttk.Button(text='返回账号密码登陆', bootstyle="default-outline", command=lambda: switch_to_pwd(username, root))
-    smsswitch.grid(row=2,column=4)
     submit = ttk.Button(text='提交', bootstyle="primary", command=lambda: next_page(username, password, root, zonevar))
     submit.grid(row=3, column=3)
     root.mainloop()