Skip to content

H
hls-xcmg-vue-app
Commit bf7cfeed authored by 李晓兵's avatar 李晓兵
Browse files
Options

Merge branch 'develop' into uat

parents 1325f428 ed6810c4
Hide whitespace changes
Inline Side-by-side
Showing with 320 additions and 82 deletions
config/uat.env.js
View file @ bf7cfeed
......@@ -11,5 +11,5 @@ module.exports = {
ocrPath:'"http://180.104.121.66:8088/r/api"',
fileUploadSvcPath:'"http://180.104.121.66:8088/r/api/app/fileUploadSvc?sysName=XCMG_DEV&apiName="',
appId: '"com.xcmg.app.dev"',
currentVersion: '"1.2.5"'
currentVersion: '"1.2.8"'
}
src/pages/contractCreate/contract-create-list.vue
View file @ bf7cfeed
......@@ -326,11 +326,13 @@ export default {
window.localStorage.setItem('fromPage', 'list')
window.localStorage.setItem('project_id', item.project_id)
window.localStorage.setItem('bp_class_tenant', item.bp_class)
window.localStorage.setItem('bp_id_tenant', item.bp_id)
} else if (this.num === 2) {
window.localStorage.setItem('contractReadonly', true)
window.localStorage.setItem('fromPage', 'list')
window.localStorage.setItem('project_id', item.project_id)
window.localStorage.setItem('bp_class_tenant', item.bp_class)
window.localStorage.setItem('bp_id_tenant', item.bp_id)
}
this.$router.push({
name: 'CreateBaseInfo',
......
src/pages/contractCreate/creat-rent-info.vue
View file @ bf7cfeed
......@@ -2,7 +2,7 @@
<h-view id="create-rent-info">
<h-header :proportion="[5,1,1]" class="bar-custom">
<div slot="left" class="h-header-btn">
<img src="@/assets/userBind/arrow.png" @click="$routeGo()" >
<img src="@/assets/userBind/arrow.png" @click="routeGoCustom()" >
<span>租赁信息</span>
</div>
</h-header>
......@@ -152,7 +152,8 @@
</list-item>
</h-content>
<bottom-tab class="add-box">
<tab-button v-if="!isReadOnly" class="before" @click.native="save">计算</tab-button>
<tab-button v-if="!isReadOnly && !calculeFlag" class="before" @click.native="save">计算</tab-button>
<tab-button v-if="!isReadOnly && calculeFlag" class="before" @click.native="save">重新计算</tab-button>
<tab-button class="next" @click.native="next">下一步</tab-button>
</bottom-tab>
<h-modal ref="modal" v-model="showModalValue" class="flow" position="bottom">
......@@ -249,6 +250,9 @@ export default {
},
data () {
return {
calculeFlag: false,
salesEnter: '', // 页面进入标识，该字段作用：第一次创建时即从销售页面进入进本信息、租赁信息、附件信息。用于判断后面页面录入数据后未保存则点击上一步，再次进入该页面数据丢失问题
saveTed: false, // 本页面数据是否保存标识
showModalValue: false,
showModalBusiness: false,
isComputed: false,
......@@ -350,22 +354,29 @@ export default {
vm.divisionLists = []
vm.pagenum = 1
vm.pagenumPolicy = 1
vm.saveInfo['project_id'] = window.localStorage.project_id // 重新赋值，防止缓存
vm.productInfo['project_id'] = window.localStorage.project_id // 重新赋值，防止缓存
if (from.name === 'CreateBaseInfo') {
vm.isComputed = false
vm.calculeFlag = false
vm.salesEnter = vm.$route.params.salesEnter
vm.saveTed = false
if (vm.fromPage === 'sale') {
vm.fromList = false
} else if (vm.fromPage === 'list') {
vm.fromList = true
vm.rentInfoQuery()
}
console.log('****************** '+JSON.stringify(vm.saveInfo))
Object.keys(vm.saveInfo).forEach(i => { // 置空saveInfo
if (i !== 'project_id') {
vm.saveInfo[i] = ''
}
})
console.log('@@@@@@@@@@@@@@@@@@'+JSON.stringify(vm.saveInfo))
Object.keys(vm.productInfo).forEach(i => { // 置空productInfo
if (i !== 'project_id') {
vm.saveInfo[i] = ''
vm.productInfo[i] = ''
}
})
setTimeout(() => {
......@@ -377,6 +388,25 @@ export default {
})
},
methods: {
// 自定义返回逻辑：第一次新建时返回判断是否保存数据，未保存提示保存
routeGoCustom () {
let vm = this
if (vm.salesEnter === 'SalesInfo' && !vm.saveTed) {
hlsPopup.showConfirm({
title: '提示',
content: '当前页面数据未保存，返回会导致数据丢失，是否保存？',
onConfirm: function (index) {
if (index === 1) {
vm.saveBack()
} else {
vm.$routeGo()
}
},
})
} else {
vm.$routeGo()
}
},
changeRatio () {
this.saveInfo.down_payment_ratio_n = `${(this.saveInfo.down_payment / this.saveInfo.equip_price).toFixed(2) * 100}%`
},
......@@ -421,15 +451,32 @@ export default {
vm.saveInfo.penalty_rate = e.penalty_rate
vm.saveInfo.deposit_ratio = e.deposit_ratio
vm.saveInfo.deposit_ratio_n = e.deposit_ratio_n
vm.saveInfo.lease_times = e.lease_times
setTimeout(() => {
vm.showModalBusiness = false
}, 100)
},
calculateBack(){
let vm = this
let url = process.env.basePath + 'prj_lease_info_save'
vm.saveInfo.down_payment_ratio = (vm.saveInfo.down_payment_ratio_n.replace('%', '') / 100).toFixed(2)
vm.saveInfo.lease_charge_ratio = (vm.saveInfo.lease_charge_ratio_n.replace('%', '') / 100).toFixed(2)
vm.saveInfo.deposit_ratio = (vm.saveInfo.deposit_ratio_n.replace('%', '') / 100).toFixed(2)
vm.saveInfo.finance_amount = vm.finance_amount
let param = {
master: vm.saveInfo,
}
vm.$post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
if (res.result === 'S') {
// vm.isComputed = true
} else {
hlsPopup.showLongCenter(res.message)
}
})
},
save () {
let vm = this
// vm.$router.push({
// name: 'CreateEnclosureInfo',
// })
let url = process.env.basePath + 'prj_lease_info_save'
vm.saveInfo.down_payment_ratio = (vm.saveInfo.down_payment_ratio_n.replace('%', '') / 100).toFixed(2)
vm.saveInfo.lease_charge_ratio = (vm.saveInfo.lease_charge_ratio_n.replace('%', '') / 100).toFixed(2)
......@@ -443,6 +490,7 @@ export default {
vm.hlsPopup.hideLoading()
if (res.result === 'S') {
vm.isComputed = true
vm.calculeFlag = true
hlsPopup.showLongCenter('计算成功')
vm.goPlan()
} else {
......@@ -450,6 +498,28 @@ export default {
}
})
},
saveBack () {
let vm = this
vm.calculateBack() // 保存融资信息
let url = process.env.basePath + 'prj_product_info_save'
let param = {
master: {
division_n: vm.saveInfo.division_n,
bp_name: vm.$route.params.bp_name,
...vm.productInfo,
},
}
hlsPopup.showLoading('请稍候')
vm.$post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
if (res.result === 'S') {
hlsPopup.showLongCenter('保存成功')
vm.$routeGo()
} else {
hlsPopup.showLongCenter(res.message)
}
})
},
next () {
let vm = this
if (vm.isReadOnly) {
......@@ -459,37 +529,21 @@ export default {
// name: 'CreateEnclosureInfo',
// })
})
}
if (vm.isComputed) {
let url = process.env.basePath + 'prj_product_info_save'
let param = {
master: {
division_n: vm.saveInfo.division_n,
bp_name: vm.$route.params.bp_name,
...vm.productInfo,
},
}
hlsPopup.showLoading('请稍候')
vm.$post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
if (res.result === 'S') {
vm.$router.push({
name: 'CreateEnclosureInfo',
})
} else {
hlsPopup.showLongCenter(res.message)
}
})
} else {
if (vm.isComputed) {
let url = process.env.basePath + 'prj_product_info_save'
let param = {
master: vm.productInfo,
master: {
division_n: vm.saveInfo.division_n,
bp_name: vm.$route.params.bp_name,
...vm.productInfo,
},
}
hlsPopup.showLoading('请稍候')
vm.$post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
if (res.result === 'S') {
vm.saveTed = true
vm.$router.push({
name: 'CreateEnclosureInfo',
})
......@@ -585,6 +639,8 @@ export default {
},
searchBusinessPolicy () {
let vm = this
vm.businessLists = []
vm.pagenumSearchPolicy = 1
let randomString = Math.floor(Math.random() * 21)
let url =
process.env.basePath +
......@@ -623,6 +679,8 @@ export default {
},
getBusinessPolicy () {
let vm = this
vm.businessLists = []
vm.pagenumPolicy = 1
let randomString = Math.floor(Math.random() * 21)
let url =
process.env.basePath +
......@@ -678,6 +736,8 @@ export default {
},
searchProduct () {
let vm = this
vm.divisionLists = []
vm.pagenumSearch = 1
let randomString = Math.floor(Math.random() * 21)
let url =
process.env.basePath +
......@@ -719,6 +779,8 @@ export default {
},
getProduct () {
let vm = this
vm.divisionLists = []
vm.pagenum = 1
vm.showModalValue = true
let randomString = Math.floor(Math.random() * 21)
let url =
......@@ -726,6 +788,7 @@ export default {
'prd_product_list' +
'&index' +
`'${randomString}'`
console.log('++++++++++++++++++++ '+vm.saveInfo.division)
let param = {
division: vm.saveInfo.division,
user_phone: window.localStorage.getItem('user_phone'),
......@@ -764,6 +827,8 @@ export default {
},
selectProductLine (e) {
let vm = this
vm.productInfo.product_id = ''
vm.productInfo.product_id_n = ''
vm.hlsPopup.selectList({
list: vm.productLine,
code: 'bp_type',
......
src/pages/contractCreate/create-base-info.vue
View file @ bf7cfeed
......@@ -2,7 +2,7 @@
<h-view id="create-base-info">
<h-header :proportion="[5,1,1]" class="bar-custom">
<div slot="left" class="h-header-btn">
<img src="@/assets/userBind/arrow.png" @click="$routeGo()" >
<img src="@/assets/userBind/arrow.png" @click="routeGoCustom()" >
<span>基本信息</span>
</div>
</h-header>
......@@ -310,6 +310,8 @@ export default {
},
data () {
return {
salesEnter: '', // 页面进入标识，该字段作用：第一次创建时即从销售页面进入进本信息、租赁信息、附件信息。用于判断后面页面录入数据后未保存则点击上一步，再次进入该页面数据丢失问题
saveTed: false, // 本页面数据是否保存标识
checked: false, // 农行代扣
checkedApproved: false, // 是否特批
bp_class: '',
......@@ -379,12 +381,18 @@ export default {
},
beforeRouteEnter (to, from, next) {
next(vm => {
vm.salesEnter = ''
vm.saveTed = false
vm.showModalValue = false
vm.checked = false // 农行代扣
vm.checkedApproved = false // 是否特批
vm.pageNum = 1
vm.pageNumSearch = 1
vm.undertakeList = []
vm.bp_class = window.localStorage.bp_class_tenant
vm.saveInfo['project_id'] = window.localStorage.project_id // 重新赋值，防止缓存
if (from.name === 'SalesInfo') {
vm.salesEnter = 'SalesInfo'
vm.fromPutted = false
Object.keys(vm.saveInfo).forEach(i => {
if (i !== 'project_id' && i !== 'bp_id' && i !== 'bp_class' && i !== 'abc_deduction_flag' && i !== 'special_flag') {
......@@ -394,6 +402,7 @@ export default {
} else if (i === 'bp_id') {
vm.saveInfo[i] = window.localStorage.bp_id_tenant
}
// vm.saveInfo['project_id'] = window.localStorage.project_id // 重新赋值，防止缓存
})
vm.selectUdertake = []
setTimeout(() => {
......@@ -421,8 +430,40 @@ export default {
mounted () {
},
methods: {
// 自定义返回逻辑：第一次新建时返回判断是否保存数据，未保存提示保存
routeGoCustom () {
let vm = this
if (vm.salesEnter === 'SalesInfo' && !vm.saveTed) {
hlsPopup.showConfirm({
title: '提示',
content: '当前页面数据未保存，返回会导致数据丢失，是否保存？',
onConfirm: function (index) {
if (index === 1) {
vm.saveBack()
} else {
vm.$routeGo()
}
},
})
} else{
vm.$routeGo()
}
},
getSaveInfo () {
let vm = this
let url = process.env.basePath + 'prj_base_info_query'
let param = {
project_id: window.localStorage.project_id,
}
hlsPopup.showLoading('请稍候')
vm.$post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
if (res.result === 'S') {
Object.assign(vm.saveInfo, res.info)
} else {
hlsPopup.showLongCenter(res.message)
}
})
},
addUnder (e) {
let index = this.selectUdertake.findIndex(item => {
......@@ -465,6 +506,24 @@ export default {
}
})
},
// 第一次新建返回保存
saveBack () {
let vm = this
let url = process.env.basePath + 'prj_base_info_save'
let param = {
master: {...vm.saveInfo, ...vm.makeData()},
}
hlsPopup.showLoading('请稍候')
vm.$post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
if (res.result === 'S') {
hlsPopup.showLongCenter('保存成功')
vm.$routeGo()
} else {
hlsPopup.showLongCenter(res.message)
}
})
},
save () {
let vm = this
if (vm.fromPutted) {
......@@ -472,6 +531,7 @@ export default {
name: 'CreateRentInfo',
params: {
bp_agent_id: vm.bp_agent_id,
salesEnter: vm.salesEnter
},
})
} else {
......@@ -483,11 +543,13 @@ export default {
vm.$post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
if (res.result === 'S') {
vm.saveTed = true
vm.$router.push({
name: 'CreateRentInfo',
params: {
bp_agent_id: vm.bp_agent_id,
bp_name: vm.NPBaseInfo.bp_name,
salesEnter: vm.salesEnter
},
})
} else {
......
src/pages/contractCreate/create-enclosure-info.vue
View file @ bf7cfeed
......@@ -185,7 +185,16 @@ export default {
vm.$post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
if (res.result === 'S') {
res.lists.forEach(item => {
item['url'] =
process.env.filePath +
'attachment_id=' +
item.attachment_id +
'&access_token=' +
window.localStorage.access_token
})
vm.dowload_list = res.lists
console.log('下载图片', vm.dowload_list)
}
})
},
......@@ -362,7 +371,7 @@ export default {
},
loadItemList () {
let vm = this
let bpId = window.localStorage.getItem('bp_id')
let bp_id_tenant = window.localStorage.getItem('bp_id_tenant')
let url = process.env.basePath + 'prj_cdd_check_list'
let group = ''
if (vm.bpClass === 'NP') {
......@@ -372,7 +381,7 @@ export default {
}
let param = {
master: {
document_id: bpId,
document_id: bp_id_tenant,
document_table: 'HLS_BP_MASTER',
tab_group: group,
},
......@@ -685,11 +694,11 @@ export default {
}
}
}
.house:nth-of-type(2) {
margin-top: 0
}
.house:last-child {
margin-top: 0
margin-top: 0;
div {
float: left;
}
}
.upload-box {
......
src/pages/contractCreate/sales-info.vue
View file @ bf7cfeed
......@@ -163,7 +163,7 @@ export default {
factory: '', // 主机厂id
manu_manager: '', // 办事处业务员
dates: '请选择',
project_id: window.localStorage.project_id,
project_id: '',
},
}
},
......
src/pages/myInfo/my-info.vue
View file @ bf7cfeed
......@@ -261,7 +261,14 @@ export default {
activated () {},
methods: {
openTest () {
cordova.InAppBrowser.open('http://www.baidu.com', '_blank', 'location=yes')
// cordova.InAppBrowser.open('http://www.baidu.com', '_blank', 'location=yes')
var date = '2019.11.23'
var times = this.dateFormat(date)
console.log(times)
},
dateFormat(str){
// return `${str.substring(0,4)}-${str.substring(4,6)}-${str.substring(6)}`
return str.replace(/\./g,'-')
},
// 查询头像
getHead () {
......
src/pages/pay/firstPay/pay-entry.vue
View file @ bf7cfeed
......@@ -22,8 +22,7 @@
v-for="(item,index) in payTypeList"
:proportion="[7,1,1]"
:key="index"
@click.native="isSelect(`three${index}`);ischeck(item);confirmToPay(item)"
>
@click.native="isSelect(`three${index}`);ischeck(item)"><!--;confirmToPay(item)-->
<div slot="name" style="flex=3">
<img :src="selectImg(item)" alt class="icon" >
{{ item.code_name }}
......@@ -229,7 +228,7 @@ export default {
},
watch: {
'payTypeObj.payType_n' () {
this.confirmToPay()
// this.confirmToPay()
},
},
beforeRouteEnter (to, from, next) {
......@@ -320,6 +319,7 @@ export default {
vm.$post(url, param).then(function (res) {
if (res.result === 'S') {
vm.hlsPopup.hideLoading()
vm.checkPay()
} else {
hlsPopup.showLongCenter(res.message)
}
......@@ -352,6 +352,7 @@ export default {
url: res.paymentURL,
order_id: vm.$route.params.order_id,
text: vm.text,
payType: vm.payTypeObj.payType,
},
})
}
......@@ -361,7 +362,7 @@ export default {
})
},
affirm () {
this.confirm = true
// this.confirm = true
this.confirmToPay()
},
changePage () {
......
src/pages/pay/pay-page.vue
View file @ bf7cfeed
......@@ -61,52 +61,62 @@
</div>
</div>
</div>
<div v-if="isShowpayInfo">
<div class="box-top">
<div v-if="isShowpayInfo" class="box-wrap">
<!-- <div class="box-top">
<img src="@/assets/payment/bank-title.png" >
</div>
</div>-->
<div class="box-center">
<list-item :item-height="44">
<item>
<div slot="name" class="name">订单编号</div>
<div slot="content">{{ info.order_number }}</div>
</item>
<item>
<!-- <item>
<div slot="name" class="name">付款人</div>
<div slot="content">{{ info.pay_amount_name }}</div>
</item>
<item>
<div slot="name" class="name">付款账号</div>
<div slot="content">{{ info.pay_amount }}</div>
</item>
<item>
</item>-->
<!-- <item>
<div slot="name" class="name">交易金额</div>
<div slot="content">{{ info.orderamount|currency }}</div>
</item>
</item>-->
<div class="orderamount-wrap">
<span class="orderamount-item">交易金额</span>
<span class="orderamount-item font-color">￥ {{info.orderamount|currency}}</span>
</div>
<item>
<div slot="name" class="name">支付方式</div>
<div slot="content">{{ text }}</div>
</item>
</list-item>
<div class="description">
<p>- 说明 -</p>
<p>上述两种支付方式均支持借记卡和信用卡;</p>
<p>手机K码支付需要您开通我行消息服务。</p>
<p>掌上银行支付需要您首先开通我行掌上银行,</p>
<p>且支付账户已添加到掌上银行;</p>
<p>www.abchina. com</p>
<p>全国24小时服务热线:95599</p>
<p>中国农业银行版权所有</p>
</div>
</div>
<div class="pay-btn">
<div v-if="showpay" class="pay-btn-foot" @click="pay('')">立即支付</div>
<div v-if="nextPay" class="pay-btn-foot" @click="pay('continue')">继续支付</div>
<div v-if="showSelect" class="pay-btn-foot" @click="searchResult">查询支付结果</div>
<div v-if="isGo" class="pay-btn-foot" @click="goMyInfo">返回个人中心</div>
</div>
<div class="description">
<p>- 说明 -</p>
<p>上述两种支付方式均支持借记卡和信用卡;</p>
<p>手机K码支付需要您开通我行消息服务。</p>
<p>掌上银行支付需要您首先开通我行掌上银行,</p>
<p>且支付账户已添加到掌上银行;</p>
<!-- <p>www.abchina. com</p>
<p>全国24小时服务热线:95599</p>
<p>中国农业银行版权所有</p>-->
</div>
</div>
</h-content>
<bottom-tab>
<!-- <bottom-tab>
<tab-button v-if="showpay" class="foot" @click.native="pay">立即支付</tab-button>
<tab-button v-if="nextPay" class="foot" @click.native="pay">继续支付</tab-button>
<tab-button v-if="showSelect" class="foot" @click.native="searchResult">查询支付结果</tab-button>
<tab-button v-if="isGo" class="foot" @click.native="goMyInfo">返回个人中心</tab-button>
</bottom-tab>
</bottom-tab>-->
</h-view>
</template>
<script>
......@@ -144,6 +154,7 @@ export default {
vm.name = from.name
vm.url = vm.$route.params.url
vm.text = vm.$route.params.text
vm.payType = vm.$route.params.payType
vm.getInfo()
})
},
......@@ -162,15 +173,49 @@ export default {
name: 'MyInfo',
})
},
pay () {
pay (status) {
let vm = this
cordova.InAppBrowser.open(this.url, '_blank', 'location=yes')
// window.open(this.url)
vm.nextPay = false
if(status === 'continue' && vm.payType === 'ABC_UNION'){ // 在银联模式下继续支付重新获取支付url,因为银联页面只能打开一次
hlsPopup.showConfirm({
title: '提示',
content: '银联不支持二次支付，请重新发起支付订单',
onConfirm: function (index) {
if (index === 1) {
vm.changePage()
} else {
vm.changePage()
}
},
})
}else{
cordova.InAppBrowser.open(this.url, '_blank', 'location=yes')
// window.open(this.url)
}
setTimeout(() => {
vm.showSelect = true
vm.showpay = false
}, 3000)
},
getPayUrl(){
let vm = this
let url = process.env.basePath + 'merchant_payment'
let param = {
order_id: vm.$route.params.order_id,
}
vm.$post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
if (res.result === 'S') {
if (res.return_code !== '0000') {
hlsPopup.showLongCenter(res.error_message)
} else {
cordova.InAppBrowser.open(res.paymentURL, '_blank', 'location=yes')
}
} else {
hlsPopup.showLongCenter(res.message)
}
})
},
goMyInfo () {
this.$router.push({
name: 'MyInfo',
......@@ -262,6 +307,7 @@ export default {
}
</script>
<style lang="less">
@import "../../styles/mixin";
#pay-page {
.payBtn {
width: 200px;
......@@ -277,17 +323,46 @@ export default {
justify-content: center;
flex-wrap: wrap;
background-color: #fafafa;
.box-top {
/* .box-top {
img {
height: 72px;
}
}*/
.box-wrap{
width: 100%;
display: flex;
flex-direction: column;
justify-content: space-between;
align-items: center;
.box-center{
width: 100%;
.orderamount-wrap{
width: 100%;
padding: 10px 20px 10px 0;
margin-left: 15px;
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
.border-bottom();
.orderamount-item{
width: 100%;
height: 40px;
text-align: center;
line-height: 40px;
}
.font-color{
color: #666;
}
}
}
}
.description {
width: 232px;
width: 100%;
height: 141px;
margin: 0 auto;
margin-top:145px;
margin-bottom: 30px;
/* margin: 0 auto;
margin-top:145px;*/
// margin-bottom: 30px;
font-family: PingFangSC-Regular;
font-size: 12px;
color: #d5d5d5;
......@@ -296,6 +371,16 @@ export default {
line-height: 18px;
flex-flow: row wrap;
}
.pay-btn{
width: 90%;
background: @headerColor;
height: 36px;
font-size: 14px;
line-height: 36px;
text-align: center;
color: #FFF;
border-radius: 6px;
}
}
.foot {
color: #fff;
......
src/pages/pay/payment/pay-entry.vue
View file @ bf7cfeed
......@@ -63,8 +63,7 @@
v-for="(item,index) in payTypeList"
:proportion="[7,1,1]"
:key="index"
@click.native="isSelect(`three${index}`);ischeck(item);confirmToPay(item)"
>
@click.native="isSelect(`three${index}`);ischeck(item)"><!--;confirmToPay(item)-->
<div slot="name" style="flex=3">
<img :src="selectImg(item)" alt class="icon" >
{{ item.code_name }}
......@@ -259,7 +258,7 @@ export default {
})
},
affirm () {
this.confirm = true
// this.confirm = true
this.confirmToPay()
},
confirmToPay (e) {
......@@ -283,6 +282,7 @@ export default {
vm.$post(url, param).then(function (res) {
if (res.result === 'S') {
vm.hlsPopup.hideLoading()
vm.checkPay()
} else {
hlsPopup.showLongCenter(res.message)
}
......@@ -316,6 +316,7 @@ export default {
url: res.paymentURL,
order_id: vm.$route.params.order_id,
text: vm.text,
payType: vm.payTypeObj.payType,
},
})
}
......
src/pages/userBindNew/np/base-info.vue
View file @ bf7cfeed
......@@ -474,6 +474,9 @@ export default {
})
},
methods: {
timeFormat (str) {
return `${str.substring(0, 4)}-${str.substring(4, 6)}-${str.substring(6)}`
},
deleteBP () {
this.multiBpType.bp_type_n = ''
this.multiBpType.bp_type = ''
......@@ -1097,11 +1100,11 @@ export default {
hlsPopup.hideLoading()
let result = res.result.words_result
if (cardType === 'idCard') {
vm.baseInfo.id_card_date_from = result.签发日期.words
vm.baseInfo.id_card_date_to = result.失效日期.words
vm.baseInfo.id_card_date_from = vm.timeFormat(result.签发日期.words)
vm.baseInfo.id_card_date_to = vm.timeFormat(result.失效日期.words)
} else {
vm.baseInfo.id_card_date_from_sp = result.签发日期.words
vm.baseInfo.id_card_date_to_sp = result.失效日期.words
vm.baseInfo.id_card_date_from_sp = vm.timeFormat(result.签发日期.words)
vm.baseInfo.id_card_date_to_sp = vm.timeFormat(result.失效日期.words)
}
})
},
......
src/pages/userBindNew/org/baseInfo.vue
View file @ bf7cfeed
......@@ -609,6 +609,9 @@ export default {
next()
},
methods: {
timeFormat (str) {
return `${str.substring(0, 4)}-${str.substring(4, 6)}-${str.substring(6)}`
},
deleteBP () {
this.multiBpType.bp_type_n = ''
this.multiBpType.bp_type = ''
......@@ -1277,12 +1280,12 @@ export default {
let result = res.result.words_result
if (cardType === 'idCard') { // 法定代表人
// 未授权 身份证有效期从，身份证有效期到
vm.legal_personMsg.id_card_date_from = result.签发日期.words
vm.legal_personMsg.id_card_date_to = result.失效日期.words
vm.legal_personMsg.id_card_date_from = vm.timeFormat(result.签发日期.words)
vm.legal_personMsg.id_card_date_to = vm.timeFormat(result.失效日期.words)
} else {
// 已授权 身份证有效期从，身份证有效期到
vm.authMsg.auth_id_card_date_from = result.签发日期.words
vm.authMsg.auth_id_card_date_to = result.失效日期.words
vm.authMsg.auth_id_card_date_from = vm.timeFormat(result.签发日期.words)
vm.authMsg.auth_id_card_date_to = vm.timeFormat(result.失效日期.words)
}
})
},
......
www/index.html
View file @ bf7cfeed
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no,width=device-width,viewport-fit=cover"><meta name=format-detection content="telephone=no"><meta name=format-detection content="email=no"><meta name=apple-mobile-web-app-capable content=yes><meta name=apple-mobile-web-app-status-bar-style content=black><script type=text/javascript src=./static/vuePlatform.js></script><script type=text/javascript src=./static/prototype.js></script><script type=text/javascript src=cordova.js></script><script type=text/javascript src="http://api.map.baidu.com/api?v=2.0&ak=o7fTnpVAGzXKN7SirV8xGU2xzWQS2NrI"></script><title>徐工融租</title><link href=./static/css/app.6993e65c3c23fe091516186ea68777ec.css rel=stylesheet></head><body><div id=app-box></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.e547499500fbe65e7169.js></script><script type=text/javascript src=./static/js/app.15189d51f1772069bb43.js></script></body></html>
\ No newline at end of file
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no,width=device-width,viewport-fit=cover"><meta name=format-detection content="telephone=no"><meta name=format-detection content="email=no"><meta name=apple-mobile-web-app-capable content=yes><meta name=apple-mobile-web-app-status-bar-style content=black><script type=text/javascript src=./static/vuePlatform.js></script><script type=text/javascript src=./static/prototype.js></script><script type=text/javascript src=cordova.js></script><script type=text/javascript src="http://api.map.baidu.com/api?v=2.0&ak=o7fTnpVAGzXKN7SirV8xGU2xzWQS2NrI"></script><title>徐工融租</title><link href=./static/css/app.891dc19da1733fc7db7071712cea81e0.css rel=stylesheet></head><body><div id=app-box></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.e547499500fbe65e7169.js></script><script type=text/javascript src=./static/js/app.2ea5061d831d7ce89173.js></script></body></html>
\ No newline at end of file
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