Skip to content

H
hls-xcmg-vue-app
Commit e875975d authored by linxin's avatar linxin
Browse files
Options

add

parents 391de7d4 01a044fd
Hide whitespace changes
Inline Side-by-side
Showing with 107 additions and 44 deletions
config/dev.env.js
View file @ e875975d
......@@ -23,3 +23,5 @@ module.exports = merge(prodEnv, {
src/pages/distributorSign/contract-details.vue
View file @ e875975d
......@@ -322,6 +322,30 @@ export default {
},
created () {},
methods: {
// 跳转银行信息录入
// entryInfo () {
// let idCard = ''
// if (this.baseInfo.auth_flag) {
// this.baseInfo.auth_flag === '是'
// ? (idCard = this.baseInfo.auth_person_id_card)
// : this.baseInfo.id_card_no
// console.log(',,,,,,,,,,,', idCard)
// } else {
// idCard = this.baseInfo.id_card_no
// }
// this.$router.push({
// name: 'EntryInfo',
// params: {
// id_card_no: idCard,
// bp_name: this.bp_name,
// project_id: this.project_id,
// confirm_status: this.con_confirm_status,
// entry_info_flag: this.entry_info_flag,
// user_bp_type: this.user_bp_type,
// bp_id: this.baseInfo.bp_id,
// },
// })
// },
charge (val, status) {
let vm = this
this.hlsPopup.showConfirm({
......
src/pages/home/home-page.vue
View file @ e875975d
......@@ -83,15 +83,17 @@ export default {
},
watch: {},
created () {
this.getLocation()
// this.getLocation()
},
beforeRouteEnter (to, from, next) {
next(vm => {
// if (from.name === 'Login') {
vm.moduleSeparateList = [...functionState.moduleSeparateList]
vm.userQuery()
vm.guessingQuery() // 猜你喜欢查询
// vm.guessingQuery() // 猜你喜欢查询
vm.isVisitor = !window.localStorage.getItem('password')
// vm.guessingQuery() // 猜你喜欢查询
vm.getLocation()
// }
})
},
......@@ -102,17 +104,21 @@ export default {
let vm = this
if (vum.Platform.isAndroid()) { // 安卓采用jsapi
var geolocation = new BMap.Geolocation()
vm.hlsPopup.showLoading('数据加载中')
geolocation.getCurrentPosition(function (res) {
vm.hlsPopup.hideLoading()
if (this.getStatus() === 0) {
// 判断是否是手动选择过定位
if (window.localStorage.getItem('province')) {
vm.city = window.localStorage.getItem('city')
vm.province = window.localStorage.getItem('province')
vm.guessingQuery(vm.city)
} else {
// 没有就定位当前位置
console.log(res)
vm.city = res.address.city
vm.province = res.address.province
vm.guessingQuery(res.address.city)
}
}
}, {enableHighAccuracy: true})
......@@ -122,13 +128,16 @@ export default {
if (window.localStorage.getItem('province')) {
vm.city = window.localStorage.getItem('city')
vm.province = window.localStorage.getItem('province')
vm.guessingQuery(vm.city)
} else {
vm.city = result.city
vm.province = result.province
vm.guessingQuery(result.city)
}
}, function (error) {
})
}
// setTimeout(vm.guessingQuery(), 0)
},
goFunctionHome (data) {
this.$router.push({
......@@ -184,12 +193,13 @@ export default {
})
},
// 猜你喜欢
guessingQuery () {
guessingQuery (e) {
console.log(e)
let vm = this
let url = $config.basePath + 'guess_you_like_query'
let param = {
'user_phone': window.localStorage.getItem('user_phone'),
'city': vm.city,
'city': e,
}
vm.hlsPopup.showLoading('数据加载中')
vm.$post(url, param).then(function (res) {
......
src/pages/myInfo/my-info.vue
View file @ e875975d
......@@ -431,18 +431,18 @@ export default {
// 进入待签约功能，客户类型为经销商则进入经销商功能，非经销商则进入合同签约
goSign () {
if (this.bp_id) {
if (this.user_bp_type === 'AGENT') {
this.$router.push({
name: 'ContractList',
})
} else {
this.$router.push({
name: 'ContractSigning',
params: {
user_bp_type: this.user_bp_type,
},
})
}
// if (this.user_bp_type === 'AGENT') {
// this.$router.push({
// name: 'ContractList',
// })
// } else {
this.$router.push({
name: 'ContractSigning',
params: {
user_bp_type: this.user_bp_type,
},
})
// }
} else {
hlsPopup.showLongCenter('请先进行用户绑定')
}
......
src/pages/userBindNew/np/base-info.vue
View file @ e875975d
......@@ -215,7 +215,7 @@
>
</item>
<item
v-if="baseInfo.bp_type === 'TENANT' || baseInfo.bp_type === 'GUTA'"
v-if="((baseInfo.bp_type === 'TENANT' || baseInfo.bp_type === 'GUTA')&&!multipleRole)||multipleRole=== 'TENANT' || multipleRole === 'GUTA'"
:showArrow="true"
>
<div slot="name" class="required">婚姻状况</div>
......@@ -230,7 +230,7 @@
</item>
</list-item>
<div
v-if="(hasSP && baseInfo.bp_type === 'TENANT') || (hasSP && baseInfo.bp_type === 'GUTA')"
v-if="(hasSP && (((baseInfo.bp_type === 'TENANT'||baseInfo.bp_type === 'GUTA')&&!multipleRole)||multipleRole=== 'TENANT' || multipleRole === 'GUTA'))"
>
<!-- 主承租人活担保人为已婚显示-->
<div class="userInfo">配偶信息</div>
......@@ -449,17 +449,22 @@ export default {
vm.isLesons = false
}
},
'baseInfo.marital_status_n': function (newVal, oldVal) {
if (newVal === '已婚') {
this.hasSP = true
} else {
this.hasSP = false
this.baseInfo.bp_name_sp = ''
this.baseInfo.spouse_phone = ''
this.baseInfo.working_place_sp = ''
this.baseInfo.address_sp = ''
}
'baseInfo.marital_status_n': {
handler: function (newVal, oldVal) {
if (newVal === '已婚') {
this.hasSP = true
} else {
this.hasSP = false
this.baseInfo.bp_name_sp = ''
this.baseInfo.spouse_phone = ''
this.baseInfo.working_place_sp = ''
this.baseInfo.address_sp = ''
}
},
deep: true,
immediate: true,
},
},
created () {
this.getBpType()
......@@ -486,7 +491,34 @@ export default {
vm.upload_list = [] // 上传图片列表
vm.dowload_list = [] // 下载图片列表
vm.img_url = {}
vm.baseInfo = {}
vm.baseInfo = { bp_type_n: '',
academic_background_n: '',
marital_status_n: '',
bp_type: '',
bp_class: vm.$route.params.bp_class,
bp_name: '',
province_name: '',
province_id: '',
city_name: '',
city_id: '',
id_card_no: null,
id_card_date_from: '', // 身份证有效期从
id_card_date_to: '', // 身份证有效期到
cell_phone: window.localStorage.getItem('user_phone'),
living_address: '',
address_on_resident_booklit: '',
marital_status: '',
academic_background: '',
bp_name_sp: '',
id_card_no_sp: '', // 配偶身份证号
id_card_date_from_sp: '', // 配偶身份证有效期从
id_card_date_to_sp: '', // 配偶身份证有效期到
district_id: '',
district_name: '',
spouse_phone: '',
working_place_sp: '',
address_sp: '',
user_phone: window.localStorage.user_phone }
vm.idCardFront = '' // 身份证正面图片
vm.idCardBack = '' // 身份证反面图片
vm.idCardFrontSp = '' // 配偶身份证正面图片
......@@ -647,7 +679,8 @@ export default {
vm.$post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
if (res.result === 'S') {
vm.baseInfo = res.info
Object.assign(vm.baseInfo, res.info)
// vm.baseInfo = res.info
vm.from = true
vm.addRows(vm.baseInfo.address_on_resident_booklit)
vm.addRowsLive(vm.baseInfo.living_address)
......@@ -973,30 +1006,30 @@ export default {
vm.hlsPopup.showLongCenter('户籍地址不能为空！')
} else if (!vm.baseInfo.academic_background) {
vm.hlsPopup.showLongCenter('学历不能为空！')
} else if (!vm.baseInfo.marital_status && (vm.baseInfo.bp_type === 'TENANT' || vm.baseInfo.bp_type === 'GUTA')) {
} else if (!vm.baseInfo.marital_status && (((vm.baseInfo.bp_type === 'TENANT' || vm.baseInfo.bp_type === 'GUTA') && !vm.multipleRole) || vm.multipleRole === 'TENANT' || vm.multipleRole === 'GUTA')) {
vm.hlsPopup.showLongCenter('婚姻状况不能为空！')
} else if (vm.marital_status_n === '已婚' && !vm.baseInfo.bp_name_sp) {
} else if (vm.baseInfo.marital_status_n === '已婚' && !vm.baseInfo.bp_name_sp) {
vm.hlsPopup.showLongCenter('配偶姓名不能为空！')
} else if (vm.marital_status_n === '已婚' && !vm.baseInfo.id_card_no_sp) {
} else if (vm.baseInfo.marital_status_n === '已婚' && !vm.baseInfo.id_card_no_sp) {
vm.hlsPopup.showLongCenter('配偶身份证号不能为空！')
} else if (
vm.marital_status_n === '已婚' &&
vm.baseInfo.marital_status_n === '已婚' &&
!vm.baseInfo.id_card_date_from_sp
) {
vm.hlsPopup.showLongCenter('配偶身份证有效期从不能为空！')
} else if (
vm.marital_status_n === '已婚' &&
vm.baseInfo.marital_status_n === '已婚' &&
!vm.baseInfo.id_card_date_to_sp
) {
vm.hlsPopup.showLongCenter('配偶身份证有效期到不能为空！')
} else if (vm.marital_status_n === '已婚' && !vm.baseInfo.spouse_phone) {
} else if (vm.baseInfo.marital_status_n === '已婚' && !vm.baseInfo.spouse_phone) {
vm.hlsPopup.showLongCenter('配偶手机号不能为空！')
} else if (
vm.marital_status_n === '已婚' &&
vm.baseInfo.marital_status_n === '已婚' &&
!vm.baseInfo.working_place_sp
) {
vm.hlsPopup.showLongCenter('配偶工作单位不能为空！')
} else if (vm.marital_status_n === '已婚' && !vm.baseInfo.address_sp) {
} else if (vm.baseInfo.marital_status_n === '已婚' && !vm.baseInfo.address_sp) {
vm.hlsPopup.showLongCenter('配偶联系地址不能为空！')
} else if (!vm.hlsUtil.phoneNumber(vm.baseInfo.cell_phone)) {
vm.hlsPopup.showLongCenter('手机号码有误!')
......
src/pages/userBindNew/org/baseInfo.vue
View file @ e875975d
......@@ -95,7 +95,6 @@
<input
slot="content"
v-model="baseInfo.bp_name"
readonly
placeholder="上传营业执照自动填充"
class="auto"
>
......@@ -105,7 +104,6 @@
<input
slot="content"
v-model="baseInfo.enterprise_type"
readonly
placeholder="上传营业执照自动填充"
class="auto"
>
......@@ -115,7 +113,6 @@
<input
slot="content"
v-model="baseInfo.organization_code"
readonly
placeholder="上传营业执照自动填充"
class="auto"
>
......@@ -125,7 +122,6 @@
<input
slot="content"
v-model="baseInfo.registered_capital"
readonly
placeholder="上传营业执照自动填充"
class="auto"
>
......@@ -135,7 +131,6 @@
<input
slot="content"
v-model="baseInfo.legal_person"
readonly
placeholder="上传营业执照自动填充"
class="auto"
>
......@@ -148,7 +143,6 @@
v-model="baseInfo.registered_place"
cols="30"
rows="1"
readonly
class="auto"
placeholder="上传营业执照自动填充"
@input="addRows(baseInfo.registered_place)"
......
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