{{/* these styles are quite tricky and should also apply to the signup and link_account pages */}}
diff --git a/templates/user/auth/signin_navbar.tmpl b/templates/user/auth/signin_navbar.tmpl
new file mode 100644
index 0000000000..3bd329e8d4
--- /dev/null
+++ b/templates/user/auth/signin_navbar.tmpl
@@ -0,0 +1,29 @@
+{{if or .EnableOpenIDSignIn .EnableSSPI .EnableWechatQRSignIn}}
+
+
+
+{{end}}
diff --git a/templates/user/auth/signin_sms.tmpl b/templates/user/auth/signin_sms.tmpl
new file mode 100644
index 0000000000..6c3149040b
--- /dev/null
+++ b/templates/user/auth/signin_sms.tmpl
@@ -0,0 +1,12 @@
+{{template "base/head" .}}
+
+ {{template "user/auth/signin_navbar" .}}
+
+ {{/* 短信登录页面表单项容器 */}}
+
+{{template "base/footer" .}}
diff --git a/templates/user/auth/signin_sms_inner.tmpl b/templates/user/auth/signin_sms_inner.tmpl
new file mode 100644
index 0000000000..7522ca99c6
--- /dev/null
+++ b/templates/user/auth/signin_sms_inner.tmpl
@@ -0,0 +1,37 @@
+
+
+
+ {{template "user/auth/signin_sms_inner" .}}
+
+ + {{ctx.Locale.Tr "register_or_sign_in_with_provider" (ctx.Locale.Tr "settings.phone_sms_code")}} +
+ +
+
+
diff --git a/templates/user/auth/signin_wechat_qr.tmpl b/templates/user/auth/signin_wechat_qr.tmpl
new file mode 100644
index 0000000000..36f84db56f
--- /dev/null
+++ b/templates/user/auth/signin_wechat_qr.tmpl
@@ -0,0 +1,12 @@
+{{template "base/head" .}}
+
+ {{template "user/auth/signin_navbar" .}}
+
+ {{/* 登录页面表单项容器 */}}
+
+{{template "base/footer" .}}
diff --git a/templates/user/auth/signin_wechat_qr_inner.tmpl b/templates/user/auth/signin_wechat_qr_inner.tmpl
new file mode 100644
index 0000000000..9dde7638dd
--- /dev/null
+++ b/templates/user/auth/signin_wechat_qr_inner.tmpl
@@ -0,0 +1,207 @@
+{{/* 引入微信公众号二维码扫码注册、登录错误信息一次性提示信息 ctx.Flash.Error() 显示容器 */}}
+{{template "base/alert" .}}
+
+
+{{if .wechatQRScanSuccess}}
+
+
+
+{{else}}
+
+{{/* ============================================================= 扫码失败，需要扫码 - 开始 ============================================================= */}}
+{{if .PageIsSignIn}}
+
+
+
+ {{template "user/auth/signin_wechat_qr_inner" .}}
+
+ + {{ctx.Locale.Tr "settings.wechat_qr_prompt"}} +
+{{end}} + +
+
+
+
+
+
+
+
+
+
+{{/* ============================================================= 扫码失败，需要扫码 - 结束 ============================================================= */}}
+{{end}}
diff --git a/templates/user/auth/signup.tmpl b/templates/user/auth/signup.tmpl
index 1ce3934f84..25e557abd2 100644
--- a/templates/user/auth/signup.tmpl
+++ b/templates/user/auth/signup.tmpl
@@ -1,5 +1,6 @@
{{template "base/head" .}}
+ {{template "user/auth/signin_navbar" .}}
{{template "user/auth/signup_inner" .}}
diff --git a/templates/user/auth/signup_inner.tmpl b/templates/user/auth/signup_inner.tmpl
index a3f6e1471f..67b11e1769 100644
--- a/templates/user/auth/signup_inner.tmpl
+++ b/templates/user/auth/signup_inner.tmpl
@@ -38,6 +38,13 @@
{{end}}
+ {{if .EnableWechatQRSignIn}}
+
+
+
+
+ {{end}}
+
{{template "user/auth/captcha" .}}
diff --git a/templates/user/settings/account.tmpl b/templates/user/settings/account.tmpl
index 7dbac0ebd4..50344ac2d4 100644
--- a/templates/user/settings/account.tmpl
+++ b/templates/user/settings/account.tmpl
@@ -1,5 +1,45 @@
{{template "user/settings/layout_head" (dict "ctxData" . "pageClass" "user settings account")}}
+
+ {{if false}}
+
+ {{ctx.Locale.Tr "settings.change_phone"}} +
+
+
+
+ {{end}}
+ {{if .EnableWechatQRSignIn}}
+ + {{ctx.Locale.Tr "settings.change_wechat"}} +
+
+
+ {{end}}
+
+
+ {{template "user/auth/signin_wechat_qr_inner" .}} +
+
+ + {{template "user/auth/signin_wechat_qr_inner" .}} +