Commit 7bfcdb05 authored by 李晓兵's avatar 李晓兵

'message'

parent 9ecfc7ad
src/assets/image/tab/home@2x.png

1.26 KB | W: | H:

src/assets/image/tab/home@2x.png

2.07 KB | W: | H:

src/assets/image/tab/home@2x.png
src/assets/image/tab/home@2x.png
src/assets/image/tab/home@2x.png
src/assets/image/tab/home@2x.png
  • 2-up
  • Swipe
  • Onion skin
src/assets/image/tab/message@2x.png

2.32 KB | W: | H:

src/assets/image/tab/message@2x.png

1.44 KB | W: | H:

src/assets/image/tab/message@2x.png
src/assets/image/tab/message@2x.png
src/assets/image/tab/message@2x.png
src/assets/image/tab/message@2x.png
  • 2-up
  • Swipe
  • Onion skin
src/assets/image/tab/my@2x.png

1.66 KB | W: | H:

src/assets/image/tab/my@2x.png

3.44 KB | W: | H:

src/assets/image/tab/my@2x.png
src/assets/image/tab/my@2x.png
src/assets/image/tab/my@2x.png
src/assets/image/tab/my@2x.png
  • 2-up
  • Swipe
  • Onion skin
src/assets/image/tab/n_home@2x.png

1.26 KB | W: | H:

src/assets/image/tab/n_home@2x.png

1.96 KB | W: | H:

src/assets/image/tab/n_home@2x.png
src/assets/image/tab/n_home@2x.png
src/assets/image/tab/n_home@2x.png
src/assets/image/tab/n_home@2x.png
  • 2-up
  • Swipe
  • Onion skin
src/assets/image/tab/n_message@2x.png

2.02 KB | W: | H:

src/assets/image/tab/n_message@2x.png

1.4 KB | W: | H:

src/assets/image/tab/n_message@2x.png
src/assets/image/tab/n_message@2x.png
src/assets/image/tab/n_message@2x.png
src/assets/image/tab/n_message@2x.png
  • 2-up
  • Swipe
  • Onion skin
src/assets/image/tab/n_my@2x.png

1.63 KB | W: | H:

src/assets/image/tab/n_my@2x.png

3.27 KB | W: | H:

src/assets/image/tab/n_my@2x.png
src/assets/image/tab/n_my@2x.png
src/assets/image/tab/n_my@2x.png
src/assets/image/tab/n_my@2x.png
  • 2-up
  • Swipe
  • Onion skin
