Merge branch 'feature/add_property' into 'master'

Feature/add property

See merge request !251

src/App.vue

@@ -26,6 +26,8 @@ import AuthFromXyqb from "@/components/AuthFromXyqb";
 import PopupWithIframe from "@/components/PopupWithIframe";
 import NetError from "@/components/NetError";
 import OpenBrowerTip from "@/components/OpenBrowerTip";
+import { routerStorage } from "@/service/routerStorage";
+
 export default {
   components: {
     LoginModal,
@@ -44,6 +46,7 @@ export default {
   },
   watch: {
     $route(to, from) {
+      routerStorage(to.path, from.path);
       const firstPath = ["/home", "/goods", "/consultant", "/user"];
       if (
         [to.path, from.path].every(v => firstPath.includes(v)) ||

src/api/detail.huagui.shouxian.js

@@ -180,6 +180,10 @@ export default {
     {
       title: "转账授权书",
       url: "https://mangguo-contract.qthbx.com/hua-gui-zhuan-zhang-shou-quan-shu-v1/"
+    },
+    {
+      title: "被保人同意声明",
+      url: "https://mangguo-contract.qthbx.com/bei-bao-xian-ren-tong-yi-sheng-ming-v1/"
     }
   ],
   protocolData: [
@@ -189,7 +193,8 @@ export default {
     { title: "转账授权书", id: 11 },
     { title: "人身保险投保提示书", id: 8 },
     { title: "税收居民身份证明", id: 9 },
-    { title: "风控查询授权书", id: 10 }
+    { title: "风控查询授权书", id: 10 },
+    { title: "被保人同意声明", id: 12 }
   ],
   caseInfo: {
     name: "张先生",

src/api/detail.zhongan.yiwai.js

@@ -142,7 +142,8 @@ export default {
   protocolData: [
     { title: "保险条款", id: 0 },
     { title: "投保须知与声明", id: 1 },
-    { title: "服务协议", id: 3 }
+    { title: "服务协议", id: 3 },
+    { title: "被保人同意声明", id: 9 }
   ],
   popupArray: [
     {
@@ -168,6 +169,10 @@ export default {
     {
       title: "众安职业类别",
       url: "https://mangguo-contract.qthbx.com/zhong-an-zhi-ye-lei-bie-v1/"
+    },
+    {
+      title: "被保人同意声明",
+      url: "https://mangguo-contract.qthbx.com/bei-bao-xian-ren-tong-yi-sheng-ming-v1/"
     }
   ],
   caseInfo: {

src/api/goodsList.mock.js

@@ -31,6 +31,7 @@ export default [
     guarantee_title: "医疗保障",
     guarantee_sub: "看病报销医药费,最高600万",
     company: "泰康在线",
+    company_name: "泰康在线财产保险股份有限公司",
     payType: [
       { label: "月缴", value: 1 },
       { label: "一次交清", value: 2 }
@@ -57,6 +58,7 @@ export default [
     guarantee_title: "重疾保障",
     guarantee_sub: "100种重疾+40种轻症确诊即赔",
     company: "华泰财险",
+    company_name: "华泰财产保险有限公司",
     payType: [
       { label: "月缴", value: 1 },
       { label: "一次交清", value: 2 }
@@ -83,6 +85,7 @@ export default [
     guarantee_title: "意外保障",
     guarantee_sub: "意外风险覆盖全,保额最高100万",
     company: "众安保险",
+    company_name: "众安在线财产保险股份有限公司",
     payType: [],
     policyPeriod: [],
     paymentInstruction:
@@ -107,6 +110,7 @@ export default [
     guarantee_title: "重疾保障",
     guarantee_sub: "终身保障155种重疾，最多赔付6次",
     company: "百年人寿",
+    company_name: "",
     payType: [{ label: "年缴", value: 1 }],
     policyPeriod: [
       { label: "保至70周岁", value: 1 },
@@ -133,6 +137,7 @@ export default [
     guarantee_title: "人寿保障",
     guarantee_sub: "最高350万保额,顶梁柱必备",
     company: "华贵人寿",
+    company_name: "华贵人寿保险股份有限公司",
     payType: [{ label: "年缴", value: 1 }],
     policyPeriod: [
       { label: "10年", value: 1 },

src/api/settings.js

 export default {
-  tel: "010-82194734",
+  tel: "18701683762",
   serviceHours: "9:00-21:00",
   sobot:
     "https://mangobaoxian.sobot.com/chat/h5/v2/index.html?sysnum=cfe2ac6677f94698be2e2d842f23066d",
@@ -9,6 +9,7 @@ export default {
     title: "自动续保协议",
     url: "https://mangguo-contract.qthbx.com/zi-dong-xu-bao-fu-wu-xie-yi-v1/"
   },
+  customerNotificationUrl: "https://mangguo-contract.qthbx.com/ke-hu-gao-zhi-shu-v1/",
   consultant: {
     name: "赵玉龙",
     role: "金牌保险顾问",

src/components/AuthFromXyqb.vue

@@ -39,6 +39,7 @@ import { mapState, mapActions } from "vuex";
 import protocol from "@/api/protocol";
 import { authByxyqb } from "@/api/user";
 import localStorage from "@/service/localStorage";
+import { loginSa } from "@/service/utils";
 
 export default {
   name: "AuthFromXyqb",
@@ -88,6 +89,7 @@ export default {
     async confirm() {
       const res = await authByxyqb({ xyqbToken: localStorage.get("xyqbToken") });
       localStorage.set("mongoToken", res.token);
+      loginSa(res.userSecId);
       this.setAuthXyqb(4);
     },
     showProtocol(idx) {

src/components/GoodAction.vue

@@ -34,8 +34,8 @@
  */
 const LEFT_BTN_CLICK_EVENT = "leftClick";
 const RIGHT_BTN_CLICK_EVENT = "click";
-import settings from "@/api/settings";
-import { onKeyboardStateChange } from "@/service/utils";
+import { onKeyboardStateChange, getSobot } from "@/service/utils";
+
 export default {
   name: "GoodAction",
   props: {
@@ -72,7 +72,7 @@ export default {
   methods: {
     leftClick() {
       this.$emit(LEFT_BTN_CLICK_EVENT, {});
-      window.location.href = settings.sobot;
+      window.location.href = getSobot();
     },
     rightClick() {
       // TODO

src/components/LoginModal.vue

@@ -53,6 +53,8 @@ import { loginByPhone, getCaptchaSms } from "@/api/user";
 import protocol from "@/api/protocol";
 import { isPhone, isWeixinBrower } from "@/service/validation";
 import localStorage from "@/service/localStorage";
+import { loginSa } from "@/service/utils";
+
 export default {
   name: "LoginModal",
   components: {
@@ -108,6 +110,7 @@ export default {
         this.$notify({ type: "success", message: "登录成功" });
         this.setIsShowLogin(false);
         localStorage.set("mongoToken", res.token);
+        loginSa(res.userSecId);
         // TODO 开发目前使用这个token
         // localStorage.setItem("mongoToken", "6ae7da7dd4c543f1a36c702c6f419f12");
       }

src/main.js

@@ -11,6 +11,7 @@ import Raven from "raven-js";
 import RavenVue from "raven-js/plugins/vue";
 import config from "@/config";
 import { release } from "../.sentryclirc";
+import { registerSa } from "./service/utils";
 
 Vue.config.productionTip = false;
 new Vue({
@@ -40,8 +41,10 @@ sa.init({
   },
   show_log: config.test
 });
+
 // 添加公共属性
-sa.registerPage({ platformType: "H5" });
+registerSa();
+
 router.afterEach(() => {
   Vue.nextTick(() => {
     sa.quick("autoTrackSinglePage");

src/router/routes.js

@@ -124,6 +124,12 @@ export default [
     component: () => import("../views/Policy/VirtualDetail/index.vue"),
     meta: { title: "芒果保险" }
   },
+  {
+    path: "/goods/customer-notification",
+    name: "CustomerNotification",
+    component: () => import("../views/Goods/CustomerNotification/index.vue"),
+    meta: { title: "客户告知书" }
+  },
   {
     path: "/policy/success/:orderNo/:productNo",
     name: "Sucess",

src/service/localStorage.js

@@ -23,7 +23,6 @@ export default {
     if (key === "mongoToken") {
       Cookies.set(key, value, { expires: 3650 });
     }
-    console.log(value);
     return window.localStorage.setItem(key, value);
   },
   remove(key) {

src/service/routerStorage.js

+import localStorage from "@/service/localStorage";
+
+export function routerStorage(toPath, fromPath) {
+  let storage = localStorage.get("history") || { isBack: false, paths: [], fromPath: "" };
+  // 初始化
+  if (fromPath === "/") storage.paths = [];
+  if (storage.paths.includes(toPath)) {
+    const toPathIndex = storage.paths.indexOf(toPath);
+    storage = { ...storage, isBack: true, fromPath };
+    storage.paths.splice(toPathIndex + 1);
+  } else {
+    storage = { ...storage, isBack: false, fromPath };
+    storage.paths.push(toPath);
+  }
+  localStorage.set("history", storage);
+}
+
+export function isBack(excludeFromPath = "") {
+  let storage = localStorage.get("history") || { isBack: false, paths: [], fromPath: "" };
+  if (storage.isBack && excludeFromPath !== storage.fromPath) {
+    return true;
+  }
+  return false;
+}

src/service/utils.js

+import sa from "sa-sdk-javascript";
 import { isAndroid, isIOS } from "./validation";
+import localStorage from "@/service/localStorage";
+import settings from "@/api/settings";
+
 /**
  * 替换邮箱字符
  * @param {String} email 输入字符串
@@ -317,3 +321,31 @@ export function onKeyboardStateChange(callback = () => {}, off = false) {
 export function isValidDate(date) {
   return date instanceof Date && !isNaN(date.getTime());
 }
+
+// 神策注册公共属性
+export function registerSa() {
+  const saObj = { platformType: "H5" };
+
+  // 获取distinctId
+  sa.quick("isReady", function() {
+    const distinctId = sa.quick("getAnonymousID");
+    localStorage.set("distinctId", distinctId);
+  });
+
+  // 添加公共属性
+  sa.registerPage(saObj);
+  // 登陆埋点
+  loginSa();
+}
+
+// 用户登录神策埋点
+export function loginSa(uuid = localStorage.get("uuid")) {
+  if (!uuid) return;
+  localStorage.set("uuid", uuid);
+  sa.login(uuid);
+}
+
+export function getSobot() {
+  const distinctId = localStorage.get("distinctId");
+  return distinctId ? `${settings.sobot}&partnerid=${distinctId}` : settings.sobot;
+}

src/views/Goods/CustomerNotification/index.less

+@import "../../../style/var.less";
+@import "../../../style/mixins.less";
+
+.cn-container {
+  height: 100%;
+  background: #fff;
+}
\ No newline at end of file

src/views/Goods/CustomerNotification/index.vue

+<template>
+  <div class="cn-container">
+    <cr-image
+      width=""
+      height=""
+      fit="cover"
+      src="https://activitystatic.lkbang.net/customer_notification_1.jpg"
+    />
+  </div>
+</template>
+
+<script>
+export default {
+  name: "CustomerNotification"
+};
+</script>
+<style lang="less" src="./index.less" scoped></style>

src/views/Goods/Detail/index.vue

@@ -5,6 +5,7 @@
     <ai-detail v-if="detailType === 'ai'" />
     <li-detail v-if="detailType === 'li'" />
     <advisor-rec-dialog :value="showRec" @close="pageBack" />
+    <instruction-modal v-model="showInstruction" :items="items" />
   </div>
 </template>
 
@@ -18,6 +19,15 @@ import { getCulOrder } from "@/api/consultant";
 import localStorage from "@/service/localStorage";
 import { isXyqb } from "@/service/validation";
 import { mapActions, mapState } from "vuex";
+import InstructionModal from "./modules/InstructionModal";
+import goodsList from "@/api/goodsList.mock";
+import { isBack } from "@/service/routerStorage";
+
+const items = [
+  { title: "投保操作记录", content: "方便回溯管理让用户更放心" },
+  { title: "保险条款阅读", content: "请仔细阅读保险条款与" },
+  { title: "合作公司披露", content: "" }
+];
 
 export default {
   name: "GoodsDetail",
@@ -26,7 +36,8 @@ export default {
     miDetail,
     aiDetail,
     liDetail,
-    AdvisorRecDialog
+    AdvisorRecDialog,
+    InstructionModal
   },
   data() {
     return {
@@ -34,14 +45,22 @@ export default {
       showRec: false,
       noOrder: true,
       userClickState: false,
-      userBackState: false
+      userBackState: false,
+      showInstruction: true,
+      items
     };
   },
+  created() {
+    this.items[2].content =
+      goodsList.find(goods => goods.id === this.$route.query.id)?.company_name || "";
+    if (isBack("/goods/customer-notification")) this.showInstruction = false;
+  },
   computed: {
     ...mapState(["showAuthXyqb"])
   },
   beforeRouteLeave(to, from, next) {
     const blackList = ["Goods", "Home", "Detail", "ConsultantPlan", "User"];
+    this.showInstruction = false;
     if (isXyqb && this.showAuthXyqb == 2) {
       next(false);
       return;

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

@@ -152,6 +152,7 @@ export default {
       margin-bottom: 4px;
     }
     &-link {
+      line-height: 15px;
       a {
         font-size: @font-size-12;
         vertical-align: middle;

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

+<template>
+  <div>
+    <cr-popup v-model="value" get-container="body" @close="onClose" class="intro-popup">
+      <div class="intro-popup-container">
+        <div class="intro-popup-title">
+          <cr-image
+            class="Ip-title-image"
+            round
+            width=""
+            height=""
+            src="@/assets/images/goods/detail/instruction@2x.png"
+          />
+        </div>
+        <div class="intro-popup-desc">
+          提示您即将进入投保流程，为确保流程顺利，请了解以下信息：
+        </div>
+        <div class="intro-popup-box">
+          <div class="Ip-box-item" v-for="(item, index) in items" :key="index">
+            <div class="Ipb-item-left">{{ index + 1 }}</div>
+            <div class="Ipb-item-right">
+              <p class="Ipbi-right-title">
+                {{ item.title }}
+              </p>
+              <p class="Ipbi-right-content">
+                {{ item.content
+                }}<a
+                  v-if="index === 1"
+                  href="javascript:;"
+                  @click="$router.push('/goods/customer-notification')"
+                  >客户告知书</a
+                >
+              </p>
+            </div>
+          </div>
+        </div>
+        <div class="intro-popup-save">
+          <cr-button class="Ip-save-button" @click="close()">确认</cr-button>
+        </div>
+        <p class="intro-popup-tips">由全天候保险代理股份有限公司提供保险中介服务</p>
+      </div>
+    </cr-popup>
+  </div>
+</template>
+
+<script>
+import settings from "@/api/settings";
+
+export default {
+  name: "InstructionModal",
+  props: {
+    value: {
+      type: Boolean,
+      default: false
+    },
+    items: {
+      type: Object,
+      default: () => ({})
+    }
+  },
+  data() {
+    return {
+      popupShow: false,
+      customerNotificationUrl: settings.customerNotificationUrl
+    };
+  },
+  watch: {},
+  methods: {
+    close() {
+      this.$emit("input", false);
+    }
+  }
+};
+</script>
+
+<style lang="less" scoped>
+@import "../../../../style/index.less";
+
+.intro-popup {
+  box-sizing: border-box;
+  padding: 27px 20px;
+  width: 300px;
+  height: 453px;
+  background: linear-gradient(180deg, #ffc842 0%, #ffffff 20%);
+  border-radius: 14px;
+  &-title {
+    display: flex;
+    justify-content: center;
+    .Ip-title-image {
+      width: 156px;
+      height: 39px;
+    }
+  }
+  &-desc {
+    margin: 15px auto 17px;
+    width: 260px;
+    height: 48px;
+    font-size: 14px;
+    font-weight: 400;
+    color: #666666;
+    line-height: 24px;
+  }
+  &-box {
+    box-sizing: border-box;
+    margin: 0 auto;
+    padding: 16px;
+    width: 260px;
+    height: 182px;
+    background: #f6f7fa;
+    border-radius: 8px;
+    .Ip-box-item {
+      display: flex;
+      align-items: center;
+      &:not(:first-child) {
+        margin-top: 12px;
+      }
+      .Ipb-item-left {
+        margin-right: 12px;
+        width: 19px;
+        height: 19px;
+        background: #ffc842;
+        border-radius: 50%;
+        box-shadow: 0px 6px 25px 0px rgba(255, 200, 66, 0.2);
+        font-size: 12px;
+        font-weight: 600;
+        color: #242629;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+      }
+      .Ipb-item-right {
+        .Ipbi-right-title {
+          width: 88px;
+          height: 24px;
+          font-size: 14px;
+          font-weight: 600;
+          color: #333333;
+          line-height: 24px;
+        }
+        .Ipbi-right-content {
+          height: 18px;
+          font-size: 12px;
+          font-weight: 400;
+          color: #666666;
+          line-height: 18px;
+        }
+      }
+    }
+  }
+  &-save {
+    display: flex;
+    justify-content: center;
+    margin: 16px;
+    .Ip-save-button {
+      width: 260px;
+      height: 52px;
+      background: #ffc842 !important;
+      border-radius: 14px !important;
+      font-size: 16px;
+      font-weight: 600;
+      color: #333333;
+      line-height: 22px;
+    }
+  }
+  &-tips {
+    width: 100%;
+    text-align: center;
+    height: 13px;
+    font-size: 11px;
+    font-weight: 400;
+    color: #999999;
+    line-height: 13px;
+  }
+}
+</style>

src/views/Goods/index.vue

@@ -24,6 +24,7 @@ import AiTestTip from "./modules/AiTestTip";
 import GoodList from "@/components/GoodList/index";
 import Tabbar from "@/components/Tabbar";
 import copyright from "@/components/Copyright";
+import InstructionModal from "./Detail/modules/InstructionModal";
 
 const categoryList = [
   {
@@ -54,7 +55,8 @@ export default {
     AiTestTip,
     GoodList,
     Tabbar,
-    copyright
+    copyright,
+    InstructionModal,
   },
   data() {
     return {
@@ -62,7 +64,8 @@ export default {
       showLayer: false,
       goodsList: [],
       mongoToken: localStorage.get("mongoToken"),
-      goodsLink: ""
+      goodsLink: "",
+      showInstruction: true
     };
   },
   watch: {

src/views/Home/index.less

@@ -27,10 +27,10 @@
     position: absolute;
     top: 181px;
     left: 50%;
-    margin-left: -76.5px;
-    width: 153px;
-    height: 60px;
-    background: url('https://activitystatic.lkbang.net/mongo/images/activity-button%402x.ead076b6.png') no-repeat center/contain;
+    margin-left: -89px;
+    width: 178px;
+    height: 64px;
+    background: url('../../assets/images/home/activity-button_medical@2x.png') no-repeat center/contain;
     -webkit-animation: free_download .8s linear alternate infinite;
     animation: free_download .8s linear alternate infinite;
   }

src/views/Home/index.vue

@@ -5,9 +5,9 @@
       width=""
       height=""
       fit="cover"
-      src="@/assets/images/home/activity@2x.png"
+      src="@/assets/images/home/activity_medical@2x.png"
     />
-    <div class="home-button" @click="$router.push('/home/activity')"></div>
+    <div class="home-button" @click="goActivity()"></div>
     <div class="home-service">
       <div @click="goSmartMeasure" class="home-service-item">
         <svg-icon icon-class="risk-assessment" class-name="Hs-item-svg" />
@@ -160,6 +160,12 @@ export default {
     }
   },
   methods: {
+    goActivity() {
+      this.$router.push({
+        path: "/goods/detail",
+        query: { id: "TKYLX001", type: "mi" }
+      });
+    },
     clickUsefulOption(val) {
       this.articleUseful = val;
       localStorage.set("articleUseful", val);

src/views/Introduction/modules/BusinessQuali.vue

@@ -47,7 +47,7 @@
     <div class="itd-quali-item">
       <p class="itd-quali-item-title">8. 客服与消费者投诉电话</p>
       <div class="itd-quali-item-content">
-        010-82194734
+        18701683762
       </div>
     </div>
     <div class="itd-quali-item">

src/views/Policy/Add/index.vue

@@ -464,6 +464,8 @@
             <a href="javascript:;" @click="openIframePupop(9)">税收居民身份证明</a>
             <i></i>
             <a href="javascript:;" @click="openIframePupop(10)">风控查询授权说明书</a>
+            <i></i>
+            <a href="javascript:;" @click="openIframePupop(12)">被保人同意声明</a>
           </div>
         </template>
       </cr-field>
@@ -490,6 +492,7 @@
           <a href="javascript:;" @click="openIframePupop(8)">人身保险投保提示书</a>
           <a href="javascript:;" @click="openIframePupop(9)">税收居民身份证明</a>
           <a href="javascript:;" @click="openIframePupop(10)">风控查询授权说明书</a>
+          <a href="javascript:;" @click="openIframePupop(12)">被保人同意声明</a>
         </div>
       </div>
     </go-insure-dialog>

src/views/Policy/Detail/modules/CustomerService.vue

@@ -11,7 +11,7 @@
   </div>
 </template>
 <script>
-import settings from "@/api/settings";
+import { getSobot } from "@/service/utils";
 
 export default {
   name: "CustomerService",
@@ -23,7 +23,7 @@ export default {
       if (type === "home") {
         this.$router.push("/home");
       } else {
-        window.location.href = settings.sobot;
+        window.location.href = getSobot();
       }
     }
   }

src/views/Policy/modules/PolicyItem.vue

@@ -77,10 +77,10 @@ import { some } from "lodash-es";
 import GOODS_LIST from "@/api/goodsList.mock";
 import { getPolicyList } from "@/api/policy";
 import { getLink } from "@/api/product";
-import settings from "@/api/settings";
 import policyStatusMixin from "../mixin/policyStatus.mixin";
 import detailPayMixin from "@/views/Goods/Detail/modules/detailPay.mixin";
 import electronicInsurance from "../mixin/electronicInsurance.mixin";
+import { getSobot } from "@/service/utils";
 
 // SELF(1, "本人"),
 // PARENT(2, "父母"),
@@ -152,7 +152,7 @@ export default {
         };
         this.goPay();
       } else if (text === "联系客服") {
-        window.location.href = settings.sobot;
+        window.location.href = getSobot();
       }
     },
     goDetail(orderNo) {