yangjun
/
sadjv3_user
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

解决冲突

This commit is contained in:
Mr.jiang 2024-08-15 09:31:32 +08:00
parent 277c16e31a
commit 18a76c4506
1 changed files with 0 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
my/order/payModifyTcMy.vue
View File

@ -1414,47 +1414,21 @@
} }
.huiBtn { .huiBtn {
color:#333; color:#333;
<<<<<<< .mine
background: #f3f3f3; background: #f3f3f3;
=======
background: #f3f3f3;
// color: #333333;
>>>>>>> .theirs
} }
.lanBtn { .lanBtn {
color:#fff; color:#fff;
background: #049F89; background: #049F89;
} }
.guke-btn { .guke-btn {
<<<<<<< .mine
width: 24%; width: 24%;
line-height: 34px; line-height: 34px;
=======
width:24%;
// height: 40px;
line-height:34px;
// margin-left: 5px;
>>>>>>> .theirs
text-align: center; text-align: center;
font-weight: bold; font-weight: bold;
<<<<<<< .mine
font-size: 11px; font-size: 11px;
=======
font-size:11px;
>>>>>>> .theirs
border-radius: 6px; border-radius: 6px;
<<<<<<< .mine
margin-top: 5px; margin-top: 5px;
margin-right: 2px; margin-right: 2px;
=======
margin-top:5px;
margin-right:2px;
// border-bottom: 1px solid #ccc;
>>>>>>> .theirs
} }
.guke-list { .guke-list {
width: 100%; width: 100%;