Commit dcfcc465 authored by 李晓兵's avatar 李晓兵

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

parents e760f20a ba8e1dbb
Pipeline #3980 canceled with stages
...@@ -130,6 +130,7 @@ export default { ...@@ -130,6 +130,7 @@ export default {
}, },
getTabNum (i) { getTabNum (i) {
this.tabNum = i this.tabNum = i
this.$refs.scroll.scrollToTop()
}, },
changePage (e) { changePage (e) {
this.$router.push({ this.$router.push({
......
...@@ -426,7 +426,7 @@ export default { ...@@ -426,7 +426,7 @@ export default {
let result = res.result.words_result let result = res.result.words_result
vm.frame_number = result.VinNo // 车架号 vm.frame_number = result.VinNo // 车架号
vm.engine = result.EngineNo // 发动机号 vm.engine = result.EngineNo // 发动机号
//vm.vehicle_model = result.VinNo // 车辆型号 // vm.vehicle_model = result.VinNo // 车辆型号
vm.certificate_number = result.CertificationNo // 合格证编号 vm.certificate_number = result.CertificationNo // 合格证编号
}) })
}, },
......
...@@ -97,16 +97,23 @@ export default { ...@@ -97,16 +97,23 @@ export default {
} }
}, },
watch: { watch: {
'num': { // 'num': {
handler (newVal, oldVal) { // handler (newVal, oldVal) {
if (newVal === 2) { // if (newVal === 2) {
// if (!this.approvedFlag) {
// this.getLists()
// }
// }
// },
// immediate: true,
// },
num () {
if (this.num === 2) {
if (!this.approvedFlag) { if (!this.approvedFlag) {
this.getLists() this.getLists()
} }
} }
}, },
immediate: true,
},
searchInput () { searchInput () {
let vm = this let vm = this
if (vm.timeout) { if (vm.timeout) {
...@@ -199,6 +206,7 @@ export default { ...@@ -199,6 +206,7 @@ export default {
} }
}, },
loadMore () { loadMore () {
console.log('lodeMore')
let vm = this let vm = this
if (vm.num === 1) { if (vm.num === 1) {
vm.submitPagenum++ vm.submitPagenum++
......
...@@ -351,7 +351,7 @@ ...@@ -351,7 +351,7 @@
</div> </div>
</div> </div>
</div> </div>
<div <!-- <div
v-if="(from&&isApproved&&isAGENT)||fromPromisePay" v-if="(from&&isApproved&&isAGENT)||fromPromisePay"
class="tax" class="tax"
@click="changeUndertake" @click="changeUndertake"
...@@ -362,7 +362,7 @@ ...@@ -362,7 +362,7 @@
<p>已缴纳:500000</p> <p>已缴纳:500000</p>
</div> </div>
<img src="@/assets/userBind/arrow-right.png" class="right-img" > <img src="@/assets/userBind/arrow-right.png" class="right-img" >
</div> </div> -->
</div> </div>
<BankInfo <BankInfo
......
...@@ -103,6 +103,7 @@ export default { ...@@ -103,6 +103,7 @@ export default {
}, },
getTabNum (i) { getTabNum (i) {
this.tabNum = i this.tabNum = i
this.$refs.scroll.scrollToTop()
}, },
toSign () { toSign () {
let vm = this let vm = this
......
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