From 08ffaed42f9a00a7bc721ad8650b04b75c81fc00 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: Tue, 7 Apr 2020 15:57:19 +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=B41=E3=80=81=E6=9D=A1=E6=AC=BE?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=EF=BC=8C2=E3=80=81=E9=A2=9C=E8=89=B2?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=20--=E6=8F=90=E4=BA=A4=E4=BA=BA=EF=BC=9A?=
 =?UTF-8?q?=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/views/ebiz/proposal/CaluePDF.vue     |  3 +-
 src/views/ebiz/proposal/ProposalInfo.vue | 37 ++++++++++++------------
 2 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/src/views/ebiz/proposal/CaluePDF.vue b/src/views/ebiz/proposal/CaluePDF.vue
index a376e78a2..93bfed4ca 100644
--- a/src/views/ebiz/proposal/CaluePDF.vue
+++ b/src/views/ebiz/proposal/CaluePDF.vue
@@ -4,7 +4,6 @@
   </div>
 </template>
 <script>
-import { makePdf } from '@/api/ebiz/proposal/proposal.js'
 import { Toast } from 'vant'
 import config from '@/config'
 import dataDictionary from '@/assets/js/utils/data-dictionary' //使用数据字典中的险种类型
@@ -27,7 +26,7 @@ export default {
   mounted() {},
   methods: {
     async init() {
-      let pdfUrl = location.showCaluePDFUrl
+      let pdfUrl = localStorage.showCaluePDFUrl
       this.pdfUrl = location.origin + '/pdfjs/web/viewer.html?file=' + pdfUrl
     },
     // 分享按钮
diff --git a/src/views/ebiz/proposal/ProposalInfo.vue b/src/views/ebiz/proposal/ProposalInfo.vue
index cac3b5bf8..8f69fca0b 100644
--- a/src/views/ebiz/proposal/ProposalInfo.vue
+++ b/src/views/ebiz/proposal/ProposalInfo.vue
@@ -38,7 +38,7 @@
                 <div class="line_gray"></div>
                 <div class="text-center">
                   <label class="fs14 color_3A81F6 fw600 lh24">投保人</label><br />
-                  <label class="fs13 color_666666 lh20">{{ pageShowInfo.appntDTO.sex == '1' ? '男' : '女' }}&nbsp;{{ pageShowInfo.appntDTO.age }}周岁</label>
+                  <label class="fs13 color_666666 lh20">{{ pageShowInfo.appntDTO.sex == '0' ? '男' : '女' }}&nbsp;{{ pageShowInfo.appntDTO.age }}周岁</label>
                 </div>
                 <div class="line_gray"></div>
                 <div class="text-center">
@@ -57,7 +57,7 @@
                   <div class="flex justify-content-c align-items-c pl7 pr7 pt7 pb7 table_border">首年保费(元)</div>
                 </div>
                 <div
-                  class="risk_body flex text-center bg-green-base c-gray-darker table bg_F5FBFF"
+                  class="risk_body flex text-center bg-green-base c-gray-darker table bg_f7fbff"
                   v-for="(riskItem, index) in pageShowInfo.showInsuredDTO.riskDTOLst"
                   :key="index"
                 >
@@ -149,9 +149,15 @@
               <div class="fs16 color_3A81F6 lh24 fw600">产品总利益演示</div>
               <div class="line_C8DBFB"></div>
               <div class="mt15 ml15 mr15">
-                <div class="flex justify-content-s align-items-c fs14 lh_30" v-for="(moneyItem, index) in pageShowInfo.showInsuredDTO.demoLabel" :key="index">
-                  <span>{{ moneyItem.contentLabel }}</span>
-                  <div>
+                <div
+                  class="flex justify-content-s align-items-c fs14 div_last"
+                  v-for="(moneyItem, index) in pageShowInfo.showInsuredDTO.demoLabel"
+                  :key="index"
+                >
+                  <div class="text-left" style="width: 75%;">
+                    <span>{{ moneyItem.contentLabel }}</span>
+                  </div>
+                  <div class="text-right">
                     <span class="color_3A81F6">{{ moneyItem.value }}</span
                     >{{ moneyItem.content | productRateUnit }}
                   </div>
@@ -446,12 +452,7 @@ export default {
           extra: {
             title: this.wxTitle,
             content: '国富为您量身定制的保险产品，请查收',
-            url:
-              location.origin +
-              '/#/proposal/proposalInfo?proposalNo=' +
-              encodeURI(localStorage.orderNo) +
-              '&token=' +
-              encodeURI(localStorage.token),
+            url: location.origin + '/#/proposal/proposalInfo?proposalNo=' + encodeURI(localStorage.orderNo) + '&token=' + encodeURI(localStorage.token),
             // url: 'http://47.96.143.111/#/proposal/proposalInfo?proposalNo=' + localStorage.orderNo + '&token=' + localStorage.token,
             img: this.$assetsUrl + 'images/logo.png'
           }
@@ -464,12 +465,7 @@ export default {
         extra: {
           title: this.wxTitle,
           content: '国富为您量身定制的保险产品，请查收',
-          url:
-            location.origin +
-            '/#/proposal/proposalInfo?proposalNo=' +
-            encodeURI(localStorage.orderNo) +
-            '&token=' +
-            encodeURI(localStorage.token),
+          url: location.origin + '/#/proposal/proposalInfo?proposalNo=' + encodeURI(localStorage.orderNo) + '&token=' + encodeURI(localStorage.token),
           // url: 'http://47.96.143.111/#/proposal/proposalInfo?proposalNo=' + localStorage.orderNo + '&token=' + localStorage.token,
           img: this.$assetsUrl + 'images/logo.png'
         }
@@ -660,7 +656,7 @@ export default {
     },
     // 条款PDF
     async goCaluePDF(riskItem) {
-      location.showCaluePDFUrl = riskItem.url
+      localStorage.showCaluePDFUrl = riskItem.url
       this.$jump({
         flag: 'h5',
         extra: {
@@ -1096,7 +1092,7 @@ export default {
   width: 67px;
   height: 105px;
 }
-.bg_F5FBFF {
+.bg_f7fbff {
   background-color: #f5fbff;
 }
 .bg_DBEFFE {
@@ -1157,4 +1153,7 @@ export default {
     margin-bottom: 12px;
   }
 }
+  .div_last{
+    line-height: 20px;margin: 5px 0px;
+  }
 </style>