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

Compare commits

base: yangjun:1582a437b529e2f5bc99fe70be0101df7a21288f
Branches Tags
yangjun:master
...
compare: yangjun:277c16e31a1103a6ef29db0ed3104485814d477a
Branches Tags
yangjun:master

2 Commits
1582a437b5 ... 277c16e31a

Author SHA1 Message Date
Mr.jiang 277c16e31a 解决冲突 2024-08-15 09:29:24 +08:00
Mr.jiang 9d9640648e 修改按钮样式 2024-08-15 09:25:24 +08:00
4 changed files with 40 additions and 32 deletions
Show Stats Expand all files Collapse all files

15
my/order/payModify.vue
View File

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

18
my/order/payModifyDzhifu.vue
View File

@ -275,8 +275,8 @@
return {
fuwuBtn: [
{'title':'请速回电'},
{'title':'勿大声敲门'},
{'title':'尽快上门服务'},
{'title':'勿大声敲门'},
{'title':'直接来即可'},
],
selected:[],
@ -1456,25 +1456,21 @@
}
.huiBtn {
color:#333;
background: #ccc;
// color: #333333;
background: #f3f3f3;
}
.lanBtn {
color:#fff;
background: #049F89;
}
.guke-btn {
width: 45%;
// height: 40px;
line-height: 40px;
// margin-left: 5px;
width: 24%;
line-height: 34px;
text-align: center;
// line-height: 40px;
font-weight: bold;
font-size: 12px;
font-size: 11px;
border-radius: 6px;
margin-top:5px;
// border-bottom: 1px solid #ccc;
margin-top: 5px;
margin-right: 2px;
}
.guke-list {
width: 100%;

16
my/order/payModifyJsDetail.vue
View File

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

23
my/order/payModifyTcMy.vue
View File

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