Merge branch 'fix/goods' into 'master'

Fix/goods

See merge request !137

src/views/Goods/Detail/modules/InsurePersonForm.vue

@@ -442,11 +442,31 @@ export default {
             this.familyList = res;
             if (this.hasAutoSaveData(this.autoSaveKey) && !reset) {
               this.getSaveInfoHandler(this.autoSaveKey, AUTO_SAVE_TARGET);
-              if (this.formData.relation) {
-                const userArray = this.familyList.filter(
-                  item => item.relation === +this.formData.relation
-                );
+              const { idNo, userInfoSecId, relation } = this.formData;
+              if (relation) {
+                const userArray = this.familyList.filter(item => item.relation === +relation);
                 this.relationList = userArray.length > 1 ? userArray : [];
+                if (idNo && !userInfoSecId) {
+                  this.familyList.forEach(item => {
+                    if (item.idNo === idNo) {
+                      const { idNoMask, nameMask, socialSecurity, userInfoSecId } = item;
+                      this.formData = {
+                        ...this.formData,
+                        ...{
+                          idNo: idNoMask,
+                          name: nameMask,
+                          userInfoSecId,
+                          socialSecurity:
+                            typeof socialSecurity === undefined || socialSecurity === ""
+                              ? ""
+                              : socialSecurity
+                              ? "1"
+                              : "0"
+                        }
+                      };
+                    }
+                  });
+                }
               } else {
                 this.formData.relation = "1";
               }

src/views/Policy/Add/index.vue

@@ -997,11 +997,31 @@ export default {
         this.familyList = res;
         if (this.hasAutoSaveData(AUTO_SAVE_KEY)) {
           this.getSaveInfoHandler(AUTO_SAVE_KEY, AUTO_SAVE_TARGET);
-          if (this.formData.insuredUserInfo.relation) {
-            const userArray = this.familyList.filter(
-              item => item.relation === +this.formData.insuredUserInfo.relation
-            );
+          const { relation, idNo, userInfoSecId } = this.formData.insuredUserInfo;
+          if (relation) {
+            const userArray = this.familyList.filter(item => item.relation === +relation);
             this.relationList = userArray.length > 1 ? userArray : [];
+            if (idNo && !userInfoSecId) {
+              this.familyList.forEach(item => {
+                if (item.idNo === idNo) {
+                  const { idNoMask, nameMask, socialSecurity, userInfoSecId } = item;
+                  this.formData.insuredUserInfo = {
+                    ...this.formData.insuredUserInfo,
+                    ...{
+                      idNo: idNoMask,
+                      name: nameMask,
+                      userInfoSecId,
+                      socialSecurity:
+                        typeof socialSecurity === undefined || socialSecurity === ""
+                          ? ""
+                          : socialSecurity
+                          ? "1"
+                          : "0"
+                    }
+                  };
+                }
+              });
+            }
           }
           if (!this.formData.holderUserInfo.name) {
             const selfInfo = this.familyList.find(item => item.relation === 1);

src/views/Policy/PayWaiting/index.vue

@@ -25,8 +25,8 @@ export default {
     // }
     this.isPayWait = true;
     this.orderInfo = this.$route.query;
-    // 如果存在isXyqb，同时当前不是在信用钱包环境，或众安第三方支付
-    if (this.orderInfo.isfXyqb == 1 && (!isXyqb || this.orderInfo.third)) {
+    // 如果存在isXyqb，同时当前不是在信用钱包环境
+    if ((this.orderInfo.isfXyqb == 1 && !isXyqb) || this.orderInfo.third === "zhongan") {
       window.location.href = "xyqb://my";
       if (localStorage.get("mongoToken")) {
         this.$router.replace("/policy");