Merge branch 'fix/policy_fix' into 'master'

fix: 试算调整

See merge request !60

src/views/Goods/Detail/CIIDetail.vue

@@ -309,7 +309,7 @@ export default {
       this.$notify({ type: "warning", message: errors[0].message });
     },
     nextStep() {
-      this.$router.push("/goods/inform");
+      this.$router.push({ path: "/goods/inform" });
     },
     async getDetail() {
       this.goodId = this.$route.query.id;

src/views/Goods/Detail/LIDetail.vue

@@ -235,8 +235,12 @@ export default {
         "policyFormData",
         JSON.stringify(Object.assign(this.formData, { productNo: this.goodId }))
       );
-      const { queryId } = this.$route;
-      this.$router.push({ path: "/policy/add", query: { queryId } });
+      const { userInfoSecId } = this.$route.query;
+      this.$router.push({
+        path: "/goods/inform",
+        query: { url: this.popupArray[1].url, userInfoSecId, noOrder: true }
+      });
+      // this.$router.push({ path: "/policy/add", query: { queryId } });
     },
     async getDetail() {
       this.goodId = this.$route.query.id;

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

@@ -286,12 +286,21 @@ export default {
           userInfoSecId,
           socialSecurity:
             socialSecurity === "" || typeof socialSecurity === "undefined"
-              ? this[this.autoSaveKey + "Cache"].socialSecurity || ""
+              ? ""
               : socialSecurity
               ? "1"
               : "0"
         }
       };
+      if (!this.formData.socialSecurity) {
+        try {
+          this.formData.insuredUserInfo.socialSecurity = this[
+            this.autoSaveKey + "Cache"
+          ].socialSecurity;
+        } catch (e) {
+          console.log("缓存中不存在");
+        }
+      }
     },
     async getFamilyList() {
       this.mongoToken = localStorage.get("mongoToken");

src/views/Goods/Inform/index.vue

@@ -53,11 +53,15 @@ export default {
   },
   methods: {
     conform() {
-      // this.$router.push(`/policy/detail/123`);
+      if (this.$route.query.noOrder) {
+        const { userInfoSecId } = this.$route.query;
+        this.$router.push({ path: "/policy/add", query: { userInfoSecId } });
+      } else {
         // this.generateFormData();
         this.generateOrder();
       }
     }
+  }
 };
 </script>
 <style lang="less" src="./index.less" scoped></style>

src/views/Policy/Add/index.vue

@@ -715,8 +715,8 @@ export default {
         delete this.subFormData.insuredUserInfo;
       }
       sessionStorage.setItem("policyFormData", JSON.stringify(this.subFormData));
-      this.$router.push({ path: "/goods/inform", query: { url: popupArray[1].url } });
-      // this.generateOrder();
+      // this.$router.push({ path: "/goods/inform", query: { url: popupArray[1].url } });
+      this.generateOrder();
     },
     relationOptionChange(relation) {
       relation && this.relationChange(relation, this.clearInsured);
@@ -778,7 +778,7 @@ export default {
             AUTO_SAVE_TARGET + "Cache"
           ].insuredUserInfo.socialSecurity;
         } catch (e) {
-          console.log(e);
+          console.log("缓存中不存在");
         }
       }
       if (relation) {

src/views/User/modules/UserFamily.vue

@@ -111,9 +111,13 @@ export default {
   methods: {
     go(path, params) {
       if (path === "/goods/detail" && params) {
+        let userInfoSecId = "";
+        if (this.familyList && this.familyList.length) {
+          userInfoSecId = this.familyList[this.activeIndex].userInfoSecId;
+        }
         path = {
           path,
-          query: { id: params.id, type: params.itype }
+          query: { id: params.id, type: params.itype, userInfoSecId }
         };
       } else if (path === "/policy/detail" && params.orderNo) {
         path = `${path}/${params.orderNo}`;