Merge branch 'fix/goods' into 'master'

Fix/goods

See merge request !135

src/api/detail.zhongan.yiwai.js

@@ -4,7 +4,7 @@
  * @Description:众安50万意外险
  * @Date: 2020-07-27 15:46:37
  * @LastEditors: gzw
- * @LastEditTime: 2020-08-29 11:26:18
+ * @LastEditTime: 2020-08-29 16:18:42
  */
 import goodsBg from "@/assets/images/goods/detail/yiwaixian/bg.png";
 import title from "@/assets/images/goods/detail/yiwaixian/title.png";
@@ -135,7 +135,7 @@ export default {
   popupArray: [
     {
       title: "保险条款",
-      url: "https://mangguo-contract-pdf.qthbx.com/zhong-an-baoxiantiaokuan-v1/"
+      url: "https://mangguo-contract.qthbx.com/zhong-an-baoxiantiaokuan-v1/"
     },
     {
       title: "投保须知及声明",
@@ -147,7 +147,6 @@ export default {
       url: "https://mangguo-contract.qthbx.com/fu-wu-xie-yi-v1/"
     },
     { title: "保险计划" },
-    { title: "保险计划" },
     { title: "理赔信息" },
     { title: "完整费率" },
     {

src/api/product.js

@@ -9,7 +9,7 @@ export const list = param => {
 export const getLink = () => {
   return req.get("third/bainian/insurance_url", {
     params: {
-      goBackUrl: `${window.location.origin}/policy/detail/`
+      goBackUrl: `${window.location.origin}/policy`
     }
   });
 };

src/components/PopupAreaPicker.vue

@@ -5,7 +5,14 @@
       <svg-icon icon-class="triangle-right" slot="button" />
     </div>
     <cr-popup v-model="show" position="bottom" get-container="body">
-      <cr-area ref="area" :value="value" :list="areaList" @cancel="onCancel" @confirm="onConfirm" />
+      <cr-area
+        ref="area"
+        :value="value"
+        :list="areaList"
+        :item-height="44"
+        @cancel="onCancel"
+        @confirm="onConfirm"
+      />
     </cr-popup>
   </div>
 </template>
@@ -45,7 +52,9 @@ export default {
       setTimeout(() => {
         const $area = this.$refs.area;
         const $picker = $area.$refs.picker;
-        const val = this.value;
+        let val = this.value;
+        if (!val) return;
+        val = "" + val;
         let columns = "";
         $area.selectedCodes = [`${val.substring(0, 2)}0000`, `${val.substring(0, 4)}00`, val];
         $area.renderProvince();

src/components/PopupDatePicker.vue

@@ -10,6 +10,7 @@
         type="date"
         :min-date="minDate"
         :max-date="maxDate"
+        :item-height="44"
         @confirm="onConfirm"
         @cancel="onCancel"
       />

src/style/index.less

@@ -2,6 +2,13 @@
 @import "var.less";
 @import "mixins.less";
 
+* {
+  -moz-user-select: none; 
+  -webkit-user-select: none; 
+  -ms-user-select: none; 
+  -khtml-user-select: none; 
+  user-select: none;
+}
 html,
 body,
 #app {

src/views/Consultant/Plan/index.vue

@@ -94,6 +94,7 @@
 <script>
 import Card from "@/components/Card";
 import { getCulsuggestion } from "@/api/consultant";
+import { getLink } from "@/api/product";
 import avator from "@/assets/images/consultant/avator.png";
 import goods from "@/api/goodsList.mock";
 export default {
@@ -104,6 +105,7 @@ export default {
   data() {
     return {
       avator,
+      goods,
       goodInfo: {
         ensure: []
       }
@@ -113,7 +115,7 @@ export default {
     ensureList() {
       return this.goodInfo.ensure
         ? this.goodInfo.ensure.map(item => {
-            item.detailIndex = goods.findIndex(it => it.id === item.productNo);
+            item.detailIndex = this.goods.findIndex(it => it.id === item.productNo);
             return item;
           })
         : [];
@@ -121,6 +123,7 @@ export default {
   },
   mounted() {
     this.getSuggestion();
+    this.getGoodsLink();
   },
   methods: {
     tagFilter(type) {
@@ -168,7 +171,7 @@ export default {
       return _type;
     },
     goDetail(index) {
-      const goodItem = goods[index];
+      const goodItem = this.goods[index];
       if (!goodItem.allow) {
         return;
       }
@@ -187,6 +190,17 @@ export default {
       if (res) {
         this.goodInfo = res;
       }
+    },
+    async getGoodsLink() {
+      if (!this.mongoToken) return;
+      const res = await getLink();
+      if (res) {
+        this.goods.forEach(item => {
+          if (item.productNo === "BNZJX001") {
+            item.url = res.url;
+          }
+        });
+      }
     }
   }
 };

src/views/Policy/Add/index.vue

@@ -849,17 +849,16 @@ export default {
       this.generateOrder("li");
     },
     relationOptionChange(relation) {
-      relation && this.relationChange(relation, this.clearInsured);
-      setTimeout(() => {
-        this.clearInsured = true;
-      }, 1000);
+      relation && this.relationChange(relation, true);
+      this.clearInsured = true;
     },
     relationChange(relation, clear = false) {
       if (clear) {
-        this.formData.insuredUserInfo = {
+        this.$set(this.formData, "insuredUserInfo", {
           relation,
           longTerm: "1"
-        };
+        });
+        this.$forceUpdate();
       }
       this.familyList.forEach(item => {
         const { relation, nameMask: name, idNoMask: idNo, userInfoSecId } = item;