Merge pull request #227 from John-Hong/release-2.15.0

fix(SCRM-4463): [DE][C端]临时停车，支付宝，HKC，纸质优惠扫描以后，没有反应

src/api/request.js

@@ -87,7 +87,7 @@ function XUser(config) {
     userId: store.state?.kipUserId || '', // K+用户ID
     // userId: '2c9d85868652dee50186532bdbbb0001', // K+用户ID
     // sourceType: 'WECHAT',
-    sourceType: isAlipay() ? 'ALIPAY' : 'WECHAT',
+    sourceType: isAlipayClient ? 'ALIPAY' : 'WECHAT',
     // phoneNumber: '18521563898',
     phoneNumber: store.state?.mobile || '', // 终端用户ID, 微信端传openId, 支付宝小程序传阿里userId, APP传KIP的userId
     // projectId: store.state.projectId || '4028e3817c2b3f79017c2b48c54c0000', // 楼盘id

src/pages/parkingFee/mixins/parkingFee.js

@@ -639,6 +639,7 @@ export default {
           window.toWXSendMsg({
             type: 'scanQRCode',
           });
+          // TODO 兼容支付宝无牌车扫码
           window.subscribe('scanQRCodeOver', (options) => {
             console.log('微信扫码结束之后的返回参数', options);
             runScanFn(options);

src/pages/parkingFee/mixins/parkingFeePaperCoupon.js

@@ -89,7 +89,7 @@ export default {
     // 扫码
    async scanCode() {
       const runScanFn = ( res ) => {
-        if ( res.scanType == 'QR_CODE' && res.scanType ) {
+        if ( res.scanType == 'QR_CODE' && res.scanType || (isAlipayClient && res.scanType == 'QR')) {
           console.log(res.result);
           const url = res.result;
           if ( url.indexOf('auth/') === -1 ) {
@@ -120,7 +120,7 @@ export default {
         });
         window.subscribe('scanQRCodeOver',( options ) => {
           console.log('微信扫码结束之后的返回参数',options);
-          runScanFn(options);
+          runScanFn(isAlipayClient ? options.options : options);
         });
       } else {
         this.$wx.scanQRCode({

src/pages/parkingFee/parkingFeeMsg.vue

@@ -148,6 +148,7 @@ export default {
         window.toWXSendMsg({
           type: 'scanQRCode',
         });
+        // TODO 兼容支付宝无牌车扫码
         window.subscribe('scanQRCodeOver', (options) => {
           console.log('微信扫码结束之后的返回参数', options);
           runScanFn(options);