Commit 3202e3e8 authored by linxin's avatar linxin

add

parents 519923e6 61386bbb
......@@ -17,8 +17,11 @@ module.exports = merge(prodEnv, {
currentVersion: '"1.9.5"',
})
<<<<<<< HEAD
=======
>>>>>>> liuin
......
......@@ -835,9 +835,10 @@ export default {
position: absolute;
right: 20px;
top: 13px;
width: 57px;
height: 21px;
line-height: 19px;
// width: 57px;
padding: 2px 4px;
// height: 21px;
// line-height: 19px;
text-align: center;
border-radius: 2px;
font-family: PingFangSC-Regular;
......@@ -845,7 +846,7 @@ export default {
}
p.orange {
width: 30%;
// width: 30%;
border: 1px solid #FDB62F;
color: #FDB62F;
white-space: nowrap;
......
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