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

This commit is contained in:
pang.lizong
2019-09-27 15:02:41 +08:00
4 changed files with 36 additions and 47 deletions

View File

@@ -10,9 +10,7 @@
</span>
</div>
<p class="fs12">
{{ item.relationName }}
</p>
<p class="fs12">{{ item.relationName }}</p>
</div>
</div>
<ul>
@@ -23,9 +21,7 @@
<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>
<div class="mr10 fs15 c-gray-dark" @click="insure(choose)" v-else>点击为他/她投保</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
@@ -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)

View File

@@ -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
title="保费合计(元)"
:value="orderInfo.orderAmount == undefined ? '' : orderInfo.orderAmount | moneyFormat"
/>
<van-cell title="保费合计(元)" :value="orderInfo.orderAmount == undefined ? '' : orderInfo.orderAmount | moneyFormat" />
</van-cell-group>
<div v-if="!isWeixin">
<!-- 不再微信 -->
@@ -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>
@@ -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>
@@ -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>
@@ -213,7 +214,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>
@@ -227,10 +229,7 @@
</p>-->
</div>
<div v-if="!isWeixin">
<div
class="bottom-btn bg-white"
v-if="(appntSign.signStatus == '1' && insuredSign.signStatus == '1') || appntSign.signStatus == '1'"
>
<div 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>
@@ -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,9 +459,7 @@ 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')
this.$jump({
@@ -565,9 +560,7 @@ export default {
}
}
},
toTest(){
},
toTest() {},
// 微信分享
share(code) {
let shareName = ''