GFRS-2618【前端】修改前端bug-- 提交人:张齐

This commit is contained in:
zhangqi1
2021-09-28 16:03:57 +08:00
parent 2cc87e6512
commit 2c62431e17
8 changed files with 124 additions and 66 deletions

View File

@@ -119,7 +119,7 @@ export function approveInit(data) {
// <-- zhangqi 津贴申请与我的资料使用到的接口 begin --> // <-- zhangqi 津贴申请与我的资料使用到的接口 begin -->
// 津贴申请-基本信息,账户信息,影资料等点击下一步操作时调用的保存接口 // 津贴申请-基本信息,账户信息,影资料等点击下一步操作时调用的保存接口
export function saveOrUpdateAllowanceUrl(data) { export function saveOrUpdateAllowanceUrl(data) {
return request({ return request({
url: getUrl('/agent/allowance/saveOrUpdateAllowance', 1), url: getUrl('/agent/allowance/saveOrUpdateAllowance', 1),

View File

@@ -1,7 +1,7 @@
import request from '@/assets/js/utils/request' import request from '@/assets/js/utils/request'
import getUrl from '@/assets/js/utils/get-url' import getUrl from '@/assets/js/utils/get-url'
// 我的资料-基本信息,账户信息,影资料等查询详细数据信息的接口 // 我的资料-基本信息,账户信息,影资料等查询详细数据信息的接口
export function getAllowanceBaseDetail(data) { export function getAllowanceBaseDetail(data) {
return request({ return request({
url: getUrl('/agent/allowanceBase/getAllowanceBaseDetail', 1), url: getUrl('/agent/allowanceBase/getAllowanceBaseDetail', 1),
@@ -10,7 +10,7 @@ export function getAllowanceBaseDetail(data) {
}) })
} }
// 我的资料-基本信息,账户信息,影资料等点击下一步操作时调用的保存接口 // 我的资料-基本信息,账户信息,影资料等点击下一步操作时调用的保存接口
export function saveOrUpdateAllowanceBase(data) { export function saveOrUpdateAllowanceBase(data) {
return request({ return request({
url: getUrl('/agent/allowanceBase/saveOrUpdateAllowanceBase', 1), url: getUrl('/agent/allowanceBase/saveOrUpdateAllowanceBase', 1),

View File

@@ -79,7 +79,7 @@ export default {
}, },
{ {
pageNo: 3, pageNo: 3,
pageItem: '影资料', pageItem: '影资料',
urlStr: '/allowance/application/AttachmentManagement', urlStr: '/allowance/application/AttachmentManagement',
tabClass: '', tabClass: '',
imgCheckedUrl: this.$assetsUrl + 'images/allowance/yxzz.png', imgCheckedUrl: this.$assetsUrl + 'images/allowance/yxzz.png',

View File

@@ -79,7 +79,7 @@ export default {
}, },
{ {
pageNo: 3, pageNo: 3,
pageItem: '影资料', pageItem: '影资料',
urlStr: '/allowance/myInfo/AttachmentManagement', urlStr: '/allowance/myInfo/AttachmentManagement',
tabClass: '', tabClass: '',
imgCheckedUrl: this.$assetsUrl + 'images/allowance/yxzz.png', imgCheckedUrl: this.$assetsUrl + 'images/allowance/yxzz.png',

View File

@@ -2,16 +2,18 @@
<div class='parent'> <div class='parent'>
<van-index-bar> <van-index-bar>
<div v-if='data.length > 0'> <div v-if='data.length > 0'>
<div v-for='parent in data' :key='parent.name' <div class='bg-white border-b border-t' v-for='parent in data' :key='parent.name'>
class='flex ml15 mt10 pb10 content border-b align-items-c' @click='choose(parent)'> <div class='flex ml15 pb10 pt10 content align-items-c' @click='choose(parent)'>
<img class='w40 mr15 ' src='../../../assets/images/bnf_avatar.png' /> <img class='w40 mr15 ' src='../../../assets/images/bnf_avatar.png' />
<div class='c-gray-darker fs14'> <div class='c-gray-darker fs14'>
<div>{{ parent.name }}</div> <div>{{ parent.name }}</div>
</div> </div>
<div class='text-right' style='flex:1'> <div class='text-right' style='flex:1'>
<van-tag class='mr40' color='#2E4591' plain>{{ parent.typeName }}</van-tag> <van-tag class='mr40' color='#2E4591' plain>{{ parent.typeName }}</van-tag>
</div>
</div> </div>
</div> </div>
</div> </div>
<div v-else class='text-center'> <div v-else class='text-center'>
<img class='mt40 w200' src='../../../assets/images/pic_page-non.png' /> <img class='mt40 w200' src='../../../assets/images/pic_page-non.png' />
@@ -57,12 +59,28 @@ export default {
this.getList() this.getList()
}, },
mounted() { mounted() {
setTimeout(() => {
// eslint-disable-next-line no-undef
EWebBridge.webCallAppInJs('webview_left_button', {
img: this.$assetsUrl + 'images/del-close-btn@3x.png',
intercept: '1' //是否拦截原生返回事件 1是 其他否
})
}, 100)
// 筛选按钮的点击事件
window.appCallBack = this.appCallBack
let str = location.hash let str = location.hash
this.locationHashFlag = str.search(/myInfo/i) this.locationHashFlag = str.search(/myInfo/i)
// 调用初始化加载判断是否弹出Dialog弹出框的方法 // 调用初始化加载判断是否弹出Dialog弹出框的方法
this.init() this.init()
}, },
methods: { methods: {
appCallBack(data) {
if (data.trigger == 'left_button_click') {
this.$jump({
flag: 'home'
})
}
},
/** /**
* @Description: 初始化加载判断是否弹出Dialog弹出框的方法 * @Description: 初始化加载判断是否弹出Dialog弹出框的方法
* @author:zhangqi * @author:zhangqi
@@ -190,6 +208,10 @@ export default {
border-bottom: 1px solid #d6d6d6; border-bottom: 1px solid #d6d6d6;
} }
.border-t:nth-of-type(1) {
border-top: 1px solid #d6d6d6;
}
.content:last-child { .content:last-child {
border: none; border: none;
} }

View File

@@ -289,8 +289,6 @@ export default {
this.allowancePageFlag = '1' this.allowancePageFlag = '1'
localStorage.setItem('allowancePageFlag', this.allowancePageFlag) localStorage.setItem('allowancePageFlag', this.allowancePageFlag)
} }
} else {
this.$toast(res.resultMessage)
} }
}) })
} else { } else {

View File

@@ -1,24 +1,27 @@
<template> <template>
<div class="orderDetail-container"> <div class='orderDetail-container'>
<index-bar :allowance-no="$route.query.allowanceNo"></index-bar> <index-bar :allowance-no='$route.query.allowanceNo' v-if='!isWeixin'></index-bar>
<div v-for="(item, index) in allowanceSignDTOLst" :key="index"> <div v-for='(item, index) in allowanceSignDTOLst' :key='index'>
<!-- 申请人 --> <!-- 申请人 -->
<div v-if="item.type == 1 && !isWeixin"> <div v-if='item.type == 1 && !isWeixin'>
<p class="fw600 border-gb"> <p class='fw600 border-gb'>
<span>申请人</span><span class="ml60">{{ allowanceApplyDTO.name }}</span> <span>申请人</span><span class='ml60'>{{ allowanceApplyDTO.name }}</span>
</p> </p>
<p>点击签名按钮进行申请人签名</p> <p>点击签名按钮进行申请人签名</p>
<p class="border-gb"> <p class='border-gb'>
<span>申请人</span> <span>申请人</span>
<van-button type="danger" color="#2E4591" class="ml5" size="small" @click="signFunc(item.type, item.id)" :disabled="isSure" v-no-more-click="1000">{{ <van-button type='danger' color='#2E4591' class='ml5' size='small' @click='signFunc(item.type, item.id)'
item.signStatus == '0' ? '签名' : '已签名' :disabled='isSure' v-no-more-click='1000'>{{
}}</van-button> item.signStatus == '0' ? '签名' : '已签名'
<img class="w60 h40 v-middle ml10" v-if="item.signPath" :src="imgUrl + item.signPath.replace(/\+/g, '%2B')" alt="" /><br /> }}
</van-button>
<img class='w60 h40 v-middle ml10' v-if='item.signPath' :src="imgUrl + item.signPath.replace(/\+/g, '%2B')"
alt='' /><br />
</p> </p>
</div> </div>
<div v-if="item.type == 2"> <div v-if='item.type == 2'>
<div v-if="isWeixin" class="bg-white mt10 fs14 tips"> <div v-if='isWeixin' class='bg-white mt10 fs14 tips'>
<p> <p>
尊敬的 尊敬的
<span>{{ allowanceEnjoyDTO.name }}</span <span>{{ allowanceEnjoyDTO.name }}</span
@@ -26,54 +29,83 @@
</p> </p>
<p>恭喜您获得国富人寿桂冠专属父母赡养津贴需要您点击签字按钮进行签字申请</p> <p>恭喜您获得国富人寿桂冠专属父母赡养津贴需要您点击签字按钮进行签字申请</p>
</div> </div>
<p v-if="!isWeixin" class="fw600 border-gb"> <p v-if='!isWeixin' class='fw600 border-gb'>
<span>享受人</span><span class="ml60">{{ allowanceEnjoyDTO.name }}</span> <span>享受人</span><span class='ml60'>{{ allowanceEnjoyDTO.name }}</span>
</p> </p>
<p v-if="!isWeixin">点击签名按钮进行享受人签名</p> <p v-if='!isWeixin'>点击签名按钮进行享受人签名</p>
<p class="border-gb"> <p class='border-gb'>
<span v-if="!isWeixin">享受人</span> <span v-if='!isWeixin'>享受人</span>
<van-button type="danger" color="#2E4591" class="ml5" size="small" @click="signFunc(item.type, item.id)" :disabled="isSure" v-no-more-click="1000">{{ <van-button type='danger' color='#2E4591' class='ml5' size='small' @click='signFunc(item.type, item.id)'
item.signStatus == '0' ? '签名' : '已签名' :disabled='isSure' v-no-more-click='1000'>{{
}}</van-button> item.signStatus == '0' ? '签名' : '已签名'
<img class="w60 h40 v-middle ml10" v-if="item.signPath" :src="imgUrl + item.signPath.replace(/\+/g, '%2B')" alt="" /><br /> }}
</van-button>
<img class='w60 h40 v-middle ml10' v-if='item.signPath' :src="imgUrl + item.signPath.replace(/\+/g, '%2B')"
alt='' /><br />
<!-- 享受人有分享功能 --> <!-- 享受人有分享功能 -->
<van-button <van-button
type="danger" type='danger'
color="#2E4591" color='#2E4591'
class="ml65 mt10" class='ml65 mt10'
v-if="!isWeixin" v-if='!isWeixin'
size="small" size='small'
@click="share('0')" @click="share('0')"
:disabled="isSure" :disabled='isSure'
v-no-more-click="1000" v-no-more-click='1000'
>分享</van-button >分享
</van-button
> >
</p> </p>
</div> </div>
</div> </div>
<van-button v-if="!isWeixin" type="danger" color="#2E4591" class="bottom-btn ffcb6b" @click="nextStep" v-no-more-click="1000">提交审批</van-button> <van-button v-if='!isWeixin' type='danger' color='#2E4591' class='bottom-btn ffcb6b' @click='nextStep'
<SignTure :SignShow="SignShow" :signInfo="allowanceEnjoyDTO" @close="SignClose" @SignSuccessful="SignSuccessful"></SignTure> v-no-more-click='1000'>提交审批
</van-button>
<SignTure :SignShow='SignShow' :signInfo='allowanceEnjoyDTO' @close='SignClose'
@SignSuccessful='SignSuccessful'></SignTure>
<!-- 短信验证 --> <!-- 短信验证 -->
<van-dialog v-model="show" title="提示" show-cancel-button @confirm="authConfirm(authCode)" @cancel="clearTimer"> <van-dialog v-model='show' title='提示' show-cancel-button @confirm='authConfirm(authCode)' @cancel='clearTimer'>
<p class="p10 fs14">为确保是您本人操作短信验证码已发送至您手机号{{ encyCustomerMobile }}请您输入验证码以完成后续投保操作</p> <p class='p10 fs14'>为确保是您本人操作短信验证码已发送至您手机号{{ encyCustomerMobile }}请您输入验证码以完成后续投保操作</p>
<van-cell-group class="flex align-items-c pr5 mb15"> <van-cell-group class='flex align-items-c pr5 mb15'>
<van-field maxlength="6" placeholder="请输入短信验证码" v-model="authCode" clearable label-width="0" /> <van-field maxlength='6' placeholder='请输入短信验证码' v-model='authCode' clearable label-width='0' />
<van-button type="danger" color="#2E4591" plain size="small" class="w160 p0" @click="getAuthCode" :disabled="codeDisabled" v-no-more-click="2000">{{ <van-button type='danger' color='#2E4591' plain size='small' class='w160 p0' @click='getAuthCode'
codeDisabled ? `${countDown}s后重新获取` : '获取验证码' :disabled='codeDisabled' v-no-more-click='2000'>{{
}}</van-button> codeDisabled ? `${countDown}s后重新获取` : '获取验证码'
}}
</van-button>
</van-cell-group> </van-cell-group>
</van-dialog> </van-dialog>
</div> </div>
</template> </template>
<script> <script>
import { Toast, CellGroup, Field, Dialog, Collapse, CollapseItem, Cell, Popup, Divider, RadioGroup, Radio, Tag } from 'vant' import {
Toast,
CellGroup,
Field,
Dialog,
Collapse,
CollapseItem,
Cell,
Popup,
Divider,
RadioGroup,
Radio,
Tag
} from 'vant'
import { getAllowanceDetail, saveOrUpdateAllowanceUrl, approveInit } from '@/api/ebiz/allowance/allowance' import { getAllowanceDetail, saveOrUpdateAllowanceUrl, approveInit } from '@/api/ebiz/allowance/allowance'
import SignTure from './component/SignTure' import SignTure from './component/SignTure'
import config from '@/config' import config from '@/config'
import { getWhitelist } from '@/api/ebiz/whitelist' import { getWhitelist } from '@/api/ebiz/whitelist'
import { weixinShare } from '@/assets/js/utils/wxShare.js' import { weixinShare } from '@/assets/js/utils/wxShare.js'
import { checkPhone } from '@/api/ebiz/customer/customer' import { checkPhone } from '@/api/ebiz/customer/customer'
import { getSignInvalid, checkSignInvalid, getAuthCode, autchCodeCheck, getRecognitionUrl, getRecognitionResult } from '@/api/ebiz/sale/sale' import {
getSignInvalid,
checkSignInvalid,
getAuthCode,
autchCodeCheck,
getRecognitionUrl,
getRecognitionResult
} from '@/api/ebiz/sale/sale'
import { getShareParam } from '@/api/ebiz/cardList/cardList.js' import { getShareParam } from '@/api/ebiz/cardList/cardList.js'
import IndexBar from '@/components/ebiz/allowance/application/IndexBar' import IndexBar from '@/components/ebiz/allowance/application/IndexBar'
@@ -469,7 +501,7 @@ export default {
}).then((data) => { }).then((data) => {
console.log(JSON.parse(data), 'APP人脸识别结果') console.log(JSON.parse(data), 'APP人脸识别结果')
if (JSON.parse(data).state == '1') { if (JSON.parse(data).state == '1') {
this.isAppFacePassEnjoy = true //app内人脸识别是否通过 this.isAppFacePassEnjoy = true //app内人脸识别是否通过
this.SignShow = true //去签字 this.SignShow = true //去签字
} else { } else {
that.faceAuthCount.enjoy++ that.faceAuthCount.enjoy++
@@ -507,7 +539,7 @@ export default {
signStatus: '1', //--签名状态 0:未签名; 1:已签名 signStatus: '1', //--签名状态 0:未签名; 1:已签名
signPath: signPath //--签名图片地址 signPath: signPath //--签名图片地址
} }
that.allowanceSignDTOLst.forEach(function (item) { that.allowanceSignDTOLst.forEach(function(item) {
if (item.id == that.signId) { if (item.id == that.signId) {
item.signStatus = obj.signStatus item.signStatus = obj.signStatus
item.signPath = signPath item.signPath = signPath
@@ -600,7 +632,7 @@ export default {
extra: { extra: {
title: `国富人寿桂冠专属父母赡养津贴申请`, title: `国富人寿桂冠专属父母赡养津贴申请`,
content: '点击去签字', content: '点击去签字',
shareScene:0,// 0只分享好友1 只分享朋友圈 不传默认所有 shareScene: 0,// 0只分享好友1 只分享朋友圈 不传默认所有
url: location.origin + '/#/allowance/application/signatureConfirmation?allowanceNo=' + this.allowanceNo + '&token=' + res.content, url: location.origin + '/#/allowance/application/signatureConfirmation?allowanceNo=' + this.allowanceNo + '&token=' + res.content,
// '&relationToAppnt=' + // '&relationToAppnt=' +
// JSON.parse(this.$CacheUtils.getLocItem('saleInsuredPersonInfo')).relationToAppnt + // JSON.parse(this.$CacheUtils.getLocItem('saleInsuredPersonInfo')).relationToAppnt +
@@ -641,10 +673,13 @@ export default {
this.$jump({ this.$jump({
flag: 'h5', flag: 'h5',
extra: { extra: {
url: location.origin + `/#/allowance/application/List` url: location.origin + `/#/allowance/application/List?active=commit`
}, },
routerInfo: { routerInfo: {
path: '/allowance/application/List' path: '/allowance/application/List',
query: {
active: 'commit'
}
} }
}) })
}, 1000) }, 1000)
@@ -656,7 +691,7 @@ export default {
} }
} }
</script> </script>
<style lang="scss"> <style lang='scss'>
#app { #app {
.van-dialog__confirm, .van-dialog__confirm,
.van-dialog__confirm:active { .van-dialog__confirm:active {
@@ -664,17 +699,20 @@ export default {
} }
} }
</style> </style>
<style lang="scss" scoped> <style lang='scss' scoped>
.orderDetail-container { .orderDetail-container {
background-color: #fff; background-color: #fff;
min-height: 100vh; min-height: 100vh;
p { p {
padding: 10px 20px; padding: 10px 20px;
} }
/deep/.van-popup {
/deep/ .van-popup {
width: 100%; width: 100%;
height: 100%; height: 100%;
} }
.tips { .tips {
line-height: 20px; line-height: 20px;
} }

View File

@@ -343,7 +343,7 @@ export default {
this.$jump({ this.$jump({
flag: 'navigation', flag: 'navigation',
extra: { extra: {
title: '津贴申请信息', title: '填写津贴申请信息',
hiddenRight: '1' hiddenRight: '1'
} }
}) })
@@ -407,7 +407,7 @@ export default {
this.$jump({ this.$jump({
flag: 'navigation', flag: 'navigation',
extra: { extra: {
title: '津贴申请信息', title: '填写津贴申请信息',
hiddenRight: '1' hiddenRight: '1'
} }
}) })