Merge branch 'dev_product' into dev

2025-12-18 12:06:45 +08:00 · 2019-12-02 09:34:11 +08:00
parent 56efe16410 51b54c51d1
commit afd83f20a4
6 changed files with 100 additions and 27 deletions
--- a/src/assets/images/test.png
+++ b/src/assets/images/test.png
--- a/src/config/index.js
+++ b/src/config/index.js
@@ -19,7 +19,8 @@ switch (process.env.VUE_APP_FLAG) {
    // 静态服务资源
    assetsUrl = 'http://139.199.50.151:8000/app/'
    mainUrl = 'http://139.199.50.151'
-    payUrl = 'http://10.10.100.84:7003/s3-modules-gateway/embed/gateway.action'
+    // payUrl = 'http://10.10.100.84:7003/s3-modules-gateway/embed/gateway.action'
+    payUrl = 'http://funduat.e-guofu.com/s3-modules-gateway/embed/gateway.action'
    break
  case 'uat':
    apiDomain = ''
--- a/src/views/ebiz/common/CalculatePremium.vue
+++ b/src/views/ebiz/common/CalculatePremium.vue
@@ -628,7 +628,8 @@ export default {
                trialInfo['amt'] = Number(dutyItem.defaultDutyAmt) * Number(dutyItem.moneyUnit)
                result.push({
                  amt: Number(dutyItem.defaultDutyAmt) * Number(dutyItem.moneyUnit),
-                  dutyCode: dutyItem.duty
+                  dutyCode: dutyItem.duty,
+                  dutyName: dutyItem.dutyName
                })
              }
            })
