Commit 2addf190 authored by JingChao's avatar JingChao

1.4.5

parents c124e815 9acbe89d
Pipeline #4563 canceled with stages
......@@ -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.4.4"'
currentVersion: '"1.4.5"'
}
......@@ -249,7 +249,7 @@ export default {
let url = process.env.basePath + 'get_sign_url'
let param = {
confirm_id: vm.confirm_id,
data_class: 'PRJ_PROJECT',
data_class: 'LEASE_ITEM',
}
vm.hlsPopup.showLoading('请稍后')
vm.hlsHttp.post(url, param).then(function (res) {
......
......@@ -377,5 +377,38 @@ export default {
}
}
.scrollContent {
padding-bottom: 400px;
}
.tab-style {
width: 100%;
position: absolute;
}
}
.platform-ios {
#repay-detail {
.scrollContent {
// padding-top: 3.32rem;
}
}
}
@media (device-width: 375px) and (device-height: 812px) and (-webkit-min-device-pixel-ratio: 3) {
.platform-ios {
#repay-detail{
.scrollContent {
// padding-top: 3.72rem;
}
}
}
}
// iPhoneXR适配
@media (device-width: 414px) and (device-height: 896px) {
.platform-ios {
#repay-detail{
.scrollContent {
// padding-top: 3.72rem;
}
}
}
}
</style>
......@@ -342,6 +342,39 @@ export default {
}
}
}
.scrollContent {
padding-bottom: 20px;
}
.tab-style {
width: 100%;
position: absolute;
}
}
.platform-ios {
#repay-details {
.scrollContent {
// padding-top: 3.32rem;
}
}
}
@media (device-width: 375px) and (device-height: 812px) and (-webkit-min-device-pixel-ratio: 3) {
.platform-ios {
#repay-details{
.scrollContent {
// padding-top: 3.72rem;
}
}
}
}
// iPhoneXR适配
@media (device-width: 414px) and (device-height: 896px) {
.platform-ios {
#repay-details{
.scrollContent {
// padding-top: 3.72rem;
}
}
}
}
</style>
......@@ -52,30 +52,32 @@
<span class="number">合同号</span>
<span>{{ list.project_number }}</span>
</div>
<div v-for="(item,indexTwo) in list.con_lists" :key="indexTwo" class="bottom">
<list-item >
<item>
<div slot="name">首付款</div>
<div slot="content">{{ item.down_payment | currency }}</div>
</item>
<item>
<div slot="name">保证金</div>
<div slot="content">{{ item.deposit | currency }}</div>
</item>
<item>
<div slot="name">手续费</div>
<div slot="content">{{ item.lease_charge | currency }}</div>
</item>
<item>
<div slot="name">GPS费用</div>
<div slot="content">{{ item.gps_fee | currency }}</div>
</item>
<item>
<div slot="name">保险押金</div>
<div slot="content">{{ item.insurance_fee | currency }}</div>
</item>
</list-item>
</div>
<scroll ref="scroll" :updateData="[conList]" :pullUp="true" @pullingUp="getConList">
<div v-for="(item,indexTwo) in list.con_lists" :key="indexTwo" class="bottom">
<list-item >
<item>
<div slot="name">首付款</div>
<div slot="content">{{ item.down_payment | currency }}</div>
</item>
<item>
<div slot="name">保证金</div>
<div slot="content">{{ item.deposit | currency }}</div>
</item>
<item>
<div slot="name">手续费</div>
<div slot="content">{{ item.lease_charge | currency }}</div>
</item>
<item>
<div slot="name">GPS费用</div>
<div slot="content">{{ item.gps_fee | currency }}</div>
</item>
<item>
<div slot="name">保险押金</div>
<div slot="content">{{ item.insurance_fee | currency }}</div>
</item>
</list-item>
</div>
</scroll>
</div>
</div>
</h-content>
......@@ -88,10 +90,12 @@ export default {
return {
detail: {},
conList: [],
pagenum: 1,
}
},
beforeRouteEnter (to, from, next) {
next(vm => {
vm.pagenum = 1
vm.getDetail()
vm.getConList()
})
......@@ -122,12 +126,30 @@ export default {
let url = process.env.basePath + 'my_con_list_query'
let param = {
order_id: vm.$route.params.order_id,
pagesize: 10,
pagenum: vm.pagenum,
}
hlsPopup.showLoading('请稍候')
vm.$post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
if (res.result === 'S') {
vm.conList = res.prj_lists
let returnData = []
returnData = res.prj_lists
if (returnData.length === 0) {
vm.$refs.scroll.update(true)
} else if (returnData.length > 0 && returnData.length < 10) {
vum.forEach(returnData, function (data, index, array) {
vm.conList.push(array[index])
})
vm.pagenum++
vm.$refs.scroll.update(true)
} else if (returnData.length === 10) {
vum.forEach(returnData, function (data, index, array) {
vm.conList.push(array[index])
})
vm.pagenum++
vm.$refs.scroll.update(false)
}
} else {
hlsPopup.showLongCenter(res.message)
}
......
......@@ -20,7 +20,11 @@ export default {
url: this.$route.params.authUrl,
}
},
watch: {
$route (to, from) {
this.exitCertification()
},
},
created () {
console.log(this)
},
......
......@@ -901,17 +901,18 @@ export default {
// hlsPopup.showLongCenter('获取认证url失败')
}
} else if (vm.bp_identity === 'ORG_NO') {
let authUrl = await vm.getOrgCertificationUrl()
if (authUrl) {
vm.$router.push({
name: 'Certification',
params: {
authUrl: authUrl,
},
})
} else {
// hlsPopup.showLongCenter('获取认证url失败')
}
// let authUrl = await vm.getOrgCertificationUrl()
// if (authUrl) {
// vm.$router.push({
// name: 'Certification',
// params: {
// authUrl: authUrl,
// },
// })
// } else {
// // hlsPopup.showLongCenter('获取认证url失败')
// }
hlsPopup.showLongCenter('请联系对应业务人员为企业进行认证')
} else {
hlsPopup.showLongCenter('您已认证通过')
}
......
......@@ -57,7 +57,7 @@
<list-item>
<item v-for="(item,index) in list.cf_lists" :key="index">
<div slot="name">{{ item.cf_item_name }}</div>
<div slot="content">{{ item.due_amount | currency }}</div>
<div slot="content">{{ parseFloat(item.received_amount).toFixed(2) | currency }}</div>
</item>
</list-item>
</div>
......@@ -108,7 +108,7 @@ export default {
let vm = this
let url = process.env.basePath + 'my_con_list_query'
let param = {
bp_id: window.localStorage.bp_id,
order_id: vm.$route.params.order_id,
pagesize: 10,
pagenum: vm.pagenum,
}
......
<!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.486eb393b1929813a88cd1e17a0b75ae.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.347d8a64f0016023e186.js></script><script type=text/javascript src=./static/js/app.cf0b522c85816b556395.js></script></body></html>
\ No newline at end of file
<<<<<<< HEAD
<!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.486eb393b1929813a88cd1e17a0b75ae.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.347d8a64f0016023e186.js></script><script type=text/javascript src=./static/js/app.cf0b522c85816b556395.js></script></body></html>
=======
<!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.1fba01d4acb1ed0185103a92c1363a7a.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.737b66774b6e80545073.js></script><script type=text/javascript src=./static/js/app.b55aa48989ca8151b595.js></script></body></html>
>>>>>>> 9acbe89d947ec7fd32a726a05985fc405fef6acb
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