Merge branch 'develop' into 'test'

src/containers/Equipment/EquipmentTest.js

@@ -145,9 +145,10 @@ class EquipmentTest extends Component {
             <i className='inputIcon'>
               <img src={eqIcon} alt='' />
             </i>
-            <span className='ellipsis inputText'>
+            {/* <span className='ellipsis inputText'>
               设备编号：
-              <input
+            </span> */}
+            <input
                 className='br8 listInput'
                 onChange={this.changeHandle}
                 type='text'
@@ -155,7 +156,6 @@ class EquipmentTest extends Component {
                 maxLength='8'
                 value={deviceCode}
               />
-            </span>
           </div>
           <Button type='primary' className='scan' onClick={this.scanEquipment}>
             <div className='scanicon'>
@@ -171,12 +171,12 @@ class EquipmentTest extends Component {
             </i>
             <span>测试吹风</span>
           </div>
-        </div>
-        <div className='linkItem' onClick={this.clickHandle}>
-          <i className='linkIcon'>
-            <img src={rateIcon} alt='' />
-          </i>
-          <span>解绑键盘设备</span>
+          <div className='linkItem' onClick={this.clickHandle}>
+            <i className='linkIcon'>
+              <img src={rateIcon} alt='' />
+            </i>
+            <span>解绑键盘设备</span>
+          </div>
         </div>
       </div>
     );