@@ -712,6 +713,11 @@ export default {
        if (item.isMainRisk == 0) {
          mainRiskCode = item.productCode
        }
+        // this.trialInfos.map(trial=>{
+        //   trial.duty.map(dutylist=> {
+        //     dutylist.dutyname
+        //   })
+        // })
        let riskItem = {
          isMainRisk: item.isMainRisk,
          riskName: item.riskName,
@@ -833,5 +839,6 @@ export default {
  /deep/.van-action-sheet__name {
    font-size: 12px;
  }
+  
 }
 </style>
--- a/src/views/ebiz/proposal/Exhibition.vue
+++ b/src/views/ebiz/proposal/Exhibition.vue
@@ -110,12 +110,52 @@
              </tr>
            </tbody>
          </table>
-          <div class=" bg-green-base pt20 pl15 pr15">
+          <div class=" bg-green-base pt20 pl15 pr15" v-if="mainRiskCodes[0] == 'GFRS_M0008'">
            <div class="text-center fw500 c-gray-darker fs14">产品总利益</div>
-            <div class="flex justify-content-s mt15 " v-for="demoLabel in risk.demoLabel" :key="demoLabel.content">
+            <!-- {{risk.demoLabel}} -->
+            <div class="flex justify-content-s mt15 " v-for="(demoLabel, demoIndex) in risk.demoLabel" :key="demoLabel.content" v-if="demoIndex < 3">
              <span class=" c-gray-darker fs14 ">{{ demoLabel.contentLabel }}</span>
              <span class=" green fs14 ">{{ demoLabel.value }}</span>
            </div>
+            <div class="flex justify-content-s mt15 " v-for="(duty, dutyIndex) in dutyLst" :key="dutyIndex">
+              <span class=" c-gray-darker fs14 ">{{ duty.dutyName }}</span>
+              <span class=" green fs14 ">{{ duty.amt }}</span>
+            </div>
+            <div class="flex justify-content-s  align-items-c mt30 mb20">
+              <img class="w20" @click="reduce(risk)" src="@/assets/images/lessen.png" />
+              <van-slider
+                class="w220"
+                active-color="#E9332E"
+                inactive-color="#fff"
+                :min="1"
+                :max="risk.policyYear"
+                v-model="risk.sliderValue"
+                @input="input(risk.sliderValue, risk.demoValue, risk.demoLabel)"
+              >
+              </van-slider>
+
+              <img class="w20" @click="exhibitionAdd(risk)" src="@/assets/images/add.png" />
+            </div>
+            <select-radio
+              class="mb10"
+              v-if="risk.tap"
+              @radioChange="radioChange(risk)"
+              :required="false"
+              :radios="risk.radios"
+              :value.sync="risk.tap"
+            ></select-radio>
+
+            <div class="green fs12 text-center pb15">拖动按钮查看不同年龄的保单利益</div>
+          </div>
+          <div class=" bg-green-base pt20 pl15 pr15" v-else>
+            <div class="text-center fw500 c-gray-darker fs14">产品总利益</div>
+
+            <div class="flex justify-content-s mt15 " v-for="demoLabel in risk.demoLabel" :key="demoLabel.content">
+              <div>
+                <span class=" c-gray-darker fs14 ">{{ demoLabel.contentLabel }}</span>
+                <span class=" green fs14 ">{{ demoLabel.value }}</span>
+              </div>
+            </div>
            <div class="flex justify-content-s  align-items-c mt30 mb20">
              <img class="w20" @click="reduce(risk)" src="@/assets/images/lessen.png" />
              <van-slider
@@ -188,11 +228,14 @@ export default {
      },
      createDate: '', //创建日期
      amtFormat: filters.amtFormat, //保额格式化
-      wxTitle: ''
+      wxTitle: '',
+      dutyLst: [],
+      mainRiskCodes: []
    }
  },
  mounted() {
    document.body.style.backgroundColor = '#fff'
+    this.mainRiskCodes = JSON.parse(localStorage.mainRiskCodes)
    setTimeout(() => {
      // 右上角的显示
      window.EWebBridge.webCallAppInJs('webview_right_button', {
@@ -253,7 +296,6 @@ export default {
        //在app端
        params.proposalInfoDTO.proposalNo = localStorage.orderNo
        getDemo(params).then(res => {
-         
          this.formatLocal(res)
        })
      }
@@ -318,6 +360,8 @@ export default {
            } else {
              risk.payName = risk.payEndYear + '岁'
            }
+            // risk.demoValue[demoLabel.content] == dutyLst.dutyCode
+            this.dutyLst = risk.dutyLst
          })
        })
        this.appntDTO = orderDTO.appntDTO
@@ -325,7 +369,7 @@ export default {
        insuredDTOs[0].insuredDTOs = orderDTO.insuredDTOs
        insuredDTOs = formatRiskList(insuredDTOs, 'insuredDTOs', 'riskDTOLst')
        this.insuredDTOs = insuredDTOs[0].insuredDTOs
-        this.insuredDTOs = relevance(this.insuredDTOs, insuredLabelResult, insuredResult, insuredInfoResult, this.amtFormat) //进行数据关联
+        this.insuredDTOs = relevance(this.insuredDTOs, insuredLabelResult, insuredResult, insuredInfoResult, this.amtFormat, this.dutyLst) //进行数据关联
        this.getWXTitle(this.insuredDTOs) //获取微信标题
        let active = this.insuredDTOs.length //默认展开项
        this.activeNames = [active]
@@ -333,16 +377,13 @@ export default {
    },
    //获取微信分享的标题
    getWXTitle(insuredDTOs) {
-      
      dataDictionary.riskType.forEach(dataRisk => {
        //根据数字字典来找到 险种简称
        // console.log(insuredDTOs)
        // console.log(insuredDTOs[0].mainRisk[0].riskCode)
-          // console.log(dataRisk.code)
-      
+        // console.log(dataRisk.code)
+
        if (insuredDTOs[0].mainRisk[0].riskCode == dataRisk.code) {
-          
-        
          this.wxTitle = dataRisk.shortName + '计划书'
        }
      })
--- a/src/views/ebiz/proposal/js/exhibitionMethod.js
+++ b/src/views/ebiz/proposal/js/exhibitionMethod.js
@@ -1,16 +1,19 @@
-export function haveTap(content,keys) { //判断是否含有档位
+export function haveTap(content, keys) {
+  //判断是否含有档位
  if (content.indexOf(keys) === -1) {
    return false
  } else {
    return true
  }
 }
-export function getTapIndex(content,keys) { //获取关键字的位置
-  let index = null ;
+export function getTapIndex(content, keys) {
+  //获取关键字的位置
+  let index = null
  index = content.indexOf(keys)
  return index
 }
-export function formLabel(label, key) {  //格式化label
+export function formLabel(label, key) {
+  //格式化label
  let obj = {}
  let result = [] //进行去重
  for (var i = 0; i < label.length; i++) {
@@ -41,7 +44,7 @@ export function formLabel(label, key) {  //格式化label
  return result
 }
 //将被保人与利益演示相关联
-export function  relevance(insured, insuredLabelResult, insuredResult, insuredInfoResult, amtFormat) {
+export function relevance(insured, insuredLabelResult, insuredResult, insuredInfoResult, amtFormat, dutyLst) {
  insured.forEach(insure => {
    insure.productFeatures = ''
    insure.riskDTOLst.forEach(risk => {
@@ -57,8 +60,20 @@ export function  relevance(insured, insuredLabelResult, insuredResult, insuredIn
      risk.demoValue = insuredResult[insuredId][riskCode]
      insure.productFeatures = insure.productFeatures + currentInsuredInfo.productFeatures //所有产品特色

+      // dutyLst.map((duty, ind) => {
+      //   console.log(duty)
+      //   risk.demoLabel.map((item, index, array) => {
+      //     // debugger
+      //     // console.log(risk.demoValue['1'][item.content].replace(/,/g, ''))
+      //     if (risk.demoValue['1'][item.content].replace(/,/g, '') != duty.dutyCode) {
+      //       array.splice(index, 1)
+      //       // console.log('删除成功')
+      //     }
+      //   })
+      // })
      risk.demoLabel.forEach(v => {
        // v.value = '' //设置初始值
+
        v.value = risk.demoValue['1'][v.content] //设置初始值
      })
      if (currentInsuredInfo.plan && currentInsuredInfo.plan === '0') {
@@ -96,4 +111,4 @@ export function  relevance(insured, insuredLabelResult, insuredResult, insuredIn
    })
  })
  return insured
-}
+}
--- a/src/views/ebiz/sale/test.vue
+++ b/src/views/ebiz/sale/test.vue
@@ -1,9 +1,17 @@
 <template>
  <div>
-    <br />
+    <div>
+      <img :src="url" />
+    </div>
+    <!-- <div style="display:flex; align-items:center">
+      <img src="@/assets/images/test.png" style="width:200px" />
+      <span style="margin-left: 100px;">代理人：</span>
+    </div> -->
+
+    <!-- <br />
    <div @click="click">111</div>
    <div @click="saveInformation">222</div>
-    <br />
+    <br /> -->
    <!-- <div @click="next">xiayibu</div>
    <br />
    <div @click="tokens">tokentoken</div>
@@ -46,6 +54,7 @@ import UploadImageFile from '@/components/ebiz/sale/UploadImageFile'
 import { test } from '@/api/ebiz/sale/sale'
 import Pdfh5 from 'pdfh5'
 import { getOrderDetail, saveInformation, submit } from '@/api/ebiz/sale/sale'
+import config from '@/config'
 export default {
  data() {
    return {
@@ -62,7 +71,9 @@ export default {
      value: '',
      file: '',
      imgName: '',
-      fileListIdFront: []
+      fileListIdFront: [],
+      url: '',
+      img: 'Ra4LpmZv2h6FrwZPS48QIETiI2AcWWLx6RavVjoAkoOWFG1azjUfxvbtNZTBxaudR%2BzlL%2B6eeKJK%0Ap7Q4IukdBKhrThx4IlGX69PstI3brvfRHw9I%2FRsejpo6pBQChdvf'
    }
  },
  components: {
@@ -408,13 +419,11 @@ export default {
    //     })
    //   }
    // }
+  },
+  mounted() {
+    this.url = config.imgDomain + `/returnImageStream?imgPath=${encodeURI(this.img).replace(/\+/g, '%2B')}`
+    // this.url = encodeURIComponent(config.imgDomain + `/returnDirectStream?imgPath=${this.img}`)
  }
-  // mounted() {
-  //   this.pdfh5 = new Pdfh5('#pdf', {
-  //     pdfurl: ' http://116.62.236.168:7001/app/returnDirectStream?imgPath=21wMnCAgjp61JTLQz9x%2FttzCA4XCq%2Fvld4QC6P6sYeW3xDg77CCun15Fu%2Fdo3dsT'
-  //     // pdfurl: res.data.content.content
-  //   })
-  // }
 }
 </script>
 <style lang="scss">