From 11ffa3ef7dcbce7f3f6d02bfc135e335bfe5de52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=98=B3=E5=8D=8E=E7=A5=A5?= <yang.huaxiang@ebiz-fooge.com>
Date: Thu, 9 Apr 2020 20:02:47 +0800
Subject: [PATCH] =?UTF-8?q?GFRS-454=E3=80=900326=E3=80=91=20=E5=BB=BA?=
 =?UTF-8?q?=E8=AE=AE=E4=B9=A6=E4=BC=98=E5=8C=962.0=20=20--=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E8=B0=83=E6=95=B4=20--=E6=8F=90=E4=BA=A4=E4=BA=BA?=
 =?UTF-8?q?=EF=BC=9A=E9=98=B3=E5=8D=8E=E7=A5=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/js/utils/data-dictionary.js   |  5 ++
 src/router/ebiz/proposal.js              |  2 +-
 src/views/ebiz/proposal/ProposalInfo.vue | 69 ++++++++++++++++++++----
 3 files changed, 66 insertions(+), 10 deletions(-)

diff --git a/src/assets/js/utils/data-dictionary.js b/src/assets/js/utils/data-dictionary.js
index bad3ac7d3..9d0fb6853 100644
--- a/src/assets/js/utils/data-dictionary.js
+++ b/src/assets/js/utils/data-dictionary.js
@@ -911,6 +911,11 @@ export default {
       shortName: '万能险',
       name: '国富人寿鑫管家终身寿险（万能型）',
       code: 'GFRS_M0017'
+    },
+    {
+      shortName: '寿险',
+      name: '国富人寿国富栋梁定期寿险',
+      code: 'GFRS_M0020'
     }
   ],
   // 职级
diff --git a/src/router/ebiz/proposal.js b/src/router/ebiz/proposal.js
index 64570abd4..6df171f56 100644
--- a/src/router/ebiz/proposal.js
+++ b/src/router/ebiz/proposal.js
@@ -49,7 +49,7 @@ export default [
     name: 'proposalInfo',
     component: proposalInfo,
     meta: {
-      title: '建议书2.0',
+      title: '建议书预览',
       index: 1
     }
   },
diff --git a/src/views/ebiz/proposal/ProposalInfo.vue b/src/views/ebiz/proposal/ProposalInfo.vue
index 6f94f33b1..75549dbc6 100644
--- a/src/views/ebiz/proposal/ProposalInfo.vue
+++ b/src/views/ebiz/proposal/ProposalInfo.vue
@@ -95,14 +95,21 @@
               </div>
               <div :class="pageShowType.riskCheckStatus ? '' : 'hideInfo'" class="text-left div_5">
                 <div v-if="pageShowType.dutyShowType == '01'">
-                  <div class="div_6" v-for="(item, index) in pageShowInfo.showInsuredDTO.riskDTOLst" :key="index">
+                  <div class="div_6 duty_by_duty" v-for="(item, index) in pageShowInfo.showInsuredDTO.riskDTOLst" :key="index">
                     <div class="fw600 fs15 color_3A81F6 show_risk_name">
                       {{ item.riskName }}
                     </div>
                     <div v-for="(subItem, subIndex) in item.riskDutySortResult[item.riskCode]" :key="subIndex">
                       <div v-for="(subItem3, subIndex3) in getObjectValues(subItem)" :key="subIndex3">
-                        <div v-for="(subItem4, subIndex4) in subItem3" :key="subIndex4">
-                          <div class="fs13 color_666666 div_8 pl15">{{ subItem4.dutyStairExplain }}。</div>
+                        <div class="div_16" v-for="(subItem4, subIndex4) in subItem3" :key="subIndex4">
+                          <div class="fw600 fs14 flex align-items-c justify-content-fs">
+                            <div class="head_radis"></div>
+                            <div class="title_2">{{ subItem4.dutyName }}</div>
+                          </div>
+                          <div class="fs13 color_333333 div_17">{{ subItem4.dutyStairExplain }}。</div>
+                          <div class="fs13 color_666666 div_17" v-if="subItem4.dutyDetailExplain && subItem4.dutyDetailExplain != ''">
+                            {{ subItem4.dutyDetailExplain }}。
+                          </div>
                         </div>
                       </div>
                     </div>
