diff --git a/src/assets/scss/common.scss b/src/assets/scss/common.scss index f731ccb..ca27023 100644 --- a/src/assets/scss/common.scss +++ b/src/assets/scss/common.scss @@ -61,4 +61,20 @@ body { color: rgba(255, 185, 109, 1); } -//标签tag样式----------------------------------------------------------------- \ No newline at end of file +//标签tag样式----------------------------------------------------------------- +//进度条样式 +.progress10{ +background-color:rgba(238, 112, 108, 1) !important; +} +.progress30{ + background-color:rgba(255, 151, 38, 1) !important; +} +.progress50{ + background-color:rgba(39, 122, 255, 1) !important; +} +.progress80{ + background-color:rgba(59, 94, 251, 1) !important; +} +.progress100{ + background-color:rgba(57, 219, 183, 1) !important; +} diff --git a/src/views/ballot/BallotPage.vue b/src/views/ballot/BallotPage.vue index f1840c4..9d26fef 100644 --- a/src/views/ballot/BallotPage.vue +++ b/src/views/ballot/BallotPage.vue @@ -221,6 +221,7 @@ export default { border-radius: 8px; color: rgba(51, 51, 51, 1); display: flex; + padding-bottom: 20px; .left { margin-left: 48px; flex: 1; diff --git a/src/views/discuss/DiscussPage.vue b/src/views/discuss/DiscussPage.vue index d2a65b3..47b576a 100644 --- a/src/views/discuss/DiscussPage.vue +++ b/src/views/discuss/DiscussPage.vue @@ -205,11 +205,11 @@ export default { display: flex; margin: 47px 45px 0 75px; max-width: 1810px; - height: 50px; + // height: 50px; background: #f9f9f9; position: relative; .linetitle { - margin: 14px 0 17px 28px; + margin: 14px 120px 17px 28px; font-size: 16px; font-weight: 800; color: #333333; @@ -263,6 +263,7 @@ export default { font-size: 16px; font-weight: 500; color: #333333; + margin-right: 88px; } .itemdiscuss { margin-top: 15px; @@ -300,7 +301,9 @@ export default { } } .thinline { - max-width: 1450px; + // max-width: 1450px; + width: calc(100% - 88px); + margin-top: 33px; border-top: 1px solid #999999; opacity: 0.2; diff --git a/src/views/discussdetail/DiscussDetail.vue b/src/views/discussdetail/DiscussDetail.vue index b73b823..ff33f36 100644 --- a/src/views/discussdetail/DiscussDetail.vue +++ b/src/views/discussdetail/DiscussDetail.vue @@ -487,7 +487,7 @@ export default { } .thinline { margin-top: 26px; - width: 1635px; + // width: 1635px; border-top: 1px solid #878b92; margin-left: -50px; opacity: 0.2; diff --git a/src/views/roadmap/PathDetails.vue b/src/views/roadmap/PathDetails.vue index 6465481..379d2c0 100644 --- a/src/views/roadmap/PathDetails.vue +++ b/src/views/roadmap/PathDetails.vue @@ -70,15 +70,15 @@ :show-text="false" :stroke-width="8" :color=" - value.progress < 20 + value.progress <= 10 ? 'rgba(238, 112, 108, 1)' - : value.progress < 30 + : value.progress <= 30 ? 'rgba(255, 151, 38, 1)' - : value.progress < 50 + : value.progress <= 50 ? 'rgba(39, 122, 255, 1)' - : value.progress < 100 + : value.progress <= 80 ? 'rgba(59, 94, 251, 1)' - : value.progress === 100 + : value.progress <= 100 ? 'rgba(57, 219, 183, 1)' : '' " @@ -93,15 +93,15 @@ " :style="{ color: - value.progress < 20 + value.progress <= 10 ? 'rgba(238, 112, 108, 1)' - : value.progress < 30 + : value.progress <= 30 ? 'rgba(255, 151, 38, 1)' - : value.progress < 50 + : value.progress <= 50 ? 'rgba(39, 122, 255, 1)' - : value.progress < 100 + : value.progress <= 100 ? 'rgba(59, 94, 251, 1)' - : value.progress === 100 + : value.progress <= 100 ? 'rgba(57, 219, 183, 1)' : '', }" @@ -227,7 +227,19 @@ percentage="32" :show-text="false" :stroke-width="8" - color="rgba(39, 122, 255, 1)" + :color=" + totalprogress <= 10 + ? 'rgba(238, 112, 108, 1)' + : totalprogress <= 30 + ? 'rgba(255, 151, 38, 1)' + : totalprogress <= 50 + ? 'rgba(39, 122, 255, 1)' + : totalprogress <= 80 + ? 'rgba(59, 94, 251, 1)' + : totalprogress <= 100 + ? 'rgba(57, 219, 183, 1)' + : '' + " />