Merge branch 'main' of http://82.156.35.112:3000/qiubinghui/zhywpt-plug

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

@@ -217,7 +217,7 @@ Page({
     }
     wx.showLoading()
     // 校验验证码是否正确
-    network.etc.activeCheckSendCode(params).then(res => {
+    network.etc.checkSendCode(params).then(res => {
       if (res.code !== 0) {
         wx.hideLoading()
         wx.showModal({
@@ -238,7 +238,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}`,
+          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}`,
         })
       }
     }).catch(() => {

wxminipro/plugin/etc/pages/activeAgain/activeAgain.wxml

@@ -126,7 +126,7 @@
         <view slot='label' class='card-title' style="width: 160rpx;">
           验证码
         </view>
-        <input placeholder="请输入短信验证码" value="{{  sendCode }}" bindinput="changeInput" maxlength="6" type="number" placeholder-style="color:rgba(0,0,0,0.2)" class='card-title input' />
+        <input placeholder="请输入短信验证码" model:value="{{  sendCode }}" bindinput="changeInput" maxlength="6" type="number" placeholder-style="color:rgba(0,0,0,0.2)" class='card-title input' />
       </view>
       <view class="row-between">
         <view style="width: 2rpx;height: 32rpx; background-color: #707070;margin-right: 40rpx;opacity: 0.2;"></view>

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

@@ -230,11 +230,18 @@ Page({
   },
 
   async getObuActivation(cmdRandNum) {
+    let vehicleArr = this.data.plateNum.split('_')
 
     let params = {
-      Flag: '0001',
-      ContractSN: this.data.obuId,
-      Random: cmdRandNum
+      // Flag: '0001',
+      // ContractSN: this.data.obuId,
+      // Random: cmdRandNum,
+      cardId: this.data.cardId,
+      obuId: this.data.obuId,
+      vehiclePlate: vehicleArr[0],
+      vehiclePlateColor: vehicleArr[1],
+      vehicleType: this.data.vehicleType,
+      random: cmdRandNum
     }
 
     let resData = await API.ETC.getVFJObuActive(params)

wxminipro/plugin/network/etcApi.js

@@ -187,9 +187,20 @@ const API = {
         data: params
       })
     },
+
+    /**
+     * 3.1.公共接口，校验验证码是否正确
+     * @param {Object} params - 查询参数
+     * @returns {Promise} 返回Promise对象
+     */
+    async checkSendCode(params) {
+      return await requestEtcFnc(`${baseurl}/iaw/portal/checkSendCode`, {
+        data: params
+      })
+    },
     
     /**
-     * 3.1.设备二次激活
+     * 3.1.设备二次激活,获取车辆详情
      * @param {Object} params - 查询参数
      * @param {string} params.vehicleId 车辆Id
      * @returns {Promise} 返回Promise对象
@@ -209,14 +220,14 @@ const API = {
     },
     
     /**
-     * 3.1.设备二次激活，设备校验验证码
+     * 3.1.设备二次激活，设备校验验证码 -- 废弃
      * @param {Object} params - 查询参数
      * @param {string} params.vehicleId 车辆Id
      * @returns {Promise} 返回Promise对象
      */
-    async activeCheckSendCode(params) {
-      return request.post('ISSUES_ASS_ACTIVECHECKSENDCODE', params);
-    },
+    // async activeCheckSendCode(params) {
+    //   return request.post('ISSUES_ASS_ACTIVECHECKSENDCODE', params);
+    // },
     
     /**
      * 3.1.设备二次激活,设备激活是否可激活
@@ -235,7 +246,7 @@ const API = {
      * @returns {Promise} 返回Promise对象
      */
     async getVFJObuActive (params) {
-      return request.post('INSS_VFJ_OBUACTIVE', params);
+      return request.post('ISSUES_ASS_ACTIVEOBU', params);
     },
     
     /**

wxminipro/plugin/utils/active-tools/active-device-tools.js

@@ -428,9 +428,15 @@ async function _againObuIssueCheck() {
 async function _getAgainObuMac(randNum, callback) {
   console.log("获取随机数", randNum)
   let params = {
-    Flag: '0001',
-    ContractSN: activeCode.serialNumber,
-    Random: randNum
+    // Flag: '0001',
+    // ContractSN: activeCode.serialNumber,
+    // Random: randNum
+    cardId: activeCode.cardId,
+    obuId: activeCode.obuId,
+    vehiclePlate: activeCode.vehiclePlate,
+    vehiclePlateColor: activeCode.vehiclePlateColor,
+    vehicleType: activeCode.vehicleType,
+    random: cmdRandNum
   }
   console.log(params)
   let resData = await API.ETC.getVFJObuActive(params)