Merge branch 'feature/goods' into 'master'

Feature/goods

See merge request !15

src/api/goodsList.mock.js

@@ -63,7 +63,7 @@ export default [
   },
   {
     title: "人寿保险",
-    sub: "避免因家庭顶梁柱身故，导致的房贷、子女教育等生活压力",
+    sub: "家庭顶梁柱必备",
     children: [
       {
         id: 1,

src/components/Copyright.vue

@@ -25,7 +25,7 @@ export default {
   line-height: @line-height-sm + 2;
   &-logo {
     text-align: center;
-    margin-bottom: 19px;
+    margin-bottom: 10px;
     img {
       width: 111px;
       height: 35px;

src/views/Goods/detail.less

@@ -6,7 +6,12 @@
 }
 .container {
   background-color: @background-color;
-  margin-bottom: 80px;
+  overflow: hidden;
+  &::after {
+    content: " ";
+    display: block;
+    height: 60px;
+  }
 }
 .plan-tip {
   font-size: @font-size-11;
@@ -14,12 +19,12 @@
   line-height: @line-height-sm;
   margin-top: 14px;
   .svg-icon {
-    margin-right: 1px;
+    margin-right: 4px;
     width: 12px;
     height: 12px;
   }
   &_offset {
-    margin-right: 2px;
+    margin-right: 9px;
   }
 }
 

src/views/Goods/detail.vue

@@ -7,7 +7,7 @@
         <compactCellGroup :cell-data="planCellData" :text-bold="true" />
         <div class="plan-tip">
           <svg-icon icon-class="check-circle" />
-          <span class="plan-tip_offset">垫付医药费轻症赔付后，重疾保障继续有效</span>
+          <span class="plan-tip_offset">轻症赔付后，重疾保障继续有效</span>
           <svg-icon icon-class="check-circle" />
           <span>可逐年续保至99岁</span>
         </div>
@@ -91,7 +91,7 @@
     </div>
     <detail-footer />
     <copyright />
-    <good-action @click="goInsureState = true" />
+    <good-action @click="goInsureState = true" @leftClick="showLayer = true" />
     <protocol-iframe
       v-model="popupShow"
       :title="pupopData.title"
@@ -101,6 +101,7 @@
       <cps-process-detail v-if="currentPupopIndex === 5" />
       <cps-rate v-if="currentPupopIndex === 6" />
     </protocol-iframe>
+    <record-layer v-model="showLayer" desc="敬请期待" />
     <go-insure-dialog v-model="goInsureState" />
   </div>
 </template>
@@ -125,6 +126,7 @@ import crRadioBtn from "@/components/CrRadioBtn";
 import card from "@/components/Card";
 import copyright from "@/components/Copyright";
 import goodAction from "@/components/GoodAction";
+import RecordLayer from "@/components/RecordLayer";
 
 export default {
   name: "GoodsDetail",
@@ -142,7 +144,8 @@ export default {
     goodAction,
     protocolIframe,
     cpsProcessDetail,
-    cpsRate
+    cpsRate,
+    RecordLayer
   },
   data() {
     return {
@@ -159,19 +162,6 @@ export default {
           value: ""
         }
       ],
-      noticeCellData: [
-        { title: "投保年龄", value: "30~6周岁" },
-        { title: "保障期限", value: "1年（可续保至99周岁）" },
-        { title: "等待期", value: "90天" },
-        {
-          title: "保费",
-          value: {
-            needSlot: true,
-            tpl: "保费与保额、被保人年龄有关<br />首月3元，次月5.6元/月起",
-            longTxt: true
-          }
-        }
-      ],
       planOptions: [
         { label: "30万", value: "3" },
         { label: "20万", value: "2" },
@@ -221,7 +211,8 @@ export default {
         auto: false,
         pact: false
       },
-      goInsureState: false
+      goInsureState: false,
+      showLayer: false
     };
   },
   computed: {
@@ -266,6 +257,22 @@ export default {
           break;
       }
       return _data;
+    },
+    noticeCellData() {
+      const { planValue } = this.formData;
+      return [
+        { title: "投保年龄", value: `30~${planValue === "3" ? 5 : 6}0周岁` },
+        { title: "保障期限", value: "1年（可续保至99周岁）" },
+        { title: "等待期", value: "90天" },
+        {
+          title: "保费",
+          value: {
+            needSlot: true,
+            tpl: "保费与保额、被保人年龄有关<br />首月3元，次月5.6元/月起",
+            longTxt: true
+          }
+        }
+      ];
     }
   },
   methods: {

src/views/Goods/index.less

@@ -4,6 +4,11 @@
 .container {
   overflow: hidden;
   background-color: @background-color;
+  &::after {
+    content: " ";
+    display: block;
+    height: 60px;
+  }
 }
 .goods-head {
   width: 100% !important;

src/views/Goods/index.vue

@@ -10,24 +10,27 @@
     </cr-sticky> -->
     <good-list :list="goodsList" />
     <record-layer v-model="showLayer" desc="敬请期待"></record-layer>
-    <ai-test-tip @click.native="showLayer = true" />
+    <!-- <ai-test-tip @click.native="showLayer = true" /> -->
+    <copyright :logo="true" />
     <tabbar></tabbar>
   </div>
 </template>
 
 <script>
-import AiTestTip from "./modules/AiTestTip";
+// import AiTestTip from "./modules/AiTestTip";
 import GoodList from "@/components/GoodList/index";
 import Tabbar from "@/components/Tabbar";
 import goodsList from "@/api/goodsList.mock";
+import copyright from "@/components/Copyright";
 import RecordLayer from "@/components/RecordLayer";
 
 export default {
   name: "GoodsList",
   components: {
-    AiTestTip,
+    // AiTestTip,
     GoodList,
     Tabbar,
+    copyright,
     RecordLayer
   },
   data() {

src/views/Goods/inform.less

@@ -2,7 +2,12 @@
 .inform-container {
   background-color: @white;
   padding-top: 15px;
-  margin-bottom: 60px;
+  overflow: hidden;
+  &::after {
+    content: " ";
+    display: block;
+    height: 60px;
+  }
 }
 .inform {
   &-notice {
@@ -37,6 +42,7 @@
       font-size: @font-size-12;
       color: @black;
       line-height: @line-height-sm + 2;
+      margin-bottom: 0;
     }
   }
   &-btns {

src/views/Goods/modules/CpsQA.vue

 <template>
-  <card title="Q&A" class="collapse-header">
+  <card title="常见问题" class="collapse-header">
     <div class="collapse">
       <div
         class="collapse-item"

src/views/Goods/modules/DetailHeader.vue

@@ -20,7 +20,7 @@
       <cr-button type="warning" block @click="btnClick">立即开启保障</cr-button>
       <div class="det-hd-insured-people">
         已有
-        <em>31492</em>位用户投保
+        <em>0</em>位用户投保
       </div>
     </div>
   </div>

src/views/Goods/modules/GoInsureDialog.vue

@@ -50,11 +50,11 @@ export default {
     return {
       show: false,
       payCellData: [
-        { title: "首月保费", value: "1元" },
+        { title: "首月保费", value: "3元" },
         {
           title: "次月保费",
           value: {
-            tpl: "100.00元/月（共11期）",
+            tpl: "5.6元/月起（共11期）",
             longTxt: true
           }
         }