feat: 修复bug

merge-requests/52/head
xiaoguang 2 years ago
parent 2f7bb07ff6
commit 2a15109002

Binary file not shown.

After

Width:  |  Height:  |  Size: 700 B

@ -112,4 +112,17 @@ $baseFontSize: 100 !default;
/*可点击文字hover*/ /*可点击文字hover*/
.hover-text:hover { .hover-text:hover {
color: #FF875B; color: #FF875B;
}
/*扩大元素可点击热区*/
.expend-click {
position: relative;
&::after {
content: '';
position: absolute;
left: -10px;
top: -10px;
right: -10px;
bottom: -10px;
}
} }

@ -1,7 +1,7 @@
<template> <template>
<div class="bs-login"> <div class="bs-login">
<el-dialog <el-dialog
:visible.sync="dialogTableVisible" :visible.sync="dialogVisible"
:show-close="false" :show-close="false"
:close-on-click-modal="false" :close-on-click-modal="false"
:close-on-press-escape="false" :close-on-press-escape="false"
@ -35,11 +35,11 @@
>登录</el-button >登录</el-button
> >
</el-form> </el-form>
<div class="login-wrap-content__agreement flex felx-start"> <div
<div @click="onAgreementSelect"
class="wrap-content-agreement-icons" class="login-wrap-content__agreement flex felx-start"
@click="onAgreementSelect" >
> <div class="wrap-content-agreement-icons">
<img <img
v-if="isAcceptAgreement" v-if="isAcceptAgreement"
class="icon-choose" class="icon-choose"
@ -48,7 +48,7 @@
<span v-else class="icon-unchoose"></span> <span v-else class="icon-unchoose"></span>
</div> </div>
<span class="wrap-content-agreement__text flex-1"> <span class="wrap-content-agreement__text flex-1">
同意用户协议隐私协议首次 登陆将自动注册 同意用户协议隐私协议首次登录将自动注册
</span> </span>
</div> </div>
</div> </div>
@ -101,11 +101,17 @@ export default {
}, },
computed: { computed: {
...mapState(["token"]), ...mapState(["token"]),
dialogTableVisible: { dialogVisible: {
get() { get() {
return this.visible; return this.visible;
}, },
set(val) { set(val) {
if (!val) {
Object.assign(this.form, {
phone: "",
verificationCode: "",
});
}
this.$emit("update:visible", val); this.$emit("update:visible", val);
}, },
}, },
@ -159,7 +165,7 @@ export default {
return; return;
} }
if (result) { if (result) {
this.dialogTableVisible = false; this.dialogVisible = false;
this.$store.commit("setToken", result.token); this.$store.commit("setToken", result.token);
this.$store.dispatch("getUserInfo"); this.$store.dispatch("getUserInfo");
} }
@ -167,7 +173,7 @@ export default {
}); });
}, },
onClose() { onClose() {
this.dialogTableVisible = false; this.dialogVisible = false;
}, },
}, },
}; };
@ -227,6 +233,7 @@ export default {
color: #999999; color: #999999;
font-size: 12px; font-size: 12px;
margin-top: 25px; margin-top: 25px;
cursor: pointer;
.wrap-content-agreement-icons { .wrap-content-agreement-icons {
cursor: pointer; cursor: pointer;
.icon-unchoose { .icon-unchoose {

@ -30,15 +30,15 @@ export default {
icon: require("~/assets/img/layout/footer-1.png"), icon: require("~/assets/img/layout/footer-1.png"),
}, },
{ {
label: "马士兵严选", label: "100%正品",
icon: require("~/assets/img/layout/footer-2.png"), icon: require("~/assets/img/layout/footer-2.png"),
}, },
{ {
label: "马士兵严选", label: "365天质保",
icon: require("~/assets/img/layout/footer-3.png"), icon: require("~/assets/img/layout/footer-3.png"),
}, },
{ {
label: "马士兵严选", label: "售后无忧",
icon: require("~/assets/img/layout/footer-4.png"), icon: require("~/assets/img/layout/footer-4.png"),
}, },
], ],

@ -76,7 +76,8 @@ export default {
}, },
rules: { rules: {
nickname: [ 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: "", ossUploadUrl: "",

@ -21,10 +21,7 @@
<div class="home-wrap-select__header flex flex-center flex-middle"> <div class="home-wrap-select__header flex flex-center flex-middle">
<img src="~/assets/img/common/icon-select.png" /> <img src="~/assets/img/common/icon-select.png" />
<strong>为你精选</strong> <strong>为你精选</strong>
<img <img src="~/assets/img/common/icon-select-turn.png" />
class="wrap-select-header__img--rotate"
src="~/assets/img/common/icon-select.png"
/>
</div> </div>
<div v-loading="loading"> <div v-loading="loading">
<div class="home-wrap-select__content flex flex-wrap"> <div class="home-wrap-select__content flex flex-wrap">
@ -180,9 +177,6 @@ export default {
font-size: 24px; font-size: 24px;
color: #333333; color: #333333;
margin-bottom: 30px; margin-bottom: 30px;
.wrap-select-header__img--rotate {
transform: rotate(180deg);
}
img { img {
width: 24px; width: 24px;
height: 22px; height: 22px;

Loading…
Cancel
Save