Merge pull request #440 from John-Hong/release-3.2.0

fix(SCRM-4787): 补充对需要登录无牌车的识别

src/pages/parkingFeeV2/mixins/parkingFee.js

@@ -824,34 +824,40 @@ export default {
             runScanFn(options.options);
           });
         } else {
-          this.$wx.scanQRCode({
-            // onlyFromCamera: false,
-            // desc: 'scanQRCode desc',
-            // needResult: 0, // 默认为0，扫描结果由微信处理，1则直接返回扫描结果，
-            // scanType: ['qrCode', 'barCode'], // 可以指定扫二维码还是一维码，默认二者都有
-            success: (res) => {
-              console.log('H5页面扫码获取到的参数——成功1', res);
-              // const res = {"resultStr": "lo$Qed.3YuVi*D7vXilrrV0571a1&type=unlicensedIn", "errMsg": "scanQRCode:ok"}
-              // const test = {"resultStr": "lp$Qed.3YuVi*D7vXilrrV0571a2&type=unlicensedOut", "errMsg": "scanQRCode:ok"}
-              let path = res.resultStr.replace(/.*([a-z0-9]{6}&type)/g, '8b$1')
-              console.log(614, path);
-              const regex = /(\w+)&type=(\w+)/;
-              const match = path.match(regex);
-              const obj = {code: match[1], type: match[2]};
-              console.log(618, obj);
-              console.log(696, this.qrCodesRule);
-              this.$store.commit('SET_UNLICENSED_INFO', obj);
-              this.$nextTick(() => {
-                this.qrCodesRule(obj.code, 'scan');
-              })
-              // runScanFn(res);
-              // this.formMsg.deviceCode = res.resultStr;
-            },
-            error: (res) => {
-              console.log('H5页面扫码获取到的参数——失败', res);
-              // console.log(242, res);
-            },
-          });
+          try {
+            this.$wx.scanQRCode({
+              needResult: 0, // 默认为0，扫描结果由微信处理，1则直接返回扫描结果，
+              // onlyFromCamera: false,
+              // desc: 'scanQRCode desc',
+              // needResult: 0, // 默认为0，扫描结果由微信处理，1则直接返回扫描结果，
+              // scanType: ['qrCode', 'barCode'], // 可以指定扫二维码还是一维码，默认二者都有
+              success: (res) => {
+                console.log('H5页面扫码获取到的参数——成功1', res);
+                // const res = {"resultStr": "lo$Qed.3YuVi*D7vXilrrV0571a1&type=unlicensedIn", "errMsg": "scanQRCode:ok"}
+                // const test = {"resultStr": "lp$Qed.3YuVi*D7vXilrrV0571a2&type=unlicensedOut", "errMsg": "scanQRCode:ok"}
+                let path = res.resultStr.replace(/.*([a-z0-9]{6}&type)/g, '8b$1')
+                console.log(614, path);
+                const regex = /(\w+)&type=(\w+)/;
+                const match = path.match(regex);
+                const obj = {code: match[1], type: match[2]};
+                console.log(618, obj);
+                console.log(696, this.qrCodesRule);
+                this.$store.commit('SET_UNLICENSED_INFO', obj);
+                this.$nextTick(() => {
+                  this.qrCodesRule(obj.code, 'scan');
+                })
+                // runScanFn(res);
+                // this.formMsg.deviceCode = res.resultStr;
+              },
+              error: (res) => {
+                console.log('H5页面扫码获取到的参数——失败res', res);
+                // console.log(242, res);
+              },
+            });  
+          } catch (err) {
+            console.log('H5页面扫码获取到的参数——失败err', err);
+          }
+          
         }
       } catch (err) {
         console.log(624, err);

src/pages/parkingFeeV2/parkingFeeMsg.vue

@@ -158,14 +158,16 @@ export default {
           runScanFn(options.options);
         });
       } else {
-        this.$wx.scanQRCode({
-          // onlyFromCamera: false,
-          // desc: 'scanQRCode desc',
-          // needResult: 0, // 默认为0，扫描结果由微信处理，1则直接返回扫描结果，
-          // scanType: ['qrCode', 'barCode'], // 可以指定扫二维码还是一维码，默认二者都有
-          success: (res) => {
-            console.log('H5页面扫码获取到的参数——成功2', res);
-            let path = res.resultStr.replace(/.*([a-z0-9]{6}&type)/g, '8b$1')
+        try {
+          this.$wx.scanQRCode({
+            needResult: 0, // 默认为0，扫描结果由微信处理，1则直接返回扫描结果，
+            // onlyFromCamera: false,
+            // desc: 'scanQRCode desc',
+            // needResult: 0, // 默认为0，扫描结果由微信处理，1则直接返回扫描结果，
+            // scanType: ['qrCode', 'barCode'], // 可以指定扫二维码还是一维码，默认二者都有
+            success: (res) => {
+              console.log('H5页面扫码获取到的参数——成功res2', res);
+              let path = res.resultStr.replace(/.*([a-z0-9]{6}&type)/g, '8b$1')
               const regex = /(\w+)&type=(\w+)/;
               const match = path.match(regex);
               const obj = {code: match[1], type: match[2]};
@@ -173,12 +175,16 @@ export default {
               this.$nextTick(() => {
                 this.qrCodesRule(obj.code);
               })
-          },
-          error: (res) => {
-            console.log('H5页面扫码获取到的参数——失败', res);
-            // console.log(242, res);
-          },
-        });
+            },
+            error: (res) => {
+              console.log('H5页面扫码获取到的参数——失败res', res);
+              // console.log(242, res);
+            },
+          });  
+        } catch (err) {
+          console.log('H5页面扫码获取到的参数——失败err', err);
+        }
+        
       }
     },
     // 处理扫码结果: 组装参数，剩余流程，在 缴费支付页面 实现