/*
* @Description: In User Settings Edit
* @Author: your name
* @Date: 2019-09-24 12:34:06
* @LastEditTime: 2019-09-24 12:34:06
* @LastEditors: your name
*/
export default {
bannerList: [
{
pictureUrl: require('../assets/image/home/bannerWrap@2x.png'),
},
{
pictureUrl: require('../assets/image/home/bannerWrap2@2x.png'),
},
],
moduleSeparateList: [
{
'moduleId': 1,
'moduleCode': 'PARTNER',
'moduleName': '商业伙伴',
'moduleIcon': 'http://hlsapp.hand-china.com/file/hel_dev/function/partner@2x.png',
'roleId': 1,
'roleCode': 'ADMIN',
'roleName': '管理员',
},
{
'moduleId': 2,
'moduleCode': 'PROJECT',
'moduleName': '项目申请',
'moduleIcon': 'http://hlsapp.hand-china.com/file/hel_dev/function/project@2x.png',
'roleId': 1,
'roleCode': 'ADMIN',
'roleName': '管理员',
},
{
'moduleId': 3,
'moduleCode': 'CONTRACT',
'moduleName': '合同模块',
'moduleIcon': 'http://hlsapp.hand-china.com/file/hel_dev/function/contract@2x.png',
'roleId': 1,
'roleCode': 'ADMIN',
'roleName': '管理员',
},
{
'moduleId': 4,
'moduleCode': 'PERSONAL',
'moduleName': '个人办公',
'moduleIcon': 'http://hlsapp.hand-china.com/file/hel_dev/function/personWork@2x.png',
'roleId': 1,
'roleCode': 'ADMIN',
'roleName': '管理员',
},
],
}
<!--
* @Description: In User Settings Edit
* @Author: your name
* @Date: 2019-09-24 12:34:06
* @LastEditTime: 2019-09-24 12:34:06
* @LastEditors: your name
-->
<template>
<h-view id="home" class="public-style" title="车租易">
<h-content :cal-content="false" class="content scroll-content">
<div class="top-box">
<swipe :interval="5000" :showIndicators="false" class="swipe">
<swipe-item v-for="img in imgList" :key="img.pictureUrl">
<img :src="img.pictureUrl">
</swipe-item>
</swipe>
<div class="function">
<function-item
v-for="item in moduleSeparateList.slice(0,4)" :key="item.moduleId" :functionIcon="item.moduleIcon"
:functionName="item.moduleName"
:data="item"/>
</div>
</div>
<div class="middle-box">
<header>常用应用</header>
<div class="function">
<function-item
v-for="(item,index) in functionList" :key="index" :functionIcon="item.functionIcon"
:functionName="item.functionName"
:data="item" class="function-item vue-1px" @clickFunction="goFunctionHome"/>
</div>
</div>
<div class="important-message">
<div class="important-message-title">重要消息</div>
<div class="important-message-title-icon">
<img src="../assets/image/home/messageIcon@2x.png">
</div>
<div id="scroll">
<ul id="p1">
<li v-for="item in messageList">{{ item.msg_body }}</li>
</ul>
<ul id="p2"/>
</div>
</div>
<div class="bank" style="height: 60px;width: 100%"/>
</h-content>
</h-view>
</template>
<script>
import functionState from './functionState'
export default {
data () {
return {
imgList: [],
moduleSeparateList: [],
functionList: [
{
functionIcon: require('@/assets/userBind/np.png'),
functionName: '用户绑定',
functionState: 'UserBind',
},
{
functionIcon: require('@/assets/intoApproval/introduce.png'),
functionName: '绑定查询',
functionState: 'NaturePersonReadOnly',
},
{
functionIcon: require('@/assets/intoApproval/introduce.png'),
functionName: '进件审批',
functionState: 'IntoList',
},
{
functionIcon: require('@/assets/intoApproval/introduce.png'),
functionName: '经销商签约',
functionState: 'ContractList',
},
{
functionIcon: require('@/assets/intoApproval/introduce.png'),
functionName: '合同签约',
functionState: 'ContractSigning',
},
], // 全部应用
messageList: [
{
msg_body: '庆祝建国70周年',
},
{
msg_body: '祖国万岁',
},
],
area: {},
box1: {},
box2: {},
user_bp_status: '',
user_bp_class: '',
bp_id: '',
}
},
beforeCreate: function () {
},
created: function () {
/* this.imgList = [...functionState.bannerList]
this.moduleSeparateList = [...functionState.moduleSeparateList]
this.userQuery() */
},
beforeRouteEnter (to, from, next) {
next(vm => {
// if (from.name === 'Login') {
vm.imgList = [...functionState.bannerList]
vm.moduleSeparateList = [...functionState.moduleSeparateList]
vm.userQuery()
// }
})
},
updated: function () {
},
methods: {
goModuleFunction (data) {
this.$router.push({
name: 'ModuleFunction',
params: {
moduleFunctionList: data,
},
})
},
goFunctionHome (data) {
if (data.functionState === 'NaturePersonReadOnly') {
if (this.user_bp_status !== 'APPROVING' && this.user_bp_class === 'NP') {
this.$router.push({
name: 'NaturePersonReadOnly',
params: {
'bp_id': this.bp_id,
},
})
} else if (this.user_bp_status !== 'APPROVING' && this.user_bp_class === 'ORG') {
this.$router.push({
name: 'EnterpriseReadOnly',
params: {
'bp_id': this.bp_id,
},
})
} else {
this.hlsPopup.showLongCenter('您的绑定申请还在流程中')
}
} else {
this.$router.push({
name: data.functionState,
})
}
},
// 用户信息查询
userQuery () {
let vm = this
let url = $config.basePath + 'user_query'
let param = {
'phone': window.localStorage.getItem('user_phone'),
}
vm.$post(url, param).then(function (res) {
if (res.result === 'S') {
vm.user_bp_status = res.info.user_bp_status
vm.user_bp_class = res.info.user_bp_class
vm.bp_id = res.info.user_bp_id
}
})
},
},
}
</script>
<style lang="less" scoped type="text/less">
@import "../styles/vue-1px";
#home {
.content{
margin-bottom: 40px;
}
.top-box {
height: 264px;
width: 100%;
overflow: hidden;
position: relative;
.header {
width: 100%;
height: 40px;
position: absolute;
top: 0;
z-index: 100;
input {
width: calc(~"100% - 53px");
height: 26px;
margin: 10px 0 0 10px;
background: white;
// border: 1px solid white;
border-radius: 15px;
text-align: center;
color: #B6B6B6;
font-size: 12px;
}
img {
width: 21px;
height: 21px;
position: absolute;
top: 12px;
right: 10px;
}
}
.hls-swipe {
height: 175px;
width: 100%;
overflow: hidden;
}
.function {
height: 117px;
width: 100%;
position: absolute;
bottom: 0;
background: url("../assets/image/home/moduleBg@2x.png");
Background-size: 100%;
padding-top: 43px;
display: flex;
justify-content: space-between;
&:before {
content: ''
}
&:after {
content: ''
}
.function-item {
text-align: center;
}
}
}
.middle-box {
margin-top: 8px;
background: white;
header {
height: 33px;
display: flex;
align-items: center;
line-height: 100%;
color: #5D98F6;
position: relative;
&:before {
content: '';
width: 4px;
height: 15px;
margin-right: 9px;
margin-left: 10px;
background-image: linear-gradient(-180deg, #5D98F6 0%, #76BCEE 100%);
border-radius: 2px;
}
&:after {
.setBottomLine()
}
span {
font-size: 12px;
color: #878A8D;
position: absolute;
right: 15px;
}
}
.function{
display: flex;
flex-wrap: wrap;
.function-item {
width: 25%;
height: 89px;
font-size: 12px;
// border: 1px solid rgba(169,169,169,0.1); /*no*/
/deep/ img {
height: 30px;
width: 30px;
margin: 23px 28px 9px 33px;
}
&:before {
.setBottomLine();
}
&:after {
.setRightLine();
}
}
}
}
.important-message {
width: 100%;
height: 42px;
margin-top: 8px;
background-color: #FFFFFF;
display: flex;
justify-content: flex-start;
align-items: center;
.important-message-title {
-webkit-flex: 0 0 20%;
flex: 0 0 20%;
max-width: 20%;
color: #E84A55;
font-size: 14px;
//margin-left: 3.2%;
height: 100%;
display: flex;
justify-content: center;
align-items: center;
}
.important-message-title-icon {
height: 100%;
margin-left: 1%;
display: flex;
justify-content: flex-start;
align-items: center;
img {
width: 13px;
height: 12px;
}
}
#scroll {
height: 42px;
overflow: hidden;
margin-left: 5%;
}
#scroll li {
height: 42px;
color: #565656;
font-size: 13px;
line-height: 18px;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
/*word-wrap: break-word;
word-break: break-all;
white-space: normal;*/
display: flex;
align-items: center;
margin-right: 10px;
}
}
}
.platform-ios{
#home{
.header{
top:20px
}
}
}
// iPhoneX适配
@media (device-width: 375px) and (device-height: 812px) and (-webkit-min-device-pixel-ratio: 3) {
.platform-ios{
#home{
.content{
margin-bottom: 74px;
}
.header{
top:40px
}
}
}
}
@media (device-width: 414px) and (device-height: 896px){
.platform-ios{
#home{
.content{
margin-bottom: 74px;
}
.header{
top:40px
}
}
}
}
</style>
...@@ -15,9 +15,9 @@ ...@@ -15,9 +15,9 @@
</div> </div>
<div slot="center" @click="getLocation">徐工租赁</div> <div slot="center" @click="getLocation">徐工租赁</div>
</h-header> </h-header>
<h-content> <h-content class="has-footer">
<div class="top-wrap"></div> <div class="top-wrap"/>
<div class="top-wrap-white"></div> <div class="top-wrap-white"/>
<swipe :interval="5000" class="hls-swipe"> <swipe :interval="5000" class="hls-swipe">
<swipe-item class="hls-swipe"> <swipe-item class="hls-swipe">
<img src="@/assets/homePage/banner1.png" alt=""> <img src="@/assets/homePage/banner1.png" alt="">
...@@ -43,70 +43,62 @@ ...@@ -43,70 +43,62 @@
</div> </div>
</div> </div>
<div class="guessing">猜你喜欢<span><img src="@/assets/homePage/intrest.png"></span></div> <div class="guessing">猜你喜欢<span><img src="@/assets/homePage/intrest.png"></span></div>
<list-item :item-height="110"> <div v-for="(list,index) in guessingList" :key="index" class="guessing-wrap" @click="goProductDetail(list)" >
<item> <list-item :item-height="120">
<div slot="name" class="item-pic"> <item>
<img src="@/assets/homePage/WechatIMG2 Copy@2x.png" alt=""> <div slot="name" class="item-pic">
</div> <img src="@/assets/homePage/WechatIMG2 Copy@2x.png" alt="">
<div slot="content" class="item-content"> </div>
<div class="top">***起重机 <span class="hot">热门</span></div> <div slot="content" class="item-content">
<div class="center"><span class="firsts">经销商</span> <span class="seconds">xxx代理商</span></div> <div class="top">{{ list.product_name }}</div>
<div class="center"><span class="firsts">参数项</span> <span class="seconds">GTZ226</span></div> <img src="@/assets/homePage/hot.png" class="hot">
<div class="center"><span class="firsts">地址</span> <span class="seconds">江苏省徐州市云龙区</span></div> <div class="center"><span class="firsts">经销商</span> <span class="seconds">{{ list.bp_name }}</span></div>
</div> <div class="center"><span class="firsts">参数项</span> <span class="seconds">{{ list.product_code }}</span></div>
</item> <div class="center"><span class="firsts">地址</span> <span class="seconds">{{ list.province_id_n + list.city_id_n + list.district_id_n}}</span></div>
<item> </div>
<div slot="name" class="item-pic"> </item>
<img src="@/assets/homePage/WechatIMG3 Copy@2x.png" alt=""> </list-item>
</div> </div>
<div slot="content" class="item-content"> <!-- <div class="bank" style="height: 60px;width: 100%"/>-->
<div class="top">***起重机 <span class="hot">热门</span></div>
<div class="center"><span class="firsts">经销商</span> <span class="seconds">xxx代理商</span></div>
<div class="center"><span class="firsts">参数项</span> <span class="seconds">GTZ226</span></div>
<div class="center"><span class="firsts">地址</span> <span class="seconds">江苏省徐州市云龙区</span></div>
</div>
</item>
</list-item>
<div class="bank" style="height: 60px;width: 100%"/>
</h-content> </h-content>
</h-view> </h-view>
</template> </template>
<script> <script>
import functionState from './functionState' import functionState from './functionState'
export default { export default {
name: 'HomePage', name: 'HomePage',
data() { data () {
return { return {
city: '', city: '',
province: '', province: '',
user_bp_status: '', user_bp_status: '',
user_bp_class: '', user_bp_class: '',
bp_id: '', bp_id: '',
moduleSeparateList: [], moduleSeparateList: [],
} guessingList: [],
}, }
computed: {}, },
watch: {}, computed: {},
created() { watch: {},
this.getLocation() created () {
}, this.getLocation()
beforeRouteEnter(to, from, next) { },
next(vm => { beforeRouteEnter (to, from, next) {
// if (from.name === 'Login') { next(vm => {
vm.moduleSeparateList = [...functionState.moduleSeparateList] // if (from.name === 'Login') {
vm.userQuery() vm.moduleSeparateList = [...functionState.moduleSeparateList]
// } vm.userQuery()
}) // }
}, })
methods: },
methods:
{ {
// 定位 // 定位
getLocation() { getLocation () {
let vm = this let vm = this
var geolocation = new BMap.Geolocation() var geolocation = new BMap.Geolocation()
geolocation.getCurrentPosition(function (res) { geolocation.getCurrentPosition(function (res) {
// debugger
if (this.getStatus() === 0) { if (this.getStatus() === 0) {
// 判断是否是手动选择过定位 // 判断是否是手动选择过定位
if (window.localStorage.getItem('province')) { if (window.localStorage.getItem('province')) {
...@@ -117,20 +109,21 @@ ...@@ -117,20 +109,21 @@
vm.city = res.address.city vm.city = res.address.city
vm.province = res.address.province vm.province = res.address.province
} }
vm.guessingQuery() // 猜你喜欢查询
} }
}, {enableHighAccuracy: true}) }, {enableHighAccuracy: true})
}, },
goFunctionHome(data) { goFunctionHome (data) {
this.$router.push({ this.$router.push({
name: data.functionState, name: data.functionState,
}) })
}, },
goModuleFunction(data) { goModuleFunction (data) {
this.$router.push({ this.$router.push({
name: data.moduleState, name: data.moduleState,
}) })
}, },
location() { location () {
this.$router.push({ this.$router.push({
name: 'Location', name: 'Location',
params: { params: {
...@@ -140,7 +133,7 @@ ...@@ -140,7 +133,7 @@
}) })
}, },
// 用户信息查询 // 用户信息查询
userQuery() { userQuery () {
let vm = this let vm = this
let url = $config.basePath + 'user_query' let url = $config.basePath + 'user_query'
let param = { let param = {
...@@ -153,13 +146,42 @@ ...@@ -153,13 +146,42 @@
vm.user_bp_status = res.info.user_bp_status vm.user_bp_status = res.info.user_bp_status
vm.user_bp_class = res.info.user_bp_class vm.user_bp_class = res.info.user_bp_class
vm.bp_id = res.info.user_bp_id vm.bp_id = res.info.user_bp_id
} else {
hlsPopup.showLongCenter(res.message)
}
})
},
// 猜你喜欢
guessingQuery () {
let vm = this
let url = $config.basePath + 'guess_you_like_query'
let param = {
'user_phone': window.localStorage.getItem('user_phone'),
'city': vm.city,
}
vm.$post(url, param).then(function (res) {
if (res.result === 'S') {
vm.guessingList = res.lists
} else {
hlsPopup.showLongCenter(res.message)
} }
}) })
}, },
// 进入产品明细
goProductDetail(list){
let vm = this
this.$router.push({
name: 'ProDetailed',
params: {
product_id: list.product_id,
bp_id: vm.bp_id
},
})
},
}, },
} }
</script> </script>
<style lang='less' scoped> <style lang='less'>
@import "../../styles/vue-1px"; @import "../../styles/vue-1px";
#homePage { #homePage {
...@@ -196,7 +218,7 @@ ...@@ -196,7 +218,7 @@
.functions { .functions {
height: 108px; height: 108px;
width: 96%; width: 96%;
margin: 0 auto; margin: -6px auto 10px;
border-radius: 10px; border-radius: 10px;
background: #fff; background: #fff;
padding-top: 10px; padding-top: 10px;
...@@ -246,6 +268,18 @@ ...@@ -246,6 +268,18 @@
width: 100vw; width: 100vw;
// height: 100%; // height: 100%;
} }
.hls-swipe-indicators{
left: 54%;
bottom: 20px;
.hls-swipe-indicators-item{
width: 10px;
height: 2px;
border-radius: 0;
}
.hls-swipe-indicators-item--active{
background-color: #FFF;
}
}
} }
.center-pic { .center-pic {
...@@ -301,7 +335,17 @@ ...@@ -301,7 +335,17 @@
height: 14px; height: 14px;
} }
} }
.guessing-wrap{
position: relative;
width: 96%;
margin: 0 auto;
.hls-list-item{
border-radius: 10px;
.contents{
padding: 8px 6px 8px 0;
}
}
}
.item-pic { .item-pic {
width: 110px; width: 110px;
height: 110px; height: 110px;
...@@ -313,50 +357,38 @@ ...@@ -313,50 +357,38 @@
} }
.item-content { .item-content {
// width: 90%;
height: 110px;
// border: 1px solid #ccc;
.top { .top {
font-family: PingFangSC-Semibold; font-family: PingFangSC-Semibold;
font-size: 16px; font-size: 16px;
color: #00469C; color: #3B3B3B;
letter-spacing: 0.57px; letter-spacing: 0.54px;
font-weight: 600;
margin-top: 10px; margin-top: 10px;
font-weight: 600;
.hot { }
display: inline-block; .hot {
height: 14px; position: absolute;
line-height: 14px; top: 0;
// width: 32px; right: 0;
border: 1px solid #FF8214; width: 45px;
border-radius: 2px;
font-family: PingFangSC-Semibold;
font-size: 11px;
color: #FF8214;
letter-spacing: 0.46px;
margin-left: 6px;
}
} }
.center { .center {
margin-top: 6px; margin-top: 6px;
font-family: PingFangSC-Semibold; display: flex;
font-size: 13px;
color: rgba(56, 63, 69, 0.60);
letter-spacing: 0.5px;
.firsts { .firsts {
display: inline-block; width: 66px;
width: 44px; font-family: PingFangSC-Regular;
font-size: 14px;
color: rgba(56,63,69,0.60);
letter-spacing: 0.5px;
} }
.seconds { .seconds {
margin-left: 16px; flex: 1;
text-align: left;
font-weight: 600; font-weight: 600;
font-family: PingFangSC-Semibold; font-family: PingFangSC-Semibold;
font-size: 13px; font-size: 14px;
color: #383F45; color: #4B4A4B;
letter-spacing: 0.5px; letter-spacing: 0.5px;
} }
} }
......
...@@ -209,14 +209,10 @@ export default { ...@@ -209,14 +209,10 @@ export default {
line-height: 24px; line-height: 24px;
} }
} }
// .sec {
// position: fixed;
// }
.current-location { .current-location {
height: 34px; height: 34px;
width: 100%; width: 100%;
display: flex; display: flex;
flex-direction: rwo;
align-items: center; align-items: center;
background: rgba(0, 70, 156, 0.1); background: rgba(0, 70, 156, 0.1);
.img-box { .img-box {
...@@ -237,7 +233,7 @@ export default { ...@@ -237,7 +233,7 @@ export default {
// width: 56px; // width: 56px;
font-family: PingFangSC-Semibold; font-family: PingFangSC-Semibold;
font-size: 14px; font-size: 14px;
color: #00469C; color: @headerColor;
letter-spacing: 0; letter-spacing: 0;
margin-left: 6px; margin-left: 6px;
font-weight: 700 font-weight: 700
...@@ -253,7 +249,7 @@ export default { ...@@ -253,7 +249,7 @@ export default {
.relocation { .relocation {
font-family: PingFangSC-Regular; font-family: PingFangSC-Regular;
font-size: 13px; font-size: 13px;
color: #00469C; color: @headerColor;
letter-spacing: 0; letter-spacing: 0;
div { div {
display: flex; display: flex;
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
</h-header> </h-header>
<h-content class="content"> <h-content class="content">
<section v-for="(item,parentIndex) in list" :key="parentIndex" class="msg-wrap"> <section v-for="(item,parentIndex) in list" :key="parentIndex" class="msg-wrap">
<item-option> <item-option ref="itemOption">
<list-item> <list-item>
<item :hasBorder="false" :proportion="[2,2]"> <item :hasBorder="false" :proportion="[2,2]">
<div slot="left-icon" class="left-icon left-icon-box"><img src="@/assets/messageCenter/messageIcon.png"></div> <div slot="left-icon" class="left-icon left-icon-box"><img src="@/assets/messageCenter/messageIcon.png"></div>
...@@ -151,6 +151,7 @@ export default { ...@@ -151,6 +151,7 @@ export default {
if (index === 1) { if (index === 1) {
vm.list.remove(Index) vm.list.remove(Index)
vm.list.sort() vm.list.sort()
vm.$refs.itemOption[0].reset()
} }
}, },
}) })
......
...@@ -35,11 +35,11 @@ ...@@ -35,11 +35,11 @@
<img src="@/assets/myInfo/unSign.png" > <img src="@/assets/myInfo/unSign.png" >
<p>待签约</p> <p>待签约</p>
</div> </div>
<div class="content-wrap" @click="goConfirm"> <!-- <div class="content-wrap" @click="goConfirm">
<span :class="{'content-wrap-class-width':confirmCount>99, 'content-wrap-class':confirmCount<99}">{{ confirmCount > 99 ? '99+' : confirmCount }}</span> <span :class="{'content-wrap-class-width':confirmCount>99, 'content-wrap-class':confirmCount<99}">{{ confirmCount > 99 ? '99+' : confirmCount }}</span>
<img src="@/assets/myInfo/unConfirm.png" > <img src="@/assets/myInfo/unConfirm.png" >
<p>待确认</p> <p>待确认</p>
</div> </div>-->
<div class="content-wrap"> <div class="content-wrap">
<span :class="{'content-wrap-class-width':vedioCount>99, 'content-wrap-class':vedioCount<99}">{{ vedioCount > 99 ? '99+' : vedioCount }}</span> <span :class="{'content-wrap-class-width':vedioCount>99, 'content-wrap-class':vedioCount<99}">{{ vedioCount > 99 ? '99+' : vedioCount }}</span>
<img src="@/assets/myInfo/unFace.png" > <img src="@/assets/myInfo/unFace.png" >
......
...@@ -109,7 +109,7 @@ export default { ...@@ -109,7 +109,7 @@ export default {
}, },
beforeRouteEnter (to, from, next) { beforeRouteEnter (to, from, next) {
if (from.name === 'ProductList' || from.name === 'MyProductList') { if (from.name === 'ProductList' || from.name === 'MyProductList' || from.name === 'HomePage') {
next(vm => { next(vm => {
vm.tabNum = 0 vm.tabNum = 0
vm.product_id = vm.$route.params.product_id vm.product_id = vm.$route.params.product_id
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
--> -->
<template> <template>
<div id="tab" style="height: 100%;width:100%;"> <div id="tabBar" style="height: 100%;width:100%;">
<transition> <transition>
<keep-alive> <keep-alive>
<router-view v-if="$route.meta.keepAlive"/> <router-view v-if="$route.meta.keepAlive"/>
...@@ -22,8 +22,8 @@ ...@@ -22,8 +22,8 @@
<span slot="label">主页</span> <span slot="label">主页</span>
</tabbar-item> </tabbar-item>
<tabbar-item :link="{path:'/tab/message-center'}" :selected="$route.path === '/tab/message-center'"> <tabbar-item :link="{path:'/tab/message-center'}" :selected="$route.path === '/tab/message-center'">
<img slot="icon-active" src="../assets/image/tab/all@2x.png"> <img slot="icon-active" src="../assets/image/tab/message@2x.png">
<img slot="icon" src="../assets/image/tab/n_all@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 :link="{path:'/tab/my-info'}" :selected="$route.path === '/tab/my-info'">
...@@ -37,70 +37,80 @@ ...@@ -37,70 +37,80 @@
</template> </template>
<script> <script>
export default { export default {
components: {}, components: {},
data () { data() {
return { return {
pathList: [], pathList: [],
transitionName: '', transitionName: '',
}
},
watch: { // 监听路由变化
$route (to, from) {
if (this.pathList.includes(to.path)) {
const index = (this.pathList.findIndex(() => {
return from.path
}))
this.pathList.splice(index, 1)
this.$router.isBack = true
} else {
this.pathList.push(to.path)
this.$router.isBack = false
}
if (to.path === '/tab/home-page') {
this.$router.isBack = true
this.pathList = []
} }
let isBack = this.$router.isBack
if (isBack) {
this.transitionName = 'router-slide-right'
} else {
this.transitionName = 'router-slide-left'
}
this.$router.isBack = false
}, },
}, watch: { // 监听路由变化
methods: { $route(to, from) {
tabClick () { if (this.pathList.includes(to.path)) {
// console.log('click'); const index = (this.pathList.findIndex(() => {
return from.path
}))
this.pathList.splice(index, 1)
this.$router.isBack = true
} else {
this.pathList.push(to.path)
this.$router.isBack = false
}
if (to.path === '/tab/home-page') {
this.$router.isBack = true
this.pathList = []
}
let isBack = this.$router.isBack
if (isBack) {
this.transitionName = 'router-slide-right'
} else {
this.transitionName = 'router-slide-left'
}
this.$router.isBack = false
},
}, },
methods: {
tabClick() {
// console.log('click');
},
}, },
} }
</script> </script>
<style lang="less" scoped> <style lang="less">
.weui-tabbar { #tabBar {
background-color: #ffffff;
}
.weui-tab__panel { .weui-tabbar {
padding-bottom: 0px !important; background-color: #ffffff;
} }
.weui-tab { .weui-tab__panel {
position: fixed; padding-bottom: 0px !important;
height: 100%; }
bottom: 0; .weui-tabbar__item.weui-bar__item_on .weui-tabbar__icon, .weui-tabbar__item.weui-bar__item_on .weui-tabbar__icon > i, .weui-tabbar__item.weui-bar__item_on .weui-tabbar__label{
width: 100%; color: @headerColor;
.vux-tabbar { }
.weui-tabbar__item { .weui-tabbar__item .weui-tabbar__label{
p { color: #4A4A4A;
font-size: 24px; }
} .weui-tab {
img { position: fixed;
width: 44px; height: 100%;
height: 44px; bottom: 0;
width: 100%;
.vux-tabbar {
.weui-tabbar__item {
p {
font-size: 24px;
}
img {
width: 44px;
height: 44px;
}
} }
} }
} }
...@@ -108,14 +118,15 @@ export default { ...@@ -108,14 +118,15 @@ export default {
// 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 {
.weui-tabbar { .weui-tabbar {
padding-bottom: 34px; padding-bottom: 34px;
} }
} }
} }
@media (device-width: 414px) and (device-height: 896px){
.platform-ios{ @media (device-width: 414px) and (device-height: 896px) {
.platform-ios {
.weui-tabbar { .weui-tabbar {
padding-bottom: 34px; padding-bottom: 34px;
} }
......
...@@ -1629,9 +1629,9 @@ export default { ...@@ -1629,9 +1629,9 @@ export default {
.put { .put {
width: 175px; width: 175px;
height: 45px; height: 45px;
color: @headerColor; color: #FDB62F;
border-radius: 4px; border-radius: 4px;
border: 1px solid @headerColor; border: 1px solid #FDB62F;
background-color: #fafafa; background-color: #fafafa;
} }
.put-approved { .put-approved {
......
...@@ -245,7 +245,7 @@ ...@@ -245,7 +245,7 @@
</item> </item>
<item> <item>
<div slot="name" class="font-color required">手机号</div> <div slot="name" class="font-color required">手机号</div>
<input slot="content" v-model="legal_personMsg.cell_phone" placeholder="请输入手机号" readonly @blur="phoneCheck(legal_personMsg.cell_phone)"> <input slot="content" v-model="legal_personMsg.cell_phone" placeholder="请输入手机号" @blur="phoneCheck(legal_personMsg.cell_phone)">
</item> </item>
<item> <item>
<div slot="name" class="font-color required">联系地址</div> <div slot="name" class="font-color required">联系地址</div>
...@@ -531,7 +531,7 @@ export default { ...@@ -531,7 +531,7 @@ export default {
legal_personMsg: { legal_personMsg: {
id_card_no: null, id_card_no: null,
// legal_person: '', // legal_person: '',
cell_phone: window.localStorage.getItem('user_phone'), cell_phone: '',
living_address: '', living_address: '',
id_card_date_from: '', // 法定代表人身份证有效期从 id_card_date_from: '', // 法定代表人身份证有效期从
id_card_date_to: '', // 法定代表人身份证有效期到 id_card_date_to: '', // 法定代表人身份证有效期到
...@@ -649,20 +649,24 @@ export default { ...@@ -649,20 +649,24 @@ export default {
}, },
}, },
created () { created () {
this.getBpType() /* this.getBpType()
this.getProvince() this.getProvince()
if (this.$route.params.status === 'APPROVED') { if (this.$route.params.status === 'APPROVED') {
this.isApproved = true this.isApproved = true
} }*/
// this.getBankInfo() // this.getBankInfo()
}, },
beforeRouteEnter (to, from, next) { beforeRouteEnter (to, from, next) {
if (from.fullPath === '/tab/my-info' || from.fullPath === '/margin-first-pay') { if (from.fullPath === '/tab/my-info') { /*|| from.fullPath === '/margin-first-pay'*/
next(vm => { next(vm => {
vm.from = true vm.from = true
vm.getbaseInfo() vm.getbaseInfo()
vm.getBankInfo() vm.getBankInfo()
// vm.loadItemList()// 附件查询 vm.getBpType()
vm.getProvince()
if (vm.$route.params.status === 'APPROVED') {
vm.isApproved = true
}
}) })
} }
next() next()
...@@ -841,18 +845,17 @@ export default { ...@@ -841,18 +845,17 @@ export default {
}*/ }*/
this.baseInfo.auth_flag = 'Y' this.baseInfo.auth_flag = 'Y'
this.lastInfo = { ...this.baseInfo, ...this.authMsg } this.lastInfo = { ...this.baseInfo, ...this.legal_personMsg, ...this.authMsg }
this.saveInfo = { this.saveInfo = {
...this.lastInfo, ...this.lastInfo,
...this.legal_personMsg,
...this.invoiceInfo, ...this.invoiceInfo,
} }
} }
else{ // 未授权 else{ // 未授权
this.lastInfo = { ...this.baseInfo, ...this.authMsg } this.lastInfo = { ...this.baseInfo, ...this.legal_personMsg }
this.saveInfo = { this.saveInfo = {
...this.lastInfo, ...this.lastInfo,
...this.legal_personMsg, ...this.authMsg,
...this.invoiceInfo, ...this.invoiceInfo,
} }
} }
...@@ -1049,8 +1052,8 @@ export default { ...@@ -1049,8 +1052,8 @@ export default {
master: vm.saveInfo, master: vm.saveInfo,
} }
vm.hlsHttp.post(url, param).then(function (res) { vm.hlsHttp.post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
if (res.result === 'S') { if (res.result === 'S') {
vm.hlsPopup.hideLoading()
vm.hlsPopup.showSuccess('保存成功') vm.hlsPopup.showSuccess('保存成功')
// window.localStorage.setItem('user_id', res.bp_id) // window.localStorage.setItem('user_id', res.bp_id)
// window.sessionStorage.setItem('user_id', res.bp_id) // window.sessionStorage.setItem('user_id', res.bp_id)
...@@ -1058,7 +1061,7 @@ export default { ...@@ -1058,7 +1061,7 @@ export default {
vm.getBankInfo() vm.getBankInfo()
// 查询资料清单 // 查询资料清单
vm.loadItemList() vm.loadItemList()
}else { } else {
vm.hlsPopup.showLongCenter(res.message) vm.hlsPopup.showLongCenter(res.message)
} }
}) })
...@@ -1938,7 +1941,7 @@ export default { ...@@ -1938,7 +1941,7 @@ export default {
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
background: rgba(0, 70, 156, 0.03); background: rgba(0, 70, 156, 0.03);
margin-bottom: 10px;
.authorize-select { .authorize-select {
// width: 48px; // width: 48px;
height: 20px; height: 20px;
...@@ -2110,9 +2113,9 @@ export default { ...@@ -2110,9 +2113,9 @@ export default {
.put { .put {
width: 175px; width: 175px;
height: 45px; height: 45px;
color: @headerColor; color: #FDB62F;
border-radius: 4px; border-radius: 4px;
border: 1px solid @headerColor; border: 1px solid #FDB62F;
background-color: #fafafa; background-color: #fafafa;
} }
.put-approved { .put-approved {
......
...@@ -14,7 +14,6 @@ import Regiester from '@/pages/regiester' ...@@ -14,7 +14,6 @@ import Regiester from '@/pages/regiester'
import Regiester2 from '@/pages/regiester2' import Regiester2 from '@/pages/regiester2'
import PwdForgot from '@/pages/pwd-forgotten' import PwdForgot from '@/pages/pwd-forgotten'
import FingerLogin from '@/pages/finger-login' import FingerLogin from '@/pages/finger-login'
import Home from '@/pages/home'
import Tab from '@/pages/tab' import Tab from '@/pages/tab'
import HomePage from '@/pages/home/home-page' import HomePage from '@/pages/home/home-page'
// 定位 // 定位
...@@ -177,7 +176,7 @@ export default new Router({ ...@@ -177,7 +176,7 @@ export default new Router({
// 用户绑定 // 用户绑定
{path: '/user-bind', component: UserBind, name: 'UserBind', meta: {keepAlive: false}}, {path: '/user-bind', component: UserBind, name: 'UserBind', meta: {keepAlive: false}},
{path: '/nature-person', component: NaturePerson, name: 'NaturePerson', meta: {keepAlive: false}}, {path: '/nature-person', component: NaturePerson, name: 'NaturePerson', meta: {keepAlive: false}},
{path: '/enterprise', component: Enterprise, name: 'Enterprise', meta: {keepAlive: false}}, {path: '/enterprise', component: Enterprise, name: 'Enterprise', meta: {keepAlive: true}},
// 进件审批 // 进件审批
{path: '/base', component: Base, name: 'Base', meta: {keepAlive: false}}, {path: '/base', component: Base, name: 'Base', meta: {keepAlive: false}},
{path: '/refund', component: Refund, name: 'Refund', meta: {keepAlive: false}}, {path: '/refund', component: Refund, name: 'Refund', meta: {keepAlive: false}},
......
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