Merge branch 'develop' into 'test'

src/containers/BindEquipment/index.js

@@ -92,8 +92,10 @@ export class Bindequipment extends React.Component {
       scanType: ['qrCode', 'barCode'], // 可以指定扫二维码还是一维码，默认二者都有
       success: res => {
         const result = res.resultStr; // 当needResult 为 1 时，扫码返回的结果
+        var bar = result.indexOf("https://www.dcrym.com")!==-1?result.slice(29):result;
+        bar = bar.length>8?bar.substring(0,8):bar;
         this.setState({
-          deviceCode: result,
+          deviceCode: bar,
         });
       },
       fail: err => {

src/containers/Equipment/EquipmentTest.js

@@ -67,7 +67,6 @@ class EquipmentTest extends Component {
         const result = res.resultStr; // 当needResult 为 1 时，扫码返回的结果
         var bar = result.indexOf("https://www.dcrym.com")!==-1?result.slice(29):result;
         bar = bar.length>8?bar.substring(0,8):bar;
-        alert(bar);
         this.setState({
           deviceCode: bar,
         });