Skip to content

H
hls-xcmg-vue-app
Commit 519a7656 authored by 李晓兵's avatar 李晓兵
Browse files
Options

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

parents 56d58a65 9a0505b4
Hide whitespace changes
Inline Side-by-side
Showing with 425 additions and 32 deletions
src/pages/help/detail.vue 0 → 100644
View file @ 519a7656
<template>
<h-view id="help-detail" class="public-style">
<h-header :proportion="[5,1,1]" class="header">
<div slot="left" class="h-header-btn">
<img src="@/assets/userBind/arrow.png" @click="$routeGo()" >
<span>帮助与反馈</span>
</div>
</h-header>
<h-content class="my-content">
<h4>如何进行客户绑定？</h4>
<div class="article">
<p>进入“个人中心"界面,点击”用户绑定“按钮进入用户绑定界面，填写相关资料可进行用户绑定。</p>
</div>
</h-content>
</h-view>
</template>
<script>
export default {
}
</script>
<style lang="less" scoped>
#help-detail{
.header {
background-color: #00469c;
color: #ffffff;
.h-header-btn {
img {
width: 16px;
height: 16px;
}
span {
font-family: PingFangSC-Semibold;
font-size: 17px;
color: #ffffff;
letter-spacing: 0.61px;
margin-left: 16px;
}
}
}
.my-content{
h4{
font-family: PingFangSC-Semibold;
font-size: 15px;
color: #00469C;
letter-spacing: 0;
line-height: 20px;
margin-top:16px;
padding-left:35px;
position: relative;
}
h4::before{
content:'';
display:inline-block;
background-color: #00469C;
position: absolute;
top:5px;
left:24px;
width: 4px;
height:12px;
}
.article{
width:343px;
margin:0 auto;
p{
font-family: PingFangSC-Regular;
font-size: 14px;
color: #656464;
text-align: left;
line-height: 20px;
text-indent:20px;
}
}
}
}
</style>
src/pages/help/feedback.vue 0 → 100644
View file @ 519a7656
<template>
<h-view id="help-detail" class="public-style">
<h-header :proportion="[5,1,1]" class="header">
<div slot="left" class="h-header-btn">
<img src="@/assets/userBind/arrow.png" @click="$routeGo()" />
<span>帮助与反馈</span>
</div>
</h-header>
<h-content class="my-content">
<h4>问题反馈</h4>
<div class="write">
<div class="box">
<span>问题描述</span>
<textarea placeholder="请输入您的描述……" />
</div>
</div>
<div class="upLoad">
<div class="upLoad-box">
<span>添加图片说明</span>
<div class="file-content">
<div class="file">
<img src="@/assets/help/1.jpg" />
</div>
<div class="file">
<img src="@/assets/help/1.jpg" />
</div>
<div class="file">
<img src="@/assets/help/1.jpg" />
</div>
<div class="file">
<img src="@/assets/help/1.jpg" />
</div>
<div class="file">
<img class="photo" src="@/assets/help/photo.png" />
</div>
</div>
</div>
</div>
<p class="info">欢迎您为我们提出宝贵的意见与建议，您留下的任何信息都将改善我们的软件</p>
</h-content>
<bottom-tab>
<tab-button class="bottom-button">提&nbsp;&nbsp;交</tab-button>
</bottom-tab>
</h-view>
</template>
<script>
export default {};
</script>
<style lang="less" scoped>
#help-detail {
textarea::placeholder {
font-family: PingFangSC-Regular;
font-size: 13px;
color: #b4b4b5;
letter-spacing: 0;
}
.header {
background-color: #00469c;
color: #ffffff;
.h-header-btn {
img {
width: 16px;
height: 16px;
}
span {
font-family: PingFangSC-Semibold;
font-size: 17px;
color: #ffffff;
letter-spacing: 0.61px;
margin-left: 16px;
}
}
}
.my-content {
h4 {
font-family: PingFangSC-Semibold;
font-size: 15px;
color: #00469c;
letter-spacing: 0;
line-height: 20px;
margin-top: 16px;
padding-left: 26px;
position: relative;
}
h4::before {
content: "";
display: inline-block;
background-color: #00469c;
position: absolute;
top: 5px;
left: 15px;
width: 4px;
height: 12px;
}
}
.write {
width: 100%;
height: 172px;
background-color: #fff;
margin-top: 16px;
span {
font-family: PingFangSC-Regular;
font-size: 14px;
color: #656464;
letter-spacing: 0;
}
.box {
width: 343px;
margin: 0 auto;
padding-top: 8px;
textarea {
width: 343px;
height: 119px;
margin-top: 12.5px;
font-family: PingFangSC-Regular;
font-size: 13px;
letter-spacing: 0;
}
}
}
.upLoad {
background-color: #ffffff;
margin-top: 16px;
padding-bottom: 16px;
.upLoad-box {
margin-left: 16px;
padding-top: 8px;
span {
font-family: PingFangSC-Regular;
font-size: 14px;
color: #656464;
letter-spacing: 0;
}
}
.file-content {
display: flex;
justify-content: flex-start;
flex-wrap: wrap;
align-items: center;
.file {
margin-top: 16px;
width: 80px;
height: 80px;
border: 1px dashed #dcdcdd;
border-radius: 2px;
display: flex;
align-items: center;
justify-content: center;
margin-left: 20px;
img {
width: 80px;
height: 80px;
}
.photo {
width: 21px;
height: 18px;
}
}
}
}
.info {
width: 311px;
margin: 0 auto;
font-family: PingFangSC-Regular;
font-size: 12px;
color: #b4b4b5;
text-align: center;
margin-top: 40px;
line-height: 20px;
}
.bottom-button {
color: #fff;
background-color: #00469c;
}
}
</style>
src/pages/help/helpList.vue
View file @ 519a7656
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
<img class="img0" src="@/assets/help/down.png" > <img class="img0" src="@/assets/help/down.png" >
</div> </div>
<ul class="list0"> <ul class="list0">
<li>如何进行客户绑定？</li> <li @click="changeDetail">如何进行客户绑定？</li>
<li>如何通过扫描录入进件？</li> <li>如何通过扫描录入进件？</li>
</ul> </ul>
</div> </div>
...@@ -35,18 +35,23 @@ ...@@ -35,18 +35,23 @@
<li>如何通过扫描录入进件？</li> <li>如何通过扫描录入进件？</li>
</ul> </ul>
</div> </div>
<!-- <list-item :proportion="[5,1]" :item-height="44"> <div class="question">
<item> <div class="question-top" @click="show(2)">
<div slot="name">客户绑定相关问题</div> <span>功能相关问题</span>
</item> <img class="img2" src="@/assets/help/down.png" >
<item> </div>
<div slot="name">如何进行客户绑定？</div> <ul class="list2">
</item> <li>产品展示功能如何使用？</li>
<item> <li>如何进行“产品试算”？</li>
<div slot="name">如何通过扫描录入进件？</div> <li>如何进行“合同还款”？</li>
</item> </ul>
</list-item>--> </div>
</h-content> </h-content>
<bottom-tab>
<tab-button class="bottom-button" @click.native="changeFeedback">
<img src="@/assets/help/feedback.png" >没有想要的，点击反馈
</tab-button>
</bottom-tab>
</h-view> </h-view>
</template> </template>
<script> <script>
...@@ -60,16 +65,27 @@ export default { ...@@ -60,16 +65,27 @@ export default {
show (e) { show (e) {
let ul = document.querySelector(`.list${e}`) let ul = document.querySelector(`.list${e}`)
let li = ul.querySelectorAll('li') let li = ul.querySelectorAll('li')
let img = document.querySelector(`.list${e}`) let img = document.querySelector(`.img${e}`)
if (this.isShow) { if (this.isShow) {
ul.style.height = li.length * 35 + 'px' ul.style.height = li.length * 35 + 'px'
img.style.transform = img.style.transform = 'rotate(' + 90 + 'deg)'
this.isShow = false this.isShow = false
} else { } else {
ul.style.height = 0 ul.style.height = 0
img.style.transform = 'rotate(' + 0 + 'deg)'
this.isShow = true this.isShow = true
} }
}, },
changeDetail () {
this.$router.push({
name: 'HelpDetail',
})
},
changeFeedback () {
this.$router.push({
name: 'HelpFeedback',
})
},
}, },
} }
</script> </script>
...@@ -173,11 +189,12 @@ export default { ...@@ -173,11 +189,12 @@ export default {
flex:1; flex:1;
} }
} }
.list0,.list1 { .list0,.list1,.list2 {
overflow: hidden; overflow: hidden;
transition: 0.2s linear; transition: 0.2s linear;
height:0px; height:0px;
li { li {
position: relative;
font-family: PingFangSC-Regular; font-family: PingFangSC-Regular;
font-size: 12px; font-size: 12px;
color: #656464; color: #656464;
...@@ -188,8 +205,30 @@ export default { ...@@ -188,8 +205,30 @@ export default {
border-bottom: 1px solid #F1F0F5; border-bottom: 1px solid #F1F0F5;
text-indent: 15px; text-indent: 15px;
} }
li::after{
content:'';
display: block;
width:10px;
height:14px;
background:url("../../assets/help/right-arrow.png");
background-size: 12px 16px;
position:absolute;
top:8px;
right:0px;
}
} }
} }
} }
.bottom-button{
font-family: PingFangSC-Regular;
font-size: 15px;
color: #00469C;
line-height: 20px;
img{
width:16px;
height:16px;
}
}
} }
</style> </style>
src/pages/myInfo/my-info.vue
View file @ 519a7656
...@@ -171,7 +171,8 @@ export default { ...@@ -171,7 +171,8 @@ export default {
this.$router.push({ this.$router.push({
name: 'FirstPay', name: 'FirstPay',
params: { params: {
bp_id: this.bp_id, // bp_id: this.bp_id,
bp_id: 7850,
}, },
}) })
}, },
...@@ -179,7 +180,8 @@ export default { ...@@ -179,7 +180,8 @@ export default {
this.$router.push({ this.$router.push({
name: 'PaymentFirstPay', name: 'PaymentFirstPay',
params: { params: {
bp_id: this.bp_id, // bp_id: this.bp_id,
bp_id: 7850,
}, },
}) })
}, },
......
src/pages/pay/firstPay/contract-record.vue
View file @ 519a7656
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
<span>{{ e.cf_item_name }}</span> <span>{{ e.cf_item_name }}</span>
<div>{{ e.due_amount|currency }}</div> <div>{{ e.due_amount|currency }}</div>
<p>{{ e.received_amount|currency }}</p> <p>{{ e.received_amount|currency }}</p>
<input v-model="e.pay" type="text" placeholder="请输入还款金额"> <input v-model="e.amount" type="text" placeholder="请输入还款金额">
</div> </div>
</div> </div>
</section> </section>
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
</h-content> </h-content>
<bottom-tab> <bottom-tab>
<tab-button class="footer" @click.native="toPayEntry(money)"> <tab-button class="footer" @click.native="createDetail">
支&nbsp;&nbsp;付 支&nbsp;&nbsp;付
</tab-button> </tab-button>
</bottom-tab> </bottom-tab>
...@@ -155,7 +155,7 @@ export default { ...@@ -155,7 +155,7 @@ export default {
let sumL = [] let sumL = []
for (let i of this.prj_lists) { for (let i of this.prj_lists) {
i.cf_lists.forEach(j => { i.cf_lists.forEach(j => {
sumL.push(j.pay) sumL.push(j.amount)
}) })
let a = 0 let a = 0
let newSum = sumL.filter(item => { let newSum = sumL.filter(item => {
...@@ -180,9 +180,10 @@ export default { ...@@ -180,9 +180,10 @@ export default {
}, },
beforeRouteEnter (to, from, next) { beforeRouteEnter (to, from, next) {
next(vm => { next(vm => {
// vm.getDetail() vm.getDetail()
}) })
}, },
methods: { methods: {
changePage () { changePage () {
this.$router.replace({ this.$router.replace({
...@@ -193,11 +194,12 @@ export default { ...@@ -193,11 +194,12 @@ export default {
}) })
this.$router.go(-1) this.$router.go(-1)
}, },
getDetail () { getDetail () {
let vm = this let vm = this
let url = process.env.basePath + 'payment_prj_list_query' let url = process.env.basePath + 'payment_prj_list_query'
let param = { let param = {
bp_id: vm.$route.params.bp_id, bp_id: this.$route.params.bp_id,
} }
hlsPopup.showLoading('请稍候') hlsPopup.showLoading('请稍候')
vm.$post(url, param).then(function (res) { vm.$post(url, param).then(function (res) {
...@@ -209,6 +211,42 @@ export default { ...@@ -209,6 +211,42 @@ export default {
} }
}) })
}, },
makeDetailData () {
let data = []
this.prj_lists.forEach(i => {
i.cf_lists.forEach(j => {
j.project_id = i.project_id
data.push(j)
})
})
data.forEach(i => {
delete i.cf_item_name
delete i.due_amount
delete i.received_amount
delete i.project_number
i.bp_id = this.$route.params.bp_id
})
return data
},
createDetail () {
let vm = this
let url = process.env.basePath + 'create_detail_0_part'
let data = vm.makeDetailData()
console.log(data)
let param = {
order_id: window.sessionStorage.getItem('order_id'),
pay_lists: data,
}
hlsPopup.showLoading('请稍候')
vm.$post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
if (res.result === 'S') {
vm.toPayEntry(vm.money)
} else {
hlsPopup.showLongCenter(res.message)
}
})
},
toPayEntry (money) { toPayEntry (money) {
this.$router.push({ this.$router.push({
name: 'PayEntry', name: 'PayEntry',
......
src/pages/pay/firstPay/first-pay.vue
View file @ 519a7656
...@@ -18,10 +18,9 @@ ...@@ -18,10 +18,9 @@
<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="toContractRecord(money)"><i class="icon ion-ios-arrow-right"/></div> <div @click="createOrder"><i class="icon ion-ios-arrow-right"/></div>
</div> </div>
</div> </div>
</h-content> </h-content>
<div class="prompt"> <div class="prompt">
<div><img src="@/assets/payment/prompt.png" alt=""></div> <div><img src="@/assets/payment/prompt.png" alt=""></div>
...@@ -76,12 +75,13 @@ export default { ...@@ -76,12 +75,13 @@ export default {
}) })
}, },
pay () { pay () {
if (this.money > 0 && this.money <= this.default) { let money = parseFloat(this.money)
let theDefault = parseFloat(this.default)
if (money > 0 && money <= theDefault) {
this.payProtocol() this.payProtocol()
this.toPayEntry(this.money) } else if (money > theDefault) {
} else if (this.money > this.default) {
hlsPopup.showLongCenter('当前支付金额超出应还金额！') hlsPopup.showLongCenter('当前支付金额超出应还金额！')
} else if (this.money === 0) { } else if (money === 0) {
hlsPopup.showLongCenter('当前支付金额为0元，无需支付！') hlsPopup.showLongCenter('当前支付金额为0元，无需支付！')
} }
}, },
...@@ -97,6 +97,7 @@ export default { ...@@ -97,6 +97,7 @@ export default {
vm.hlsPopup.hideLoading() vm.hlsPopup.hideLoading()
if (res.result === 'S') { if (res.result === 'S') {
console.log(res) console.log(res)
this.toPayEntry(vm.money)
} else { } else {
hlsPopup.showLongCenter(res.message) hlsPopup.showLongCenter(res.message)
} }
...@@ -111,6 +112,27 @@ export default { ...@@ -111,6 +112,27 @@ export default {
}, },
}) })
}, },
createOrder () {
let vm = this
// window.sessionStorage.setItem('order_id', 123)
// vm.toContractRecord(vm.money)
let url = process.env.basePath + 'do_order_0_prj'
let param = {
bp_id: vm.$route.params.bp_id,
}
hlsPopup.showLoading('请稍候')
vm.$post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
if (res.result === 'S') {
console.log(res)
window.sessionStorage.setItem('order_id', res.info.order_id)
vm.toContractRecord(vm.money)
} else {
hlsPopup.showLongCenter(res.message)
}
})
},
toContractRecord (money) { toContractRecord (money) {
this.$router.push({ this.$router.push({
name: 'ContractRecord', name: 'ContractRecord',
......
src/pages/pay/payment/contract-record.vue
View file @ 519a7656
...@@ -73,7 +73,7 @@ export default { ...@@ -73,7 +73,7 @@ export default {
}, },
beforeRouteEnter (to, from, next) { beforeRouteEnter (to, from, next) {
next(vm => { next(vm => {
// vm.getRentInfo() vm.getRentInfo()
vm.money = vm.$route.params.money vm.money = vm.$route.params.money
vm.sumMoney = vm.money vm.sumMoney = vm.money
}) })
......
src/pages/pay/payment/first-pay.vue
View file @ 519a7656
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
<div class="pay-input"> <div class="pay-input">
<span>应还租金</span> <span>应还租金</span>
<p>{{ pay_rent |currency }}</p> <p>{{ pay_rent |currency }}</p>
<div @click="toContractRecord(liquidated_damages)"><i class="icon ion-ios-arrow-right"/></div> <div @click="createOrder"><i class="icon ion-ios-arrow-right"/></div>
</div> </div>
</div> </div>
<div class="pay-money"> <div class="pay-money">
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
</div> </div>
</div> </div>
<bottom-tab> <bottom-tab>
<tab-button class="footer" @click.native="toPayEntry(money)"> <tab-button class="footer" @click.native="toPay">
支&nbsp;&nbsp;付 支&nbsp;&nbsp;付
</tab-button> </tab-button>
</bottom-tab> </bottom-tab>
...@@ -67,7 +67,6 @@ export default { ...@@ -67,7 +67,6 @@ export default {
'liquidated_damages': { 'liquidated_damages': {
handler () { handler () {
this.money = parseFloat(parseFloat(this.pay_rent) + parseFloat(this.liquidated_damages)) this.money = parseFloat(parseFloat(this.pay_rent) + parseFloat(this.liquidated_damages))
// if (!this.liquidated_damages) { this.money = this.pay_rent }
}, },
immediate: true, immediate: true,
}, },
...@@ -93,6 +92,42 @@ export default { ...@@ -93,6 +92,42 @@ export default {
} }
}) })
}, },
toPay () {
let vm = this
let url = process.env.basePath + 'create_order_1_amount'
let param = {
bp_id: vm.$route.params.bp_id,
}
hlsPopup.showLoading('请稍候')
vm.$post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
if (res.result === 'S') {
console.log(res)
vm.toPayEntry(vm.money)
} else {
hlsPopup.showLongCenter(res.message)
}
})
},
createOrder () {
let vm = this
// vm.toContractRecord(vm.liquidated_damages)
let url = process.env.basePath + 'do_order_1_con'
let param = {
bp_id: vm.$route.params.bp_id,
}
hlsPopup.showLoading('请稍候')
vm.$post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
if (res.result === 'S') {
console.log(res)
vm.toContractRecord(vm.liquidated_damages)
} else {
hlsPopup.showLongCenter(res.message)
}
})
},
toPayEntry (money) { toPayEntry (money) {
this.$router.push({ this.$router.push({
name: 'PaymentPayEntry', name: 'PaymentPayEntry',
......
src/router/index.js
View file @ 519a7656
...@@ -66,9 +66,12 @@ import InfoCenter from '@/pages/infoCenter/infoList' ...@@ -66,9 +66,12 @@ import InfoCenter from '@/pages/infoCenter/infoList'
import ProductList from '@/pages/productQuery/product-list' import ProductList from '@/pages/productQuery/product-list'
// 帮助与反馈 // 帮助与反馈
import HelpList from '@/pages/help/helpList' import HelpList from '@/pages/help/helpList'
import HelpDetail from '@/pages/help/detail'
import HelpFeedback from '@/pages/help/feedback'
// 我的还款 // 我的还款
import ReimburseMyselfList from '@/pages/reimburseMyself/reimburse-myself-list' import ReimburseMyselfList from '@/pages/reimburseMyself/reimburse-myself-list'
import ReimburseDetail from '@/pages/reimburseMyself/reimburse-detail' import ReimburseDetail from '@/pages/reimburseMyself/reimburse-detail'
Vue.use(Router) Vue.use(Router)
export default new Router({ export default new Router({
...@@ -180,6 +183,8 @@ export default new Router({ ...@@ -180,6 +183,8 @@ export default new Router({
{path: '/product-list', component: ProductList, name: 'ProductList', meta: {keepAlive: true}}, {path: '/product-list', component: ProductList, name: 'ProductList', meta: {keepAlive: true}},
// 帮助与反馈 // 帮助与反馈
{path: '/help-list', component: HelpList, name: 'HelpList', meta: {keepAlive: true}}, {path: '/help-list', component: HelpList, name: 'HelpList', meta: {keepAlive: true}},
{path: '/help-detail', component: HelpDetail, name: 'HelpDetail', meta: {keepAlive: true}},
{path: '/help-feedback', component: HelpFeedback, name: 'HelpFeedback', meta: {keepAlive: true}},
// 我的还款 // 我的还款
{path: '/reimburse-myself-list', component: ReimburseMyselfList, name: 'ReimburseMyselfList', meta: {keepAlive: true}}, {path: '/reimburse-myself-list', component: ReimburseMyselfList, name: 'ReimburseMyselfList', meta: {keepAlive: true}},
{path: '/reimburse-detail', component: ReimburseDetail, name: 'ReimburseDetail', meta: {keepAlive: false}}, {path: '/reimburse-detail', component: ReimburseDetail, name: 'ReimburseDetail', meta: {keepAlive: false}},
......
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