Merge branch 'feature/task1.0.0' into 'msb_test'

Feature/task1.0.0

See merge request yanxuan-frontend/shop-pc!53

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;
+  }
 }

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 {

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"),
         },
       ],

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: "",

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;