Merge branch 'feature/zl' into 'release'

name reg2

See merge request !277

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

@@ -420,6 +420,8 @@ export default {
             versionNumber,
             projectEquityNo,
             lanZhouOldflag,
+            projectEquityNoNext,
+            yunOrderNoNext,
           } = res.data;
           if (lanZhouOldflag) {
             const url = '/home';
@@ -428,9 +430,11 @@ export default {
               l +
               `/pica-insurance${url}?projectEquityNo=${projectEquityNo}&externalOrderNo=${externalOrderNo}`;
             window.location.href = hr;
-          } else if (statusCode == '0103' || [4, 5].includes(versionNumber)) {
+          } else if (statusCode == '0103' || [4, 5, 6].includes(versionNumber)) {
             this.showProtocol = true;
-            this.openWebAppConfigPositive.path = `pagesInsurance/all-entrance/index?channelSource=insurance_channel&projectEquityNo=${projectEquityNo}&yunOrderNo=${yunOrderNo}&externalOrderNo=${externalOrderNo}`;
+            const yo = yunOrderNoNext || yunOrderNo;
+            const po = projectEquityNoNext || projectEquityNo;
+            this.openWebAppConfigPositive.path = `pagesInsurance/all-entrance/index?channelSource=insurance_channel&projectEquityNo=${po}&yunOrderNo=${yo}&externalOrderNo=${externalOrderNo}`;
             console.log(
               '-this.openWebAppConfigPositive.path',
               versionNumber,

vue.config.js

@@ -36,7 +36,7 @@ module.exports = {
     port: 8083,
     proxy: {
       '/proxy': {
-        target: 'https://test1-sc.yunqueyi.com/',
+        target: 'https://dev-sc.yunqueyi.com/',
         // target: 'https://test1-sc.yunqueyi.com/',
         // target: 'https://uat-sc.yunqueyi.com/',
         // http://10.241.65.90:3000/mock/1071/cs/route/removeUser