Skip to content

H
hls-xcmg-vue-app
Commit 3202e3e8 authored by linxin's avatar linxin
Browse files
Options

add

parents 519923e6 61386bbb
Show whitespace changes
Inline Side-by-side
Showing with 8 additions and 4 deletions
config/dev.env.js
View file @ 3202e3e8
...@@ -17,8 +17,11 @@ module.exports = merge(prodEnv, { ...@@ -17,8 +17,11 @@ module.exports = merge(prodEnv, {
currentVersion: '"1.9.5"', currentVersion: '"1.9.5"',
}) })
<<<<<<< HEAD
=======
>>>>>>> liuin
......
src/pages/contractInquire/contract-records.vue
View file @ 3202e3e8
...@@ -835,9 +835,10 @@ export default { ...@@ -835,9 +835,10 @@ export default {
position: absolute; position: absolute;
right: 20px; right: 20px;
top: 13px; top: 13px;
width: 57px; // width: 57px;
height: 21px; padding: 2px 4px;
line-height: 19px; // height: 21px;
// line-height: 19px;
text-align: center; text-align: center;
border-radius: 2px; border-radius: 2px;
font-family: PingFangSC-Regular; font-family: PingFangSC-Regular;
...@@ -845,7 +846,7 @@ export default { ...@@ -845,7 +846,7 @@ export default {
} }
p.orange { p.orange {
width: 30%; // width: 30%;
border: 1px solid #FDB62F; border: 1px solid #FDB62F;
color: #FDB62F; color: #FDB62F;
white-space: nowrap; 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