From 2a1510900287bda3dfc56395711c52b3c2ff1a56 Mon Sep 17 00:00:00 2001
From: xiaoguang <aadsdas1@dingtalk.com>
Date: Fri, 13 May 2022 21:10:36 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 assets/img/common/icon-select-turn.png | Bin 0 -> 700 bytes
 assets/scss/util.scss                  |  13 ++++++++++++
 components/BsLogin.vue                 |  27 ++++++++++++++++---------
 layouts/module/footer/index.vue        |   6 +++---
 pages/account/index/userInfo.vue       |   3 ++-
 pages/index/index.vue                  |   8 +-------
 6 files changed, 36 insertions(+), 21 deletions(-)
 create mode 100644 assets/img/common/icon-select-turn.png

diff --git a/assets/img/common/icon-select-turn.png b/assets/img/common/icon-select-turn.png
new file mode 100644
index 0000000000000000000000000000000000000000..8f698bc8cdb752dde8532cf132ed2a7141c34602
GIT binary patch
literal 700
zcmV;t0z>_YP)<h;3K|Lk000e1NJLTq001xm001lq1^@s6BNjVn00001b5ch_0Itp)
z=>Px%c1c7*RA@u(S3PXgKooxO2rwrZG9ZD3oiZ`SM1qk81~!InsNG<It*nT(-C%$X
z#8wG523QzDO6-XVVj~fWAw!ZG>fS>a#cmT)d_JG=9H|+y<lW2nchAoV75M}~umu2j
zi0B#-T@bJk@fRZY0pNY7(|NrLD%!^1>-Dx6V^0C#Vg{BW=ln^x+g%`Hm4NU2&j8?I
zP7$Abp7$s@V~v0!_yl)K!U}<TY+mJ5exaOmzAfTpg@Et-KP57s#c$|&-X-G%#Izxz
zLh7gaN8GkS;4Kl|&5~E<cSL+=oPehIB>aZP3H1B@7!l9ND4bP8M2DvYvQ%3Bz4QnT
z27~L2v3me;lZY<Qcak3f@QHK&rrmCT$qV{;eGmlYUE(N;UI4)T41g~k$9bSiqO>s@
zhT#W9yd?vSh(5Zmdt0V<RgI<?9X-e-m0!l9?1a`;VxIZWDr$1hZ>Zi0ZOfdZ`UziU
z7eoU^5{v6}6h+?vU_-?L0Ql}W&K1S8vtxx{Xu>c&K*X8~2qKDI*FCFpcKM9*D`iy(
zsEUBLBcuvEU8!we;-cVZTY{}IsssFtfcR2$q0k7`N<cI-xk~5)pE{5<lyssJ%BPoj
zS&g#SX`Sl-<ACnwCi)qFrPNL8lz?tU^Y%09z+^JnA)-yj*i`|PbN&?(_ZyAIUS8lQ
zP9fDs|2sDtjhtGowvULNRdqxZ#BsdYYPF)g|8K;B@p$Z?1U>;QNHm*GuW|%LYye<a
z64>LsaVp&b8TE^}P&$F>bo!f!&dE4{h=1z!`gxgJW0!dC39NmD*8UQUtjf4h*)b{z
ito?&5nHXiP5`O_mnQ1iOHUE(S0000<MNUMnLSTY7i9wS9

literal 0
HcmV?d00001

diff --git a/assets/scss/util.scss b/assets/scss/util.scss
index 1020b57..2a30cf3 100644
--- a/assets/scss/util.scss
+++ b/assets/scss/util.scss
@@ -112,4 +112,17 @@ $baseFontSize: 100 !default;
 /*可点击文字hover*/
 .hover-text:hover {
   color: #FF875B;
+}
+
+/*扩大元素可点击热区*/
+.expend-click {
+  position: relative;
+  &::after {
+    content: '';
+    position: absolute;
+    left: -10px;
+    top: -10px;
+    right: -10px;
+    bottom: -10px;
+  }
 }
\ No newline at end of file
diff --git a/components/BsLogin.vue b/components/BsLogin.vue
index 8500170..f75ddbd 100644
--- a/components/BsLogin.vue
+++ b/components/BsLogin.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="bs-login">
     <el-dialog
-      :visible.sync="dialogTableVisible"
+      :visible.sync="dialogVisible"
       :show-close="false"
       :close-on-click-modal="false"
       :close-on-press-escape="false"
@@ -35,11 +35,11 @@
               >登录</el-button
             >
           </el-form>
-          <div class="login-wrap-content__agreement flex felx-start">
-            <div
-              class="wrap-content-agreement-icons"
-              @click="onAgreementSelect"
-            >
+          <div
+            @click="onAgreementSelect"
+            class="login-wrap-content__agreement flex felx-start"
+          >
+            <div class="wrap-content-agreement-icons">
               <img
                 v-if="isAcceptAgreement"
                 class="icon-choose"
@@ -48,7 +48,7 @@
               <span v-else class="icon-unchoose"></span>
             </div>
             <span class="wrap-content-agreement__text flex-1">
-              同意《用户协议》和《隐私协议》，首次 登陆将自动注册
+              同意《用户协议》和《隐私协议》，首次登录将自动注册
             </span>
           </div>
         </div>
@@ -101,11 +101,17 @@ export default {
   },
   computed: {
     ...mapState(["token"]),
-    dialogTableVisible: {
+    dialogVisible: {
       get() {
         return this.visible;
       },
       set(val) {
+        if (!val) {
+          Object.assign(this.form, {
+            phone: "",
+            verificationCode: "",
+          });
+        }
         this.$emit("update:visible", val);
       },
     },
@@ -159,7 +165,7 @@ export default {
             return;
           }
           if (result) {
-            this.dialogTableVisible = false;
+            this.dialogVisible = false;
             this.$store.commit("setToken", result.token);
             this.$store.dispatch("getUserInfo");
           }
@@ -167,7 +173,7 @@ export default {
       });
     },
     onClose() {
-      this.dialogTableVisible = false;
+      this.dialogVisible = false;
     },
   },
 };
