Merge branch 'release-zl' into 'release'

tips

See merge request !261

src/views/entitlement/list.vue

@@ -259,7 +259,7 @@
             // const hr = l + `/pica-insurance/sz-public?projectEquityNo=${projectEquityNo}&externalOrderNo=${externalOrderNo}`;
             // window.location.href = hr;
             this.$router.push({
-              path: '/sz-public',
+              path: '/sz-public-new',
               query: {
                 externalOrderNo: externalOrderNo,
                 projectEquityNo:projectEquityNo,

src/views/lz-home/index.vue

@@ -30,17 +30,19 @@ export default {
     getJumpPageStatus(externalOrderNo) {
       getLanZhouFlag(externalOrderNo).then(res => {
         if (res.code === '000000') {
+
           const {externalOrderNo, flag, projectEquityNo} = res.data;
-          let url = '/home';
+          let url = '/sz-public-new';
+          if(flag == 1) {
+            url = '/sz-public-new';
+          }
           if(flag == 0) {
             url = '/home';
           }
-          if(flag == 1) {
-            url = '/entitlement';
-          }
           this.$loading.hide();
           const l = window.location.origin;
           const hr = l + `/pica-insurance${url}?projectEquityNo=${projectEquityNo}&externalOrderNo=${externalOrderNo}`;
+          console.log('getJumpPageStatus--', res, hr);
           window.location.href = hr;
         }
       });

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

@@ -206,7 +206,13 @@ export default {
       createOrderSzV2(data).then((res) => {
         console.log(res);
         if(res.code == '000000') {
-          const {yunOrderNo, statusCode, externalOrderNo} = res.data;
+          const {yunOrderNo, statusCode, externalOrderNo, lanZhouOldflag, projectEquityNo} = res.data;
+          if(lanZhouOldflag) {
+            const url = '/home';
+            const l = window.location.origin;
+            const hr = l + `/pica-insurance${url}?projectEquityNo=${projectEquityNo}&externalOrderNo=${externalOrderNo}`;
+            window.location.href = hr;
+          }
           if(statusCode == '0103') {
             this.showProtocol = true;
             this.openWebAppConfigPositive.path = `pagesInsurance/all-entrance/index?channelSource=insurance_channel&projectEquityNo=${projectEquityNo}&yunOrderNo=${yunOrderNo}&externalOrderNo=${externalOrderNo}`;