Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/gt_client_pad into develop

src/pages/DeviceManager/index.less

@@ -47,7 +47,6 @@
     cursor: pointer;
     background: url('@/assets/iconFundFilled.png') no-repeat;
   }
-  
 }
 
 .lineContent {
@@ -72,16 +71,18 @@
     .btn {
       width: 147px;
       height: 59px;
-      background: #e8e8e8;
+      // background: #e8e8e8;
       border-radius: 10px;
       font-size: 30px;
       color: #4a4a4a;
       line-height: 59px;
       text-align: center;
+      background-image: url('@/assets/deviceManager/deviceBtn1.png');
+      background-size: 100% 100%;
     }
     .active {
       color: #4a90e2;
-      background: #cae2ff;
+      background-image: url('@/assets/deviceManager/deviceBtn2.png');
     }
   }
   .itemText {
@@ -134,4 +135,4 @@
 .main {
   padding: 20px;
   margin-top: 40px;
-}
+}