Merge branch 'feature/fix_user' into 'master'

fix: 去掉pdfmapurl、修改bug

See merge request !148

src/api/goodsList.mock.js

@@ -105,7 +105,7 @@ export default [
     icon_closed: illness_closed,
     icon: illness,
     guarantee_title: "重疾保障",
-    guarantee_sub: "100种重症+40种轻症",
+    guarantee_sub: "终身保障155种重疾，最多赔付6次",
     company: "百年人寿",
     payType: [{ label: "年缴", value: 1 }],
     policyPeriod: [

src/store/modules/user.js

@@ -80,7 +80,7 @@ export default {
           })
         )
       }));
-      commit("setFamilyList", result);
+      commit("setFamilyList", JSON.parse(JSON.stringify(result)));
     },
     async setUserInfo({ commit }) {
       const userInfo = await getUserInfo();

src/views/Goods/Detail/modules/detailPay.mixin.js

@@ -121,7 +121,7 @@ export default {
           }
 
           this.$router.replace({
-            path: "/policy/detail/" + orderNo + "?isWxH5=" + this.orderInfo.isWxH5 || ""
+            path: "/policy/detail/" + orderNo + "?isWxH5=" + (this.orderInfo.isWxH5 || "")
           });
           this.isPayWait = false;
           this.setIsLoading(false);

src/views/Introduction/constant.js

@@ -94,4 +94,98 @@ const companys = [
   }
 ];
 
-export default companys;
+const products = [
+  {
+    name: "万家保·百万医疗险",
+    company: "泰康在线财产保险股份有限公司",
+    no: `泰康在线财产保险股份有限公司住院医疗费用保险（C款)<br>
+      泰康在线财产保险股份有限公司附加特定疾病保险（A款)<br>
+      泰康在线财产保险股份有限公司附加质子重离子医疗保险<br>
+      泰康在线财产保险股份有限公司附加恶性肿瘤院外特定药品费用医疗保险条款<br>
+      C00019932512020071000092<br>
+      C00019932522020081804172<br>
+      C00019932522019010901732<br>
+      C00019932522019043002571<br>`
+  },
+  {
+    name: "万家保·重疾轻症险",
+    company: "华泰财产保险有限公司",
+    no: `华泰财险重大疾病保险条款(B款)<br>
+      华泰财险附加重大疾病轻症综合保险条款<br>
+      华泰财险附加保险费分期支付条款<br>
+      C00015431912018061501152<br>
+      C00015432622017111500872<br>
+      C00015431922018061503991<br>`
+  },
+  {
+    name: "万家保·综合意外险",
+    company: "众安在线财产保险股份有限公司",
+    no: `众安在线财产保险股份有限公司个人意外伤害保险条款(2019版)<br>
+      众安在线财产保险股份有限公司附加急性疾病猝死保险条款<br>
+      众安在线财产保险股份有限公司附加意外伤害医疗费用保险条款(C款）<br>
+      众安在线财产保险股份有限公司营运交通工具乘客意外伤害保险条款(2018版)<br>
+      (众安在线)(备-普通意外保险)【2019】(主)018 号<br>
+      (众安在线)(备-疾病保险)【2017】(附)006号<br>
+      (众安在线)(备-普通意外保险)【2016】(附)037号<br>
+      (众安在线)(备-普通意外保险)【2019】(主)010号<br>`
+  },
+  {
+    name: "百年康惠保2.0重大疾病险",
+    company: "百年人寿保险股份有限公司",
+    no: `百年康惠保(2.0)重大疾病保险<br>
+      百年附加医惠通费用补偿医疗保险<br>
+      百年附加投保人豁免保险费重大疾病保险（2018版）<br>
+      众安在线财产保险股份有限公司营运交通工具乘客意外伤害保险条款(2018版)<br>
+      百保发[2020]184号<br>
+      百保发[2019]464号<br>
+      百保发[2018]516号<br>`
+  },
+  {
+    name: "华贵大麦2020定期寿险",
+    company: "华贵人寿保险股份有限公司",
+    no: `华贵大麦2020定期寿险条款<br>
+      华贵保险[2019]207号<br>`
+  }
+];
+
+const corporations = [
+  {
+    name: "泰康在线财产保险股份有限公司",
+    area: "-",
+    scope: "互联网保险业务",
+    url: "https://www.tk.cn",
+    tel: "95522"
+  },
+  {
+    name: "华泰财产保险有限公司",
+    area:
+      "北京、上海、天津、重庆、江苏、广东、陕西、四川、云南、辽宁、浙江、河北、湖南、湖北、安徽、山西、福建、山东、广西、河南、江西、深圳、青岛、大连、宁波、贵州、内蒙古、厦门、黑龙江、新疆、宁夏、吉林、甘肃",
+    scope: "互联网保险业务",
+    url: "http://pc.ehuatai.com",
+    tel: "400-609-5509"
+  },
+  {
+    name: "众安在线财产保险股份有限公司",
+    area: "-",
+    scope: "互联网保险业务",
+    url: "https://www.zhongan.com",
+    tel: "400-999-9595"
+  },
+  {
+    name: "百年人寿保险股份有限公司",
+    area:
+      "大连、湖北、河北、辽宁、北京、河南、黑龙江、安徽、山东、江苏、四川、福建、陕西、内蒙古、吉林、江西、山西、浙江、广东和重庆",
+    scope: "互联网保险业务",
+    url: "http://www.aeonlife.com.cn",
+    tel: "95542"
+  },
+  {
+    name: "华贵人寿保险股份有限公司",
+    area: "贵州，河北",
+    scope: "互联网保险业务",
+    url: "https://www.huaguilife.cn",
+    tel: "400-684-1888"
+  }
+];
+
+export { companys, products, corporations };

