Merge remote-tracking branch 'origin/dev' into dev

src/config/index.js

@@ -29,7 +29,7 @@ switch (process.env.VUE_APP_FLAG) {
     imgDomain = 'http://116.62.236.168:7001'
     // 静态服务资源
     assetsUrl = 'http://139.9.25.84:7001/'
-    mainUrl=''
+    mainUrl = ''
     break
 }
 /**

src/views/ebiz/proposal/ChooseInsuredPerson.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="choose-insuredPerson pb60 pt10">
-    <div slot="content" class=" p10 bg-white flex h80 justify-content-s">
+    <div slot="content" class="p10 bg-white flex h80 justify-content-s">
-      <div v-for="item in persons" class="text-center " :key="item.code" @click="handleChoose(item)">
+      <div v-for="item in persons" class="text-center" :key="item.code" @click="handleChoose(item)">
         <div class="relative">
           <img :src="item.icon" class="w50 radius50" />
           <span class="absolute" style="right:0px">
@@ -10,22 +10,18 @@
           </span>
         </div>
 
-        <p class="fs12">
+        <p class="fs12">{{ item.relationName }}</p>
-          {{ item.relationName }}
-        </p>
       </div>
     </div>
     <ul>
       <li class="flex pv15 ph10 bg-white align-items-c" style="flex-wrap: wrap;border-top:1px solid #DADADA" v-for="(choose, index) in chooseList" :key="index">
         <img class="w35 mr10 radius50" :src="choose.icon" />
         <span class="mr20 fs15">{{ choose.relationName }}</span>
-        <div v-if="choose.hasRisk" class="fs15 c-gray-dark ">
+        <div v-if="choose.hasRisk" class="fs15 c-gray-dark">
           <div>姓名: {{ choose.name }}</div>
           <div v-if="choose.totalPrem != '0.00'">首期总保费（元）: {{ choose.totalPrem | moneyFormat }}</div>
         </div>
-        <div class="mr10 fs15 c-gray-dark" @click="insure(choose)" v-else>
+        <div class="mr10 fs15 c-gray-dark" @click="insure(choose)" v-else>点击为他/她投保</div>
-          点击为他/她投保
-        </div>
         <div style="flex-grow:1" :class="[choose.totalAmt == '0.00' || choose.hasRisk == false ? '' : 'mt10', 'flex', 'justify-content-fe']">
           <van-button v-if="choose.code > 3" round class="ph0 w40" hairline type="danger" size="small" style="margin-right:5px;" @click="addPerson(choose)"
             >添加</van-button
@@ -119,7 +115,7 @@ export default {
 
       if (res.result == '0') {
         this.chooseList = res.content[0].insuredDTOs
-        console.log(res.content[0].appntDTO,'zzz')
+        console.log(res.content[0].appntDTO, 'zzz')
         localStorage.proposalAppnt = JSON.stringify(res.content[0].appntDTO)
         this.proposalInfo = res.content[0]
         if (this.chooseList != null) {
@@ -203,7 +199,6 @@ export default {
         }
       }
       saveProposal(params).then(res => {
-        console.log(res)
         if (res.result == '0') {
           localStorage.orderNo = res.content.orderNo
           //调用保存接口
@@ -219,6 +214,7 @@ export default {
         }
       })
     },
+
     //从页头选择被保人
     handleChoose(item) {
       console.log(item)

src/views/ebiz/sale/SignatureConfirmation.vue

@@ -4,7 +4,8 @@
       <div v-if="isWeixin" class="bg-white mt10 p20 fs14 tips">
         <p>
           尊敬的
-          <span class="red">{{tipsName}}</span>先生/女士，您好！
+          <span class="red">{{ tipsName }}</span
+          >先生/女士，您好！
         </p>
         <p>该保单由国富人寿保险有限责任公司进行承保，具体确认信息如下：</p>
       </div>
@@ -13,10 +14,7 @@
         <van-cell title="销售人员姓名" :value="recmd.name" />
         <van-cell title="投保单号" :value="orderInfo.orderNo" @click="toTest"></van-cell>
         <van-cell title="投保日期" :value="date" />
-        <van-cell
+        <van-cell title="保费合计(元)" :value="orderInfo.orderAmount == undefined ? '' : orderInfo.orderAmount | moneyFormat" />
-          title="保费合计(元)"
-          :value="orderInfo.orderAmount == undefined ? '' : orderInfo.orderAmount | moneyFormat"
-        />
       </van-cell-group>
       <div v-if="!isWeixin">
         <!--  不再微信 -->
@@ -32,7 +30,7 @@
               <span class="text">{{ appntSign.readDocumentName }}</span>
               <img :src="src" v-if="appntSign.readStatus == '1'" />
             </p>
-                   <p>需签署：</p>
+            <p>需签署：</p>
             <p class="mb20">
               <span class="text">{{ appntSign.tipsSignDocumentName }}</span>
               <img :src="src" v-if="appntSign.tipsSignStatus == '1'" />
@@ -63,7 +61,8 @@
                 :disabled="appntSign.signStatus == '1'"
                 v-no-more-click="1000"
                 @click="start_ocr(insured.length == '0' ? '2' : '0')"
-              >开始</van-button>
+                >开始</van-button
+              >
             </div>
             <div class="text" v-else>操作时间已失效，请联系销售人员！</div>
           </van-collapse-item>
@@ -81,12 +80,12 @@
                 <span class="text">{{ insuredSign.readDocumentName }}</span>
                 <img :src="src" v-if="insuredSign.readStatus == '1'" />
               </p>
-                 <!-- <p>需签署：</p>
+              <!-- <p>需签署：</p>
               <p class="mb20">
                 <span class="text">{{ insuredSign.tipsSignDocumentName }}</span>
                 <img :src="src" v-if="insuredSign.tipsSignStatus == '1'" />
               </p> -->
-                   <p>需签署：</p>
+              <p>需签署：</p>
               <p class="mb20">
                 <span class="text">{{ insuredSign.signDocumentName }}</span>
                 <img :src="src" v-if="insuredSign.signStatus == '1'" />
@@ -111,7 +110,8 @@
                   :disabled="insuredSign.signStatus == '1'"
                   @click="start_ocr('1')"
                   v-no-more-click="1000"
-                >开始</van-button>
+                  >开始</van-button
+                >
               </div>
               <div class="text" v-else>操作时间已失效，请联系销售人员！</div>
             </van-collapse-item>
@@ -137,7 +137,7 @@
                 <span class="text">{{ appntSign.tipsSignDocumentName }}</span>
                 <img :src="src" v-if="appntSign.tipsSignStatus == '1'" />
               </p>
-                <p>需签署：</p>
+              <p>需签署：</p>
               <p class="mb20">
                 <span class="text">{{ appntSign.signDocumentName }}</span>
                 <img :src="src" v-if="appntSign.signStatus == '1'" />
@@ -162,7 +162,8 @@
                   :disabled="appntSign.signStatus == '1'"
                   v-no-more-click="1000"
                   @click="start_ocr(insured.length == '0' ? '2' : '0')"
-                >开始</van-button>
+                  >开始</van-button
+                >
               </div>
               <div class="text" v-else>操作时间已失效，请联系销售人员！</div>
             </van-collapse-item>
@@ -182,12 +183,12 @@
                 <span class="text">{{ insuredSign.readDocumentName }}</span>
                 <img :src="src" v-if="insuredSign.readStatus == '1'" />
               </p>
-                 <!-- <p>需签署：</p>
+              <!-- <p>需签署：</p>
               <p class="mb20">
                 <span class="text">{{ insuredSign.tipsSignDocumentName }}</span>
                 <img :src="src" v-if="insuredSign.tipsSignStatus == '1'" />
               </p>  -->
-                <!-- 新加的 需要改++++++++++++++++++++++++= -->
+              <!-- 新加的 需要改++++++++++++++++++++++++= -->
               <p>需签111署：</p>
               <p class="mb20">
                 <span class="text">{{ insuredSign.signDocumentName }}</span>
@@ -210,10 +211,11 @@
                   size="normal"
                   plain
                   style="width: 157px;"
-                  :disabled="insuredSign.signStatus   == '1'"
+                  :disabled="insuredSign.signStatus == '1'"
                   @click="start_ocr('1')"
                   v-no-more-click="1000"
-                >开始</van-button>
+                  >开始</van-button
+                >
               </div>
               <div class="text" v-else>操作时间已失效，请联系销售人员！</div>
             </van-collapse-item>
@@ -227,10 +229,7 @@
       </p>-->
     </div>
     <div v-if="!isWeixin">
-      <div
+      <div class="bottom-btn bg-white" v-if="(appntSign.signStatus == '1' && insuredSign.signStatus == '1') || appntSign.signStatus == '1'">
-        class="bottom-btn bg-white"
-        v-if="(appntSign.signStatus == '1' && insuredSign.signStatus == '1') || appntSign.signStatus == '1'"
-      >   
         <van-button type="danger" size="large" @click="next" v-no-more-click="1000">提交</van-button>
       </div>
     </div>
@@ -262,7 +261,7 @@ export default {
       // 被保人签名阅读信息
       insuredSign: {},
       // 折叠面板
-      activeNames: ['1','2'],
+      activeNames: ['1', '2'],
       // 图片路径
       src: this.$assetsUrl + 'images/u6490.png',
       // 被保人信息
@@ -353,7 +352,7 @@ export default {
             this.appnt = res.orderDTO.appntDTO
             this.date = res.orderDTO.orderInfoDTO.appntDateLabel
             // debugger
-            console.log(res.orderDTO.signDTOS,'xxxx')
+            console.log(res.orderDTO.signDTOS, 'xxxx')
             res.orderDTO.signDTOS.map(item => {
               if (item.signType == '0') {
                 this.appntSign = item
@@ -411,7 +410,7 @@ export default {
         } else {
           window.localStorage.setItem('sign-val', val)
           window.localStorage.setItem('sign-insured', JSON.stringify(that.insuredSign))
-          if (JSON.parse(this.$route.query.saleInsuredPersonInfo).idType != '1' ||  JSON.parse(this.$route.query.saleInsuredPersonInfo).age <= "16") {
+          if (JSON.parse(this.$route.query.saleInsuredPersonInfo).idType != '1' || JSON.parse(this.$route.query.saleInsuredPersonInfo).age <= '16') {
             this.$jump({
               flag: 'h5',
               extra: {
@@ -436,9 +435,7 @@ export default {
           }
         }
       } else {
-      
         if (val == '0' || val == '2') {
-         
           window.localStorage.setItem('sign-val', val)
           window.localStorage.setItem('sign-appnt', JSON.stringify(that.appntSign))
           if (this.saleInsuredInfo.idType != '1' || this.saleInsuredInfo.age <= '16') {
@@ -462,11 +459,9 @@ export default {
               console.log('--跳过人脸识别--返回识别成功')
               resolve(JSON.stringify({ state: '1' }))
             }).then(data => {
-           
               if (JSON.parse(data).state == '1') {
-           
                 if (that.appntSign.readStatus == '0') {
-                        console.log('--跳过人脸识别--返回识别成功zzzzzzzzzz')
+                  console.log('--跳过人脸识别--返回识别成功zzzzzzzzzz')
                   this.$jump({
                     flag: 'h5',
                     extra: {
@@ -565,9 +560,7 @@ export default {
         }
       }
     },
-    toTest(){
+    toTest() {},
-      
-    },
     // 微信分享
     share(code) {
       let shareName = ''