@@ -227,6 +233,7 @@ export default {
           color: #999999;
           font-size: 12px;
           margin-top: 25px;
+          cursor: pointer;
           .wrap-content-agreement-icons {
             cursor: pointer;
             .icon-unchoose {
diff --git a/layouts/module/footer/index.vue b/layouts/module/footer/index.vue
index 37ed298..0f41cce 100644
--- a/layouts/module/footer/index.vue
+++ b/layouts/module/footer/index.vue
@@ -30,15 +30,15 @@ export default {
           icon: require("~/assets/img/layout/footer-1.png"),
         },
         {
-          label: "马士兵严选",
+          label: "100%正品",
           icon: require("~/assets/img/layout/footer-2.png"),
         },
         {
-          label: "马士兵严选",
+          label: "365天质保",
           icon: require("~/assets/img/layout/footer-3.png"),
         },
         {
-          label: "马士兵严选",
+          label: "售后无忧",
           icon: require("~/assets/img/layout/footer-4.png"),
         },
       ],
diff --git a/pages/account/index/userInfo.vue b/pages/account/index/userInfo.vue
index 184c3b8..01b4c11 100644
--- a/pages/account/index/userInfo.vue
+++ b/pages/account/index/userInfo.vue
@@ -76,7 +76,8 @@ export default {
       },
       rules: {
         nickname: [
-          { min: 1, max: 5, message: "请输入1-10个字符", trigger: "blur" },
+          { required: true, message: "请输入昵称", trigger: "blur" },
+          { min: 1, max: 10, message: "请输入1-10个字符", trigger: "blur" },
         ],
       },
       ossUploadUrl: "",
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 4c0a35b..a80f05b 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -21,10 +21,7 @@
         <div class="home-wrap-select__header flex flex-center flex-middle">
           <img src="~/assets/img/common/icon-select.png" />
           <strong>为你精选</strong>
-          <img
-            class="wrap-select-header__img--rotate"
-            src="~/assets/img/common/icon-select.png"
-          />
+          <img src="~/assets/img/common/icon-select-turn.png" />
         </div>
         <div v-loading="loading">
           <div class="home-wrap-select__content flex flex-wrap">
@@ -180,9 +177,6 @@ export default {
         font-size: 24px;
         color: #333333;
         margin-bottom: 30px;
-        .wrap-select-header__img--rotate {
-          transform: rotate(180deg);
-        }
         img {
           width: 24px;
           height: 22px;