src/views/Introduction/index.less

@@ -2,10 +2,10 @@
 @import "../../style/mixins.less";
 
 .itd {
-  position: absolute;
-  top: 0;
-  bottom: 0;
+  min-height: 100%;
   background-color: #FFFFFF;
+  padding-bottom: 20px;
+  
   &-divider {
     margin: 0;
     border-color: #ECE9E9;
@@ -24,7 +24,7 @@
         position: relative;
         &::after {
           position: absolute;
-          top: 26px;
+          top: 30px;
           // transition: width .2s linear;
           content: " ";
           display: block;

src/views/Introduction/modules/BusinessQuali.vue

@@ -91,7 +91,7 @@
 </template>
 <script>
 import businessLicence from "@/assets/images/user/business-licence.jpeg";
-import companys from "../constant";
+import { companys } from "../constant";
 
 export default {
   name: "BusinessQuali",

src/views/Introduction/modules/Company.vue

 <template>
-  <div class="itd-product">
-    <div class="itd-product-pro">
-      <p class="itd-product-pro-title">保险产品名称</p>
-      <p class="itd-product-pro-value">万家保·重疾轻症险</p>
-    </div>
-    <div class="itd-product-comp">
-      <p class="itd-product-comp-title">保险公司</p>
-      <p class="itd-product-comp-value">华泰财产保险有限公司</p>
-    </div>
-    <cr-divider class="itd-divider" :hairline="false" />
-    <div class="itd-product-no">
-      <p class="itd-product-no-title">备案编号注册编号</p>
-      <p class="itd-product-no-value">
-        华泰财险重大疾病保险条款(B款) <br />
-        华泰财险附加重大疾病轻症综合保险条款<br />
-        华泰财险附加保险费分期支付条款<br />
-        <br />
-        C00015431912018061501152<br />
-        C00015432622017111500872<br />
-        C00015431922018061503991
-      </p>
+  <div class="container">
+    <div class="itd-product" v-for="item in products" :key="item.name">
+      <div class="itd-product-pro">
+        <p class="itd-product-pro-title">保险产品名称</p>
+        <p class="itd-product-pro-value">{{ item.name }}</p>
+      </div>
+      <div class="itd-product-comp">
+        <p class="itd-product-comp-title">保险公司</p>
+        <p class="itd-product-comp-value">{{ item.company }}</p>
+      </div>
+      <cr-divider class="itd-divider" :hairline="false" />
+      <div class="itd-product-no">
+        <p class="itd-product-no-title">备案编号注册编号</p>
+        <p class="itd-product-no-value" v-html="item.no"></p>
+      </div>
     </div>
   </div>
 </template>
 <script>
+import { products } from "../constant";
+
 export default {
   name: "Company",
   data() {
-    return {};
+    return {
+      products
+    };
   }
 };
 </script>

src/views/Introduction/modules/Product.vue

 <template>
-  <div class="itd-comp">
-    <div class="itd-comp-info">
-      <p class="itd-comp-info-title">保险公司名称</p>
-      <p class="itd-comp-info-value">华泰财产保险有限公司</p>
-    </div>
-    <div class="itd-comp-branch">
-      <p class="itd-comp-branch-title">已设分支机构</p>
-      <p class="itd-comp-branch-value">
-        北京、上海、天津、重庆、江苏、广东、陕西、四川、云南、辽宁、浙江、河北、湖南、湖北、安徽、山西、福建、山东、广西、河南、江西、深圳、青岛、大连、宁波、贵州、内蒙古、厦门、黑龙江、新疆、宁夏、吉林、甘肃
-      </p>
-    </div>
-    <cr-divider class="itd-divider" :hairline="false" />
-    <div class="itd-comp-item">
-      <p class="itd-comp-item-title">业务合作范围</p>
-      <p class="itd-comp-item-value">互联网保险业务</p>
-    </div>
-    <cr-divider class="itd-divider" :hairline="false" />
-    <div class="itd-comp-item">
-      <p class="itd-comp-item-title">保险公司网址</p>
-      <p class="itd-comp-item-value">http://pc.ehuatai.com</p>
-    </div>
-    <cr-divider class="itd-divider" :hairline="false" />
-    <div class="itd-comp-item">
-      <p class="itd-comp-item-title">客服电话</p>
-      <p class="itd-comp-item-value">400-609-5509</p>
+  <div>
+    <div class="itd-comp" v-for="item in corporations" :key="item.name">
+      <div class="itd-comp-info">
+        <p class="itd-comp-info-title">保险公司名称</p>
+        <p class="itd-comp-info-value">{{ item.name }}</p>
+      </div>
+      <div class="itd-comp-branch">
+        <p class="itd-comp-branch-title">已设分支机构</p>
+        <p class="itd-comp-branch-value">{{ item.area }}</p>
+      </div>
+      <cr-divider class="itd-divider" :hairline="false" />
+      <div class="itd-comp-item">
+        <p class="itd-comp-item-title">业务合作范围</p>
+        <p class="itd-comp-item-value">{{ item.scope }}</p>
+      </div>
+      <cr-divider class="itd-divider" :hairline="false" />
+      <div class="itd-comp-item">
+        <p class="itd-comp-item-title">保险公司网址</p>
+        <p class="itd-comp-item-value">{{ item.url }}</p>
+      </div>
+      <cr-divider class="itd-divider" :hairline="false" />
+      <div class="itd-comp-item">
+        <p class="itd-comp-item-title">客服电话</p>
+        <p class="itd-comp-item-value">{{ item.tel }}</p>
+      </div>
     </div>
   </div>
 </template>
 <script>
+import { corporations } from "../constant";
+
 export default {
   name: "Product",
   data() {
-    return {};
+    return {
+      corporations
+    };
   }
 };
 </script>

src/views/Policy/VirtualDetail/index.vue

@@ -34,7 +34,7 @@ export default {
       const url = `${
         config.basicHost
       }policy/download?token=${token}&policySecId=${encodeURIComponent(policySecId)}`;
-      this.pdfUrl = pdf.createLoadingTask({ url, cMapUrl: CMAP_URL, cMapPacked: true });
+      this.pdfUrl = pdf.createLoadingTask({ url });
       this.pdfUrl.promise
         .then(pdf => {
           this.pdfNumPages = pdf.numPages;

src/views/User/Family/modules/FamilyForm.vue

@@ -253,7 +253,7 @@ export default {
     async delFamily() {
       this.modal.delete = false;
       await delFamily({ userInfoSecId: this.information?.userInfoSecId });
-      this.$router.push("/user/family");
+      this.$router.back(-1);
     },
     getReletion(relation) {
       let result = -1;

src/views/User/modules/UserFamily.vue

@@ -4,7 +4,7 @@
     <div class="user-family-info" :class="{ 'user-family-info-item_placeholder': isFixed }">
       <div
         class="user-family-info-item"
-        @click="activeIndex = index"
+        @click="switchTab(index)"
         v-for="(item, index) in familyList"
         :key="index"
       >
@@ -78,22 +78,19 @@ export default {
   data() {
     return {
       isFixed: false,
-      activeIndex: 0
+      activeIndex: 0,
+      policyList: []
     };
   },
+  created() {
+    this.getPolicyList();
+  },
   computed: {
-    ...mapState("user", ["familyList"]),
-    policyList() {
-      if (!localStorage.get("mongoToken") || !this.familyList.length) {
-        // 未登录时返回默认徽章墙
-        const policyList = GOODS_LIST.filter(v => v.id !== "BNZJX001");
-        return policyList;
-      }
-      return this.familyList[this.activeIndex]?.policyList;
-    }
+    ...mapState("user", ["familyList"])
   },
   watch: {
     familyList() {
+      this.getPolicyList();
       this.$nextTick(() => {
         const offsetWidth = document.querySelector(".user-family-info").offsetWidth;
         const scrollWidth = document.querySelector(".user-family-info").scrollWidth;
@@ -102,6 +99,14 @@ export default {
     }
   },
   methods: {
+    getPolicyList() {
+      if (!localStorage.get("mongoToken") || !this.familyList.length) {
+        // 未登录时返回默认徽章墙
+        this.policyList = GOODS_LIST.filter(v => v.id !== "BNZJX001");
+        return;
+      }
+      this.policyList = this.familyList[this.activeIndex]?.policyList;
+    },
     go(path, params) {
       let pathObj = "";
       if (path === "/goods/detail" && params) {
@@ -126,6 +131,10 @@ export default {
       if (pathObj) {
         this.$emit("go", pathObj, false);
       }
+    },
+    switchTab(index) {
+      this.activeIndex = index;
+      this.getPolicyList();
     }
   }
 };

vue.config.js

@@ -152,5 +152,8 @@ module.exports = {
   },
   lintOnSave: true,
   runtimeCompiler: false, // 是否使用包含运行时编译器的 Vue 构建版本
-  productionSourceMap: IS_PROD // 生产环境的 source map
+  productionSourceMap: IS_PROD, // 生产环境的 source map
+  css: {
+    extract: false
+  }
 };