diff --git a/my/order/payModifyTcMy.vue b/my/order/payModifyTcMy.vue index 0adc4f3..440db73 100644 --- a/my/order/payModifyTcMy.vue +++ b/my/order/payModifyTcMy.vue @@ -1414,47 +1414,21 @@ } .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; 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%;