Merge remote-tracking branch 'origin/master'

@@ -9,7 +9,7 @@
 
 .iconfont {
   font-family: "iconfont" !important;
-  font-size: 16px;
+  font-size: 18px;
   font-style: normal;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;

@@ -11,7 +11,7 @@
     width: 100%;
     height: 100%;
     box-sizing: border-box;
-    padding: 18px 18px 0!important;
+    padding: 18px 10px 0!important;
 }
 .pagination {
     padding: 18px;

@@ -13,24 +13,24 @@
 						</el-col>
 						<el-col :span="10" class="fr">
 							<div  v-show="qszt=='0'" class="fr" style="margin-right:20px">
-								<el-button size="mini" @click="addRow">
+								<el-button class="qlrBtn" size="mini" @click="addRow">
 									<i class="iconfont iconxinzeng"></i> 新增
 								</el-button>
-								<el-button size="mini" @click="changeRow">
+								<el-button class="qlrBtn" size="mini" @click="changeRow">
 									<i class="iconfont iconbianji"></i> 编辑
 								</el-button>
-								<el-button size="mini" @click="delRow">
+								<el-button class="qlrBtn" size="mini" @click="delRow">
 									<i class="iconfont iconshanchu"></i> 删除
 								</el-button>
 							</div>
 							<div v-show="qszt!='0'" class="fr" style="margin-right:20px">
-								<el-button size="mini" disabled>
+								<el-button class="qlrBtn" size="mini" disabled>
 									<i class="iconfont iconxinzeng"></i> 新增
 								</el-button>
-								<el-button size="mini" disabled>
+								<el-button class="qlrBtn" size="mini" disabled>
 									<i class="iconfont iconbianji"></i> 编辑
 								</el-button>
-								<el-button size="mini" disabled>
+								<el-button class="qlrBtn" size="mini" disabled>
 									<i class="iconfont iconshanchu"></i> 删除
 								</el-button>
 							</div>
@@ -648,6 +648,12 @@
 		font-size: 14px;
 		width: 100%;
 		table-layout: fixed;
+		.qlrBtn{
+			border: 0;
+		}
+		.qlrBtn:hover{
+			background-color: none!important;
+		}
 		.iconfont{
 			font-size: 14px!important;
 		}

@@ -796,8 +796,9 @@ export default {
 			}
 		}
 		.radioBtn {
-			margin-left: 16px;
-			padding:12px 14px;
+			margin-left: 10px;
+			padding: 12px 10px;
+			border: 0;
 			i{
 				font-size: 13px;
     			padding-right: 4px;