Skip to content

P
pica-new-compaign
提交 1ea877b4 编写于 作者: guangjun.yang's avatar guangjun.yang
浏览文件
操作

no message

上级 35cbd6a3
隐藏空白字符变更
内嵌 并排
正在显示 包含 47 行增加 和 33 行删除
components/bussiness/status-bar.vue
浏览文件 @ 1ea877b4
...@@ -12,7 +12,11 @@ ...@@ -12,7 +12,11 @@
<span class="score-text">勤奋值</span> <span class="score-text">勤奋值</span>
</div> </div>
<div v-for="(item, index) in statusTextList" :key="index"> <div v-for="(item, index) in statusTextList" :key="index">
<span class="circle" :class="{'active': activeNum >= (index + 1)}"></span> <span v-if="activeNum < (index + 1)" class="circle" :class="{'active': activeNum >= (index + 1)}"></span>
<div v-if="activeNum >= (index + 1)" >
<span class="active-circle"></span>
<span class="active-circle-active"></span>
</div>
<span class="score" :class="{'active': activeNum >= (index + 1)}">{{item}}</span> <span class="score" :class="{'active': activeNum >= (index + 1)}">{{item}}</span>
</div> </div>
</div> </div>
...@@ -89,7 +93,11 @@ export default { ...@@ -89,7 +93,11 @@ export default {
if(activeWidth >= 100) { if(activeWidth >= 100) {
activeWidth = 100; activeWidth = 100;
} }
this.activeWidth = activeWidth + '%'; if(minValue == 100 || minValue == 200 || minValue >= 300) {
this.activeWidth = activeWidth - 3 + '%';
} else {
this.activeWidth = activeWidth + '%';
}
this.htmlText = htmlText; this.htmlText = htmlText;
} }
}, },
...@@ -176,17 +184,42 @@ export default { ...@@ -176,17 +184,42 @@ export default {
&.active { &.active {
color: #730F21; color: #730F21;
background: linear-gradient(360deg,rgba(255,160,33,1) 0%,rgba(255,232,165,1) 100%); background: linear-gradient(360deg,rgba(255,160,33,1) 0%,rgba(255,232,165,1) 100%);
// background: rgba(255, 232, 165, 0.3);
border: none; border: none;
font-weight: 700; font-weight: 700;
} }
} }
} }
.circle.active { .circle.active {
border: 4px solid #FFE8A5; border: 4px solid rgba(255, 232, 165, 1);
// background: rgba(255, 232, 165, 0.3);
// background: rgba(255, 200, 100, 1); // background: rgba(255, 200, 100, 1);
background: linear-gradient(360deg,rgba(255,160,33,1) 0%,rgba(255,232,165,1) 100%); background: linear-gradient(360deg,rgba(255,160,33,1) 0%,rgba(255,232,165,1) 100%);
} }
} }
.active-circle {
display: block;
position: relative;
top: 1px !important;
z-index: 100;
left: 0px;
width: 16px;
height: 16px;
background: #FFE8A5;
opacity: 0.3;
border-radius: 8px;
}
.active-circle-active {
position: relative;
top: -12px;
display: block;
width: 10px;
height: 10px;
left: 3px;
background:linear-gradient(360deg,rgba(255,160,33,1) 0%,rgba(255,232,165,1) 100%);
border-radius: 10px;
}
} }
} }
} }
......
package-lock.json
浏览文件 @ 1ea877b4
...@@ -5523,8 +5523,7 @@ ...@@ -5523,8 +5523,7 @@
}, },
"ansi-regex": { "ansi-regex": {
"version": "2.1.1", "version": "2.1.1",
"bundled": true, "bundled": true
"optional": true
}, },
"aproba": { "aproba": {
"version": "1.2.0", "version": "1.2.0",
...@@ -5542,13 +5541,11 @@ ...@@ -5542,13 +5541,11 @@
}, },
"balanced-match": { "balanced-match": {
"version": "1.0.0", "version": "1.0.0",
"bundled": true, "bundled": true
"optional": true
}, },
"brace-expansion": { "brace-expansion": {
"version": "1.1.11", "version": "1.1.11",
"bundled": true, "bundled": true,
"optional": true,
"requires": { "requires": {
"balanced-match": "^1.0.0", "balanced-match": "^1.0.0",
"concat-map": "0.0.1" "concat-map": "0.0.1"
...@@ -5561,18 +5558,15 @@ ...@@ -5561,18 +5558,15 @@
}, },
"code-point-at": { "code-point-at": {
"version": "1.1.0", "version": "1.1.0",
"bundled": true, "bundled": true
"optional": true
}, },
"concat-map": { "concat-map": {
"version": "0.0.1", "version": "0.0.1",
"bundled": true, "bundled": true
"optional": true
}, },
"console-control-strings": { "console-control-strings": {
"version": "1.1.0", "version": "1.1.0",
"bundled": true, "bundled": true
"optional": true
}, },
"core-util-is": { "core-util-is": {
"version": "1.0.2", "version": "1.0.2",
...@@ -5675,8 +5669,7 @@ ...@@ -5675,8 +5669,7 @@
}, },
"inherits": { "inherits": {
"version": "2.0.4", "version": "2.0.4",
"bundled": true, "bundled": true
"optional": true
}, },
"ini": { "ini": {
"version": "1.3.5", "version": "1.3.5",
...@@ -5686,7 +5679,6 @@ ...@@ -5686,7 +5679,6 @@
"is-fullwidth-code-point": { "is-fullwidth-code-point": {
"version": "1.0.0", "version": "1.0.0",
"bundled": true, "bundled": true,
"optional": true,
"requires": { "requires": {
"number-is-nan": "^1.0.0" "number-is-nan": "^1.0.0"
} }
...@@ -5699,20 +5691,17 @@ ...@@ -5699,20 +5691,17 @@
"minimatch": { "minimatch": {
"version": "3.0.4", "version": "3.0.4",
"bundled": true, "bundled": true,
"optional": true,
"requires": { "requires": {
"brace-expansion": "^1.1.7" "brace-expansion": "^1.1.7"
} }
}, },
"minimist": { "minimist": {
"version": "0.0.8", "version": "0.0.8",
"bundled": true, "bundled": true
"optional": true
}, },
"minipass": { "minipass": {
"version": "2.9.0", "version": "2.9.0",
"bundled": true, "bundled": true,
"optional": true,
"requires": { "requires": {
"safe-buffer": "^5.1.2", "safe-buffer": "^5.1.2",
"yallist": "^3.0.0" "yallist": "^3.0.0"
...@@ -5729,7 +5718,6 @@ ...@@ -5729,7 +5718,6 @@
"mkdirp": { "mkdirp": {
"version": "0.5.1", "version": "0.5.1",
"bundled": true, "bundled": true,
"optional": true,
"requires": { "requires": {
"minimist": "0.0.8" "minimist": "0.0.8"
} }
...@@ -5810,8 +5798,7 @@ ...@@ -5810,8 +5798,7 @@
}, },
"number-is-nan": { "number-is-nan": {
"version": "1.0.1", "version": "1.0.1",
"bundled": true, "bundled": true
"optional": true
}, },
"object-assign": { "object-assign": {
"version": "4.1.1", "version": "4.1.1",
...@@ -5821,7 +5808,6 @@ ...@@ -5821,7 +5808,6 @@
"once": { "once": {
"version": "1.4.0", "version": "1.4.0",
"bundled": true, "bundled": true,
"optional": true,
"requires": { "requires": {
"wrappy": "1" "wrappy": "1"
} }
...@@ -5897,8 +5883,7 @@ ...@@ -5897,8 +5883,7 @@
}, },
"safe-buffer": { "safe-buffer": {
"version": "5.1.2", "version": "5.1.2",
"bundled": true, "bundled": true
"optional": true
}, },
"safer-buffer": { "safer-buffer": {
"version": "2.1.2", "version": "2.1.2",
...@@ -5928,7 +5913,6 @@ ...@@ -5928,7 +5913,6 @@
"string-width": { "string-width": {
"version": "1.0.2", "version": "1.0.2",
"bundled": true, "bundled": true,
"optional": true,
"requires": { "requires": {
"code-point-at": "^1.0.0", "code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0", "is-fullwidth-code-point": "^1.0.0",
...@@ -5946,7 +5930,6 @@ ...@@ -5946,7 +5930,6 @@
"strip-ansi": { "strip-ansi": {
"version": "3.0.1", "version": "3.0.1",
"bundled": true, "bundled": true,
"optional": true,
"requires": { "requires": {
"ansi-regex": "^2.0.0" "ansi-regex": "^2.0.0"
} }
...@@ -5985,13 +5968,11 @@ ...@@ -5985,13 +5968,11 @@
}, },
"wrappy": { "wrappy": {
"version": "1.0.2", "version": "1.0.2",
"bundled": true, "bundled": true
"optional": true
}, },
"yallist": { "yallist": {
"version": "3.1.1", "version": "3.1.1",
"bundled": true, "bundled": true
"optional": true
} }
} }
}, },
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或