Skip to content

C
campSite
Commit 87af904c authored by 杨梦雪's avatar 杨梦雪
Browse files
Options

Merge branch 'master' of http://git.thussat.com.cn/yangmengxue/campsite

parents bba8c6f8 1e0135e4
Show whitespace changes
Inline Side-by-side
Showing with 38 additions and 117 deletions
src/assets/scss/common.scss
View file @ 87af904c
.com-container{ .com-container{
width: 60%; width: 60%;
max-width: 1160px; max-width: 1160px;
min-width: 1024px; min-width: 1050px;
//min-width: 960px; //min-width: 960px;
padding: 0 40px; padding: 0 40px;
margin: 0 auto; margin: 0 auto;
......
src/components/breadcrumb.vue
View file @ 87af904c
...@@ -23,75 +23,6 @@ ...@@ -23,75 +23,6 @@
/> />
</div> </div>
</div> </div>
<!-- 1 -->
<!-- <div class="step flex">-->
<!-- <div :class="'cricle' + ' ' + (status >= 0? 'speed-bg-color' : '')">-->
<!-- <span class="num">1</span>-->
<!-- </div>-->
<!-- <div-->
<!-- :class="'step_title' + ' ' + (status >= 0 ? 'speed-text-color' : '')"-->
<!-- >-->
<!-- 确认报名须知-->
<!-- </div>-->
<!-- <div>-->
<!-- <img src="../assets/img/signUp/left.png" alt=""/>-->
<!-- </div>-->
<!-- </div>-->
<!-- 2 -->
<!-- <div class="step flex">-->
<!-- <div-->
<!-- class="cricle cc"-->
<!-- :class="'cricle' + ' ' + (status >= 1 ? 'speed-bg-color' : '')"-->
<!-- >-->
<!-- <span class="num">2</span>-->
<!-- </div>-->
<!-- <div-->
<!-- :class="'step_title' + ' ' + (status >= 1? 'speed-text-color' : '')"-->
<!-- >-->
<!-- 填写邀请码-->
<!-- </div>-->
<!-- <img src="../assets/img/signUp/left.png" alt=""/>-->
<!-- </div>-->
<!-- 3 -->
<!-- <div class="step flex">-->
<!-- <div-->
<!-- class="cricle cc"-->
<!-- :class="'cricle' + ' ' + (status >=2 ? 'speed-bg-color' : '')"-->
<!-- >-->
<!-- <span class="num">3</span>-->
<!-- </div>-->
<!-- <div-->
<!-- :class="'step_title' + ' ' + (status >=2 ? 'speed-text-color' : '')"-->
<!-- >-->
<!-- 填写报名资料-->
<!-- </div>-->
<!-- <img src="../assets/img/signUp/left.png" alt=""/>-->
<!-- </div>-->
<!-- 4 -->
<!-- <div class="step flex">-->
<!-- <div-->
<!-- class="cricle cc"-->
<!-- :class="'cricle' + ' ' + (status >=3 ? 'speed-bg-color' : '')"-->
<!-- >-->
<!-- <span class="num">4</span>-->
<!-- </div>-->
<!-- <div :class="'step_title' + ' ' + (status >=3? 'speed-text-color' : '')">-->
<!-- 报名资料审核-->
<!-- </div>-->
<!-- <img src="../assets/img/signUp/left.png" alt=""/>-->
<!-- </div>-->
<!-- 5 -->
<!-- <div class="step flex">-->
<!-- <div-->
<!-- class="cricle cc"-->
<!-- :class="'cricle' + ' ' + (status >= 4 ? 'speed-bg-color' : '')"-->
<!-- >-->
<!-- <span class="num">5</span>-->
<!-- </div>-->
<!-- <div :class="'step_title' + ' ' + (status >= 4 ? 'speed-text-color' : '')">-->
<!-- 缴费-->
<!-- </div>-->
<!-- </div>-->
</div> </div>
</template> </template>
...@@ -174,41 +105,36 @@ export default { ...@@ -174,41 +105,36 @@ export default {
color: var(--color) !important; color: var(--color) !important;
} }
.steps { .steps {
.step { .step {
align-items: center; align-items: center;
}
.num {
color: #ffff;
position: absolute;
z-index: 999;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
}
.cricle { .cricle {
position: relative; width: 30px;
width: 57px; height: 30px;
height: 29px; text-align: center;
line-height: 30px;
color: #ffff;
background: #d0ced0; background: #d0ced0;
border-radius: 41px; border-radius: 15px;
// margin-right: 10px; margin-right: 10px;
} font-size: 14px;
font-family: PingFang SC;
img {
margin: 15px;
} }
.step_title { .step_title {
flex: 1;
font-size: 14px; font-size: 14px;
width: 100%;
height: 20px; height: 20px;
font-weight: 600; font-weight: 600;
color: #d0ced0; color: #d0ced0;
margin-left: 5px; line-height: 20px;
font-family: PingFang SC;
} }
}
.img {
margin: 0 15px 0 10px;
}
}
}
</style> </style>
src/components/index/SignUp/confirm.vue
View file @ 87af904c
...@@ -60,7 +60,7 @@ export default { ...@@ -60,7 +60,7 @@ export default {
<style lang="scss" scoped> <style lang="scss" scoped>
@import "a/scss/btn"; @import "a/scss/btn";
.confirm { .confirm {
padding: 0 56px 65px 56px; padding: 0 50px 60px;
.line { .line {
border-bottom: 1px solid #d4d0d4; border-bottom: 1px solid #d4d0d4;
} }
......
src/views/index/camp/Index.vue
View file @ 87af904c
...@@ -169,15 +169,10 @@ export default { ...@@ -169,15 +169,10 @@ export default {
display: flex; display: flex;
flex-flow: row; flex-flow: row;
.camp_left { .camp_left {
position: relative; position: relative;
width: 24%; width: 22%;
max-width: 280px;
min-width: 200px;
border-radius: 8px;
margin-right: 24px;
.camp_left_box {
max-width: 280px; max-width: 280px;
min-width: 200px; min-width: 200px;
height: 300px; height: 300px;
...@@ -219,7 +214,7 @@ export default { ...@@ -219,7 +214,7 @@ export default {
&:hover { &:hover {
cursor: pointer; cursor: pointer;
background-color: #f8f8f8; background-color: #f8f8f8;
}
} }
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment