Skip to content

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

Merge branch 'develop' of https://hel.hand-china.com/xugong/hls-xcmg-vue-app into develop

parents fc95f762 b9b3e8f0
Hide whitespace changes
Inline Side-by-side
Showing with 619 additions and 617 deletions
src/pages/contractSigning/contract-detail.vue
View file @ c6d72498
...@@ -310,7 +310,7 @@ export default { ...@@ -310,7 +310,7 @@ export default {
uncheck1: unCheck1, uncheck1: unCheck1,
uncheck2: unCheck2, uncheck2: unCheck2,
uncheck3: unCheck3, uncheck3: unCheck3,
con_confirm_status: this.$route.params.item.con_confirm_status, con_confirm_status: this.$route.params.item.confirm_status,
entry_info_flag: false, entry_info_flag: false,
} }
}, },
...@@ -342,7 +342,7 @@ export default { ...@@ -342,7 +342,7 @@ export default {
vm.bp_name = vm.$route.params.item.bp_name vm.bp_name = vm.$route.params.item.bp_name
vm.project_id = vm.$route.params.item.project_id vm.project_id = vm.$route.params.item.project_id
vm.confirm_id = vm.$route.params.item.confirm_id vm.confirm_id = vm.$route.params.item.confirm_id
vm.con_confirm_status = vm.$route.params.item.con_confirm_status vm.con_confirm_status = vm.$route.params.item.confirm_status
if (vm.$route.params.item.bp_class === 'NP') { if (vm.$route.params.item.bp_class === 'NP') {
vm.bp_flag = false vm.bp_flag = false
} else { } else {
......
src/pages/contractSigning/contract-signing.vue
View file @ c6d72498
...@@ -121,8 +121,8 @@ export default { ...@@ -121,8 +121,8 @@ export default {
vm.hlsHttp.post(url, param).then(function (res) { vm.hlsHttp.post(url, param).then(function (res) {
vm.hlsPopup.hideLoading() vm.hlsPopup.hideLoading()
if (res.result === 'S') { if (res.result === 'S') {
vm.submitLists = res.lists.filter(item => item.con_confirm_status === 'SUBMIT') vm.submitLists = res.lists.filter(item => item.confirm_status === 'SUBMIT')
vm.approvedLists = res.lists.filter(item => item.con_confirm_status === 'APPROVED') vm.approvedLists = res.lists.filter(item => item.confirm_status === 'APPROVED')
} else { } else {
hlsPopup.showLongCenter(res.message) hlsPopup.showLongCenter(res.message)
} }
......
src/pages/pay/firstPay/first-pay.vue
View file @ c6d72498
<template> <template>
<h-view id="first-pay" class="public-style"> <h-view id="first-pay" class="public-style">
<h-header :proportion="[5,1,1]" class="bar-custom"> <h-header :proportion="[5,1,1]" class="bar-custom">
<div slot="left" class="h-header-btn"> <div slot="left" class="h-header-btn">
<img src="@/assets/userBind/arrow.png" @click="goHome" > <img src="@/assets/userBind/arrow.png" @click="goHome" >
<span>首付款支付</span> <span>首付款支付</span>
</div> </div>
</h-header> </h-header>
<h-content> <h-content>
<div class="top-head"> <div class="top-head">
<div class="center"> <div class="center">
<div class="now-pay"> <div class="now-pay">
<div class="title">当前应付</div> <div class="title">当前应付</div>
<div class="data"> <div class="data">
<span>￥</span> <span>￥</span>
{{ money |currency }} {{ money |currency }}
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<section class="pay-content"> <section class="pay-content">
<div class="pos"> <div class="pos">
<div class="pay-money"> <div class="pay-money">
<div class="pay-icon"> <div class="pay-icon">
<img src="@/assets/payment/first-pay.png" >首付款支付 <img src="@/assets/payment/first-pay.png" >首付款支付
</div> </div>
<div class="pay-input"> <div class="pay-input">
<span>应还首付款</span> <span>应还首付款</span>
<input v-model="money" type="text" placeholder="请输入支付金额" > <input v-model="money" type="text" placeholder="请输入支付金额" >
<div @click="createOrder"> <div @click="createOrder">
<img src="@/assets/payment/into.png" > <img src="@/assets/payment/into.png" >
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</section> </section>
<div class="prompt"> <div class="prompt">
<div> <div>
<img src="@/assets/payment/prompt.png" alt > <img src="@/assets/payment/prompt.png" alt >
</div> </div>
<div> <div>
<p>温馨提示</p> <p>温馨提示</p>
<p>推荐使用农行卡，农行卡支付免收手续费！</p> <p>推荐使用农行卡，农行卡支付免收手续费！</p>
</div> </div>
</div> </div>
</h-content> </h-content>
<bottom-tab> <bottom-tab>
<tab-button class="footer" @click.native="pay">支&nbsp;&nbsp;付</tab-button> <tab-button class="footer" @click.native="pay">支&nbsp;&nbsp;付</tab-button>
</bottom-tab> </bottom-tab>
</h-view> </h-view>
</template> </template>
<script> <script>
export default { export default {
name: 'FirstPay', name: 'FirstPay',
components: {}, components: {},
data () { data () {
return { return {
money: 0, money: 0,
default: 0, default: 0,
} }
}, },
beforeRouteEnter (to, from, next) { beforeRouteEnter (to, from, next) {
next(vm => { next(vm => {
if (from.name === 'MyInfo') { if (from.name === 'MyInfo') {
vm.getDownPayment() vm.getDownPayment()
} else if (from.name === 'Success') { } else if (from.name === 'Success') {
vm.money = vm.money =
parseInt(vm.default) - parseInt(vm.default) -
parseInt(window.sessionStorage.getItem('money')) parseInt(window.sessionStorage.getItem('money'))
vm.default = vm.money vm.default = vm.money
} }
}) })
}, },
computed: {}, computed: {},
watch: {}, watch: {},
methods: { methods: {
getDownPayment () { getDownPayment () {
let vm = this let vm = this
let url = process.env.basePath + 'initial_payment_query' let url = process.env.basePath + 'initial_payment_query'
let param = { let param = {
bp_id: window.sessionStorage.getItem('bp_id'), bp_id: window.sessionStorage.getItem('bp_id'),
} }
hlsPopup.showLoading('请稍候') hlsPopup.showLoading('请稍候')
vm.$post(url, param).then(function (res) { vm.$post(url, param).then(function (res) {
vm.hlsPopup.hideLoading() vm.hlsPopup.hideLoading()
if (res.result === 'S') { if (res.result === 'S') {
vm.money = res.info.down_payment vm.money = res.info.down_payment
vm.default = res.info.down_payment vm.default = res.info.down_payment
} else { } else {
hlsPopup.showLongCenter(res.message) hlsPopup.showLongCenter(res.message)
} }
}) })
}, },
goHome () { goHome () {
this.$router.replace({ this.$router.replace({
name: 'MyInfo', name: 'MyInfo',
}) })
}, },
pay () { pay () {
this.payProtocol() this.payProtocol()
// let money = parseFloat(this.money) // let money = parseFloat(this.money)
// let theDefault = parseFloat(this.default) // let theDefault = parseFloat(this.default)
// if (money > 0 && money <= theDefault) { // if (money > 0 && money <= theDefault) {
// this.payProtocol() // this.payProtocol()
// } else if (money > theDefault) { // } else if (money > theDefault) {
// hlsPopup.showLongCenter('当前支付金额超出应还金额！') // hlsPopup.showLongCenter('当前支付金额超出应还金额！')
// } else if (money === 0) { // } else if (money === 0) {
// hlsPopup.showLongCenter('当前支付金额为0元，无需支付！') // hlsPopup.showLongCenter('当前支付金额为0元，无需支付！')
// } // }
}, },
payProtocol () { payProtocol () {
let vm = this let vm = this
let url = process.env.basePath + 'create_order_0_amount' let url = process.env.basePath + 'create_order_0_amount'
let param = { let param = {
info: { info: {
bp_id: window.sessionStorage.getItem('bp_id'), bp_id: window.sessionStorage.getItem('bp_id'),
amount: vm.money, amount: vm.money,
}, },
} }
hlsPopup.showLoading('请稍候') hlsPopup.showLoading('请稍候')
vm.$post(url, param).then(function (res) { vm.$post(url, param).then(function (res) {
vm.hlsPopup.hideLoading() vm.hlsPopup.hideLoading()
if (res.result === 'S') { if (res.result === 'S') {
vm.toPayEntry(vm.money) vm.toPayEntry(vm.money)
} else { } else {
hlsPopup.showLongCenter(res.message) hlsPopup.showLongCenter(res.message)
} }
}) })
}, },
toPayEntry (money) { toPayEntry (money) {
this.$router.push({ this.$router.push({
name: 'PayEntry', name: 'PayEntry',
params: { params: {
money, money,
}, },
}) })
}, },
createOrder () { createOrder () {
let vm = this let vm = this
let url = process.env.basePath + 'do_order_0_prj' let url = process.env.basePath + 'do_order_0_prj'
let param = { let param = {
info: { info: {
bp_id: window.sessionStorage.getItem('bp_id'), bp_id: window.sessionStorage.getItem('bp_id'),
}, },
} }
hlsPopup.showLoading('请稍候') hlsPopup.showLoading('请稍候')
vm.$post(url, param).then(function (res) { vm.$post(url, param).then(function (res) {
vm.hlsPopup.hideLoading() vm.hlsPopup.hideLoading()
if (res.result === 'S') { if (res.result === 'S') {
window.sessionStorage.setItem('order_id', res.order_id) window.sessionStorage.setItem('order_id', res.order_id)
vm.toContractRecord(vm.money) vm.toContractRecord(vm.money)
} else { } else {
hlsPopup.showLongCenter(res.message) hlsPopup.showLongCenter(res.message)
} }
}) })
}, },
toContractRecord (money) { toContractRecord (money) {
this.$router.push({ this.$router.push({
name: 'ContractRecord', name: 'ContractRecord',
params: { params: {
money, money,
}, },
}) })
}, },
}, },
} }
</script> </script>
<style lang='less' > <style lang='less' >
#first-pay { #first-pay {
.top-head { .top-head {
width: 100%; width: 100%;
height: 142px; height: 142px;
background: url("../../../assets/payment/back1.png"); background: url("../../../assets/payment/back1.png");
background-size: 100% 142px; background-size: 100% 142px;
.now-pay { .now-pay {
width: 100%; width: 100%;
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
flex-flow: column wrap; flex-flow: column wrap;
.title { .title {
font-family: PingFangSC-Regular; font-family: PingFangSC-Regular;
font-size: 14px; font-size: 14px;
color: #ffffff; color: #ffffff;
margin-top: 20px; margin-top: 20px;
} }
.data { .data {
font-family: Verdana-Bold; font-family: Verdana-Bold;
font-size: 24px; font-size: 24px;
color: #ffffff; color: #ffffff;
letter-spacing: 0; letter-spacing: 0;
line-height: 18px; line-height: 18px;
text-align: center; text-align: center;
margin-top: 16px; margin-top: 16px;
} }
} }
} }
.pay-content { .pay-content {
position: relative; position: relative;
top: -57px; top: -57px;
width: 100%; width: 100%;
height: 94px; height: 94px;
display: flex; display: flex;
justify-content: center; justify-content: center;
.pos { .pos {
width: 96%; width: 96%;
height: 100%; height: 100%;
background: #ffffff; background: #ffffff;
box-shadow: 0 1px 3px 2px rgba(168, 168, 168, 0.14); box-shadow: 0 1px 3px 2px rgba(168, 168, 168, 0.14);
} }
.pay-money { .pay-money {
width: 100%; width: 100%;
height: 100%; height: 100%;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
flex: 1; flex: 1;
background-color: #fff; background-color: #fff;
padding-left: 16px; padding-left: 16px;
.pay-icon { .pay-icon {
height: 50%; height: 50%;
display: flex; display: flex;
align-items: center; align-items: center;
font-family: PingFangSC-Regular; font-family: PingFangSC-Regular;
font-size: 14px; font-size: 14px;
color: #1d3fff; color: #1d3fff;
img { img {
width: 30px; width: 30px;
display: block; display: block;
float: left; float: left;
margin-right: 9px; margin-right: 9px;
} }
} }
.pay-input { .pay-input {
height: 44px; height: 44px;
display: flex; display: flex;
align-items: center; align-items: center;
flex: 1; flex: 1;
font-family: PingFangSC-Regular; font-family: PingFangSC-Regular;
font-size: 14px; font-size: 14px;
color: #656464; color: #656464;
img { img {
width: 15px; width: 15px;
height: 17px; height: 17px;
} }
span { span {
flex: 2; flex: 2;
text-align: left; text-align: left;
line-height: 37px; line-height: 37px;
height: 100%; height: 100%;
display: flex; display: flex;
align-items: center; align-items: center;
} }
input { input {
flex: 3; flex: 3;
text-align: right; text-align: right;
padding-right: 5px; padding-right: 5px;
} }
div { div {
display: flex; display: flex;
height: 100%; height: 100%;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
flex: 1; flex: 1;
text-align: center; text-align: center;
background: rgba(0, 70, 156, 0.08); background: rgba(0, 70, 156, 0.08);
i { i {
color: #00469c; color: #00469c;
font-size: 16px; font-size: 16px;
} }
} }
input::placeholder { input::placeholder {
font-family: PingFangSC-Regular; font-family: PingFangSC-Regular;
font-size: 14px; font-size: 14px;
color: #b4b4b5; color: #b4b4b5;
} }
} }
} }
} }
.prompt { .prompt {
background: rgba(142, 195, 30, 0.1); background: rgba(142, 195, 30, 0.1);
height: 77px; height: 77px;
display: flex; display: flex;
position: absolute; position: absolute;
width: 100%; width: 100%;
bottom: 0; bottom: 0;
div:first-child { div:first-child {
flex: 1; flex: 1;
padding: 16px 0 0 16px; padding: 16px 0 0 16px;
img { img {
width: 16px; width: 16px;
height: 16px; height: 16px;
} }
} }
div:last-child { div:last-child {
flex: 12; flex: 12;
p:first-child { p:first-child {
padding-top: 16px; padding-top: 16px;
font-family: PingFangSC-Semibold; font-family: PingFangSC-Semibold;
font-size: 14px; font-size: 14px;
color: #8ec31e; color: #8ec31e;
letter-spacing: 0.5px; letter-spacing: 0.5px;
} }
p:last-child { p:last-child {
padding-top: 15px; padding-top: 15px;
font-family: PingFangSC-Regular; font-family: PingFangSC-Regular;
font-size: 12px; font-size: 12px;
color: rgba(101, 100, 100, 0.8); color: rgba(101, 100, 100, 0.8);
letter-spacing: 0.37px; letter-spacing: 0.37px;
} }
} }
} }
.footer { .footer {
background-color: @headerColor; background-color: @headerColor;
color: #fff; color: #fff;
} }
} }
</style> </style>
src/pages/pay/marginPay/first-pay.vue
View file @ c6d72498
<template> <template>
<h-view id="first-pay" class="public-style"> <h-view id="first-pay" class="public-style">
<h-header :proportion="[5,1,1]" class="bar-custom"> <h-header :proportion="[5,1,1]" class="bar-custom">
<div slot="left" class="h-header-btn"> <div slot="left" class="h-header-btn">
<img src="@/assets/userBind/arrow.png" @click="goHome" > <img src="@/assets/userBind/arrow.png" @click="$routeGo()" >
<span>保证金支付</span> <span>保证金支付</span>
</div> </div>
</h-header> </h-header>
<h-content> <h-content>
<div class="top-head"> <div class="top-head">
<div class="center"> <div class="center">
<div class="now-pay"> <div class="now-pay">
<div class="title">当前应付</div> <div class="title">当前应付</div>
<div class="data"> <div class="data">
<span>￥</span> <span>￥</span>
{{ money |currency }} {{ money |currency }}
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<section class="pay-content"> <section class="pay-content">
<div class="pos"> <div class="pos">
<div class="pay-money"> <div class="pay-money">
<div class="pay-icon"> <div class="pay-icon">
<img src="@/assets/payment/first-pay.png" >保证金支付 <img src="@/assets/payment/first-pay.png" >保证金支付
</div> </div>
<div class="pay-input"> <div class="pay-input">
<span>应还保证金</span> <span>应还保证金</span>
<input v-model="money" type="text" placeholder="请输入支付金额" > <input v-model="money" type="text" placeholder="请输入支付金额" >
<div @click="createOrder"> <div>
<img src="@/assets/payment/into.png" > <img src="@/assets/payment/into.png" >
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</section> </section>
<div class="prompt"> <div class="prompt">
<div> <div>
<img src="@/assets/payment/prompt.png" alt > <img src="@/assets/payment/prompt.png" alt >
</div> </div>
<div> <div>
<p>温馨提示</p> <p>温馨提示</p>
<p>推荐使用农行卡，农行卡支付免收手续费！</p> <p>推荐使用农行卡，农行卡支付免收手续费！</p>
</div> </div>
</div> </div>
</h-content> </h-content>
<bottom-tab> <bottom-tab>
<tab-button class="footer" @click.native="toPayEntry(money)">支&nbsp;&nbsp;付</tab-button> <tab-button class="footer" @click.native="toPayEntry(money)">支&nbsp;&nbsp;付</tab-button>
</bottom-tab> </bottom-tab>
</h-view> </h-view>
</template> </template>
<script> <script>
export default { export default {
components: {}, components: {},
data () { data () {
return { return {
money: 0, money: 0,
default: 0, default: 0,
} }
}, },
beforeRouteEnter (to, from, next) { beforeRouteEnter (to, from, next) {
next(vm => { next(vm => {
}) })
}, },
computed: {}, computed: {},
watch: {}, watch: {},
methods: { methods: {
toPayEntry (money) { toPayEntry (money) {
this.$router.push({ this.$router.push({
name: 'PayEntry', name: 'PayEntry',
params: { params: {
money, money,
}, },
}) })
}, },
}, },
} }
</script> </script>
<style lang='less' > <style lang='less' >
#first-pay { #first-pay {
.top-head { .top-head {
width: 100%; width: 100%;
height: 142px; height: 142px;
background: url("../../../assets/payment/back1.png"); background: url("../../../assets/payment/back1.png");
background-size: 100% 142px; background-size: 100% 142px;
.now-pay { .now-pay {
width: 100%; width: 100%;
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
flex-flow: column wrap; flex-flow: column wrap;
.title { .title {
font-family: PingFangSC-Regular; font-family: PingFangSC-Regular;
font-size: 14px; font-size: 14px;
color: #ffffff; color: #ffffff;
margin-top: 20px; margin-top: 20px;
} }
.data { .data {
font-family: Verdana-Bold; font-family: Verdana-Bold;
font-size: 24px; font-size: 24px;
color: #ffffff; color: #ffffff;
letter-spacing: 0; letter-spacing: 0;
line-height: 18px; line-height: 18px;
text-align: center; text-align: center;
margin-top: 16px; margin-top: 16px;
} }
} }
} }
.pay-content { .pay-content {
position: relative; position: relative;
top: -57px; top: -57px;
width: 100%; width: 100%;
height: 94px; height: 94px;
display: flex; display: flex;
justify-content: center; justify-content: center;
.pos { .pos {
width: 96%; width: 96%;
height: 100%; height: 100%;
background: #ffffff; background: #ffffff;
box-shadow: 0 1px 3px 2px rgba(168, 168, 168, 0.14); box-shadow: 0 1px 3px 2px rgba(168, 168, 168, 0.14);
} }
.pay-money { .pay-money {
width: 100%; width: 100%;
height: 100%; height: 100%;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
flex: 1; flex: 1;
background-color: #fff; background-color: #fff;
padding-left: 16px; padding-left: 16px;
.pay-icon { .pay-icon {
height: 50%; height: 50%;
display: flex; display: flex;
align-items: center; align-items: center;
font-family: PingFangSC-Regular; font-family: PingFangSC-Regular;
font-size: 14px; font-size: 14px;
color: #1d3fff; color: #1d3fff;
img { img {
width: 30px; width: 30px;
display: block; display: block;
float: left; float: left;
margin-right: 9px; margin-right: 9px;
} }
} }
.pay-input { .pay-input {
height: 44px; height: 44px;
display: flex; display: flex;
align-items: center; align-items: center;
flex: 1; flex: 1;
font-family: PingFangSC-Regular; font-family: PingFangSC-Regular;
font-size: 14px; font-size: 14px;
color: #656464; color: #656464;
img { img {
width: 15px; width: 15px;
height: 17px; height: 17px;
} }
span { span {
flex: 2; flex: 2;
text-align: left; text-align: left;
line-height: 37px; line-height: 37px;
height: 100%; height: 100%;
display: flex; display: flex;
align-items: center; align-items: center;
} }
input { input {
flex: 3; flex: 3;
text-align: right; text-align: right;
padding-right: 5px; padding-right: 5px;
} }
div { div {
display: flex; display: flex;
height: 100%; height: 100%;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
flex: 1; flex: 1;
text-align: center; text-align: center;
background: rgba(0, 70, 156, 0.08); background: rgba(0, 70, 156, 0.08);
i { i {
color: #00469c; color: #00469c;
font-size: 16px; font-size: 16px;
} }
} }
input::placeholder { input::placeholder {
font-family: PingFangSC-Regular; font-family: PingFangSC-Regular;
font-size: 14px; font-size: 14px;
color: #b4b4b5; color: #b4b4b5;
} }
} }
} }
} }
.prompt { .prompt {
background: rgba(142, 195, 30, 0.1); background: rgba(142, 195, 30, 0.1);
height: 77px; height: 77px;
display: flex; display: flex;
position: absolute; position: absolute;
width: 100%; width: 100%;
bottom: 0; bottom: 0;
div:first-child { div:first-child {
flex: 1; flex: 1;
padding: 16px 0 0 16px; padding: 16px 0 0 16px;
img { img {
width: 16px; width: 16px;
height: 16px; height: 16px;
} }
} }
div:last-child { div:last-child {
flex: 12; flex: 12;
p:first-child { p:first-child {
padding-top: 16px; padding-top: 16px;
font-family: PingFangSC-Semibold; font-family: PingFangSC-Semibold;
font-size: 14px; font-size: 14px;
color: #8ec31e; color: #8ec31e;
letter-spacing: 0.5px; letter-spacing: 0.5px;
} }
p:last-child { p:last-child {
padding-top: 15px; padding-top: 15px;
font-family: PingFangSC-Regular; font-family: PingFangSC-Regular;
font-size: 12px; font-size: 12px;
color: rgba(101, 100, 100, 0.8); color: rgba(101, 100, 100, 0.8);
letter-spacing: 0.37px; letter-spacing: 0.37px;
} }
} }
} }
.footer { .footer {
background-color: @headerColor; background-color: @headerColor;
color: #fff; color: #fff;
} }
} }
</style> </style>
src/pages/productQuery/product-detailed.vue
View file @ c6d72498
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* @Descrip: 产品明细 * @Descrip: 产品明细
* @Author: your name * @Author: your name
* @Date: 2019-10-15 14:30:00 * @Date: 2019-10-15 14:30:00
* @LastEditTime: 2019-11-06 16:35:55 * @LastEditTime: 2019-11-06 19:12:51
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
--> -->
<template> <template>
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
title="产品查询"> title="产品查询">
<h-header :proportion="[5,1,1]" class="bar-custom"> <h-header :proportion="[5,1,1]" class="bar-custom">
<div slot="left" class="h-header-btn"> <div slot="left" class="h-header-btn">
<img src="@/assets/userBind/arrow.png" @click="returnGo()"> <img src="@/assets/userBind/arrow.png" @click="$routeGo()">
<span>产品明细</span> <span>产品明细</span>
</div> </div>
</h-header> </h-header>
...@@ -22,8 +22,8 @@ ...@@ -22,8 +22,8 @@
</div> </div>
<!-- <Tab v-if="slide" :tabNums="tabNum" @getTabNum="getTabNum"/> --> <!-- <Tab v-if="slide" :tabNums="tabNum" @getTabNum="getTabNum"/> -->
<!-- 基本信息 --> <!-- 基本信息 -->
<h-content v-swipeup="(e)=>vueTouch('上滑',e)" v-swipedown="(e)=>vueTouch('下滑',e)" class="hcontent"> <h-content class="hcontent" v-swipeup="(e)=>vueTouch('上滑',e)" v-swipedown="(e)=>vueTouch('下滑',e)">
<scroll class="scrolls" ref="scrolls"> <scroll class="scrolls" ref="scrolls" :listenScroll="true" @scroll="startScroll">
<!-- 基本信息 --> <!-- 基本信息 -->
<div id="baseInfo" class="base"> <div id="baseInfo" class="base">
<swipe :interval="5000" class="hls-swipe"> <swipe :interval="5000" class="hls-swipe">
...@@ -160,44 +160,34 @@ export default { ...@@ -160,44 +160,34 @@ export default {
methods: methods:
{ {
startScroll (v) {
this.slide = true
},
// tab切换 // tab切换
tabCheck (num) { tabCheck (num) {
let scrollContent = document.getElementsByClassName('scrollContent')[0] let scrollContent = document.getElementsByClassName('scrollContent')[0]
if(num === 0){ if(num === 0){
this.num = 0 this.num = 0
console.log('基本信息',document.getElementsByClassName('base')[0].getBoundingClientRect().top) this.$refs.scrolls.scrollToElement(document.getElementsByClassName('base')[0])
this.height = document.getElementsByClassName('base')[0].getBoundingClientRect().top - 83
// console.log(height)
scrollContent.style.transition = 'all .3s cubic-bezier(0.165, 0.84, 0.44, 1) 0s'
scrollContent.style.transform = 'translate(0px, -' + this.height + 'px) scale(1) translateZ(0px)'
}else if(num === 1){ }else if(num === 1){
this.num = 1 this.num = 1
console.log('详情信息',document.getElementsByClassName('prodetail')[0].getBoundingClientRect().top) this.$refs.scrolls.scrollToElement(document.getElementsByClassName('prodetail')[0])
this.height = document.getElementsByClassName('prodetail')[0].getBoundingClientRect().top - 83
console.log(this.height)
scrollContent.style.transition = 'all .3s cubic-bezier(0.165, 0.84, 0.44, 1) 0s'
scrollContent.style.transform = 'translate(0px, -' + this.height + 'px) scale(1) translateZ(0px)'
}else{ }else{
this.num = 2 this.num = 2
console.log('配置信息',document.getElementsByClassName('procnf')[0].getBoundingClientRect().top) this.$refs.scrolls.scrollToElement(document.getElementsByClassName('procnf')[0])
this.height = document.getElementsByClassName('procnf')[0].getBoundingClientRect().top - 83
// console.log(height)
scrollContent.style.transition = 'all .3s cubic-bezier(0.165, 0.84, 0.44, 1) 0s'
scrollContent.style.transform = 'translate(0px, -' + this.height + 'px) scale(1) translateZ(0px)'
} }
}, },
returnGo () { returnGo () {
this.$router.replace({ this.$router.replace({
name: 'ProductList', name: 'ProductList',
}) })
// this.$router.go(-1)
}, },
vueTouch: function (s, e) { vueTouch: function (s, e) {
// console.log(s, e)
this.slide = true
// this.height = 0
// console.log(this.$refs.detail.style)
let clientHeight = document.body.clientHeight // 屏幕可视高度 let clientHeight = document.body.clientHeight // 屏幕可视高度
let procnfGather = document.getElementsByClassName('procnf')[0].getBoundingClientRect() // 配置信息元素集合 let procnfGather = document.getElementsByClassName('procnf')[0].getBoundingClientRect() // 配置信息元素集合
let detailGather = document.getElementsByClassName('prodetail')[0].getBoundingClientRect() // 详情信息元素集合 let detailGather = document.getElementsByClassName('prodetail')[0].getBoundingClientRect() // 详情信息元素集合
...@@ -339,6 +329,13 @@ export default { ...@@ -339,6 +329,13 @@ export default {
</script> </script>
<style lang='less'> <style lang='less'>
#detailed { #detailed {
.hls-swipe {
height: 220px;
img {
width: 100%;
height: 100%;
}
}
.tab-style{ .tab-style{
display:flex; display:flex;
justify-content: center; justify-content: center;
......
src/pages/productQuery/product-list.vue
View file @ c6d72498
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<h-view id="prolist" class="public-style" title="产品查询"> <h-view id="prolist" class="public-style" title="产品查询">
<h-header :proportion="[5,1,1]" class="bar-custom"> <h-header :proportion="[5,1,1]" class="bar-custom">
<div slot="left" class="h-header-btn"> <div slot="left" class="h-header-btn">
<img src="@/assets/userBind/arrow.png" @click="returnGo()"> <img src="@/assets/userBind/arrow.png" @click="$routeGo()">
<span>产品信息</span> <span>产品信息</span>
</div> </div>
</h-header> </h-header>
......
src/pages/productQuery/query-home.vue
View file @ c6d72498
...@@ -2,14 +2,14 @@ ...@@ -2,14 +2,14 @@
* @Descrip: 查询首页 * @Descrip: 查询首页
* @Author: your name * @Author: your name
* @Date: 2019-10-15 14:30:00 * @Date: 2019-10-15 14:30:00
* @LastEditTime: 2019-11-04 19:08:13 * @LastEditTime: 2019-11-06 17:29:18
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
--> -->
<template> <template>
<h-view id="query" class="public-style" title="产品查询"> <h-view id="query" class="public-style" title="产品查询">
<h-header :proportion="[5,1,1]" class="bar-custom"> <h-header :proportion="[5,1,1]" class="bar-custom">
<div slot="left" class="h-header-btn"> <div slot="left" class="h-header-btn">
<img src="@/assets/userBind/arrow.png" @click="returnGo()"> <img src="@/assets/userBind/arrow.png" @click="$routeGo()">
<span>产品信息</span> <span>产品信息</span>
</div> </div>
</h-header> </h-header>
......
src/pages/userBind/np/naturePerson.vue
View file @ c6d72498
...@@ -621,10 +621,12 @@ export default { ...@@ -621,10 +621,12 @@ export default {
async verified () { async verified () {
this.dowload_list = [] // 保存之前将图片下载列表清空，防止出现重复的图片 this.dowload_list = [] // 保存之前将图片下载列表清空，防止出现重复的图片
this.upload_list = [] // 保存之前将待上传列表清空，防止出现重复的图片 this.upload_list = [] // 保存之前将待上传列表清空，防止出现重复的图片
let bpId = await this.saveWord() let res = await this.saveWord()
this.getBankInfo() if(res){
// 查询资料清单 this.getBankInfo()
this.loadItemList() // 查询资料清单
this.loadItemList()
}
}, },
loadItemList () { loadItemList () {
let vm = this let vm = this
...@@ -800,7 +802,7 @@ export default { ...@@ -800,7 +802,7 @@ export default {
vm.hlsPopup.showLongCenter('手机号码有误!') vm.hlsPopup.showLongCenter('手机号码有误!')
} else { } else {
let bpId = await vm.saveProtocol() let bpId = await vm.saveProtocol()
return bpId return true
} }
}, },
// 图片上传入口 // 图片上传入口
......
src/pages/userBind/org/enterprise.vue
View file @ c6d72498
...@@ -657,18 +657,21 @@ export default { ...@@ -657,18 +657,21 @@ export default {
// this.getBankInfo() // this.getBankInfo()
}, },
beforeRouteEnter (to, from, next) { beforeRouteEnter (to, from, next) {
if (from.fullPath === '/tab/my-info') { /*|| from.fullPath === '/margin-first-pay'*/
next(vm => { next(vm => {
vm.from = true
vm.getbaseInfo()
vm.getBankInfo()
vm.getBpType() vm.getBpType()
vm.getProvince() vm.getProvince()
if (vm.$route.params.status === 'APPROVED') { if (vm.$route.params.status === 'APPROVED') {
vm.isApproved = true vm.isApproved = true
} }
if (from.fullPath === '/tab/my-info') { /*|| from.fullPath === '/margin-first-pay'*/
vm.upload_list= [] // 上传图片列表
vm.dowload_list= [] // 下载图片列表
vm.from = true
vm.getbaseInfo()
vm.getBankInfo()
}
}) })
}
next() next()
}, },
methods: { methods: {
......
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