Skip to content

H
hls-xcmg-vue-app
Commit 1c17ec20 authored by 786817560's avatar 786817560
Browse files
Options

Merge branch 'ren' into develop

parents ba7a07fe 7347f616
Hide whitespace changes
Inline Side-by-side
Showing with 51 additions and 107 deletions
src/pages/contractSigning/contract-detail.vue
View file @ 1c17ec20
<!--
* @Author: your name
* @Date: 2019-09-29 10:02:11
* @LastEditTime: 2019-10-28 10:07:05
* @LastEditTime: 2019-10-28 15:18:20
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
-->
......@@ -294,18 +294,11 @@ export default {
let param = {
project_id: vm.project_id,
}
vm.hlsPopup.showLoading('数据加载中')
vm.hlsHttp.post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
console.log('bankcardinfo。。。。。。。。。。。。', res)
if (res.result === 'S') {
// if ('info' in res && Object.keys(res.info).length !== 0) {
// for (var key1 in res.info) {
// if (!res.info[key1]) {
// vm.bank_flag = false
// return
// } else {
// vm.bank_flag = true
// }
// }
// console.log(typeof res.info.bank_full_name)
console.log(!res.info.bank_full_name)
if (res.info.bank_full_name === ' ') {
......@@ -314,19 +307,6 @@ export default {
} else {
vm.bank_flag = true
}
// vm.bank_lists = [res.info]
// console.log(vm.bank_lists[0])
// } else {
// vm.bank_flag = false
// this.bank_lists = [
// {
// bank_full_name: '', // 银行名称
// bank_account_num: '', // 卡号
// bank_account_name: '',
// bank_branch_name: '',
// },
// ]
// }
} else {
hlsPopup.showLongCenter(res.message)
}
......
src/pages/distributorSign/contract-details.vue
View file @ 1c17ec20
......@@ -2,7 +2,7 @@
* @Description: 合同详情
* @Author: your name
* @Date: 2019-09-25 15:38:21
* @LastEditTime: 2019-10-25 11:41:16
* @LastEditTime: 2019-10-28 15:14:10
* @LastEditors: Please set LastEditors
-->
<template>
......@@ -80,15 +80,15 @@
</item>
<item>
<div slot="name" class="font-color">设备总价</div>
<span slot="content">{{ info.equip_price * info.product_num | NumFormat }}</span>
<span slot="content">{{ info.equip_price * info.product_num | currency }}</span>
</item>
<item>
<div slot="name" class="font-color">融资金额</div>
<span slot="content">{{ info.finance_amount * info.product_num | NumFormat }}</span>
<span slot="content">{{ info.finance_amount * info.product_num | currency }}</span>
</item>
<item>
<div slot="name" class="font-color">首付款</div>
<span slot="content">{{ info.down_payment * info.product_num | NumFormat }}</span>
<span slot="content">{{ info.down_payment * info.product_num | currency }}</span>
</item>
<item>
<div slot="name" class="font-color">保证金比例</div>
......@@ -96,7 +96,7 @@
</item>
<item>
<div slot="name" class="font-color">保证金</div>
<span slot="content">{{ info.deposit * info.product_num | NumFormat }}</span>
<span slot="content">{{ info.deposit * info.product_num | currency }}</span>
</item>
<item>
<div slot="name" class="font-color">手续费比例</div>
......@@ -104,19 +104,19 @@
</item>
<item>
<div slot="name" class="font-color">手续费</div>
<span slot="content">{{ info.lease_charge * info.product_num | NumFormat }}</span>
<span slot="content">{{ info.lease_charge * info.product_num | currency }}</span>
</item>
<item>
<div slot="name" class="font-color">保险押金</div>
<span slot="content">{{ info.insurance_fee * info.product_num | NumFormat }}</span>
<span slot="content">{{ info.insurance_fee * info.product_num | currency }}</span>
</item>
<item>
<div slot="name" class="font-color">GPS费用</div>
<span slot="content">{{ info.gps_fee * info.product_num | NumFormat }}</span>
<span slot="content">{{ info.gps_fee * info.product_num | currency }}</span>
</item>
<item>
<div slot="name">首次付款合计</div>
<span slot="content">{{ info.first_pay | NumFormat }}</span>
<span slot="content">{{ info.first_pay | currency }}</span>
</item>
<item>
<div slot="name" class="font-color">预计付款日</div>
......@@ -244,28 +244,6 @@ export default {
Personal,
LegalPerson,
},
filters: {
NumFormat: function (valueOrig) {
var value = parseFloat(valueOrig).toFixed(2)
if (!value) return '0.00'
var intPart = Number(value) | 0 // 获取整数部分
var intPartFormat = intPart.toString().replace(/(\d)(?=(?:\d{3})+$)/g, '$1,') // 将整数部分逢三一断
var floatPart = '.00' // 预定义小数部分
var value2Array = value.split('.')
// =2表示数据有小数位
if (value2Array.length === 2) {
floatPart = value2Array[1].toString() // 拿到小数部分
if (floatPart.length === 1) { // 补0,实际上用不着
return intPartFormat + '.' + floatPart + '0'
} else {
return intPartFormat + '.' + floatPart
}
} else {
return intPartFormat + floatPart
}
},
},
data () {
return {
hasButtomStorage: window.localStorage.getItem('hasButtom'),
......@@ -362,8 +340,10 @@ export default {
let param = {
project_id: window.sessionStorage.getItem('project_id'),
}
vm.hlsPopup.showLoading('数据加载中')
vm.hlsHttp.post(url, param).then(function (res) {
console.log('baseinfo', res)
vm.hlsPopup.hideLoading()
if (res.result === 'S') {
// vm.lists = res.lists
vm.baseInfo = res.info
......@@ -381,8 +361,10 @@ export default {
let param = {
project_id: window.sessionStorage.getItem('project_id'),
}
vm.hlsPopup.showLoading('数据加载中')
vm.hlsHttp.post(url, param).then(function (res) {
console.log('getGuarantor', res)
vm.hlsPopup.hideLoading()
if (res.result === 'S') {
vm.guarantorInfo = res.lists
}
......@@ -395,7 +377,9 @@ export default {
project_id: window.sessionStorage.getItem('project_id'),
}
// 租赁信息
vm.hlsPopup.showLoading('数据加载中')
vm.hlsHttp.post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
console.log('result', res)
if (res.result === 'S') {
vm.info = res.info
......
src/pages/distributorSign/contract-list.vue
View file @ 1c17ec20
......@@ -33,7 +33,7 @@
</div>
<div class="option">
<p class="name">合同金额</p>
<p class="normal money">{{ item.total_price|NumFormat }}</p>
<p class="normal money">{{ item.total_price|currency }}</p>
<img src="@/assets/distributorSign/goDetails.png" alt="">
</div>
<div class="option">
......@@ -58,7 +58,7 @@
</div>
<div class="option">
<p class="name">合同金额</p>
<p class="normal money">{{ item.total_price|NumFormat }}</p>
<p class="normal money">{{ item.total_price|currency }}</p>
<img src="@/assets/distributorSign/goDetails.png" alt="">
</div>
<div class="option">
......@@ -76,27 +76,6 @@
import Tab from '@/pages/distributorSign/tab'
export default {
name: 'ContractList',
filters: {
NumFormat: function (value) {
if (!value) return '0.00'
var intPart = Number(value) | 0 // 获取整数部分
var intPartFormat = intPart.toString().replace(/(\d)(?=(?:\d{3})+$)/g, '$1,') // 将整数部分逢三一断
var floatPart = '.00' // 预定义小数部分
var value2Array = value.split('.')
// =2表示数据有小数位
if (value2Array.length === 2) {
floatPart = value2Array[1].toString() // 拿到小数部分
if (floatPart.length === 1) { // 补0,实际上用不着
return intPartFormat + '.' + floatPart + '0'
} else {
return intPartFormat + '.' + floatPart
}
} else {
return intPartFormat + floatPart
}
},
},
components: {
Tab,
},
......@@ -115,7 +94,9 @@ export default {
let param = {
user_phone: window.localStorage.user_phone,
}
vm.hlsPopup.showLoading('数据加载中')
vm.hlsHttp.post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
console.log(res.result)
if (res.result === 'S') {
vm.submitLists = res.lists.filter(item => item.confirm_status === 'SUBMIT')
......
src/pages/distributorSign/financ-details.vue
View file @ 1c17ec20
......@@ -2,7 +2,7 @@
* @Description: In User Settings Edit
* @Author: your name
* @Date: 2019-09-27 18:07:12
* @LastEditTime: 2019-10-24 19:41:25
* @LastEditTime: 2019-10-28 15:11:57
* @LastEditors: Please set LastEditors
-->
<template>
......@@ -16,22 +16,22 @@
</h-header>
<div class="top-content">
<span class="top-tittle">总租金</span>
<span class="num">{{ info.total_rental_sum|NumFormat }}</span>
<span class="num">{{ info.total_rental_sum|currency }}</span>
<div class="top-detail">
<div class="left">
<span class="line">保证金</span>
<span>￥{{ info.deposit * product_num |NumFormat }}</span>
<span>￥{{ info.deposit * product_num |currency }}</span>
</div>
<div class="right">
<span class="line">首付款</span>
<span>￥{{ info.down_payment * product_num |NumFormat }}</span>
<span>￥{{ info.down_payment * product_num |currency }}</span>
</div>
</div>
<div class="clear" />
<div class="top-detail">
<div class="left">
<span class="line">手续费</span>
<span>￥{{ info.lease_charge * product_num |NumFormat }}</span>
<span>￥{{ info.lease_charge * product_num |currency }}</span>
</div>
<div class="right">
<span class="line">合同期数</span>
......@@ -52,7 +52,7 @@
<td>{{ index+1 }}</td>
<td>{{ dateConverse(item.due_date) }}</td>
<td>租金</td>
<td>{{ item.rental * product_num |NumFormat }}</td>
<td>{{ item.rental * product_num |currency }}</td>
</tr>
</table>
</h-content>
......@@ -61,28 +61,6 @@
<script>
export default {
name: 'FinancDetails',
filters: {
NumFormat: function (valueOrig) {
var value = parseFloat(valueOrig).toFixed(2)
if (!value) return '0.00'
var intPart = Number(value) | 0 // 获取整数部分
var intPartFormat = intPart.toString().replace(/(\d)(?=(?:\d{3})+$)/g, '$1,') // 将整数部分逢三一断
var floatPart = '.00' // 预定义小数部分
var value2Array = value.split('.')
// =2表示数据有小数位
if (value2Array.length === 2) {
floatPart = value2Array[1].toString() // 拿到小数部分
if (floatPart.length === 1) { // 补0,实际上用不着
return intPartFormat + '.' + floatPart + '0'
} else {
return intPartFormat + '.' + floatPart
}
} else {
return intPartFormat + floatPart
}
},
},
data () {
return {
confirm_status: this.$route.params.confirm_status,
......@@ -107,6 +85,7 @@ export default {
let param = {
project_id: this.$route.params.project_id,
}
vm.hlsPopup.showLoading('数据加载中')
vm.hlsHttp.post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
if (res.result === 'S') {
......
src/pages/home/home-page.vue
View file @ 1c17ec20
......@@ -2,7 +2,7 @@
* @Descrip: 主页
* @Author: your name
* @Date: 2019-10-10 14:25:15
* @LastEditTime: 2019-10-16 12:42:19
* @LastEditTime: 2019-10-28 10:50:02
* @LastEditors: Please set LastEditors
-->
<template>
......@@ -199,7 +199,9 @@ export default {
let param = {
'phone': window.localStorage.getItem('user_phone'),
}
vm.hlsPopup.showLoading('数据加载中')
vm.$post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
if (res.result === 'S') {
vm.user_bp_status = res.info.user_bp_status
vm.user_bp_class = res.info.user_bp_class
......
src/pages/home/location.vue
View file @ 1c17ec20
......@@ -116,7 +116,9 @@ export default {
let vm = this
let url = process.env.basePath + 'fnd_province_query'
let param = {}
vm.hlsPopus.showLoading('请稍后')
vm.hlsHttp.post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
console.log(res)
vm.lists = res.lists
vm.$nextTick(() => {
......@@ -149,8 +151,10 @@ export default {
province_id: val.province_id,
}
let vm = this
// vm.hlsPopus.showLoading('请稍后')
this.hlsHttp.post(url, param).then(function (res) {
console.log(res)
// vm.hlsPopup.hideLoading()
vm.cityList = res.lists
vm.$nextTick(() => {
vm.cityScroll = new BScroll(vm.$refs.city, {
......
src/pages/productQuery/product-detailed.vue
View file @ 1c17ec20
......@@ -2,7 +2,7 @@
* @Descrip: 产品明细
* @Author: your name
* @Date: 2019-10-15 14:30:00
* @LastEditTime: 2019-10-25 17:57:20
* @LastEditTime: 2019-10-28 14:55:46
* @LastEditors: Please set LastEditors
-->
<template>
......@@ -185,7 +185,9 @@ export default {
bp_id: vm.bp_id,
},
}
vm.hlsPopup.showLoading('请稍后')
vm.$post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
console.log('取消收藏。。。。。。。。', res)
if (res.result === 'S') {
window.sessionStorage.setItem('collect_status', 'N')
......@@ -214,8 +216,10 @@ export default {
bp_id: vm.bp_id,
},
}
vm.hlsPopup.showLoading('请稍后')
vm.$post(url, param).then(function (res) {
console.log('收藏', res)
vm.hlsPopup.hideLoading()
if (res.result === 'S') {
window.sessionStorage.setItem('collect_status', 'Y')
vm.src = require('@/assets/productQuery/coll-success.png')
......@@ -237,7 +241,9 @@ export default {
product_id: vm.$route.params.product_id,
bp_id: vm.bp_id,
}
vm.hlsPopup.showLoading('数据加载中')
vm.$post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
console.log('基本信息', res)
if (res.result === 'S') {
vm.baseInfo = res.info
......@@ -253,8 +259,10 @@ export default {
let param = {
product_id: vm.$route.params.product_id,
}
vm.hlsPopup.showLoading('数据加载中')
vm.$post(url, param).then(function (res) {
console.log('产品详情', res)
vm.hlsPopup.hideLoading()
if (res.result === 'S') {
vm.detailInfo = res.info
// vm.picLists = res.lists
......@@ -275,8 +283,10 @@ export default {
let param = {
product_id: vm.$route.params.product_id,
}
vm.hlsPopup.showLoading('数据加载中')
vm.$post(url, param).then(function (res) {
console.log('配置信息', res)
vm.hlsPopup.hideLoading()
if (res.result === 'S') {
vm.confgInfo = res.info
} else {
......
src/pages/productQuery/product-list.vue
View file @ 1c17ec20
......@@ -78,8 +78,10 @@ export default {
division: window.sessionStorage.division,
user_phone: window.localStorage.user_phone,
}
vm.hlsPopup.showLoading('数据加载中')
vm.$post(url, param).then(function (res) {
console.log(res)
vm.hlsPopup.hideLoading()
if (res.result === 'S') {
vm.lists = res.lists
} else {
......
src/pages/productQuery/query-home.vue
View file @ 1c17ec20
......@@ -74,7 +74,9 @@ export default {
let vm = this
let url = $config.basePath + 'prd_product_type_list'
let param = { }
vm.hlsPopup.showLoading('数据加载中')
vm.$post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
console.log(res)
if (res.result === 'S') {
vm.prolists = res.lists
......
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