@@ -119,7 +126,10 @@
                           <div class="head_radis"></div>
                           <div class="title_2">{{ subItem2.dutyName }}</div>
                         </div>
-                        <div class="fs13 div_17">{{ subItem2.dutyStairExplain }}</div>
+                        <div class="fs13 div_17 color_333333">{{ subItem2.dutyStairExplain }}。</div>
+                        <div class="fs13 div_17 color_666666" v-if="subItem2.dutyDetailExplain && subItem2.dutyDetailExplain != ''">
+                          {{ subItem2.dutyDetailExplain }}。
+                        </div>
                       </div>
                     </div>
                   </div>
@@ -238,7 +248,7 @@
       <div class="div_02">
         <div class="text-center div_021">
           <div class="text-center div_022">家庭保障计划</div>
-          <div class="text-center div_023">尊敬的{{ pageShowInfo.appntDTO.name.substr(0, 1) }}{{ pageShowInfo.appntDTO.sex == '1' ? '先生' : '女士' }}</div>
+          <div class="text-center div_023">尊敬的{{ pageShowInfo.appntDTO.name.substr(0, 1) }}{{ pageShowInfo.appntDTO.sex == '0' ? '先生' : '女士' }}</div>
         </div>
         <img class="img_13" src="@/assets/images/proposal/proposal_share_bg.png" />
       </div>
@@ -334,7 +344,8 @@ export default {
         '5_0': '其他'
       },
       agent: {},
-      mainRiskCodes: []
+      mainRiskCodes: [],
+      time: 10
     }
   },
   filters: {
@@ -362,11 +373,27 @@ export default {
     window['appCallBack'] = this.appCallBack*/
     this.init()
   },
+  created() {},
   beforeRouteLeave(to, from, next) {
     document.body.style.backgroundColor = ''
     next()
   },
   methods: {
+    /* 添加定时器 */
+    timeOut() {
+      let timer = setInterval(() => {
+        this.time--
+        console.log(this.time)
+        if (this.time <= 0) {
+          this.time = 0
+          clearInterval(timer)
+          //处理页面跳转
+          this.showShareType = '01'
+          this.time = false
+        }
+      }, 1000)
+    },
+    /*end*/
     callPhone() {
       console.log('callPhone')
       window.location.href = 'tel://' + this.agent.mobile
@@ -491,6 +518,14 @@ export default {
     //将后端返回的数据格式化为本地
     formatLocal(res) {
       if (res.result == '0') {
+        /*微信分享添加定时*/
+        if (this.isWeixin && this.showShareType == '00') {
+          if (this.time) {
+            console.log(this.time)
+            this.timeOut()
+          }
+        }
+        /*end*/
         let that = this
         let orderDTO = res.content.orderDTO
         this.pageShowInfo.appntDTO = res.content.orderDTO.appntDTO
@@ -637,6 +672,12 @@ export default {
     },
     // 跳转到公司介绍
     goToCompanyProfile() {
+      this.$toast.loading({
+        duration: 0, // 持续展示 toast
+        forbidClick: true, // 禁用背景点击
+        loadingType: 'spinner',
+        message: '加载中……'
+      })
       this.$jump({
         flag: 'h5',
         extra: {
@@ -649,6 +690,12 @@ export default {
     },
     //跳转到pdf 进入建议书后 根据建议书编码来查找相应的pdf
     async goPDF() {
+      this.$toast.loading({
+        duration: 0, // 持续展示 toast
+        forbidClick: true, // 禁用背景点击
+        loadingType: 'spinner',
+        message: '加载中……'
+      })
       this.$jump({
         flag: 'h5',
         extra: {
@@ -803,6 +850,9 @@ export default {
   .color_666666 {
     color: #666666;
   }
+  .color_333333 {
+    color: #333333;
+  }
   .color_FFA42F {
     color: #ffa42f;
   }
@@ -1158,7 +1208,8 @@ export default {
     margin-bottom: 12px;
   }
 }
-  .div_last{
-    line-height: 20px;margin: 5px 0px;
-  }
+.div_last {
+  line-height: 20px;
+  margin: 5px 0px;
+}
 </style>