Skip to content

C
CRM
Commit dc0c1e74 authored by zhengke's avatar zhengke
Browse files
Options

no message

parent 96ad0f2d
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 12 deletions
src/components/customerManage/orderList.vue
View file @ dc0c1e74
......@@ -743,7 +743,6 @@ export default {
};
</script>
<style>
<<<<<<< HEAD
li {
list-style-type: none;
}
......@@ -1135,12 +1134,12 @@ export default {
cursor: pointer;
}
.OrderType-text{
font-size: 14px;
font-size: 11px;
font-weight: 100;
margin-left: 5px;
border-radius: 3px;
display: inline-block;
padding: 0 2px;
padding: 0 1px;
}
.OrderType-text.one{
color: rgb(41, 97, 254);
......@@ -1155,15 +1154,13 @@ export default {
background-color: rgba(63, 196, 255,.2);
}
.OrderType-text.four{
color: rgb(255,224,130);
background-color: rgba(255,224,130,.2);
color: rgb(255,111,0);
background-color: rgba(255,111,0,.2);
}
.OrderType-text.five{
color: rgb(197,225,165);
background-color: rgba(97,225,165,.2);
}
</style>
=======
li {
list-style-type: none;
}
......@@ -1557,4 +1554,3 @@ li {
cursor: pointer;
}
</style>
>>>>>>> 40fc3cafc0b05769fd3a8d6b3d843f8259bbaf70
src/components/guestManagement/Agreement.vue
View file @ dc0c1e74
......@@ -117,12 +117,12 @@
overflow: hidden !important;
}
.OrderType-text{
font-size: 12px;
font-size: 11px;
font-weight: 100;
margin-left: 5px;
border-radius: 3px;
display: inline-block;
padding: 0 2px;
padding: 0 1px;
}
.OrderType-text-box .OrderType-text:nth-child(2){
margin-left: 0;
......@@ -140,8 +140,8 @@
background-color: rgba(63, 196, 255,.2);
}
.OrderType-text.four{
color: rgb(255,213,79);
background-color: rgba(255,213,79,.2);
color: rgb(255,111,0);
background-color: rgba(255,111,0,.2);
}
.OrderType-text.five{
color: rgb(197,225,165);
......
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