Commit 391de7d4 authored by linxin's avatar linxin

add

parent 79ddc586
Pipeline #5166 canceled with stages
...@@ -8,9 +8,9 @@ module.exports = merge(prodEnv, { ...@@ -8,9 +8,9 @@ module.exports = merge(prodEnv, {
debug: true, debug: true,
isMobilePlatform: false, isMobilePlatform: false,
loginPath: '"http://180.104.121.66:8088/oauth/token?client_id=client2&client_secret=secret&grant_type=password&username=appadmin&password=" ', loginPath: '"http://180.104.121.66:8088/oauth/token?client_id=client2&client_secret=secret&grant_type=password&username=appadmin&password=" ',
basePath: '"http://180.104.121.66:8088/r/api/interface?sysName=XCMG_DEV&apiName="', basePath: '"http://180.104.121.66:8088/r/api/interface?sysName=XCMG_UAT&apiName="',
rootPath: '"http://180.104.121.66:8088/r/api"', rootPath: '"http://180.104.121.66:8088/r/api"',
filePath: '"http://180.104.121.66:8088/r/api/app/fileViewSvc?sysName=XCMG_DEV&apiName=file_view&"', filePath: '"http://180.104.121.66:8088/r/api/app/fileViewSvc?sysName=XCMG_UAT&apiName=file_view&"',
fileUploadSvcPath:'"http://180.104.121.66:8088/r/api/app/fileUploadSvc?sysName=XCMG_DEV&apiName="', fileUploadSvcPath:'"http://180.104.121.66:8088/r/api/app/fileUploadSvc?sysName=XCMG_DEV&apiName="',
ocrPath: '"http://180.104.121.66:8088/r/api"', ocrPath: '"http://180.104.121.66:8088/r/api"',
appId: '"com.xcmg.app.uat"', appId: '"com.xcmg.app.uat"',
......
...@@ -76,6 +76,7 @@ export default { ...@@ -76,6 +76,7 @@ export default {
user_bp_status: '', user_bp_status: '',
user_bp_class: '', user_bp_class: '',
bp_id: '', bp_id: '',
isVisitor: false,
moduleSeparateList: [], moduleSeparateList: [],
guessingList: [], guessingList: [],
} }
...@@ -90,7 +91,7 @@ export default { ...@@ -90,7 +91,7 @@ export default {
vm.moduleSeparateList = [...functionState.moduleSeparateList] vm.moduleSeparateList = [...functionState.moduleSeparateList]
vm.userQuery() vm.userQuery()
vm.guessingQuery() // 猜你喜欢查询 vm.guessingQuery() // 猜你喜欢查询
vm.isVisitor = !window.localStorage.getItem('password')
// } // }
}) })
}, },
...@@ -135,9 +136,23 @@ export default { ...@@ -135,9 +136,23 @@ export default {
}) })
}, },
goModuleFunction (data) { goModuleFunction (data) {
this.$router.push({ let vm = this
name: data.moduleState, if (this.isVisitor && data.moduleState !== 'FinancingTrial') {
}) hlsPopup.showConfirm({
title: '提示',
content: `请先登录!`,
onConfirm: data => {
if (data) {
vm.$router.push('/login')
} else {
}
},
})
} else {
this.$router.push({
name: data.moduleState,
})
}
}, },
location () { location () {
this.$router.push({ this.$router.push({
...@@ -191,13 +206,27 @@ export default { ...@@ -191,13 +206,27 @@ export default {
}, },
// 进入产品明细 // 进入产品明细
goProductDetail (list) { goProductDetail (list) {
this.$router.push({ let vm = this
name: 'ProDetailed', if (!window.localStorage.getItem('password')) {
params: { hlsPopup.showConfirm({
product_id: list.product_id, title: '提示',
bp_id: list.bp_id, content: `请先登录!`,
}, onConfirm: data => {
}) if (data) {
vm.$router.push('/login')
} else {
}
},
})
} else {
this.$router.push({
name: 'ProDetailed',
params: {
product_id: list.product_id,
bp_id: list.bp_id,
},
})
}
}, },
}, },
} }
......
...@@ -38,7 +38,11 @@ ...@@ -38,7 +38,11 @@
<div class="register" @click="registerNew">注册</div> <div class="register" @click="registerNew">注册</div>
<div class="pwd-forgotten" @click="pwdForgotten">忘记密码?</div> <div class="pwd-forgotten" @click="pwdForgotten">忘记密码?</div>
</div> </div>
<div class="button submit" @click="access">登录</div> <div class="both-button">
<div class="button submit" @click="access">登录</div>
<div class="button submit" @click="goHome">游客体验</div>
</div>
</div> </div>
</scroll> </scroll>
</template> </template>
...@@ -98,6 +102,12 @@ export default { ...@@ -98,6 +102,12 @@ export default {
} }
}, },
methods: { methods: {
async goHome () {
let flag = await this.getAccessToken()
if (flag) {
this.$router.push('tab')
}
},
changeType () { changeType () {
this.pwdType = this.pwdType === 'password' ? 'text' : 'password' this.pwdType = this.pwdType === 'password' ? 'text' : 'password'
this.openEye = this.openEye =
...@@ -476,12 +486,16 @@ export default { ...@@ -476,12 +486,16 @@ export default {
justify-content: space-between; justify-content: space-between;
-webkit-justify-content: space-between; -webkit-justify-content: space-between;
} }
.both-button{
display: flex;
justify-content: space-around;
}
.submit { .submit {
background: #1d3fff; background: #1d3fff;
border-radius: 4px; border-radius: 4px;
width: 279px; width: 130px;
margin-top: 32px; margin-top: 32px;
height: 49px; height: 45px;
font-size: 16px; font-size: 16px;
color: #fff; color: #fff;
display: flex; display: flex;
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
<img slot="icon" src="../assets/image/tab/n_message@2x.png"> <img slot="icon" src="../assets/image/tab/n_message@2x.png">
<span slot="label">消息</span> <span slot="label">消息</span>
</tabbar-item> </tabbar-item>
<tabbar-item :link="{path:'/tab/my-info'}" :selected="$route.path === '/tab/my-info'"> <tabbar-item @click.native="tabClick">
<img slot="icon-active" src="../assets/image/tab/my@2x.png"> <img slot="icon-active" src="../assets/image/tab/my@2x.png">
<img slot="icon" src="../assets/image/tab/n_my@2x.png"> <img slot="icon" src="../assets/image/tab/n_my@2x.png">
<span slot="label">我的</span> <span slot="label">我的</span>
...@@ -74,7 +74,21 @@ export default { ...@@ -74,7 +74,21 @@ export default {
}, },
methods: { methods: {
tabClick () { tabClick () {
// console.log('click'); let vm = this
if (!window.localStorage.getItem('password')) {
hlsPopup.showConfirm({
title: '提示',
content: `请先登录!`,
onConfirm: data => {
if (data) {
vm.$router.push('/login')
} else {
}
},
})
} else {
vm.$router.push('/tab/my-info')
}
}, },
}, },
......
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