Skip to content

H
hls-xcmg-vue-app
Commit 2a9defad authored by jiacheng.mao's avatar jiacheng.mao
Browse files
Options

Merge remote-tracking branch 'origin/develop' into develop

parents d29bfeb3 f7170ed3
Hide whitespace changes
Inline Side-by-side
Showing with 326 additions and 310 deletions
config/dev.env.js
View file @ 2a9defad
'use strict'
module.exports = {
NODE_ENV: '"production"',
NODE_ENV: '"development"',
CONFIG_ENV: JSON.stringify(process.env.CONFIG_ENV),
debug: true,
isMobilePlatform: true,
......@@ -11,5 +11,5 @@ module.exports = {
ocrPath:'"http://180.104.121.66:8088/r/api"',
fileUploadSvcPath:'"http://180.104.121.66:8088/r/api/app/fileUploadSvc?sysName=XCMG_UAT&apiName="',
appId: '"com.xcmg.app.dev"',
currentVersion: '"3.0.0"'
currentVersion: '"3.0.3"'
}
config/uat.env.js
View file @ 2a9defad
......@@ -11,5 +11,5 @@ module.exports = {
ocrPath:'"http://180.104.121.66:8088/r/api"',
fileUploadSvcPath:'"http://180.104.121.66:8088/r/api/app/fileUploadSvc?sysName=XCMG_UAT&apiName="',
appId: '"com.xcmg.app.dev"',
currentVersion: '"3.0.0"'
currentVersion: '"3.0.3"'
}
src/pages/functionCenter/function-list.vue
View file @ 2a9defad
......@@ -6,44 +6,44 @@
<h-content class="has-footer">
<!-- 搜索 -->
<div class="search has-header">
<img src="@/assets/functionCenter/bgxg-pic@2x.png" alt="" >
<img src="@/assets/functionCenter/bgxg-pic@2x.png" alt="">
</div>
<div class="fun-item">
<div class="userInfo"> 租前业务</div>
<div class="info-content">
<div class="add-name">
<img src="@/assets/functionCenter/bound@2x.png" alt="" >
<img src="@/assets/functionCenter/bound@2x.png" alt="">
<div class="name-title">用户绑定</div>
</div>
<div class="add-content" @click="userBind()">
<img src="@/assets/functionCenter/in@2x.png" alt="" >
<img src="@/assets/functionCenter/in@2x.png" alt="">
</div>
</div>
<div class="info-content">
<div class="add-name">
<img src="@/assets/functionCenter/todo@2x.png" alt="" >
<img src="@/assets/functionCenter/todo@2x.png" alt="">
<div class="name-title">待办审批</div>
</div>
<div class="add-content" @click="todoList()">
<img src="@/assets/functionCenter/in@2x.png" alt="" >
<img src="@/assets/functionCenter/in@2x.png" alt="">
</div>
</div>
<div class="info-content">
<div class="add-name">
<img src="@/assets/functionCenter/todo@2x.png" alt="" >
<img src="@/assets/functionCenter/todo@2x.png" alt="">
<div class="name-title">产品查询</div>
</div>
<div class="add-content" @click="toproduct()">
<img src="@/assets/functionCenter/in@2x.png" alt="" >
<img src="@/assets/functionCenter/in@2x.png" alt="">
</div>
</div>
<div class="info-content">
<div class="add-name">
<img src="@/assets/functionCenter/todo@2x.png" alt="" >
<img src="@/assets/functionCenter/todo@2x.png" alt="">
<div class="name-title">产品试算</div>
</div>
<div class="add-content" @click="financingTrial()">
<img src="@/assets/functionCenter/in@2x.png" alt="" >
<img src="@/assets/functionCenter/in@2x.png" alt="">
</div>
</div>
</div>
......@@ -51,20 +51,20 @@
<div class="userInfo"> 租中业务</div>
<div class="info-content">
<div class="add-name">
<img src="@/assets/functionCenter/con-sign@2x.png" alt="" >
<img src="@/assets/functionCenter/con-sign@2x.png" alt="">
<div class="name-title">融租方案确认</div>
</div>
<div class="add-content" @click="conSign">
<img src="@/assets/functionCenter/in@2x.png" alt="" >
<img src="@/assets/functionCenter/in@2x.png" alt="">
</div>
</div>
<div class="info-content">
<div class="add-name">
<img src="@/assets/functionCenter/con-sign@2x.png" alt="" >
<img src="@/assets/functionCenter/con-sign@2x.png" alt="">
<div class="name-title">融租合同创建</div>
</div>
<div class="add-content" @click="goStart">
<img src="@/assets/functionCenter/in@2x.png" alt="" >
<img src="@/assets/functionCenter/in@2x.png" alt="">
</div>
</div>
<!-- <div class="info-content">
......@@ -78,20 +78,20 @@
</div> -->
<div class="info-content">
<div class="add-name">
<img src="@/assets/functionCenter/car@2x.png" alt="" >
<img src="@/assets/functionCenter/car@2x.png" alt="">
<div class="name-title">合同签订</div>
</div>
<div class="add-content" @click="goCarConfirm">
<img src="@/assets/functionCenter/in@2x.png" alt="" >
<img src="@/assets/functionCenter/in@2x.png" alt="">
</div>
</div>
<div class="info-content">
<div class="add-name">
<img src="@/assets/functionCenter/payment@2x.png" alt="" >
<img src="@/assets/functionCenter/payment@2x.png" alt="">
<div class="name-title">首付还款</div>
</div>
<div class="add-content" @click="goReimburse">
<img src="@/assets/functionCenter/in@2x.png" alt="" >
<img src="@/assets/functionCenter/in@2x.png" alt="">
</div>
</div>
</div>
......@@ -99,38 +99,38 @@
<div class="userInfo"> 租后业务</div>
<div class="info-content">
<div class="add-name">
<img src="@/assets/functionCenter/rent@2x.png" alt="" >
<img src="@/assets/functionCenter/rent@2x.png" alt="">
<div class="name-title">我的发票</div>
</div>
<div class="add-content" @click="goInvoice">
<img src="@/assets/functionCenter/in@2x.png" alt="" >
<img src="@/assets/functionCenter/in@2x.png" alt="">
</div>
</div>
<div class="info-content">
<div class="add-name">
<img src="@/assets/functionCenter/rent@2x.png" alt="" >
<img src="@/assets/functionCenter/rent@2x.png" alt="">
<div class="name-title">合同还款</div>
</div>
<div class="add-content" @click="goContractRepayment">
<img src="@/assets/functionCenter/in@2x.png" alt="" >
<img src="@/assets/functionCenter/in@2x.png" alt="">
</div>
</div>
<div class="info-content">
<div class="add-name">
<img src="@/assets/functionCenter/rent@2x.png" alt="" >
<img src="@/assets/functionCenter/rent@2x.png" alt="">
<div class="name-title">租金还款</div>
</div>
<div class="add-content" @click="changeRent">
<img src="@/assets/functionCenter/in@2x.png" alt="" >
<img src="@/assets/functionCenter/in@2x.png" alt="">
</div>
</div>
<div class="info-content">
<div class="add-name">
<img src="@/assets/functionCenter/con-que@2x.png" alt="" >
<img src="@/assets/functionCenter/con-que@2x.png" alt="">
<div class="name-title">合同查询</div>
</div>
<div class="add-content" @click="changeContract('GUTA')">
<img src="@/assets/functionCenter/in@2x.png" alt="" >
<img src="@/assets/functionCenter/in@2x.png" alt="">
</div>
</div>
......@@ -155,9 +155,7 @@ export default {
}
},
computed: {},
watch: {
},
watch: {},
beforeRouteEnter (to, from, next) {
// if (true) {
next(vm => {
......@@ -245,7 +243,7 @@ export default {
},
// 融租方案确认
conSign () {
// .首付还款、租金还款、融租方案确认需对业务经理角色做控制，点击无法进入，提示“当前角色非承租人或担保人，无法使用该功能！”
// .首付还款、租金还款、融租方案确认需对业务经理角色做控制，点击无法进入，提示“当前角色非承租人或担保人，无法使用该功能！”
if (this.user_bp_type === 'MANAGER') {
hlsPopup.showLongCenter('当前角色非承租人或担保人，无法使用该功能！')
return
......@@ -375,7 +373,7 @@ export default {
name: 'UserBind',
})
} else if (this.bp_id && this.user_bp_status === 'NEW') {
// this.description = '待提交'
// this.description = '待提交'
if (this.user_bp_class === 'NP') {
this.$router.push({
name: 'NPBaseInfo',
......@@ -396,7 +394,7 @@ export default {
}
} else if (
(this.bp_id && this.user_bp_status === 'RETURN') ||
(this.bp_id && this.user_bp_status === 'REJECT')
(this.bp_id && this.user_bp_status === 'REJECT')
) {
if (this.user_bp_class === 'NP') {
this.$router.push({
......@@ -451,288 +449,310 @@ export default {
}
</script>
<style lang='less'>
#function-center {
#function-center {
.search {
background-color: #fff;
position: absolute;
width: 100%;
z-index: 1;
width: 100%;
position: absolute;
top: 0;
img {
width: 100%;
height: 150px;
position: absolute;
top: 0;
img {
width: 100%;
height: 150px;
}
}
.fun-item{
background: #FFFFFF;
border-radius: 0.4rem;
width: 80%;
margin-left: 10%;
position: absolute;
z-index: 2;
margin-top: 1.4rem;
.userInfo {
height: 35px;
line-height: 35px;
color: @headerColor;
margin-top: 5px;
font-family: PingFangSC-Semibold;
font-size: 15px;
color: #1D3FFF;
letter-spacing: 0;
margin-left: 30px;
position: relative;
}
.userInfo::before {
content: "";
display: block;
width: 4px;
height: 16px;
background-color: @headerColor;
position: absolute;
left: -15px;
top: 9px;
}
.info-content{
width: 85%;
margin-left: 10%;
height: 40px;
display: -webkit-box;
display: -webkit-flex;
display: flex;
-webkit-box-pack: justify;
-webkit-justify-content: space-between;
justify-content: space-between;
.add-name{
width: 70%;
display: -webkit-flex;
display: -webkit-box;
display: flex;
-webkit-box-pack: start;
justify-content: flex-start;
-webkit-box-align: center;
align-items: center;
-webkit-justify-content: flex-start;
-webkit-align-items: center;
img{
height: 15px;
width: 15px;
}
}
.name-title{
margin-left: 2%;
font-family: PingFangSC-Regular;
font-size: 15px;
color: #656464;
letter-spacing: 0;
line-height: 18px;
}
}
.add-content{
width: 20%;
display: -webkit-flex;
display: -webkit-box;
display: flex;
-webkit-box-pack: end;
justify-content: flex-end;
-webkit-box-align: center;
align-items: center;
-webkit-justify-content: flex-end;
-webkit-align-items: center;
img{
height: 15px;
width: 14px;
}
}
.fun-item {
background: #FFFFFF;
border-radius: 0.4rem;
width: 80%;
margin-left: 10%;
position: absolute;
z-index: 2;
margin-top: 1.4rem;
.userInfo {
height: 35px;
line-height: 35px;
color: @headerColor;
margin-top: 5px;
font-family: PingFangSC-Semibold;
font-size: 15px;
color: #1D3FFF;
letter-spacing: 0;
margin-left: 30px;
position: relative;
}
.userInfo::before {
content: "";
display: block;
width: 4px;
height: 16px;
background-color: @headerColor;
position: absolute;
left: -15px;
top: 9px;
}
.info-content {
width: 85%;
margin-left: 10%;
height: 40px;
display: -webkit-box;
display: -webkit-flex;
display: flex;
-webkit-box-pack: justify;
-webkit-justify-content: space-between;
justify-content: space-between;
.add-name {
width: 70%;
display: -webkit-flex;
display: -webkit-box;
display: flex;
-webkit-box-pack: start;
justify-content: flex-start;
-webkit-box-align: center;
align-items: center;
-webkit-justify-content: flex-start;
-webkit-align-items: center;
img {
height: 15px;
width: 15px;
}
}
.name-title {
margin-left: 2%;
font-family: PingFangSC-Regular;
font-size: 15px;
color: #656464;
letter-spacing: 0;
line-height: 18px;
}
}
.add-content {
width: 20%;
display: -webkit-flex;
display: -webkit-box;
display: flex;
-webkit-box-pack: end;
justify-content: flex-end;
-webkit-box-align: center;
align-items: center;
-webkit-justify-content: flex-end;
-webkit-align-items: center;
img {
height: 15px;
width: 14px;
}
}
}
.fun-item-before {
background: #FFFFFF;
border-radius: 0.4rem;
width: 80%;
margin-left: 10%;
margin-top: 5.6rem;
background: #FFFFFF;
border-radius: 0.4rem;
width: 80%;
margin-left: 10%;
margin-top: 5.6rem;
position: absolute;
// position: absolute;
// z-index: 2;
.userInfo {
height: 35px;
line-height: 35px;
color: @headerColor;
margin-top: 5px;
font-family: PingFangSC-Semibold;
font-size: 15px;
color: #1D3FFF;
letter-spacing: 0;
margin-left: 30px;
position: relative;
}
.userInfo::before {
content: "";
display: block;
width: 4px;
height: 16px;
background-color: @headerColor;
position: absolute;
// position: absolute;
// z-index: 2;
.userInfo {
height: 35px;
line-height: 35px;
color: @headerColor;
margin-top: 5px;
font-family: PingFangSC-Semibold;
font-size: 15px;
color: #1D3FFF;
letter-spacing: 0;
margin-left: 30px;
position: relative;
}
.userInfo::before {
content: "";
display: block;
width: 4px;
height: 16px;
background-color: @headerColor;
position: absolute;
left: -15px;
top: 9px;
}
.info-content{
width: 85%;
margin-left: 10%;
height: 40px;
display: -webkit-box;
display: -webkit-flex;
display: flex;
-webkit-box-pack: justify;
-webkit-justify-content: space-between;
justify-content: space-between;
.add-name{
width: 70%;
display: -webkit-flex;
display: -webkit-box;
display: flex;
-webkit-box-pack: start;
justify-content: flex-start;
-webkit-box-align: center;
align-items: center;
-webkit-justify-content: flex-start;
-webkit-align-items: center;
img{
height: 15px;
width: 15px;
}
}
.name-title{
margin-left: 2%;
font-family: PingFangSC-Regular;
font-size: 15px;
color: #656464;
letter-spacing: 0;
line-height: 18px;
}
}
.add-content{
width: 20%;
display: -webkit-flex;
display: -webkit-box;
display: flex;
-webkit-box-pack: end;
justify-content: flex-end;
-webkit-box-align: center;
align-items: center;
-webkit-justify-content: flex-end;
-webkit-align-items: center;
img{
height: 15px;
width: 14px;
}
}
left: -15px;
top: 9px;
}
}
.fun-item-after{
background: #FFFFFF;
border-radius: 0.4rem;
width: 80%;
.info-content {
width: 85%;
margin-left: 10%;
margin-top: 9.8rem;
margin-bottom: 1.5rem;
// position: absolute;
// z-index: 2;
.userInfo {
height: 35px;
line-height: 35px;
color: @headerColor;
margin-top: 5px;
font-family: PingFangSC-Semibold;
font-size: 15px;
color: #1D3FFF;
letter-spacing: 0;
margin-left: 30px;
position: relative;
}
.userInfo::before {
content: "";
display: block;
width: 4px;
height: 16px;
background-color: @headerColor;
position: absolute;
left: -15px;
top: 9px;
}
.info-content{
width: 85%;
margin-left: 10%;
height: 40px;
display: -webkit-box;
display: -webkit-flex;
display: flex;
-webkit-box-pack: justify;
-webkit-justify-content: space-between;
justify-content: space-between;
.add-name{
width: 70%;
display: -webkit-flex;
display: -webkit-box;
display: flex;
-webkit-box-pack: start;
justify-content: flex-start;
-webkit-box-align: center;
align-items: center;
-webkit-justify-content: flex-start;
-webkit-align-items: center;
img{
height: 15px;
width: 15px;
}
}
.name-title{
margin-left: 2%;
font-family: PingFangSC-Regular;
font-size: 15px;
color: #656464;
letter-spacing: 0;
line-height: 18px;
}
}
.add-content{
width: 20%;
display: -webkit-flex;
display: -webkit-box;
display: flex;
-webkit-box-pack: end;
justify-content: flex-end;
-webkit-box-align: center;
align-items: center;
-webkit-justify-content: flex-end;
-webkit-align-items: center;
img{
height: 15px;
width: 14px;
}
}
height: 40px;
display: -webkit-box;
display: -webkit-flex;
display: flex;
-webkit-box-pack: justify;
-webkit-justify-content: space-between;
justify-content: space-between;
}
.add-name {
width: 70%;
display: -webkit-flex;
display: -webkit-box;
display: flex;
-webkit-box-pack: start;
justify-content: flex-start;
-webkit-box-align: center;
align-items: center;
-webkit-justify-content: flex-start;
-webkit-align-items: center;
img {
height: 15px;
width: 15px;
}
}
.name-title {
margin-left: 2%;
font-family: PingFangSC-Regular;
font-size: 15px;
color: #656464;
letter-spacing: 0;
line-height: 18px;
}
}
.add-content {
width: 20%;
display: -webkit-flex;
display: -webkit-box;
display: flex;
-webkit-box-pack: end;
justify-content: flex-end;
-webkit-box-align: center;
align-items: center;
-webkit-justify-content: flex-end;
-webkit-align-items: center;
img {
height: 15px;
width: 14px;
}
}
}
.content{
position: absolute;
top:0;
.fun-item-after {
background: #FFFFFF;
border-radius: 0.4rem;
width: 80%;
margin-left: 10%;
margin-top: 9.8rem;
margin-bottom: 1.5rem;
// position: absolute;
// z-index: 2;
.userInfo {
height: 35px;
line-height: 35px;
color: @headerColor;
margin-top: 5px;
font-family: PingFangSC-Semibold;
font-size: 15px;
color: #1D3FFF;
letter-spacing: 0;
margin-left: 30px;
position: relative;
}
.userInfo::before {
content: "";
display: block;
width: 4px;
height: 16px;
background-color: @headerColor;
position: absolute;
left: -15px;
top: 9px;
}
.info-content {
width: 85%;
margin-left: 10%;
height: 40px;
display: -webkit-box;
display: -webkit-flex;
display: flex;
-webkit-box-pack: justify;
-webkit-justify-content: space-between;
justify-content: space-between;
.add-name {
width: 70%;
display: -webkit-flex;
display: -webkit-box;
display: flex;
-webkit-box-pack: start;
justify-content: flex-start;
-webkit-box-align: center;
align-items: center;
-webkit-justify-content: flex-start;
-webkit-align-items: center;
img {
height: 15px;
width: 15px;
}
}
.name-title {
margin-left: 2%;
font-family: PingFangSC-Regular;
font-size: 15px;
color: #656464;
letter-spacing: 0;
line-height: 18px;
}
}
.add-content {
width: 20%;
display: -webkit-flex;
display: -webkit-box;
display: flex;
-webkit-box-pack: end;
justify-content: flex-end;
-webkit-box-align: center;
align-items: center;
-webkit-justify-content: flex-end;
-webkit-align-items: center;
img {
height: 15px;
width: 14px;
}
}
}
.platform-ios {
}
.platform-ios {
#query {
.scrollContent {
padding-top: 2.32rem;
}
}
}
// iPhoneX适配
@media (device-width: 375px) and (device-height: 812px) and (-webkit-min-device-pixel-ratio: 3) {
.platform-ios {
......@@ -743,6 +763,7 @@ export default {
}
}
}
// iPhoneXR适配
@media (device-width: 414px) and (device-height: 896px) {
.platform-ios {
......@@ -750,21 +771,21 @@ export default {
.scrollContent {
padding-top: 2.72rem;
}
.search {
input {
background: url("../../assets/contractStart/search1.png") 320px
no-repeat;
background-size: 16px 16px;
background-color: rgba(239, 239, 239, 0.55);
padding: 8px 12px;
border-radius: 4px;
width: 100%;
font-family: PingFangSC-Regular;
font-size: 14px;
color: #888c8f;
input {
background: url("../../assets/contractStart/search1.png") 320px no-repeat;
background-size: 16px 16px;
background-color: rgba(239, 239, 239, 0.55);
padding: 8px 12px;
border-radius: 4px;
width: 100%;
font-family: PingFangSC-Regular;
font-size: 14px;
color: #888c8f;
}
}
}
}
}
}
</style>
src/pages/home/home-page.vue
View file @ 2a9defad
......@@ -139,7 +139,7 @@ export default {
console.log('&&&&&&&&&&&&___ios')
// if (!$config.isMobilePlatform) {
// }
/*baidumap_location.getCurrentPosition(function (result) {
baidumap_location.getCurrentPosition(function (result) {
if (window.localStorage.getItem('province')) {
vm.city = window.localStorage.getItem('city')
vm.province = window.localStorage.getItem('province')
......@@ -150,7 +150,7 @@ export default {
vm.guessingQuery(result.city)
}
}, function (error) {
})*/
})
// setTimeout(vm.guessingQuery(), 0)
},
goFunctionHome (data) {
......
src/pages/myInfo/setting.vue
View file @ 2a9defad
......@@ -135,11 +135,6 @@ export default {
this.update_content,
this.version_url
)
} else {
this.hote_update_version(
this.update_content,
this.version_url
)
}
} else {
this.hlsPopup.showLongCenter('您的版本是最新版')
......
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