@@ -636,25 +646,28 @@ export default {
}
}
.hero-item-hp {
- margin-bottom: 23px;
+ margin-bottom: 17px;
}
.hero-item-attack {
- margin-bottom: 23px;
+ margin-bottom: 17px;
}
.hero-item-def {
- margin-bottom: 23px;
+ margin-bottom: 17px;
}
.hero-item-cri {
- margin-bottom: 23px;
+ margin-bottom: 17px;
}
.hero-item-criDam {
- margin-bottom: 23px;
+ margin-bottom: 17px;
}
.hero-item-dodge {
- margin-bottom: 23px;
+ margin-bottom: 17px;
}
.hero-item-reduces {
- margin-bottom: 23px;
+ margin-bottom: 17px;
+ }
+ .hero-item-speed{
+ margin-bottom: 17px;
}
}
diff --git a/src/views/mobile/Market.vue b/src/views/mobile/Market.vue
index 0de4947..9e7aa07 100644
--- a/src/views/mobile/Market.vue
+++ b/src/views/mobile/Market.vue
@@ -5,11 +5,20 @@
@@ -56,6 +64,7 @@ import HeroList from "../../components/mobile/main/HeroList.vue";
import WeaponList from "../../components/mobile/main/WeaponList";
import ChipList from "../../components/mobile/main/ChipList";
import Herofilter from "../../components/mobile/main/Herofilter.vue";
+import MySlider from "@/components/mobile/main/Slider.vue";
export default {
components: {
mobileHeader,
@@ -63,12 +72,14 @@ export default {
HeroList,
Herofilter,
WeaponList,
- ChipList
+ ChipList,
+ MySlider,
},
data() {
return {
curId: 0,
- isFiters:false,
+ hero: "",
+ isFiters: false,
types: [
{ id: 0, Image: require("../../assets/mobile/market/hero.png") },
{ id: 1, Image: require("../../assets/mobile/market/weapon.png") },
@@ -104,7 +115,10 @@ export default {
this.curId = s.id;
},
handFilter(s) {
- this.isFiters = !this.isFiters
+ this.isFiters = !this.isFiters;
+ },
+ handClear() {
+ this.hero = "";
},
},
};
@@ -118,17 +132,28 @@ $item-size: 22px;
// height: 100vh;
background: url("../../assets/mobile/market/bg.png") no-repeat;
.search {
- width: 500px;
+ width: 575px;
height: 81px;
background: #ffffff;
border-radius: 20px 10px 10px 20px;
+ ::v-deep .el-input__inner {
+ background: transparent;
+ height: 81px;
+ // padding-left: 60px;
+ color: #474545;
+ border: none;
+ }
+ ::v-deep .el-input__inner::placeholder {
+ color: #c1c1c1;
+ // text-align: center;
+ }
+ ::v-deep .el-input__icon {
+ line-height: 79px !important;
+ }
+ ::v-deep .el-input__prefix {
+ left: 55px;
+ }
}
- // .container .search[data-v-7077e23f] {
- // width: 46.296296vw;
- // height: 7.5vw;
- // background: #ffffff;
- // border-radius: 1.851852vw 0.925926vw 0.925926vw 1.851852vw;
- // }
.filter {
width: 255px;
height: 81px;
@@ -154,13 +179,13 @@ $item-size: 22px;
.filter-top {
display: flex;
padding-top: 145px;
- margin-left: 45px;
+ margin-left: 25px;
justify-content: flex-start;
position: relative;
- .filter-modal{
- position: absolute;
- top: 202px;
- left:-11px ;
+ .filter-modal {
+ position: absolute;
+ top: 202px;
+ left: 0;
z-index: 1;
}
}
@@ -252,5 +277,30 @@ $item-size: 22px;
font-size: $item-size;
}
}
+
+ // .v-enter-active,
+ // .v-leave-active {
+ // transition: opacity 0.5s ease;
+ // }
+
+ // .v-enter-from,
+ // .v-leave-to {
+ // opacity: 0;
+ // }
+
+ .v-enter-from,
+ .v-leave-to {
+ opacity: 0;
+ }
+
+ .v-enter-active,
+ .v-leave-active {
+ transition: opacity 0.5s ease;
+ }
+
+ .v-enter-to,
+ .v-leave-from {
+ opacity: 1;
+ }
}