Commit 43d917bb authored by linxin's avatar linxin

修复bug

parent 939c5349
...@@ -98,7 +98,7 @@ ...@@ -98,7 +98,7 @@
</item> </item>
<item> <item>
<div slot="name" class="font-color">手续费比例</div> <div slot="name" class="font-color">手续费比例</div>
<input slot="content" v-model="info.lease_charge_ratio" readonly> <input slot="content" v-model="info.lease_charge_ratio_n" readonly>
</item> </item>
<item> <item>
<div slot="name" class="font-color">手续费</div> <div slot="name" class="font-color">手续费</div>
...@@ -230,7 +230,8 @@ export default { ...@@ -230,7 +230,8 @@ export default {
LegalPerson, LegalPerson,
}, },
filters: { filters: {
NumFormat: function (value) { NumFormat: function (valueOrig) {
var value = parseFloat(valueOrig).toFixed(2)
if (!value) return '0.00' if (!value) return '0.00'
var intPart = Number(value) | 0 // 获取整数部分 var intPart = Number(value) | 0 // 获取整数部分
var intPartFormat = intPart.toString().replace(/(\d)(?=(?:\d{3})+$)/g, '$1,') // 将整数部分逢三一断 var intPartFormat = intPart.toString().replace(/(\d)(?=(?:\d{3})+$)/g, '$1,') // 将整数部分逢三一断
......
...@@ -92,8 +92,9 @@ ...@@ -92,8 +92,9 @@
<script> <script>
export default { export default {
filters: { filters: {
'NumFormat': function (value) { 'NumFormat': function (valueOrig) {
// if (!value) return '0.00' // if (!value) return '0.00'
var value = parseFloat(valueOrig).toFixed(2)
var intPart = Number(value) | 0 // 获取整数部分 var intPart = Number(value) | 0 // 获取整数部分
var intPartFormat = intPart.toString().replace(/(\d)(?=(?:\d{3})+$)/g, '$1,') // 将整数部分逢三一断 var intPartFormat = intPart.toString().replace(/(\d)(?=(?:\d{3})+$)/g, '$1,') // 将整数部分逢三一断
var floatPart = '.00' // 预定义小数部分 var floatPart = '.00' // 预定义小数部分
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<h-view id="margin-first-pay" class="public-style"> <h-view id="margin-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="$routeGo()"> <img src="@/assets/userBind/arrow.png" @click="changePage">
<span>保证金支付</span> <span>保证金支付</span>
</div> </div>
</h-header> </h-header>
...@@ -46,11 +46,27 @@ export default { ...@@ -46,11 +46,27 @@ export default {
data () { data () {
return { return {
money: '', money: '',
fromName: '',
} }
}, },
beforeRouteEnter (to, from, next) {
next(vm => {
vm.fromName = from.name
})
},
computed: {}, computed: {},
watch: {}, watch: {},
methods: { methods: {
changePage () {
this.$router.replace({
name: this.fromName,
params: {
bp_id: this.$route.params.bp_id,
status: this.$route.params.status,
isAGENT: this.$route.params.isAGENT,
},
})
},
toPayEntry (money) { toPayEntry (money) {
this.$router.push({ this.$router.push({
name: 'MarginPayEntry', name: 'MarginPayEntry',
......
...@@ -423,7 +423,7 @@ export default { ...@@ -423,7 +423,7 @@ export default {
} }
}, },
beforeRouteEnter (to, from, next) { beforeRouteEnter (to, from, next) {
if (from.fullPath === '/tab/my-info') { // 绑定查询入口 if (from.fullPath === '/tab/my-info' || from.fullPath === '/margin-first-pay') { // 绑定查询入口
next(vm => { next(vm => {
vm.from = true vm.from = true
vm.basicInfoQuery() vm.basicInfoQuery()
...@@ -454,6 +454,16 @@ export default { ...@@ -454,6 +454,16 @@ export default {
} }
}) })
}, },
changeUndertake () {
this.$router.push({
name: 'MarginFirstPay',
params: {
bp_id: this.$route.params.bp_id,
status: this.$route.params.status,
isAGENT: this.isAGENT,
},
})
},
load_picture (check_id, index) { load_picture (check_id, index) {
let vm = this let vm = this
let url = process.env.basePath + 'attachment_list_query' + '&index' + index // 附件查询 let url = process.env.basePath + 'attachment_list_query' + '&index' + index // 附件查询
......
...@@ -548,7 +548,7 @@ export default { ...@@ -548,7 +548,7 @@ export default {
// this.getBankInfo() // this.getBankInfo()
}, },
beforeRouteEnter (to, from, next) { beforeRouteEnter (to, from, next) {
if (from.fullPath === '/tab/my-info') { if (from.fullPath === '/tab/my-info' || from.fullPath === '/margin-first-pay') {
next(vm => { next(vm => {
vm.from = true vm.from = true
vm.getbaseInfo() vm.getbaseInfo()
...@@ -579,6 +579,11 @@ export default { ...@@ -579,6 +579,11 @@ export default {
changeUndertake () { changeUndertake () {
this.$router.push({ this.$router.push({
name: 'MarginFirstPay', name: 'MarginFirstPay',
params: {
bp_id: this.$route.params.bp_id,
status: this.$route.params.status,
isAGENT: this.isAGENT,
},
}) })
}, },
addRows (e) { addRows (e) {
......
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