合并master

This commit is contained in:
lemon橪
2021-08-13 11:30:47 +08:00
9 changed files with 15 additions and 33 deletions

View File

@@ -1,5 +1,3 @@
<template>
<div>
<Card class="change-pass">
@@ -143,24 +141,3 @@ export default {
}
};
</script>
<style lang="scss" scoped>
.change-pass {
&-btn-box {
margin-bottom: 10px;
button {
padding-left: 0;
span {
color: #2d8cf0;
transition: all 0.2s;
}
span:hover {
color: #0c25f1;
transition: all 0.2s;
}
}
}
}
</style>

View File

@@ -2,7 +2,7 @@
<div class="model-carousel">
<div class="nav-body clearfix">
<!-- 侧边导航 -->
<div class="nav-side">导航栏占位区</div>
<div class="nav-side">分类占位区</div>
<div class="nav-content setup-content">
<!-- 轮播图 -->
<Carousel autoplay>

View File

@@ -2,7 +2,7 @@
<div class="model-carousel1" :style="{background: bgColor}">
<div class="nav-body clearfix">
<!-- 侧边导航 -->
<div class="nav-side">导航栏占位区</div>
<div class="nav-side">分类占位区</div>
<div class="nav-content setup-content">
<!-- 轮播图 -->
<Carousel autoplay @on-change="autoChange">

View File

@@ -2,7 +2,7 @@
<div class="model-carousel2">
<div class="nav-body clearfix">
<!-- 侧边导航 -->
<div class="nav-side">导航栏占位区</div>
<div class="nav-side">分类占位区</div>
<div class="nav-content setup-content">
<!-- 轮播图 -->
<Carousel autoplay>

View File

@@ -433,7 +433,7 @@
style: {
color: 'red'
}
}, params.row.variablePoint),
}, '-' + params.row.variablePoint),
]);
}
}

View File

@@ -106,7 +106,7 @@
style: {
color: 'red'
}
}, params.row.variablePoint),
}, '-' + params.row.variablePoint),
]);
}