Commit 5475e626 authored by 李晓兵's avatar 李晓兵

'修复'

parent f0a380df
Pipeline #3180 canceled with stages
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
<div class="userInfo">我的合同</div> <div class="userInfo">我的合同</div>
<div class="my-contract"> <div class="my-contract">
<div class="content-wrap" @click="goSign"> <div class="content-wrap" @click="goSign">
<span <span v-if="signCount > 0"
:class="{'content-wrap-class-width':signCount>99, 'content-wrap-class':signCount<99}" :class="{'content-wrap-class-width':signCount>99, 'content-wrap-class':signCount<99}"
>{{ signCount > 99 ? '99+' : signCount }}</span> >{{ signCount > 99 ? '99+' : signCount }}</span>
<img src="@/assets/myInfo/unSign.png" > <img src="@/assets/myInfo/unSign.png" >
...@@ -61,14 +61,14 @@ ...@@ -61,14 +61,14 @@
<p>待确认</p> <p>待确认</p>
</div> --> </div> -->
<div class="content-wrap" @click="goVideoSign"> <div class="content-wrap" @click="goVideoSign">
<span <span v-if="vedioCount > 0"
:class="{'content-wrap-class-width':vedioCount>99, 'content-wrap-class':vedioCount<99}" :class="{'content-wrap-class-width':vedioCount>99, 'content-wrap-class':vedioCount<99}"
>{{ vedioCount > 99 ? '99+' : vedioCount }}</span> >{{ vedioCount > 99 ? '99+' : vedioCount }}</span>
<img src="@/assets/myInfo/unFace.png" > <img src="@/assets/myInfo/unFace.png" >
<p>待面签</p> <p>待面签</p>
</div> </div>
<div class="content-wrap" @click="goCarConfirm"> <div class="content-wrap" @click="goCarConfirm">
<span <span v-if="carCount > 0"
:class="{'content-wrap-class-width':carCount>99, 'content-wrap-class':carCount<99}" style="margin-left:5px;" :class="{'content-wrap-class-width':carCount>99, 'content-wrap-class':carCount<99}" style="margin-left:5px;"
>{{ carCount > 99 ? '99+' : carCount }}</span> >{{ carCount > 99 ? '99+' : carCount }}</span>
<img src="@/assets/myInfo/carConfirm.png" > <img src="@/assets/myInfo/carConfirm.png" >
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
<item @click.native="goMyProduct"> <item @click.native="goMyProduct">
<img slot="left-icon" src="@/assets/myInfo/collect.png" class="left-icon" > <img slot="left-icon" src="@/assets/myInfo/collect.png" class="left-icon" >
<div slot="name">我的收藏</div> <div slot="name">我的收藏</div>
<div <div v-if="productCount > 0"
slot="right-icon" slot="right-icon"
:class="{'right-icon-width':productCount>99, 'right-icon':productCount<99}" :class="{'right-icon-width':productCount>99, 'right-icon':productCount<99}"
>{{ productCount > 99 ? '99+' : productCount }}</div> >{{ productCount > 99 ? '99+' : productCount }}</div>
......
...@@ -386,7 +386,7 @@ ...@@ -386,7 +386,7 @@
</list-item> </list-item>
</div> </div>
</h-view> </h-view>
<bottom-tab v-if="!isApproved || (isClear && isApproved)" class="add-box"> <bottom-tab class="add-box"> <!-- v-if="!isApproved || (isClear && isApproved)"-->
<tab-button class="add-card" @click.native="addBankInfo">添加</tab-button> <tab-button class="add-card" @click.native="addBankInfo">添加</tab-button>
</bottom-tab> </bottom-tab>
</h-modal> </h-modal>
...@@ -1058,9 +1058,11 @@ export default { ...@@ -1058,9 +1058,11 @@ export default {
vm.baseInfo.bp_name = result.姓名.words vm.baseInfo.bp_name = result.姓名.words
vm.baseInfo.id_card_no = result.公民身份号码.words vm.baseInfo.id_card_no = result.公民身份号码.words
vm.baseInfo.address_on_resident_booklit = result.住址.words vm.baseInfo.address_on_resident_booklit = result.住址.words
vm.baseInfo.living_address = vm.baseInfo.address_on_resident_booklit // 联系地址默认为户籍地址,支持修改
} else { } else {
vm.baseInfo.bp_name_sp = result.姓名.words vm.baseInfo.bp_name_sp = result.姓名.words
vm.baseInfo.id_card_no_sp = result.公民身份号码.words vm.baseInfo.id_card_no_sp = result.公民身份号码.words
vm.baseInfo.address_sp = result.住址.words // 联系地址默认为户籍地址,支持修改
} }
}) })
}, },
...@@ -1161,10 +1163,8 @@ export default { ...@@ -1161,10 +1163,8 @@ export default {
}) })
}, },
putData () { putData () {
if ( let bp_id = this.from ? this.$route.params.bp_id : window.localStorage.getItem('user_id')
window.localStorage.getItem('user_id') && if (bp_id) {
window.localStorage.getItem('user_id') !== 'undefined'
) {
this.hlsPopup.showConfirm({ this.hlsPopup.showConfirm({
title: '提示', title: '提示',
content: '您确认提交吗?', content: '您确认提交吗?',
...@@ -1174,7 +1174,7 @@ export default { ...@@ -1174,7 +1174,7 @@ export default {
let url = process.env.basePath + 'bp_bind_submit' let url = process.env.basePath + 'bp_bind_submit'
let param = { let param = {
master: { master: {
bp_id: window.localStorage.getItem('user_id'), bp_id: this.from ? this.$route.params.bp_id : window.localStorage.getItem('user_id'),
company_id: '2145', company_id: '2145',
}, },
} }
...@@ -1194,7 +1194,7 @@ export default { ...@@ -1194,7 +1194,7 @@ export default {
}, },
}) })
} else { } else {
this.hlsPopup.showLongCenter('基本信息还未保存') this.hlsPopup.showLongCenter('请先保存')
} }
}, },
hideModal () { hideModal () {
......
...@@ -485,7 +485,7 @@ ...@@ -485,7 +485,7 @@
</list-item> </list-item>
</div> </div>
</h-view> </h-view>
<bottom-tab v-if="!isApproved || (isClear && isApproved)" class="add-box"> <bottom-tab class="add-box"> <!-- v-if="!isApproved || (isClear && isApproved)"-->
<tab-button class="add-card" @click.native="addBankInfo">添加</tab-button> <tab-button class="add-card" @click.native="addBankInfo">添加</tab-button>
</bottom-tab> </bottom-tab>
</h-modal> </h-modal>
...@@ -745,7 +745,8 @@ export default { ...@@ -745,7 +745,8 @@ export default {
} }
}, },
handSubmit () { handSubmit () {
if (this.bp_id) { let bp_id = this.from ? this.$route.params.bp_id : this.bp_id
if (bp_id) {
this.hlsPopup.showConfirm({ this.hlsPopup.showConfirm({
title: '提示', title: '提示',
content: '您确认提交吗?', content: '您确认提交吗?',
...@@ -756,7 +757,7 @@ export default { ...@@ -756,7 +757,7 @@ export default {
let param = { let param = {
master: { master: {
// bp_id: window.localStorage.getItem('user_id'), // bp_id: window.localStorage.getItem('user_id'),
bp_id: this.bp_id, bp_id: this.from ? this.$route.params.bp_id : this.bp_id,
company_id: '2145', company_id: '2145',
}, },
} }
...@@ -773,7 +774,7 @@ export default { ...@@ -773,7 +774,7 @@ export default {
}, },
}) })
} else { } else {
this.hlsPopup.showLongCenter('基本信息未保存!') this.hlsPopup.showLongCenter('请先保存!')
} }
}, },
addBankInfo () { addBankInfo () {
...@@ -1057,7 +1058,6 @@ export default { ...@@ -1057,7 +1058,6 @@ export default {
vm.msg_flag = false vm.msg_flag = false
vm.hlsPopup.showLongCenter('身份证不正确') vm.hlsPopup.showLongCenter('身份证不正确')
} }
debugger
if (!vm.flag) { if (!vm.flag) {
if (vm.hlsUtil.isCardID(vm.saveInfo.auth_person_id_card)) { if (vm.hlsUtil.isCardID(vm.saveInfo.auth_person_id_card)) {
vm.msg_flag = false vm.msg_flag = false
...@@ -1410,6 +1410,7 @@ export default { ...@@ -1410,6 +1410,7 @@ export default {
// 未授权 姓名,身份证号 // 未授权 姓名,身份证号
vm.baseInfo.legal_person = result.姓名.words vm.baseInfo.legal_person = result.姓名.words
vm.legal_personMsg.id_card_no = result.公民身份号码.words vm.legal_personMsg.id_card_no = result.公民身份号码.words
vm.legal_personMsg.living_address = result.住址.words // 联系地址默认为户籍地址,支持修改
} else { // 授权人 } else { // 授权人
// 已授权 姓名,身份证号 // 已授权 姓名,身份证号
vm.authMsg.auth_person_name = result.姓名.words vm.authMsg.auth_person_name = result.姓名.words
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment