Skip to content

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

Merge branch 'ren' into develop

parents 779efd65 b6d0faeb
Hide whitespace changes
Inline Side-by-side
Showing with 37 additions and 36 deletions
src/pages/home/home-page.vue
View file @ 20a0a23c
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* @Descrip: 主页 * @Descrip: 主页
* @Author: your name * @Author: your name
* @Date: 2019-10-10 14:25:15 * @Date: 2019-10-10 14:25:15
* @LastEditTime: 2019-10-11 14:45:17 * @LastEditTime: 2019-10-11 16:26:13
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
--> -->
<template> <template>
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
<h-header class="bar-custom"> <h-header class="bar-custom">
<div slot="left" class="h-header-btn"> <div slot="left" class="h-header-btn">
<!-- <i class="ion-ios-arrow-back" /> --> <!-- <i class="ion-ios-arrow-back" /> -->
<img class="locations" src="@/assets/homePage/location.png" alt=""> <img class="locations" src="@/assets/homePage/location.png" alt="" @click="location">
<span @click="location">徐州</span> <span>徐州</span>
</div> </div>
<div slot="center">徐工租赁</div> <div slot="center">徐工租赁</div>
</h-header> </h-header>
...@@ -39,9 +39,7 @@ ...@@ -39,9 +39,7 @@
<img src="@/assets/homePage/3 copy@2x.png" alt=""> <img src="@/assets/homePage/3 copy@2x.png" alt="">
</div> </div>
</div> </div>
<div class="guessing"> <div class="guessing">猜你喜欢</div>
猜你喜欢
</div>
<list-item :item-height="110"> <list-item :item-height="110">
<item> <item>
<div slot="name" class="item-pic"> <div slot="name" class="item-pic">
...@@ -103,34 +101,34 @@ export default { ...@@ -103,34 +101,34 @@ export default {
watch: {}, watch: {},
methods: methods:
{ {
// goFunctionHome (data) { goFunctionHome (data) {
// if (data.functionState === 'NaturePersonReadOnly') { // if (data.functionState === 'NaturePersonReadOnly') {
// if (this.user_bp_status === 'APPROVED' && this.user_bp_class === 'NP') { // if (this.user_bp_status === 'APPROVED' && this.user_bp_class === 'NP') {
// this.$router.push({ // this.$router.push({
// name: 'NaturePersonReadOnly', // name: 'NaturePersonReadOnly',
// params: { // params: {
// 'bp_id': this.bp_id, // 'bp_id': this.bp_id,
// }, // },
// }) // })
// } else if (this.user_bp_status === 'APPROVED' && this.user_bp_class === 'ORG') { // } else if (this.user_bp_status === 'APPROVED' && this.user_bp_class === 'ORG') {
// this.$router.push({ // this.$router.push({
// name: 'EnterpriseReadOnly', // name: 'EnterpriseReadOnly',
// params: { // params: {
// 'bp_id': this.bp_id, // 'bp_id': this.bp_id,
// }, // },
// }) // })
// } else { // } else {
// this.hlsPopup.showLongCenter('您的绑定申请还在流程中') // this.hlsPopup.showLongCenter('您的绑定申请还在流程中')
// } // }
// } else { // } else {
// this.$router.push({ // this.$router.push({
// name: data.functionState, // name: data.functionState,
// }) // })
// } // }
// }, },
location () { location () {
this.$router.push({ this.$router.push({
name: 'location', name: 'Location',
}) })
}, },
}, },
......
src/pages/home/location.vue
View file @ 20a0a23c
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* @Descrip""/>User Settings Edit * @Descrip""/>User Settings Edit
* @Author: your name * @Author: your name
* @Date: 2019-10-11 09:39:51 * @Date: 2019-10-11 09:39:51
* @LastEditTime: 2019-10-11 14:02:18 * @LastEditTime: 2019-10-11 15:55:47
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
--> -->
<template> <template>
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
</div> </div>
<div class="provinces"> <div class="provinces">
<p :class="{styles:!flag}" @click="changeStyle(1)">{{ province }}</p> <p :class="{styles:!flag}" @click="changeStyle(1)">{{ province }}</p>
<p :class="{styles:flag}" @click="changeStyle(2)">请选择市</p> <p :class="{styles:flag}" @click="changeStyle(2)">{{ city }}</p>
</div> </div>
<list-item v-if="province_flag" :item-height="40"> <list-item v-if="province_flag" :item-height="40">
<item v-for="(item,index) in lists" :key="index"> <item v-for="(item,index) in lists" :key="index">
...@@ -64,9 +64,10 @@ export default { ...@@ -64,9 +64,10 @@ export default {
flag: false, flag: false,
province_flag: true, province_flag: true,
province: '请选择省', province: '请选择省',
city: '请选择市',
places: '江苏省-徐州市', places: '江苏省-徐州市',
lists: ['北京省', '浙江省', '四川省'], lists: ['北京省', '浙江省', '四川省'],
cityList: ['北京', '成都', '上海', '广州'], cityList: ['北京市', '成都市', '上海市', '广州市'],
} }
}, },
computed: {}, computed: {},
...@@ -80,6 +81,7 @@ export default { ...@@ -80,6 +81,7 @@ export default {
console.log(val) console.log(val)
if (val === 1) { if (val === 1) {
this.flag = false this.flag = false
this.province_flag = true
} else { } else {
this.flag = true this.flag = true
} }
...@@ -92,11 +94,12 @@ export default { ...@@ -92,11 +94,12 @@ export default {
selectCity (val) { selectCity (val) {
this.hlsPopup.showConfirm({ this.hlsPopup.showConfirm({
title: '提示', title: '提示',
content: `是否切换到${val}城市？`, content: `是否切换到${val}？`,
onConfirm: (data) => { onConfirm: (data) => {
console.log(data) console.log(data)
if (data) { if (data) {
this.places = this.province + '-' + val this.places = this.province + '-' + val
this.city = val
} }
}, },
}) })
......
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