bug修改

wxminipro/plugin/etc/pages/activeAgain/activeAgain.js

@@ -241,7 +241,7 @@ Page({
       } else {
         let data = this.data
         wx.redirectTo({
-          url: `plugin://issuer-plugin/activeAgainStep?plateNum=${data.plateNum}&cardId=${data.modelInfo.cardId}&obuId=${data.modelInfo.obuId}&vehPosImgUrl=${data.vehPosImgUrl}&vehNegImgUrl=${data.vehNegImgUrl}&vehBodyUrl=${data.vehBodyUrl}&installImgUrl=${data.installImgUrl}&vehicleType=${data.vehicleType}`,
+          url: `plugin://issuer-plugin/activeAgainStep?plateNum=${data.plateNum}&cardId=${data.modelInfo.cardId}&obuId=${data.modelInfo.obuId}&vehPosImgUrl=${data.vehPosImgUrl}&vehNegImgUrl=${data.vehNegImgUrl}&vehBodyUrl=${data.vehBodyUrl}&installImgUrl=${data.installImgUrl}&vehicleType=${data.modelInfo.vehicleType}`,
         })
       }
     }).catch(() => {

wxminipro/plugin/etc/pages/activeAgainStep/activeAgainStep.js

@@ -161,7 +161,7 @@ Page({
       this.setData({
         activeFail: true,
         devName: device.name || "",
-        activeFailMsg: res.msg || '请检查ETC硬件是否处于通电并开启蓝牙的状态'
+        activeFailMsg: res.msg || res.message || '请检查ETC硬件是否处于通电并开启蓝牙的状态'
       })
     }
   },
@@ -248,6 +248,10 @@ Page({
 
     let resData = await API.ETC.getVFJObuActive(params)
 
+    if (resData.code != '0') {
+      return resData
+    }
+
     let APDUInfo = resData.data
 
     let cmdArr = APDUInfo.APDU.split(',')