Commit 2a9defad authored by jiacheng.mao's avatar jiacheng.mao

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

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