Skip to content

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

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

parents d56111cd 1878562e
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 436 additions and 306 deletions
src/pages/distributorSign/contract-details.vue
View file @ fff47c92
......@@ -2,7 +2,7 @@
* @Description: 合同详情
* @Author: your name
* @Date: 2019-09-25 15:38:21
* @LastEditTime: 2019-10-10 10:52:55
* @LastEditTime: 2019-10-21 18:48:53
* @LastEditors: Please set LastEditors
-->
<template>
......@@ -90,7 +90,7 @@
</item>
<item>
<div slot="name" class="font-color">保证金比例</div>
<span slot="content">{{ info.deposit_ratio|NumFormat }}</span>
<span slot="content">{{ info.deposit_ratio_n }}</span>
</item>
<item>
<div slot="name" class="font-color">保证金</div>
......@@ -122,7 +122,7 @@
</item>
<item>
<div slot="name" class="font-color">年利率</div>
<input slot="content" v-model="info.int_rate" readonly>
<input slot="content" v-model="info.int_rate_n" readonly>
</item>
</list-item>
<div class="repay-plan">
......
src/pages/financingTrial/financing-details.vue
View file @ fff47c92
......@@ -2,7 +2,7 @@
* @Descrip""/>User Settings Edit
* @Author: your name
* @Date: 2019-09-29 20:31:00
* @LastEditTime: 2019-10-21 15:17:55
* @LastEditTime: 2019-10-22 10:40:02
* @LastEditors: Please set LastEditors
-->
<template>
......@@ -122,7 +122,7 @@ export default {
showTime (format) {
let vm = this
hlsPopup.showTime({
nowDate: new Date().toLocaleDateString(),
nowDate: (new Date()).format('yyyy-MM-dd'),
format: format,
callback: (date) => {
// alert(date)
......
src/pages/help/helpList.vue
View file @ fff47c92
......@@ -15,7 +15,27 @@
<p>每日8:00-18:00</p>
</div>
<p class="matter">常见问题</p>
<list-item :proportion="[5,1]" :item-height="44">
<div class="question">
<div class="question-top" @click="show(0)">
<span>客户绑定相关问题</span>
<img class="img0" src="@/assets/help/down.png" >
</div>
<ul class="list0">
<li>如何进行客户绑定？</li>
<li>如何通过扫描录入进件？</li>
</ul>
</div>
<div class="question">
<div class="question-top" @click="show(1)">
<span>客户绑定相关问题</span>
<img class="img1" src="@/assets/help/down.png" >
</div>
<ul class="list1">
<li>如何进行客户绑定？</li>
<li>如何通过扫描录入进件？</li>
</ul>
</div>
<!-- <list-item :proportion="[5,1]" :item-height="44">
<item>
<div slot="name">客户绑定相关问题</div>
</item>
......@@ -25,12 +45,33 @@
<item>
<div slot="name">如何通过扫描录入进件？</div>
</item>
</list-item>
</list-item>-->
</h-content>
</h-view>
</template>
<script>
export default {}
export default {
data () {
return {
isShow: true,
}
},
methods: {
show (e) {
let ul = document.querySelector(`.list${e}`)
let li = ul.querySelectorAll('li')
let img = document.querySelector(`.list${e}`)
if (this.isShow) {
ul.style.height = li.length * 35 + 'px'
img.style.transform =
this.isShow = false
} else {
ul.style.height = 0
this.isShow = true
}
},
},
}
</script>
<style lang="less" scoped>
#help-list {
......@@ -95,6 +136,60 @@ export default {}
margin-left: 16px;
margin-bottom: 10px;
}
.question {
background-color: #ffffff;
.question-top {
height: 44px;
line-height: 44px;
background-color: #ffffff;
padding-left: 24px;
display: flex;
align-items: center;
span {
display:inline-block;
position: relative;
font-family: PingFangSC-Regular;
font-size: 13px;
color: #00469c;
letter-spacing: 0;
line-height: 20px;
text-indent: 8px;
flex:12;
}
span::before{
content:'';
display: block;
position: absolute;
top:4px;
left: 0px;
width:4px;
height:12px;
background-color:#00469C;
}
img{
width: 20px;
height: 20px;
margin-right: 20px;
flex:1;
}
}
.list0,.list1 {
overflow: hidden;
transition: 0.2s linear;
height:0px;
li {
font-family: PingFangSC-Regular;
font-size: 12px;
color: #656464;
height: 35px;
width:343px;
margin:0 auto;
line-height: 35px;
border-bottom: 1px solid #F1F0F5;
text-indent: 15px;
}
}
}
}
}
</style>
src/pages/intoApproval/intoApproval/refund.vue
View file @ fff47c92
......@@ -136,6 +136,7 @@ export default {
params: {
isConfirm: true,
hasButtom: confirmStatus,
confirm_status: this.$route.params.confirm_status,
},
})
this.$router.go(-1)
......
src/pages/pay/payment/first-pay.vue
View file @ fff47c92
......@@ -25,7 +25,7 @@
<div class="pay-icon"><img src="@/assets/payment/first-pay.png" alt="">违约金支付</div>
<div class="pay-input">
<span>应还违约金</span>
<input v-model="liquidated_damages" type="text" placeholder="请输入支付金额">
<input v-model="liquidated_damages" readonly type="text" placeholder="请输入支付金额">
</div>
</div>
</h-content>
......
src/pages/productQuery/product-detailed.vue
View file @ fff47c92
......@@ -2,7 +2,7 @@
* @Descrip: 产品明细
* @Author: your name
* @Date: 2019-10-15 14:30:00
* @LastEditTime: 2019-10-21 18:30:14
* @LastEditTime: 2019-10-22 10:28:25
* @LastEditors: Please set LastEditors
-->
<template>
......@@ -94,11 +94,11 @@
</h-content>
<bottom-tab class="footer-button">
<tab-button :class="{bgcolor: bgc_flag}" class="butt" @click.native="goTrial(baseInfo.plan_price,baseInfo.price_date_to)"><img src="@/assets/productQuery/trial.png" alt=""> 试算</tab-button>
<tab-button class="collect butt" @click.native="collect"><img :src="src" alt="">收藏</tab-button>
<tab-button class="collect butt" @click.native="collect"><img :src="src" alt="">{{ text }}</tab-button>
</bottom-tab>
<div v-if="collect_flag" class="show-collect">
<img src="@/assets/productQuery/success.png" alt="">
<p>收藏成功</p>
<p>{{ show_text }}</p>
</div>
</h-view>
</template>
......@@ -112,10 +112,12 @@ export default {
},
data () {
return {
text: '',
tabNum: 0,
baseInfo: {},
detailInfo: {},
show_text: '',
confgInfo: {},
detailInfo: {},
bgc_flag: true,
collect_flag: false,
}
......@@ -141,8 +143,10 @@ export default {
console.log('collect........', window.sessionStorage.getItem('collect_status'))
if (window.sessionStorage.getItem('collect_status') === 'Y') {
this.src = require('@/assets/productQuery/coll-success.png')
this.text = '取消收藏'
} else {
this.src = require('@/assets/productQuery/collect.png')
this.text = '收藏'
}
},
methods:
......@@ -155,8 +159,37 @@ export default {
collect () {
console.log('collect', window.sessionStorage.getItem('collect_status'))
if (window.sessionStorage.getItem('collect_status') === 'Y') {
hlsPopup.showLongCenter('该产品已收藏过，请勿重复收藏')
let vm = this
this.hlsPopup.showConfirm({
title: '提示',
content: '您确认取消收藏吗？',
onConfirm: data => {
console.log(data)
if (data) {
let url = $config.basePath + 'delete_collection'
let param = {
master: {
product_id: vm.product_id,
user_phone: window.localStorage.user_phone,
},
}
vm.$post(url, param).then(function (res) {
console.log('取消收藏。。。。。。。。', res)
if (res.result === 'S') {
vm.show_text = '取消成功'
vm.collect_flag = true
vm.src = require('@/assets/productQuery/collect.png')
setTimeout(() => {
vm.text = '收藏'
vm.collect_flag = false
}, 1500)
}
})
}
},
})
} else {
this.show_text = '收藏成功'
this.collect_flag = true
console.log(this.collect_flag)
let vm = this
......@@ -172,6 +205,7 @@ export default {
if (res.result === 'S') {
vm.src = require('@/assets/productQuery/coll-success.png')
setTimeout(() => {
vm.text = '取消收藏'
vm.collect_flag = false
}, 1500)
} else {
......@@ -302,7 +336,7 @@ export default {
img {
height: 19px;
width: 19px;
margin-top: 2px;
//margin-top: 2px;
margin-right: 3px;
}
.collect {
......
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