Skip to content

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

'解决冲突'

parents 991ef9e0 55f7efe9
Hide whitespace changes
Inline Side-by-side
Showing with 296 additions and 296 deletions
src/pages/contractSigning/contract-detail.vue
View file @ 1e0e0bd5
<!--
* @Author: your name
* @Date: 2019-09-29 10:02:11
* @LastEditTime: 2019-10-21 18:03:21
* @LastEditTime: 2019-10-22 09:43:48
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
-->
......@@ -23,10 +23,10 @@
</div>
</h-header>
<div class="tab-style">
<div :class="{'done':num === 1,'undone':num !== 1}" @click="num = 1;"><img :src="num === 1?check1:uncheck1">商务条件</div>
<div :class="{'done':num === 2,'undone':num !== 2}" @click="num = 2;"><img :src="num === 2?check2:uncheck2" >合同文本</div>
<div :class="{'done':num === 0,'undone':num !== 0}" @click="num = 0;"><img :src="num === 0?check1:uncheck1">商务条件</div>
<div :class="{'done':num === 1,'undone':num !== 1}" @click="num = 1;"><img :src="num === 1?check2:uncheck2" >合同文本</div>
</div>
<h-content v-show="num === 1" class="business-condition">
<h-content v-if="num === 0" class="business-condition">
<list-item :item-height="44" class="second-part">
<item>
<div slot="name" >商务政策</div>
......@@ -110,7 +110,7 @@
</div>
</h-content>
<h-content v-show="num === 2">
<h-content v-if="num === 1">
<list-item :item-height="56" class="contract-text" style="background-color:rgb(250,250,250);">
<item :proportion="[4,1]">
<div slot="name" class="aguremrnt-list">
......@@ -149,7 +149,7 @@
</item>
</list-item>
</h-content>
<bottom-tab v-show="num === 2">
<bottom-tab v-show="num === 1">
<tab-button class="footer" @click.native="inSure">
确认签约
</tab-button>
......@@ -158,212 +158,212 @@
</template>
<script>
import Check1 from '@/assets/constractSigning/business.png'
import Check2 from '@/assets/constractSigning/constract.png'
import unCheck1 from '@/assets/constractSigning/unbusiness.png'
import unCheck2 from '@/assets/constractSigning/unconstract.png'
export default {
name: 'ContractDetail',
components: {
},
data () {
return {
isshow: false, // 提示框的显示与隐藏
num: 1,
conditionInfo: {},
check1: Check1,
check2: Check2,
uncheck1: unCheck1,
uncheck2: unCheck2,
import Check1 from '@/assets/constractSigning/business.png'
import Check2 from '@/assets/constractSigning/constract.png'
import unCheck1 from '@/assets/constractSigning/unbusiness.png'
import unCheck2 from '@/assets/constractSigning/unconstract.png'
export default {
name: 'ContractDetail',
components: {
},
data () {
return {
isshow: false, // 提示框的显示与隐藏
num: 0,
conditionInfo: {},
check1: Check1,
check2: Check2,
uncheck1: unCheck1,
uncheck2: unCheck2,
}
},
computed: {},
watch: {},
beforeRouteEnter (to, from, next) {
if (from.name === 'ContractSigning') {
next(vm => {
vm.conditionQuery()
})
}
next()
},
methods: {
// 合同商务条件查询
conditionQuery () {
let vm = this
let url = $config.basePath + 'con_business_query'
let param = {
project_id: this.$route.params.project_id,
}
vm.hlsHttp.post(url, param).then(function (res) {
console.log('商务条件', res)
if (res.result === 'S') {
vm.conditionInfo = res.info
} else {
hlsPopup.showLongCenter(res.message)
}
})
},
computed: {},
watch: {},
beforeRouteEnter (to, from, next) {
if (from.name === 'ContractSigning') {
next(vm => {
vm.conditionQuery()
})
}
next()
// 跳转合同详情
goContractContent (name) {
this.$router.push({
name: 'ContractContent',
params: {
name,
},
})
},
methods: {
// 合同商务条件查询
conditionQuery () {
let vm = this
let url = $config.basePath + 'con_business_query'
let param = {
project_id: this.$route.params.project_id,
}
vm.hlsHttp.post(url, param).then(function (res) {
console.log('商务条件', res)
if (res.result === 'S') {
vm.conditionInfo = res.info
} else {
hlsPopup.showLongCenter(res.message)
}
})
},
// 跳转合同详情
goContractContent (name) {
this.$router.push({
name: 'ContractContent',
params: {
name,
},
})
},
// 跳转银行信息录入
entryInfo () {
this.$router.push({
name: 'EntryInfo',
})
},
inSure () {
this.isshow = true
},
// 跳转银行信息录入
entryInfo () {
this.$router.push({
name: 'EntryInfo',
})
},
}
inSure () {
this.isshow = true
},
},
}
</script>
<style lang='less' type="text/less">
#contract-details {
.all{
#contract-details {
.all{
position: absolute;
background-color: transparent;
width: 100%;
height: 100%;
top: 0;
left: 0;
z-index:2;
.prompt{
position: absolute;
background-color: transparent;
width: 100%;
height: 100%;
top: 0;
left: 0;
z-index:2;
.prompt{
position: absolute;
top: 50%;
left:50%;
margin-top:-75px;
margin-left: -121px;
background-color: #fff;
box-shadow: 0 1px 2px 1px rgba(128,128,128,0.10);
border-radius: 4px;
width: 242px;
height: 150px;
.top{
height: 105px;
border-bottom:1px solid #F1F0F5;
div:first-child{
font-family: PingFangSC-Semibold;
font-size: 14px;
color: #E50020;
letter-spacing: 0.5px;
font-weight: 700;
margin-top:13px;
img{
width: 18px;
line-height: 12px;
display: block;
margin: -3px 5px 0 40%;
float: left;
}
}
top: 50%;
left:50%;
margin-top:-75px;
margin-left: -121px;
background-color: #fff;
box-shadow: 0 1px 2px 1px rgba(128,128,128,0.10);
border-radius: 4px;
width: 242px;
height: 150px;
.top{
height: 105px;
border-bottom:1px solid #F1F0F5;
div:nth-child(2){
margin-top:22px;
font-family: PingFangSC-Regular;
font-size: 13px;
color: #383F45;
letter-spacing: 0.4px;
padding: 0 22px;
line-height: 20px;
div:first-child{
font-family: PingFangSC-Semibold;
font-size: 14px;
color: #E50020;
letter-spacing: 0.5px;
font-weight: 700;
margin-top:13px;
img{
width: 18px;
line-height: 12px;
display: block;
margin: -3px 5px 0 40%;
float: left;
}
}
.bottom{
text-align: center;
div:nth-child(2){
margin-top:22px;
font-family: PingFangSC-Regular;
font-size: 14px;
color: #00469C;
line-height: 32px;
font-size: 13px;
color: #383F45;
letter-spacing: 0.4px;
padding: 0 22px;
line-height: 20px;
}
}
}
.h-header-btn {
img {
width: 16px;
height: 16px;
margin-left: 4px;
}
span {
font-family: PingFangSC-Semibold;
margin-left: 16px;
font-size: 17px;
letter-spacing: 0.61px;
line-height: 24px;
}
}
.tab-style{
display:flex;
justify-content: center;
padding-top:12px;
padding-bottom: 8px;
align-items: center;
background-color: #fff;
box-shadow:0 2px 3px 0 rgba(220,220,221,0.50);
div{
display: block;
height: 32px;
width: 172px;
border-radius:16px;
border-radius: 16px;
font-family: PingFangSC-Semibold;
.bottom{
text-align: center;
font-family: PingFangSC-Regular;
font-size: 14px;
letter-spacing: 0.43px;
margin: 0 4px;
line-height: 32px;
}
.undone{
background: rgba(220,220,221,0.26);
color: #383F45;
}
.done{
background: rgba(0,70,156,0.10);
color: #00469C;
line-height: 32px;
}
}
}
.h-header-btn {
img {
width: 16px;
height: 16px;
margin-left: 4px;
}
img{
width: 20px;
display: block;
float: left;
margin: 6px 5px 0 43px;
}
span {
font-family: PingFangSC-Semibold;
margin-left: 16px;
font-size: 17px;
letter-spacing: 0.61px;
line-height: 24px;
}
}
span:nth-of-type(2){
margin-left: 7px;
}
.tab-style{
display:flex;
justify-content: center;
padding-top:12px;
padding-bottom: 8px;
align-items: center;
background-color: #fff;
box-shadow:0 2px 3px 0 rgba(220,220,221,0.50);
div{
display: block;
height: 32px;
width: 172px;
border-radius:16px;
border-radius: 16px;
font-family: PingFangSC-Semibold;
font-size: 14px;
letter-spacing: 0.43px;
margin: 0 4px;
line-height: 32px;
}
.undone{
background: rgba(220,220,221,0.26);
color: #383F45;
}
.done{
background: rgba(0,70,156,0.10);
color: #00469C;
}
.content{
height: 87%;
img{
width: 20px;
display: block;
float: left;
margin: 6px 5px 0 43px;
}
span:nth-of-type(2){
margin-left: 7px;
}
}
.content{
height: 87%;
.contract-text{
.border-red{
.contract-text{
.border-red{
border: 2px solid rgba(255,0,0,0.40);
}
}
.hls-item{
.hls-item{
margin-top:8px;
background-color: #fff;
}
}
.contents{
padding: 0;
}
.contents{
padding: 0;
}
.in-detail{
background-color: rgba(0,70,156,0.08);
......@@ -373,96 +373,96 @@
line-height: 65px;
img{
width: 16px;
width: 16px;
}
}
}
.in-all{
width: 96px;
display: flex;
.in-all{
width: 96px;
display: flex;
img{
width: 16px;
}
img{
width: 16px;
}
div{
width: 48px;
height: 56px;
text-align: center;
line-height: 65px;
}
div{
width: 48px;
height: 56px;
text-align: center;
line-height: 65px;
}
div:first-child{
background-color: rgba(252,200,0,0.10);
}
div:first-child{
background-color: rgba(252,200,0,0.10);
}
div:nth-child(2){
background-color: rgba(0,70,156,0.08);
}
div:nth-child(2){
background-color: rgba(0,70,156,0.08);
}
}
}
}
.business-condition{
.equipment-list {
height: 40px;
line-height: 40px;
background-color: #fafafa;
color: #00469c;
font-size: 15px;
margin-left: 16px;
position: relative;
}
.business-condition{
.equipment-list {
height: 40px;
line-height: 40px;
background-color: #fafafa;
color: #00469c;
font-size: 15px;
margin-left: 16px;
position: relative;
}
.equipment-list::before {
content: "";
display: block;
width: 4px;
height: 20px;
background-color: #00469c;
position: absolute;
left: -15px;
top: 10px;
}
.equipment-list::before {
content: "";
display: block;
width: 4px;
height: 20px;
background-color: #00469c;
position: absolute;
left: -15px;
top: 10px;
}
div{
font-family: PingFangSC-Regular;
color: #656464;
letter-spacing: 0;
}
div{
font-family: PingFangSC-Regular;
color: #656464;
letter-spacing: 0;
}
section{
font-family: PingFangSC-Regular;
color: rgba(56,63,69,0.60);
letter-spacing: 0;
}
section{
font-family: PingFangSC-Regular;
color: rgba(56,63,69,0.60);
letter-spacing: 0;
}
}
.repay-plan {
height: 44px;
width: 100%;
background: rgba(0,70,156,0.03);
.repay-plan {
height: 44px;
width: 100%;
background: rgba(0,70,156,0.03);
p {
font-family: PingFangSC-Semibold;
font-size: 14px;
color: #00469C;
letter-spacing: 0;
height: 44px;
width: 84px;
line-height: 44px;
font-weight: bold;
text-decoration: underline;
margin-left: 16px;
}
p {
font-family: PingFangSC-Semibold;
font-size: 14px;
color: #00469C;
letter-spacing: 0;
height: 44px;
width: 84px;
line-height: 44px;
font-weight: bold;
text-decoration: underline;
margin-left: 16px;
}
}
.bottom-call {
width: 100%;
height: 60px;
display: flex;
flex-direction: row;
margin-bottom: 30px;
.bottom-call {
width: 100%;
height: 60px;
display: flex;
flex-direction: row;
margin-bottom: 30px;
.left {
width: 16%;
......@@ -498,48 +498,48 @@
justify-content: center;
align-items: center
}
}
.aguremrnt-list {
display: flex;
flex-direction: row;
}
.pic {
margin-left: -3px;
}
.aguremrnt-list {
display: flex;
flex-direction: row;
.pics {
// width: 21px;
height: 30px;
}
.pic {
margin-left: -3px;
}
.read {
height: 16px;
margin-top: 8px;
margin-left: 12.5px;
}
.pics {
// width: 21px;
height: 30px;
}
.second {
height: 32px;
line-height: 32px;
font-family: PingFangSC-Regular;
font-size: 14px;
margin-left: 21px;
color: #383F45;
letter-spacing: 0.43px;
}
.read {
height: 16px;
margin-top: 8px;
margin-left: 12.5px;
}
.first {
margin-left: 13px;
}
.second {
height: 32px;
line-height: 32px;
font-family: PingFangSC-Regular;
font-size: 14px;
margin-left: 21px;
color: #383F45;
letter-spacing: 0.43px;
}
.bottom-tab-button{
background: #00469C;
border-radius: 4px;
color:white;
height: 40px;
margin: 4px 2% 0 2%;
.first {
margin-left: 13px;
}
}
.bottom-tab-button{
background: #00469C;
border-radius: 4px;
color:white;
height: 40px;
margin: 4px 2% 0 2%;
}
}
</style>
src/pages/distributorSign/contract-details.vue
View file @ 1e0e0bd5
......@@ -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 @ 1e0e0bd5
......@@ -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 09:08:31
* @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().toLocaleDateString().replace(/\//g, '-'), // return date.replace(/\//g, '-')
format: format,
callback: (date) => {
// alert(date)
......
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