Merge branch 'feature/qiao' into 'release'

Feature/qiao

See merge request !291

src/api/entitlement.js

@@ -37,10 +37,11 @@ export const projectMaterial = () => {
   });
 };
 
-export const getRequestParm = (requestParm) => {
+export const getRequestParm = (params) => {
   return request({
-    url: `/tis/insurance/common/shaoxing/requestParm?requestParm=${requestParm}`,
+    url: '/tis/insurance/common/shaoxing/requestParm',
     method: 'get',
+    params,
     withCredentials: true,
   });
 };

src/views/sz-public-new/index.vue

@@ -125,6 +125,8 @@ export default {
       channelCode = '',
       userInfo = '',
       requestParm = '',
+      token = '',
+      param = '',
     } = this.$route.query;
     let { rightsNo = '', identity = '' } = this.$route.query;
 
@@ -137,18 +139,24 @@ export default {
       window.location.href = url;
       return;
     }
-    if (requestParm) {
-      const result = await getRequestParm(requestParm);
+    let cardNo = '';
+    if (requestParm || param) {
+      const params = {
+        requestParm,
+        cardNo: param,
+      };
+      const result = await getRequestParm(params);
       if (result.code === '000000') {
         rightsNo = result.data.rightsNo;
-        identity = result.data.identity;
+        identity = result.data.identity || '';
+        cardNo = result.data.cardNo || '';
       }
     }
 
     this.getBanner(7, rightsNo || projectEquityNo);
     this.getBanner2(36, rightsNo || projectEquityNo);
 
-    this.openWebAppConfigPositive.path = `pagesInsurance/health-card/index?channelCode=${channelCode}&projectEquityNo=${projectEquityNo}&externalOrderNo=${externalOrderNo}&rightsNo=${rightsNo}&userInfo=${userInfo}&identity=${identity}`;
+    this.openWebAppConfigPositive.path = `pagesInsurance/health-card/index?channelCode=${channelCode}&projectEquityNo=${projectEquityNo}&externalOrderNo=${externalOrderNo}&rightsNo=${rightsNo}&userInfo=${userInfo}&identity=${identity}&token=${token}&cardNo=${cardNo}`;
     if (channelCode) uploadPointData({ channelCode });
     this.$sendBuriedData(
       {
@@ -161,6 +169,7 @@ export default {
           userInfo: userInfo,
           channelCode: channelCode,
           identity: identity,
+          token: token,
         },
       },
       'enter'