Commit e8529a61 authored by linxin's avatar linxin

Merge branch 'liuxin' into develop

parents 6b58d875 05381c2b
Pipeline #3743 canceled with stages
......@@ -626,7 +626,7 @@ export default {
// vm.lists = res.lists
vm.baseInfo = res.info
if (res.info.auth_flag) {
window.sessionStorage.setItem('auth_flag', res.info.auth_flag)
window.localStorage.setItem('auth_flag', res.info.auth_flag)
}
}
})
......
......@@ -219,11 +219,11 @@ export default {
baseInfo: {},
bp_flag: false,
guarantorInfo: [],
bp_class: window.sessionStorage.getItem('bp_class'),
bp_class: window.localStorage.getItem('bp_class'),
confirm_status: '',
faceListUpload: [], // 自拍照上传
confirm_note: '',
confirm_id: window.sessionStorage.getItem('confirm_id'),
confirm_id: window.localStorage.getItem('confirm_id'),
agentPic: '', // 经销商担保协议图片
readed: require('@/assets/constractSigning/read.png'), // 已读
unRead: require('@/assets/constractSigning/unread.png'), // 未读
......@@ -255,7 +255,7 @@ export default {
},
created () {
this.agentPic = this.unRead
this.confirm_status = window.sessionStorage.getItem('confirm_status')
this.confirm_status = window.localStorage.getItem('confirm_status')
if (this.bp_class === 'NP') {
this.bp_flag = false
......@@ -456,7 +456,7 @@ export default {
let url2 = $config.basePath + 'prj_org_info_query'
vm.bp_class === 'NP' ? url = url1 : url = url2
let param = {
project_id: window.sessionStorage.getItem('project_id'),
project_id: window.localStorage.getItem('project_id'),
}
vm.hlsPopup.showLoading('数据加载中')
vm.hlsHttp.post(url, param).then(function (res) {
......@@ -465,7 +465,7 @@ export default {
// vm.lists = res.lists
vm.baseInfo = res.info
if (res.info.auth_flag) {
window.sessionStorage.setItem('auth_flag', res.info.auth_flag)
window.localStorage.setItem('auth_flag', res.info.auth_flag)
}
}
})
......@@ -476,7 +476,7 @@ export default {
let vm = this
let url = $config.basePath + 'prj_guarantor_list_query'
let param = {
project_id: window.sessionStorage.getItem('project_id'),
project_id: window.localStorage.getItem('project_id'),
}
vm.hlsPopup.showLoading('数据加载中')
vm.hlsHttp.post(url, param).then(function (res) {
......@@ -490,7 +490,7 @@ export default {
let vm = this
let url = $config.basePath + 'prj_lease_query'
let param = {
project_id: window.sessionStorage.getItem('project_id'),
project_id: window.localStorage.getItem('project_id'),
}
// 租赁信息
vm.hlsPopup.showLoading('数据加载中')
......@@ -526,7 +526,7 @@ export default {
this.$router.push({
name: 'FinancDetails',
params: {
project_id: window.sessionStorage.getItem('project_id'),
project_id: window.localStorage.getItem('project_id'),
// confirm_status: this.confirm_status,
product_num: this.info.product_num,
},
......
......@@ -299,10 +299,10 @@ export default {
setTimeout(this.approvedearch, 1000)
},
goDetails (item) {
window.sessionStorage.setItem('confirm_id', item.confirm_id)
window.sessionStorage.setItem('bp_class', item.bp_class)
window.sessionStorage.setItem('project_id', item.project_id)
window.sessionStorage.setItem('confirm_status', item.confirm_status)
window.localStorage.setItem('confirm_id', item.confirm_id)
window.localStorage.setItem('bp_class', item.bp_class)
window.localStorage.setItem('project_id', item.project_id)
window.localStorage.setItem('confirm_status', item.confirm_status)
this.$router.push({
name: 'ContractDetails',
params: {
......
......@@ -132,7 +132,7 @@ export default {
pagesize: 10,
searchInput: vm.searchInput,
pagenum: vm.pagenum,
division: window.sessionStorage.division, // 收藏到试算通过产品线查询
division: window.localStorage.division, // 收藏到试算通过产品线查询
}
vm.hlsPopup.showLoading('数据加载中')
vm.hlsHttp.post(url, param).then(function (res) {
......@@ -174,7 +174,7 @@ export default {
vm.pagenum = vm.pagenum + 1
let url = $config.basePath + 'prd_product_calculation_query'
let param = {
division: window.sessionStorage.division, // 收藏到试算通过产品线查询
division: window.localStorage.division, // 收藏到试算通过产品线查询
searchInput: vm.searchInput,
pagenum: vm.pagenum,
pagesize: 10,
......@@ -245,7 +245,7 @@ export default {
pagesize: 10,
pagenum: 1,
searchInput: vm.searchInput,
division: window.sessionStorage.division, // 收藏到试算通过产品线查询
division: window.localStorage.division, // 收藏到试算通过产品线查询
}
vm.hlsPopup.showLoading('数据加载中')
vm.hlsHttp.post(url, param).then(function (res) {
......
......@@ -168,7 +168,7 @@ export default {
content: `是否切换到${val}?`,
onConfirm: (data) => {
if (data) {
// window.sessionStorage.setItem('bp_class', item.bp_class)
// window.localStorage.setItem('bp_class', item.bp_class)
window.localStorage.setItem('province', this.province)
window.localStorage.setItem('city', val)
this.places = this.province + '-' + val
......
......@@ -166,9 +166,9 @@ export default {
this.tabNum = i
},
goDetails (item) {
window.sessionStorage.setItem('confirm_id', item.confirm_id)
window.sessionStorage.setItem('bp_class', item.bp_class)
window.sessionStorage.setItem('project_id', item.project_id)
window.localStorage.setItem('confirm_id', item.confirm_id)
window.localStorage.setItem('bp_class', item.bp_class)
window.localStorage.setItem('project_id', item.project_id)
this.$router.push({
name: 'Base',
params: {
......
......@@ -394,7 +394,7 @@ export default {
baseInfo: {},
checkedImg: checkedImg,
isDown: false,
bp_class: window.sessionStorage.bp_class,
bp_class: window.localStorage.bp_class,
confirm_status: this.$route.params.confirm_status,
rentInfo: {},
bondsInfo: [],
......@@ -488,7 +488,7 @@ export default {
let vm = this
let url = process.env.basePath + 'prj_np_info_query'
let param = {
project_id: window.sessionStorage.project_id,
project_id: window.localStorage.project_id,
}
vm.hlsPopup.showLoading('数据加载中!')
vm.hlsHttp.post(url, param).then(function (res) {
......@@ -504,7 +504,7 @@ export default {
let vm = this
let url = process.env.basePath + 'prj_org_info_query'
let param = {
project_id: window.sessionStorage.project_id,
project_id: window.localStorage.project_id,
}
vm.hlsPopup.showLoading('数据加载中!')
vm.hlsHttp.post(url, param).then(function (res) {
......@@ -552,7 +552,7 @@ export default {
let vm = this
let url = process.env.basePath + 'prj_guarantor_list_query'
let param = {
project_id: window.sessionStorage.project_id,
project_id: window.localStorage.project_id,
}
vm.hlsPopup.showLoading('数据加载中!')
vm.hlsHttp.post(url, param).then(function (res) {
......@@ -583,7 +583,7 @@ export default {
let url = process.env.basePath + 'do_confrim_bp'
let param = {
'master': {
confirm_id: window.sessionStorage.confirm_id,
confirm_id: window.localStorage.confirm_id,
confirm_status: status,
confirm_note: this.confirm_note,
},
......
......@@ -124,7 +124,7 @@ export default {
let vm = this
let url = process.env.basePath + 'prj_cashflow_query'
let param = {
project_id: window.sessionStorage.project_id,
project_id: window.localStorage.project_id,
}
vm.hlsPopup.showLoading('数据加载中!')
vm.hlsHttp.post(url, param).then(function (res) {
......
......@@ -165,7 +165,7 @@ export default {
let vm = this
let url = process.env.basePath + 'prj_lease_query'
let param = {
project_id: window.sessionStorage.project_id,
project_id: window.localStorage.project_id,
}
vm.hlsHttp.post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
......
......@@ -282,7 +282,7 @@ export default {
}
},
changePay () {
if (window.sessionStorage.getItem('bp_id') !== 'undefined') {
if (window.localStorage.getItem('bp_id') !== 'undefined') {
this.$router.push({
name: 'FirstPay',
})
......@@ -291,7 +291,7 @@ export default {
}
},
changeRent () {
if (window.sessionStorage.getItem('bp_id') !== 'undefined') {
if (window.localStorage.getItem('bp_id') !== 'undefined') {
this.$router.push({
name: 'NewList',
})
......@@ -468,8 +468,7 @@ export default {
vm.user_bp_class = res.info.user_bp_class
vm.bp_id = res.info.user_bp_id
vm.bp_identity = res.info.bp_identity
window.sessionStorage.setItem('bp_id', res.info.user_bp_id)
window.sessionStorage.setItem('bp_name', res.info.user_bp_name)
window.localStorage.setItem('bp_name', res.info.user_bp_name)
vm.user_bp_name = res.info.user_bp_name
vm.user_bp_type = res.info.user_bp_type
vm.user_phone = res.info.user_phone
......
......@@ -192,7 +192,7 @@ export default {
},
// val:产品id, status: 收藏状态
goDetailed (val, status, bp_id) { // 进入产品查询功能明细页面
window.sessionStorage.setItem('collect_status', status)
window.localStorage.setItem('collect_status', status)
this.$router.push({
name: 'ProDetailed',
params: {
......
......@@ -113,7 +113,7 @@ export default {
let vm = this
let url = process.env.basePath + 'payment_prj_list_query'
let param = {
bp_id: window.sessionStorage.getItem('bp_id'),
bp_id: window.localStorage.getItem('bp_id'),
}
hlsPopup.showLoading('请稍候')
vm.$post(url, param).then(function (res) {
......@@ -144,7 +144,7 @@ export default {
delete i.due_amount
delete i.received_amount
delete i.project_number
i.bp_id = window.sessionStorage.getItem('bp_id')
i.bp_id = window.localStorage.getItem('bp_id')
})
return data
},
......@@ -153,7 +153,7 @@ export default {
let url = process.env.basePath + 'create_detail_0_part'
let data = vm.makeDetailData()
let param = {
order_id: window.sessionStorage.getItem('order_id'),
order_id: window.localStorage.getItem('order_id'),
pay_lists: data,
}
hlsPopup.showLoading('请稍候')
......
......@@ -68,7 +68,7 @@ export default {
} else if (from.name === 'Success') {
vm.money =
parseInt(vm.default) -
parseInt(window.sessionStorage.getItem('money'))
parseInt(window.localStorage.getItem('money'))
vm.default = vm.money
}
})
......@@ -79,7 +79,7 @@ export default {
let vm = this
let url = process.env.basePath + 'initial_payment_query'
let param = {
bp_id: window.sessionStorage.getItem('bp_id'),
bp_id: window.localStorage.getItem('bp_id'),
}
hlsPopup.showLoading('请稍候')
vm.$post(url, param).then(function (res) {
......@@ -115,7 +115,7 @@ export default {
let url = process.env.basePath + 'create_order_0_amount'
let param = {
info: {
bp_id: window.sessionStorage.getItem('bp_id'),
bp_id: window.localStorage.getItem('bp_id'),
amount: vm.money,
},
}
......@@ -142,14 +142,14 @@ export default {
let url = process.env.basePath + 'do_order_0_prj'
let param = {
info: {
bp_id: window.sessionStorage.getItem('bp_id'),
bp_id: window.localStorage.getItem('bp_id'),
},
}
hlsPopup.showLoading('请稍候')
vm.$post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
if (res.result === 'S') {
window.sessionStorage.setItem('order_id', res.order_id)
window.localStorage.setItem('order_id', res.order_id)
vm.toContractRecord(vm.money)
} else {
hlsPopup.showLongCenter(res.message)
......
......@@ -192,7 +192,7 @@ export default {
show: false,
downNum: false,
recommand: false,
userName: window.sessionStorage.getItem('bp_name'),
userName: window.localStorage.getItem('bp_name'),
flag: false, // 用于判断是否有农业银行卡
lists: [],
nongBank: [], // 存农行卡
......@@ -339,7 +339,7 @@ export default {
let vm = this
let url = process.env.basePath + 'payment_method_query'
let param = {
bp_id: window.sessionStorage.getItem('bp_id'),
bp_id: window.localStorage.getItem('bp_id'),
}
hlsPopup.showLoading('请稍候')
vm.$post(url, param).then(function (res) {
......
......@@ -288,7 +288,7 @@ export default {
let vm = this
let url = process.env.basePath + 'payment_method_query'
let param = {
bp_id: window.sessionStorage.getItem('bp_id'),
bp_id: window.localStorage.getItem('bp_id'),
}
hlsPopup.showLoading('请稍候')
vm.$post(url, param).then(function (res) {
......
......@@ -169,7 +169,7 @@ export default {
let vm = this
let url = process.env.basePath + 'payment_con_list_query'
let param = {
bp_id: window.sessionStorage.getItem('bp_id'),
bp_id: window.localStorage.getItem('bp_id'),
}
hlsPopup.showLoading('请稍候')
vm.$post(url, param).then(function (res) {
......@@ -192,7 +192,7 @@ export default {
this.info.forEach(i => {
i.con_lists.forEach(j => {
let obj = {}
obj.bp_id = window.sessionStorage.getItem('bp_id')
obj.bp_id = window.localStorage.getItem('bp_id')
obj.amount = j.amount
obj.contract_id = j.contract_id
pushList.push(obj)
......@@ -205,7 +205,7 @@ export default {
let url = process.env.basePath + 'create_detail_1_part'
let payLists = vm.createData()
let param = {
order_id: window.sessionStorage.getItem('order_id'),
order_id: window.localStorage.getItem('order_id'),
pay_lists: payLists,
}
hlsPopup.showLoading('请稍候')
......
......@@ -78,7 +78,7 @@ export default {
if (from.name === 'MyInfo') {
vm.getRent()
} else if (from.name === 'Success') {
vm.money = parseInt(vm.default) - parseInt(window.sessionStorage.getItem('money'))
vm.money = parseInt(vm.default) - parseInt(window.localStorage.getItem('money'))
vm.default = vm.money
vm.pay_rent = vm.money
}
......@@ -106,7 +106,7 @@ export default {
let vm = this
let url = process.env.basePath + 'rent_repayment_query'
let param = {
bp_id: window.sessionStorage.getItem('bp_id'),
bp_id: window.localStorage.getItem('bp_id'),
}
hlsPopup.showLoading('请稍候')
vm.$post(url, param).then(function (res) {
......@@ -125,7 +125,7 @@ export default {
let url = process.env.basePath + 'create_order_1_amount'
let param = {
info: {
bp_id: window.sessionStorage.getItem('bp_id'),
bp_id: window.localStorage.getItem('bp_id'),
},
}
hlsPopup.showLoading('请稍候')
......@@ -143,14 +143,14 @@ export default {
let url = process.env.basePath + 'do_order_1_con'
let param = {
info: {
bp_id: window.sessionStorage.getItem('bp_id'),
bp_id: window.localStorage.getItem('bp_id'),
},
}
hlsPopup.showLoading('请稍候')
vm.$post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
if (res.result === 'S') {
window.sessionStorage.setItem('order_id', res.order_id)
window.localStorage.setItem('order_id', res.order_id)
vm.toContractRecord(vm.liquidated_damages)
} else {
hlsPopup.showLongCenter(res.message)
......
......@@ -190,7 +190,7 @@ export default {
confirm: false,
show: false,
downNum: false,
userName: window.sessionStorage.getItem('bp_name'),
userName: window.localStorage.getItem('bp_name'),
nongBank: [], // 存农行卡
flag: false, // 用于判断是否有农业银行卡
lists: [],
......@@ -335,7 +335,7 @@ export default {
let vm = this
let url = process.env.basePath + 'payment_method_query'
let param = {
bp_id: window.sessionStorage.getItem('bp_id'),
bp_id: window.localStorage.getItem('bp_id'),
}
hlsPopup.showLoading('请稍候')
vm.$post(url, param).then(function (res) {
......
......@@ -38,7 +38,7 @@ export default {
data () {
return {
date: null,
userName: window.sessionStorage.getItem('bp_name'),
userName: window.localStorage.getItem('bp_name'),
isShow: false,
name: null,
money: this.$route.params.money,
......@@ -47,7 +47,7 @@ export default {
beforeRouteEnter (to, from, next) {
next(vm => {
vm.name = from.name
window.sessionStorage.setItem('money', vm.money)
window.localStorage.setItem('money', vm.money)
})
},
watch: {
......
......@@ -155,7 +155,7 @@ export default {
},
activated () {
if (window.sessionStorage.getItem('collect_status') === 'Y') {
if (window.localStorage.getItem('collect_status') === 'Y') {
this.src = require('@/assets/productQuery/coll-success.png')
} else {
this.src = require('@/assets/productQuery/collect.png')
......@@ -198,7 +198,7 @@ export default {
// 收藏
collect () {
if (window.sessionStorage.getItem('collect_status') === 'Y') {
if (window.localStorage.getItem('collect_status') === 'Y') {
let vm = this
let url = $config.basePath + 'delete_collection'
let param = {
......@@ -212,7 +212,7 @@ export default {
vm.$post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
if (res.result === 'S') {
window.sessionStorage.setItem('collect_status', 'N')
window.localStorage.setItem('collect_status', 'N')
vm.show_text = '取消成功'
vm.collect_flag = true
vm.src = require('@/assets/productQuery/collect.png')
......@@ -238,7 +238,7 @@ export default {
vm.$post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
if (res.result === 'S') {
window.sessionStorage.setItem('collect_status', 'Y')
window.localStorage.setItem('collect_status', 'Y')
vm.src = require('@/assets/productQuery/coll-success.png')
setTimeout(() => {
vm.text = '取消收藏'
......
......@@ -89,7 +89,7 @@ export default {
let vm = this
let url = $config.basePath + 'prd_product_list'
let param = {
division: window.sessionStorage.division,
division: window.localStorage.division,
user_phone: window.localStorage.user_phone,
searchInput: vm.searchInput,
pagenum: vm.pagenum,
......@@ -124,7 +124,7 @@ export default {
vm.pagenum = vm.pagenum + 1
let url = $config.basePath + 'prd_product_list'
let param = {
division: window.sessionStorage.division,
division: window.localStorage.division,
user_phone: window.localStorage.user_phone,
searchInput: vm.searchInput,
pagenum: vm.pagenum,
......@@ -171,7 +171,7 @@ export default {
pagesize: 10,
pagenum: 1,
searchInput: vm.searchInput,
division: window.sessionStorage.division,
division: window.localStorage.division,
user_phone: window.localStorage.user_phone,
}
vm.hlsPopup.showLoading('数据加载中')
......@@ -190,7 +190,7 @@ export default {
},
// val:产品id, status: 收藏状态
goDetailed (val, status, bp_id) {
window.sessionStorage.setItem('collect_status', status)
window.localStorage.setItem('collect_status', status)
this.$router.push({
name: 'ProDetailed',
params: {
......
......@@ -116,7 +116,7 @@ export default {
},
// 跳列表 val = 产品线
goLists (val) {
window.sessionStorage.setItem('division', val)
window.localStorage.setItem('division', val)
this.$router.push({
name: 'ProductList',
})
......
......@@ -564,7 +564,7 @@ export default {
let vm = this
let url = process.env.basePath + 'bp_np_info_query'
let param = {
bp_id: vm.fromPromisePay ? window.sessionStorage.getItem('bp_id') : vm.$route.params.bp_id,
bp_id: vm.fromPromisePay ? window.localStorage.getItem('bp_id') : vm.$route.params.bp_id,
}
hlsPopup.showLoading('请稍候')
vm.$post(url, param).then(function (res) {
......@@ -635,7 +635,7 @@ export default {
},
loadItemList () {
let vm = this
let bpId = vm.from ? vm.$route.params.bp_id : window.sessionStorage.getItem('bp_id')
let bpId = vm.from ? vm.$route.params.bp_id : window.localStorage.getItem('bp_id')
let url = process.env.basePath + 'prj_cdd_check_list'
let param = {
master: {
......@@ -754,8 +754,8 @@ export default {
vm.hlsPopup.showSuccess('保存成功')
vm.isSave = true
window.localStorage.setItem('user_id', res.bp_id)
window.sessionStorage.setItem('bp_id', res.bp_id)
window.sessionStorage.setItem('bp_name', vm.baseInfo.bp_name)
window.localStorage.setItem('bp_id', res.bp_id)
window.localStorage.setItem('bp_name', vm.baseInfo.bp_name)
window.localStorage.setItem('bp_name', vm.baseInfo.bp_name)
return res.bp_id
}
......@@ -1152,7 +1152,7 @@ export default {
let url = process.env.basePath + 'bp_bank_save'
let param = {
master: {
bp_id: this.from ? this.$route.params.bp_id : window.sessionStorage.getItem('bp_id'),
bp_id: this.from ? this.$route.params.bp_id : window.localStorage.getItem('bp_id'),
bank_lists: this.bankList,
},
}
......@@ -1171,7 +1171,7 @@ export default {
})
},
putData () {
let bp_id = this.from ? this.$route.params.bp_id : window.sessionStorage.getItem('bp_id')
let bp_id = this.from ? this.$route.params.bp_id : window.localStorage.getItem('bp_id')
if (bp_id) {
this.hlsPopup.showConfirm({
title: '提示',
......@@ -1182,7 +1182,7 @@ export default {
let url = process.env.basePath + 'bp_bind_submit'
let param = {
master: {
bp_id: this.from ? this.$route.params.bp_id : window.sessionStorage.getItem('bp_id'),
bp_id: this.from ? this.$route.params.bp_id : window.localStorage.getItem('bp_id'),
company_id: '2145',
},
}
......@@ -1241,7 +1241,7 @@ export default {
},
getBankInfo () {
let vm = this
let id = vm.from ? vm.$route.params.bp_id : window.sessionStorage.getItem('bp_id')
let id = vm.from ? vm.$route.params.bp_id : window.localStorage.getItem('bp_id')
let url = process.env.basePath + 'bp_bank_query'
let param = {
bp_id: id,
......
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