From acce6953fe5a06ee8ecf73e3fa7e646a064dd702 Mon Sep 17 00:00:00 2001
From: zyronon <zyronon@163.com>
Date: Wed, 18 Aug 2021 14:26:03 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                               |   1 +
 src/components/BaseButton.vue             |   2 +-
 src/components/dialog/ConfirmDialog.vue   |  59 +++++++--
 src/components/dialog/NoticeDialog.vue    | 115 +++++++++++++++++
 src/pages/login/Base.js                   |  36 ++++++
 src/pages/login/Base.scss                 |  56 +++++++++
 src/pages/login/OtherLogin.vue            |  83 ++----------
 src/pages/login/PasswordLogin.vue         |  83 +++---------
 src/pages/login/RetrievePassword.vue      | 147 ++++++++++++++++++++++
 src/pages/login/VerificationCode.vue      |  65 ++++------
 src/pages/login/components/LoginInput.vue |  45 +++++--
 src/pages/me/rightMenu/LookHistory.vue    |   2 +-
 src/router/index.js                       |   2 +
 src/utils/global-methods.js               |  38 +++++-
 14 files changed, 529 insertions(+), 205 deletions(-)
 create mode 100644 src/components/dialog/NoticeDialog.vue
 create mode 100644 src/pages/login/Base.js
 create mode 100644 src/pages/login/Base.scss
 create mode 100644 src/pages/login/RetrievePassword.vue

