|
@@ -60,7 +60,7 @@ import { qrCodes,unlicensedCarCheckIn } from "@/api/parking";
|
|
import baseMixins from "@/pages/parkingFee/mixins/base";
|
|
import baseMixins from "@/pages/parkingFee/mixins/base";
|
|
import uni from '@/utils/uniHooks';
|
|
import uni from '@/utils/uniHooks';
|
|
import { initWxJsSdkConfig } from '@/utils/login';
|
|
import { initWxJsSdkConfig } from '@/utils/login';
|
|
-import { getPlatform,getUrlParams, theCommunicationBetweenWechatAndH5IsNormal } from '@/utils';
|
|
|
|
|
|
+import { getPlatform,getUrlParams, theCommunicationBetweenWechatAndH5IsNormal, extractValuesFromString } from '@/utils';
|
|
import {mapState} from "vuex";
|
|
import {mapState} from "vuex";
|
|
|
|
|
|
export default {
|
|
export default {
|
|
@@ -162,9 +162,14 @@ export default {
|
|
needResult: 1, // 默认为0,扫描结果由微信处理,1则直接返回扫描结果,
|
|
needResult: 1, // 默认为0,扫描结果由微信处理,1则直接返回扫描结果,
|
|
// scanType: ['qrCode', 'barCode'], // 可以指定扫二维码还是一维码,默认二者都有
|
|
// scanType: ['qrCode', 'barCode'], // 可以指定扫二维码还是一维码,默认二者都有
|
|
success: (res) => {
|
|
success: (res) => {
|
|
- console.log('H5页面扫码获取到的参数——成功', res);
|
|
|
|
- runScanFn(res);
|
|
|
|
- // this.formMsg.deviceCode = res.resultStr;
|
|
|
|
|
|
+ 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]};
|
|
|
|
+ this.$store.commit('SET_UNLICENSED_INFO', obj);
|
|
|
|
+ this.$nextTick(() => {
|
|
|
|
+ this.qrCodesRule(obj.code);
|
|
|
|
+ })
|
|
},
|
|
},
|
|
error: (res) => {
|
|
error: (res) => {
|
|
console.log('H5页面扫码获取到的参数——失败', res);
|
|
console.log('H5页面扫码获取到的参数——失败', res);
|