Commit 8ce583e6 by wangjian

1

parent dd239ec7
<template> <template>
<view class="layout"> <view class="layout">
<view class="header-cover" ref="headerCover" :style="'opacity:' + opacity">
<view class="header-cover-top">
<!-- <text v-if="isLogin" class="header-cover-name">你好,{{ name }}</text> -->
<!-- <text v-else class="header-cover-login" @click="goLogin()">请登录</text> -->
<text class="header-cover-integral">{{ integralCount }}</text>
<!-- <view class="integral-detail" @click="goIntegralDetail">积分明细 ></view> -->
</view>
</view>
<view class="header"> <view class="header">
<view class="header-top"> <view class="header-top">
<text v-if="isLogin" class="header-name">你好,{{ name }}</text>
<text v-else class="header-login" @click="goLogin()">请登录</text>
<view class="integral-detail" @click="goIntegralDetail">积分明细 ></view>
</view> </view>
<view class="header-center"> <view class="header-center">
<view class="header-integral">{{ integralCount }}</view> <view class="header-integral">{{ integralCount }}</view>
<view class="header-integral-tip">当前积分</view> <view class="header-integral-tip">当前积分</view>
</view> </view>
</view> </view>
<text v-if="isLogin" class="header-name">你好,{{ name }}</text> <view class="list">
<text v-else class="header-login" @click="goLogin()">请登录</text>
<view class="integral-detail" @click="goIntegralDetail">积分明细 ></view>
<view class="list" ref="list">
<view class="item" v-for="(item, index) in brandList" :key="index" @click="goToGoodDetail(item.brandNo, item.name)"> <view class="item" v-for="(item, index) in brandList" :key="index" @click="goToGoodDetail(item.brandNo, item.name)">
<view class="item-layout"> <view class="item-layout">
<image class="icon" mode="aspectFill" :src="item.imgPath"></image> <image class="icon" mode="aspectFill" :src="item.imgPath"></image>
...@@ -46,8 +36,7 @@ export default { ...@@ -46,8 +36,7 @@ export default {
brandList: [], brandList: [],
page: 1, page: 1,
pageSize: 20, pageSize: 20,
isLogin: false, isLogin: false
opacity: 0
}; };
}, },
created() { created() {
...@@ -57,16 +46,6 @@ export default { ...@@ -57,16 +46,6 @@ export default {
console.log('onShow'); console.log('onShow');
this.getUserInfo(); this.getUserInfo();
}, },
onPageScroll(e) {
console.log(e)
this.opacity = e.scrollTop / 99
// const animation = uni.requireNativePlugin('animation')
// var top = this.$refs.headerCover
// animation.transition(top, {
// opacity: e.scrollTop / 99
// }, () => {})
},
methods: { methods: {
goLogin() { goLogin() {
this.$router.push('Login'); this.$router.push('Login');
...@@ -95,36 +74,7 @@ export default { ...@@ -95,36 +74,7 @@ export default {
.get('/goods/brand', { page: this.page, pageSize: this.pageSize }) .get('/goods/brand', { page: this.page, pageSize: this.pageSize })
.then(res => { .then(res => {
if (res.data.list.length > 0) { if (res.data.list.length > 0) {
this.brandList = this.brandList this.brandList = this.brandList.concat(res.data.list);
.concat(res.data.list)
.concat(res.data.list)
.concat(res.data.list)
.concat(res.data.list)
.concat(res.data.list)
.concat(res.data.list)
.concat(res.data.list)
.concat(res.data.list)
.concat(res.data.list)
.concat(res.data.list)
.concat(res.data.list)
.concat(res.data.list)
.concat(res.data.list)
.concat(res.data.list)
.concat(res.data.list)
.concat(res.data.list)
.concat(res.data.list)
.concat(res.data.list)
.concat(res.data.list)
.concat(res.data.list)
.concat(res.data.list)
.concat(res.data.list)
.concat(res.data.list)
.concat(res.data.list)
.concat(res.data.list)
.concat(res.data.list)
.concat(res.data.list)
.concat(res.data.list)
.concat(res.data.list);
this.page += 1; this.page += 1;
} }
this.loadingType = res.data.list.length < this.pageSize ? 'noMore' : 'more'; this.loadingType = res.data.list.length < this.pageSize ? 'noMore' : 'more';
...@@ -157,55 +107,11 @@ export default { ...@@ -157,55 +107,11 @@ export default {
width: 100%; width: 100%;
height: 100%; height: 100%;
display: flex; display: flex;
position: relative;
flex-direction: column; flex-direction: column;
.header-cover {
height: 100rpx;
width: 100%;
display: flex;
flex-direction: column;
// background: red;
background-image: url(../../static/home-header-bg.png);
background-size: cover;
position: fixed;
top: 0;
z-index: 999;
.header-cover-top {
display: flex;
flex-direction: row;
justify-content: center;
margin-top: 30rpx;
margin-left: 30rpx;
// .header-cover-name {
// font-size: 24rpx;
// color: #ffffff;
// }
// .header-cover-login {
// font-size: 24rpx;
// color: #ffffff;
// text-decoration: underline;
// }
// .integral-detail {
// background-image: url(../../static/integral-detail-bg.png);
// width: 174rpx;
// height: 58rpx;
// font-size: 26rpx;
// color: #ffffff;
// line-height: 58rpx;
// text-align: center;
// background-size: 100% 100%;
// }
.header-cover-integral {
font-size: 34rpx;
font-weight: bolder;
color: #ffffff;
text-align: center;
}
}
}
.header { .header {
height: 350rpx; height: 350rpx;
width: 100%; width: 100%;
position: sticky;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
background-image: url(../../static/home-header-bg.png); background-image: url(../../static/home-header-bg.png);
...@@ -216,7 +122,25 @@ export default { ...@@ -216,7 +122,25 @@ export default {
justify-content: space-between; justify-content: space-between;
margin-top: 30rpx; margin-top: 30rpx;
margin-left: 30rpx; margin-left: 30rpx;
.header-name {
font-size: 24rpx;
color: #ffffff;
}
.header-login {
font-size: 24rpx;
color: #ffffff;
text-decoration: underline;
}
.integral-detail {
background-image: url(../../static/integral-detail-bg.png);
width: 174rpx;
height: 58rpx;
font-size: 26rpx;
color: #ffffff;
line-height: 58rpx;
text-align: center;
background-size: 100% 100%;
}
} }
.header-center { .header-center {
display: flex; display: flex;
...@@ -234,37 +158,6 @@ export default { ...@@ -234,37 +158,6 @@ export default {
} }
} }
} }
.header-name {
font-size: 24rpx;
color: #ffffff;
position: fixed;
top: 30rpx;
left: 30rpx;
z-index: 999;
}
.header-login {
font-size: 24rpx;
color: #ffffff;
text-decoration: underline;
position: fixed;
top: 30rpx;
left: 30rpx;
z-index: 999;
}
.integral-detail {
background-image: url(../../static/integral-detail-bg.png);
width: 174rpx;
height: 58rpx;
font-size: 26rpx;
color: #ffffff;
line-height: 58rpx;
text-align: center;
background-size: 100% 100%;
position: fixed;
top: 20rpx;
z-index: 999;
right: 0;
}
.list { .list {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
......
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