diff --git a/src/App.vue b/src/App.vue
index c1e6e40..a9c0a9c 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -73,6 +73,7 @@ export default {
         '/login/other',
         '/login/password',
         '/login/verification-code',
+        '/login/retrieve-password',
 
 
         '/service-protocol',
diff --git a/src/components/BaseButton.vue b/src/components/BaseButton.vue
index 4dc0643..ad8c354 100644
--- a/src/components/BaseButton.vue
+++ b/src/components/BaseButton.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="button" :class="class1" @click.capture.stop="check">
-    <img v-if="loading" src="../assets/img/icon/loading-white.png" alt="">
+    <img v-show="loading" src="../assets/img/icon/loading-white.png" alt="">
     <slot v-if="showText"></slot>
   </div>
 </template>
diff --git a/src/components/dialog/ConfirmDialog.vue b/src/components/dialog/ConfirmDialog.vue
index 824ea3e..e60facd 100644
--- a/src/components/dialog/ConfirmDialog.vue
+++ b/src/components/dialog/ConfirmDialog.vue
@@ -2,12 +2,12 @@
   <div class="ConfirmDialog " @click="$emit('dismiss')">
     <div class="content" @click.stop="null">
       <div class="body">
-        <div class="title">{{ title }}</div>
-        <div class="subtitle" v-if="subtitle">{{ subtitle }}</div>
+        <div class="title" v-if="title">{{ title }}</div>
+        <div class="subtitle" :class="subtitleColor" v-if="subtitle">{{ subtitle }}</div>
       </div>
       <div class="footer">
-        <div class="cancel" @click.stop="$emit('cancel')">取消</div>
-        <div class="ok" @click.stop="$emit('ok')">确定</div>
+        <div class="cancel" :class="cancelTextColor" @click.stop="$emit('cancel')">{{ cancelText }}</div>
+        <div class="ok" @click.stop="$emit('ok')">{{ okText }}</div>
       </div>
     </div>
   </div>
@@ -31,7 +31,31 @@ export default {
       default() {
         return ''
       }
-    }
+    },
+    subtitleColor: {
+      type: String,
+      default() {
+        return 'gray'
+      }
+    },
+    okText: {
+      type: String,
+      default() {
+        return '确定'
+      }
+    },
+    cancelText: {
+      type: String,
+      default() {
+        return '取消'
+      }
+    },
+    cancelTextColor: {
+      type: String,
+      default() {
+        return 'gray'
+      }
+    },
   },
   data() {
     return {}
@@ -58,30 +82,32 @@ export default {
 
   .content {
     background: white;
-    width: 80%;
+    width: 70%;
     border-radius: 2px;
     box-sizing: border-box;
     font-size: 1.5rem;
     text-align: center;
 
     .body {
-      padding: 1rem;
+      padding: 2.5rem;
 
       .title {
-        margin-top: 1rem;
         font-size: 1.5rem;
+        font-weight: bold;
+        margin-bottom: 1rem;
       }
 
       .subtitle {
-        margin-top: 1rem;
-        color: $second-text-color;
         font-size: 1.3rem;
+
+        &.gray {
+          color: $second-text-color;
+        }
       }
     }
 
     .footer {
-      height: 4rem;
-      margin-top: 2rem;
+      height: 4.6rem;
       display: flex;
       border-top: 1px solid whitesmoke;
       font-size: 1.4rem;
@@ -93,9 +119,16 @@ export default {
         width: 49%;
       }
 
+      .ok {
+        font-weight: bold;
+      }
+
       .cancel {
-        color: $second-text-color;
         border-right: 1px solid whitesmoke;
+
+        &.gray {
+          color: $second-text-color;
+        }
       }
 
     }
diff --git a/src/components/dialog/NoticeDialog.vue b/src/components/dialog/NoticeDialog.vue
new file mode 100644
index 0000000..4b5831c
--- /dev/null
+++ b/src/components/dialog/NoticeDialog.vue
@@ -0,0 +1,115 @@
+<template>
+  <div class="NoticeDialog" @click="$emit('dismiss')">
+    <div class="content" @click.stop="null">
+      <div class="body">
+        <div class="title">{{ title }}</div>
+        <div class="subtitle" :class="subtitleColor" v-if="subtitle">{{ subtitle }}</div>
+      </div>
+      <div class="footer">
+        <div class="cancel" @click.stop="$emit('cancel')">{{ cancelText }}</div>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+export default {
+  name: "NoticeDialog",
+  props: {
+    visible: {
+      type: Boolean,
+      default: false
+    },
+    title: {
+      type: String,
+      default() {
+        return ''
+      }
+    },
+    subtitle: {
+      type: String,
+      default() {
+        return ''
+      }
+    },
+    subtitleColor: {
+      type: String,
+      default() {
+        return 'gray'
+      }
+    },
+    cancelText: {
+      type: String,
+      default() {
+        return '取消'
+      }
+    }
+  },
+  data() {
+    return {}
+  }
+}
+</script>
+
+<style scoped lang="scss">
+@import "../../assets/scss/index";
+
+.NoticeDialog {
+  z-index: 10;
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  background: #000000bb;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  color: black;
+
+
+  .content {
+    background: white;
+    width: 70%;
+    border-radius: 2px;
+    box-sizing: border-box;
+    font-size: 1.5rem;
+    text-align: center;
+
+    .body {
+      padding: 2.5rem;
+
+      .title {
+        font-size: 1.5rem;
+        font-weight: bold;
+      }
+
+      .subtitle {
+        margin-top: 1rem;
+        font-size: 1.3rem;
+
+        &.gray{
+          color: $second-text-color;
+        }
+      }
+    }
+
+    .footer {
+      height: 4.6rem;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      border-top: 1px solid whitesmoke;
+      font-size: 1.4rem;
+
+
+      .cancel {
+        font-weight: bold;
+      }
+
+    }
+
+  }
+
+
+}
+</style>
diff --git a/src/pages/login/Base.js b/src/pages/login/Base.js
new file mode 100644
index 0000000..21d57f0
--- /dev/null
+++ b/src/pages/login/Base.js
@@ -0,0 +1,36 @@
+export default {
+  name: "Base",
+  props: {},
+  data() {
+    return {
+      isAgree: false,
+      isOtherLogin: false,
+      showAnim: false,
+      showTooltip: false,
+      loading: false,
+    }
+  },
+  computed: {},
+  created() {
+  },
+  methods: {
+    async check() {
+      return new Promise((resolve, reject) => {
+        if (this.isAgree) {
+          resolve(true)
+        } else {
+          if (!this.showAnim && !this.showTooltip) {
+            this.showAnim = true
+            setTimeout(() => {
+              this.showAnim = false
+              this.showTooltip = true
+            }, 500)
+            setTimeout(() => {
+              this.showTooltip = false
+            }, 3000)
+          }
+        }
+      })
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/pages/login/Base.scss b/src/pages/login/Base.scss
new file mode 100644
index 0000000..9b26073
--- /dev/null
+++ b/src/pages/login/Base.scss
@@ -0,0 +1,56 @@
+@import "../../assets/scss/index";
+
+.content {
+  padding: 6rem 3rem;
+  //padding-top: 6rem;
+
+  .desc {
+    margin-bottom: 2rem;
+    margin-top: 4rem;
+    display: flex;
+    align-items: flex-start;
+    flex-direction: column;
+
+    .title {
+      font-weight: bold;
+      font-size: 2rem;
+      margin-bottom: 1rem;
+    }
+
+    .sub-title {
+      font-size: 1.2rem;
+      color: $second-text-color;
+    }
+  }
+
+  .notice {
+    margin-top: 1rem;
+    font-size: 1.3rem;
+    color: $primary-btn-color;
+  }
+
+  .button {
+    margin-bottom: .5rem;
+  }
+
+  .protocol {
+    position: relative;
+    color: gray;
+    margin-top: 2rem;
+    margin-bottom: 2rem;
+    font-size: 1.2rem;
+    display: flex;
+
+    .left {
+      padding-top: .1rem;
+      margin-right: .5rem;
+    }
+  }
+
+  .options {
+    font-size: 1.2rem;
+    margin-top: 2rem;
+    display: flex;
+    justify-content: space-between;
+  }
+}
\ No newline at end of file
diff --git a/src/pages/login/OtherLogin.vue b/src/pages/login/OtherLogin.vue
index 3ce6abf..836a68a 100644
--- a/src/pages/login/OtherLogin.vue
+++ b/src/pages/login/OtherLogin.vue
@@ -13,7 +13,7 @@
 
       <LoginInput autofocus type="phone" v-model="phone" placeholder="请输入手机号"/>
 
-      <div class="notice">
+      <div class="notice" v-if="notice">
         {{ notice }}
       </div>
 
@@ -47,9 +47,11 @@
 import Check from "../../components/Check";
 import Tooltip from "./components/Tooltip";
 import LoginInput from "./components/LoginInput";
+import Base from "./Base.js";
 
 export default {
   name: "OtherLogin",
+  extends: Base,
   components: {
     Check,
     Tooltip,
@@ -57,12 +59,7 @@ export default {
   },
   data() {
     return {
-      isAgree: false,
       phone: '',
-      isOtherLogin: false,
-      showAnim: false,
-      showTooltip: false,
-      loading: false,
       notice: ''
     }
   },
@@ -70,23 +67,13 @@ export default {
   created() {
   },
   methods: {
-    getCode() {
-      if (this.isAgree) {
+    async getCode() {
+      let res = await this.check()
+      if (res){
         this.loading = true
-        setTimeout(()=>{
+        setTimeout(() => {
           this.$nav('/login/verification-code')
-        },2000)
-      } else {
-        if (!this.showAnim && !this.showTooltip) {
-          this.showAnim = true
-          setTimeout(() => {
-            this.showAnim = false
-            this.showTooltip = true
-          }, 500)
-          setTimeout(() => {
-            this.showTooltip = false
-          }, 3000)
-        }
+        }, 2000)
       }
     }
   }
@@ -95,6 +82,7 @@ export default {
 
 <style scoped lang="scss">
 @import "../../assets/scss/index";
+@import "Base.scss";
 
 .other-login {
   position: fixed;
@@ -107,58 +95,5 @@ export default {
   font-size: 1.4rem;
   background: white;
 
-  .content {
-    padding: 6rem 3rem;
-    //padding-top: 6rem;
-
-    .desc {
-      margin-bottom: 2rem;
-      margin-top: 4rem;
-      display: flex;
-      align-items: flex-start;
-      flex-direction: column;
-
-      .title {
-        font-size: 2rem;
-        margin-bottom: 1rem;
-      }
-
-      .sub-title {
-        font-size: 1.2rem;
-        color: $second-text-color;
-      }
-    }
-
-    .notice {
-      margin-top: 1rem;
-      font-size: 1.3rem;
-      color: $primary-btn-color;
-    }
-
-    .button {
-      margin-bottom: .5rem;
-    }
-
-    .protocol {
-      position: relative;
-      color: gray;
-      margin-top: 2rem;
-      margin-bottom: 2rem;
-      font-size: 1.2rem;
-      display: flex;
-
-      .left {
-        padding-top: .1rem;
-        margin-right: .5rem;
-      }
-    }
-
-    .options {
-      font-size: 1.2rem;
-      margin-top: 2rem;
-      display: flex;
-      justify-content: space-between;
-    }
-  }
 }
 </style>
diff --git a/src/pages/login/PasswordLogin.vue b/src/pages/login/PasswordLogin.vue
index 0ef3735..29dd966 100644
--- a/src/pages/login/PasswordLogin.vue
+++ b/src/pages/login/PasswordLogin.vue
@@ -6,14 +6,15 @@
       </template>
     </BaseHeader>
     <div class="content">
-      <div class="notice">
+      <div class="desc">
         <div class="title">手机号密码登录</div>
       </div>
 
       <LoginInput autofocus type="phone" v-model="phone" placeholder="请输入手机号"/>
       <LoginInput autofocus class="mt1r" type="password" v-model="password" placeholder="请输入密码"/>
 
-      <div class="protocol">
+      <div class="protocol" :class="showAnim?'anim-bounce':''">
+        <Tooltip style="top: -150%;left: -1rem;" v-model="showTooltip"/>
         <div class="left">
           <Check v-model="isAgree"/>
         </div>
@@ -26,13 +27,17 @@
         </div>
       </div>
 
+      <div class="notice" v-if="notice">
+        {{ notice }}
+      </div>
+
       <b-button :loading="loading" :active="false" :disabled="disabled" @click="login">
         {{ loading ? '登录中' : '登录' }}
       </b-button>
 
       <div class="options">
         <span>
-          忘记了？<span class="link">找回密码</span>
+          忘记了？<span class="link" @click="$nav('/login/retrieve-password')">找回密码</span>
         </span>
       </div>
 
@@ -42,22 +47,23 @@
 <script>
 import Check from "../../components/Check";
 import LoginInput from "./components/LoginInput";
+import Tooltip from "./components/Tooltip";
+import Base from "./Base";
 
 export default {
   name: "PasswordLogin",
+  extends: Base,
   components: {
     Check,
+    Tooltip,
     LoginInput
   },
   data() {
     return {
-      isAgree: false,
-      showAnim: false,
-      showTooltip: false,
-      loading: false,
       phone: '',
       password: '',
       code: '',
+      notice: '',
     }
   },
   computed: {
@@ -68,20 +74,10 @@ export default {
   created() {
   },
   methods: {
-    login() {
-      if (this.isAgree) {
+    async login() {
+      let res = await this.check()
+      if (res) {
         this.loading = true
-      } else {
-        if (!this.showAnim && !this.showTooltip) {
-          this.showAnim = true
-          setTimeout(() => {
-            this.showAnim = false
-            this.showTooltip = true
-          }, 500)
-          setTimeout(() => {
-            this.showTooltip = false
-          }, 3000)
-        }
       }
     }
   }
@@ -90,6 +86,7 @@ export default {
 
 <style scoped lang="scss">
 @import "../../assets/scss/index";
+@import "Base.scss";
 
 .PasswordLogin {
   position: fixed;
@@ -102,51 +99,5 @@ export default {
   font-size: 1.4rem;
   background: white;
 
-  .content {
-    padding: 6rem 3rem;
-    //padding-top: 6rem;
-
-    .notice {
-      margin-bottom: 2rem;
-      margin-top: 4rem;
-      display: flex;
-      align-items: flex-start;
-      flex-direction: column;
-
-      .title {
-        font-size: 2rem;
-        margin-bottom: 1rem;
-      }
-
-      .sub-title {
-        font-size: 1.2rem;
-        color: $second-text-color;
-      }
-    }
-
-    .button {
-      margin-bottom: .5rem;
-    }
-
-    .protocol {
-      color: gray;
-      margin-top: 2rem;
-      margin-bottom: 2rem;
-      font-size: 1.2rem;
-      display: flex;
-
-      .left {
-        padding-top: .1rem;
-        margin-right: .5rem;
-      }
-    }
-
-    .options {
-      font-size: 1.2rem;
-      margin-top: 2rem;
-      display: flex;
-      justify-content: space-between;
-    }
-  }
 }
 </style>
diff --git a/src/pages/login/RetrievePassword.vue b/src/pages/login/RetrievePassword.vue
new file mode 100644
index 0000000..e18e2fe
--- /dev/null
+++ b/src/pages/login/RetrievePassword.vue
@@ -0,0 +1,147 @@
+<template>
+  <div class="RetrievePassword">
+    <BaseHeader mode="light" :isClose="true"></BaseHeader>
+    <div class="content">
+      <div class="desc">
+        <div class="title">找回密码</div>
+        <div class="sub-title">验证码已通过短信发送到+86 13800138000。
+          密码为8 - 20位，至少包含字母、数字、符号2种组合
+        </div>
+      </div>
+
+      <LoginInput
+          autofocus
+          type="code"
+          v-model="code"
+          placeholder="请输入验证码"
+          v-model:isSendVerificationCode="isSendVerificationCode"
+          @send="sendCode"
+      />
+      <LoginInput
+          class="mt1r"
+          autofocus
+          type="password"
+          v-model="password"
+          placeholder="请输入密码"
+      />
+
+
+      <div class="protocol" :class="showAnim?'anim-bounce':''">
+        <Tooltip style="top: -150%;left: -1rem;" v-model="showTooltip"/>
+        <div class="left">
+          <Check v-model="isAgree"/>
+        </div>
+        <div class="right">
+          已阅读并同意
+          <span class="link" @click="$nav('/service-protocol',{type:'“抖音”用户服务协议'})">用户协议</span>
+          和
+          <span class="link" @click="$nav('/service-protocol',{type:'“抖音”隐私政策'})">隐私政策</span>
+          ，同时登录并使用抖音火山版（原“火山小视频”）和抖音
+        </div>
+      </div>
+
+      <div class="notice" v-if="notice">
+        {{ notice }}
+      </div>
+
+      <b-button
+          :loading="loading"
+          :active="false"
+          :loadingWithText="true"
+          :disabled="disabled"
+          @click="login">
+        完成
+      </b-button>
+
+      <div class="options" v-if="showVoiceCode">
+        <span>
+          收不到短信？<span class="link" @click="getVoiceCode">获取语音验证码</span>
+        </span>
+      </div>
+
+    </div>
+  </div>
+</template>
+<script>
+import Check from "../../components/Check";
+import LoginInput from "./components/LoginInput";
+import Tooltip from "./components/Tooltip";
+import Base from "./Base";
+
+export default {
+  name: "RetrievePassword",
+  extends: Base,
+  components: {
+    Check,
+    Tooltip,
+    LoginInput,
+  },
+  data() {
+    return {
+      phone: '',
+      password: '',
+      code: '',
+      notice: '',
+      isSendVerificationCode: true,
+      showVoiceCode: false
+    }
+  },
+  computed: {
+    disabled() {
+      return !(this.code && this.password);
+    }
+  },
+  created() {
+    setTimeout(() => {
+      this.showVoiceCode = true
+    }, 3000)
+  },
+  methods: {
+    getVoiceCode() {
+      return this.$showNoticeDialog('语音验证码',
+          '我们将以电话的方式告知你验证码，请注意接听',
+          '',
+          () => {
+            setTimeout(() => {
+              this.$showConfirmDialog('', '您的手机可能由于空号/欠费/停机无法收到验证码，请恢复手机号状态，如果' +
+                  '您因为换号无法收到验证码，可以尝试找回账号', '', () => {
+              }, null, '找回账号', '返回', '')
+            }, 2000)
+          },
+          '知道了'
+      )
+    },
+    //TODO loading样式不对
+    async sendCode() {
+      this.$showLoading()
+      await this.$sleep(500)
+      this.$hideLoading()
+      this.isSendVerificationCode = true
+    },
+    async login() {
+      let res = await this.check()
+      if (res) {
+        this.loading = true
+      }
+    }
+  }
+}
+</script>
+
+<style scoped lang="scss">
+@import "../../assets/scss/index";
+@import "Base.scss";
+
+.RetrievePassword {
+  position: fixed;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  top: 0;
+  overflow: auto;
+  color: black;
+  font-size: 1.4rem;
+  background: white;
+
+}
+</style>
diff --git a/src/pages/login/VerificationCode.vue b/src/pages/login/VerificationCode.vue
index 55444e3..39587de 100644
--- a/src/pages/login/VerificationCode.vue
+++ b/src/pages/login/VerificationCode.vue
@@ -6,7 +6,7 @@
       </template>
     </BaseHeader>
     <div class="content">
-      <div class="notice">
+      <div class="desc">
         <div class="title">请输入验证码</div>
         <div class="sub-title">验证码已通过短信发送到+86 13800138000</div>
       </div>
@@ -17,7 +17,7 @@
                   v-model:isSendVerificationCode="isSendVerificationCode"
                   @send="sendCode"
       />
-      <div class="options">
+      <div class="options" v-if="showVoiceCode">
         <span>
           收不到短信？<span class="link" @click="getVoiceCode">获取语音验证码</span>
         </span>
@@ -27,21 +27,18 @@
         {{ loading ? '登录中' : '登录' }}
       </b-button>
 
-<!--      <ConfirmDialog></ConfirmDialog>-->
     </div>
   </div>
 </template>
 <script>
 import Check from "../../components/Check";
 import LoginInput from "./components/LoginInput";
-import ConfirmDialog from "../../components/dialog/ConfirmDialog";
 
 export default {
   name: "VerificationCode",
   components: {
     Check,
     LoginInput,
-    ConfirmDialog
   },
   data() {
     return {
@@ -52,13 +49,28 @@ export default {
       password: '',
       code: '',
       isSendVerificationCode: true,
+      showVoiceCode: false
     }
   },
   created() {
+    setTimeout(() => {
+      this.showVoiceCode = true
+    }, 3000)
   },
   methods: {
-    getVoiceCode(){
-      this.$showConfirmDialog('','语音验证码')
+    getVoiceCode() {
+      return this.$showNoticeDialog('语音验证码',
+          '我们将以电话的方式告知你验证码，请注意接听',
+          '',
+          () => {
+            setTimeout(() => {
+              this.$showConfirmDialog('', '您的手机可能由于空号/欠费/停机无法收到验证码，请恢复手机号状态，如果' +
+                  '您因为换号无法收到验证码，可以尝试找回账号', '', () => {
+              }, null, '找回账号', '返回', '')
+            }, 2000)
+          },
+          '知道了'
+      )
     },
     //TODO loading样式不对
     async sendCode() {
@@ -80,6 +92,7 @@ export default {
 
 <style scoped lang="scss">
 @import "../../assets/scss/index";
+@import "Base.scss";
 
 .VerificationCode {
   position: fixed;
@@ -92,39 +105,13 @@ export default {
   font-size: 1.4rem;
   background: white;
 
-  .content {
-    padding: 6rem 3rem;
-    //padding-top: 6rem;
-
-    .notice {
-      margin-bottom: 2rem;
-      margin-top: 4rem;
-      display: flex;
-      align-items: flex-start;
-      flex-direction: column;
-
-      .title {
-        font-size: 2rem;
-        margin-bottom: 1rem;
-      }
-
-      .sub-title {
-        font-size: 1.2rem;
-        color: $second-text-color;
-      }
-    }
-
-    .button {
-      margin-bottom: .5rem;
-    }
+  .options{
+    margin-top: 1rem;
+  }
 
-    .options {
-      font-size: 1.2rem;
-      margin-top: 2rem;
-      margin-bottom: 2rem;
-      display: flex;
-      justify-content: space-between;
-    }
+  .button{
+    margin-top: 2rem;
   }
+
 }
 </style>
diff --git a/src/pages/login/components/LoginInput.vue b/src/pages/login/components/LoginInput.vue
index 40453ae..11e2c74 100644
--- a/src/pages/login/components/LoginInput.vue
+++ b/src/pages/login/components/LoginInput.vue
@@ -6,20 +6,39 @@
         <div class="arrow"></div>
       </div>
       <div class="right flex1">
-        <input :autofocus="autofocus" v-model="value" type="text" :placeholder="placeholder">
-        <img v-if="value" src="../../../assets/img/icon/login/close-full-gray.png" alt="" @click="value=''">
+        <input
+            @click="isTyping = true"
+            @blur="delaySetTypingFalse"
+            :autofocus="autofocus"
+            v-model="value"
+            type="text"
+            :placeholder="placeholder">
+        <img v-if="value && isTyping" src="../../../assets/img/icon/login/close-full-gray.png" alt="" @click="value=''">
       </div>
     </div>
     <div class="input-number" v-if="type === 'password'">
       <div class="right flex1">
-        <input :autofocus="autofocus" v-model="value" type="password" :placeholder="placeholder">
-        <img v-if="value" src="../../../assets/img/icon/login/close-full-gray.png" alt="" @click="value=''">
+        <input
+            @click="isTyping = true"
+            @blur="delaySetTypingFalse"
+            :autofocus="autofocus"
+            v-model="value"
+            type="password"
+            autocomplete="new-password"
+            :placeholder="placeholder">
+        <img v-if="value && isTyping" src="../../../assets/img/icon/login/close-full-gray.png" alt="" @click="value=''">
       </div>
     </div>
     <div class="input-number" v-if="type === 'code'">
       <div class="left no-border flex1">
-        <input :autofocus="autofocus" v-model="value" type="text" :placeholder="placeholder">
-        <img v-if="value" src="../../../assets/img/icon/login/close-full-gray.png" alt="" @click="value=''">
+        <input
+            @click="isTyping = true"
+            @blur="delaySetTypingFalse"
+            :autofocus="autofocus"
+            v-model="value"
+            type="text"
+            :placeholder="placeholder">
+        <img v-if="value && isTyping" src="../../../assets/img/icon/login/close-full-gray.png" alt="" @click="value=''">
       </div>
       <div class="right" @click="send">
         <span :class="isSendVerificationCode && 'disabled'">{{ verificationCodeBtnText }}</span>
@@ -48,6 +67,7 @@ export default {
   },
   data() {
     return {
+      isTyping: false,
       verificationCodeBtnText: 60
     }
   },
@@ -81,8 +101,13 @@ export default {
     }
   },
   methods: {
-    send(){
-      if (!this.isSendVerificationCode){
+    delaySetTypingFalse() {
+      setTimeout(() => {
+        this.isTyping = false
+      })
+    },
+    send() {
+      if (!this.isSendVerificationCode) {
         this.$emit('send')
       }
     }
@@ -174,6 +199,10 @@ export default {
     border: none;
     background: whitesmoke;
     caret-color: red;
+
+    &[type="password"] {
+      //letter-spacing: 1rem;
+    }
   }
 }
 </style>
diff --git a/src/pages/me/rightMenu/LookHistory.vue b/src/pages/me/rightMenu/LookHistory.vue
index cbb192b..abe8119 100644
--- a/src/pages/me/rightMenu/LookHistory.vue
+++ b/src/pages/me/rightMenu/LookHistory.vue
@@ -54,7 +54,7 @@ export default {
   },
   methods: {
     clear() {
-      this.$showConfirmDialog('确定清空？', '清空后，以往观看记录不再展示', () => {
+      this.$showConfirmDialog('确定清空？', '清空后，以往观看记录不再展示', 'gray',() => {
         this.list = 0
         console.log(this.list)
       })
diff --git a/src/router/index.js b/src/router/index.js
index abb9530..6b52398 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -40,6 +40,7 @@ import Login from "../pages/login/Login";
 import OtherLogin from "../pages/login/OtherLogin";
 import PasswordLogin from "../pages/login/PasswordLogin";
 import VerificationCode from "../pages/login/VerificationCode";
+import RetrievePassword from "../pages/login/RetrievePassword";
 
 const routes = [
   // {path: '', component: Music},
@@ -84,6 +85,7 @@ const routes = [
   {path: '/login/other', component: OtherLogin},
   {path: '/login/password', component: PasswordLogin},
   {path: '/login/verification-code', component: VerificationCode},
+  {path: '/login/retrieve-password', component: RetrievePassword},
 ]
 
 export default VueRouter.createRouter({
diff --git a/src/utils/global-methods.js b/src/utils/global-methods.js
index d4cd837..6c4777b 100644
--- a/src/utils/global-methods.js
+++ b/src/utils/global-methods.js
@@ -4,6 +4,7 @@ import SimpleConfirmDialog from "../components/dialog/SimpleConfirmDialog";
 import ConfirmDialog from "../components/dialog/ConfirmDialog";
 import Loading from "../components/Loading";
 import Config from '../config'
+import NoticeDialog from "../components/dialog/NoticeDialog";
 
 export default {
   $showLoading() {
@@ -69,7 +70,7 @@ export default {
     document.body.append(parent)
     app.mount(parent)
   },
-  $showConfirmDialog(title, subtitle, okCb, cancelCb) {
+  $showConfirmDialog(title, subtitle, subtitleColor, okCb, cancelCb, okText, cancelText, cancelTextColor) {
     let remove = () => {
       let parent = document.querySelector('.dialog-ctn')
       parent.classList.replace('fade-in', 'fade-out')
@@ -79,11 +80,11 @@ export default {
     }
     let tempOkCb = e => {
       remove()
-      okCb(e)
+      okCb && okCb(e)
     }
     let tempCancelCb = e => {
       remove()
-      cancelCb(e)
+      cancelCb && cancelCb(e)
     }
     const app = Vue.createApp({
       render() {
@@ -91,6 +92,10 @@ export default {
                               onDismiss={remove}
                               title={title}
                               subtitle={subtitle}
+                              subtitleColor={subtitleColor}
+                              cancelTextColor={cancelTextColor}
+                              okText={okText}
+                              cancelText={cancelText}
                               onOk={tempOkCb}/>
       },
     })
@@ -99,6 +104,33 @@ export default {
     document.body.append(parent)
     app.mount(parent)
   },
+  $showNoticeDialog(title, subtitle, subtitleColor, cancelCb, cancelText) {
+    let remove = () => {
+      let parent = document.querySelector('.dialog-ctn')
+      parent.classList.replace('fade-in', 'fade-out')
+      setTimeout(() => {
+        parent.remove()
+      }, 300)
+    }
+    let tempCancelCb = e => {
+      remove()
+      cancelCb(e)
+    }
+    const app = Vue.createApp({
+      render() {
+        return <NoticeDialog onCancel={tempCancelCb}
+                             onDismiss={remove}
+                             title={title}
+                             subtitleColor={subtitleColor}
+                             cancelText={cancelText}
+                             subtitle={subtitle}/>
+      },
+    })
+    let parent = document.createElement('div')
+    parent.classList.add(...['dialog-ctn', 'fade-in'])
+    document.body.append(parent)
+    app.mount(parent)
+  },
   $notice(val) {
     let div = document.createElement('div')
     div.classList.add('global-notice')