Skip to content

F
FuLiMini
Commit f04c0d5d by wangjian
Options

Merge branch 'dev' of https://gitlab.jntmedia.cn/wangjian/FuLiMini into dev

* 'dev' of https://gitlab.jntmedia.cn/wangjian/FuLiMini: 解决bug 动画修改
parents b587434e 5e8cf76c
Showing with 106 additions and 27 deletions
pages/home/home.vue
<template>
<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-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 class="header-center">
<view class="header-integral">{{ integralCount }}</view>
<view class="header-integral-tip">当前积分</view>
</view>
</view>
<view class="list">
<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 class="list" ref="list">
<view class="item" v-for="(item, index) in brandList" :key="index" @click="goToGoodDetail(item.brandNo, item.name)">
<view class="item-layout">
<image class="icon" mode="aspectFill" :src="item.imgPath"></image>
......@@ -22,7 +32,7 @@
</view>
</view>
</view>
<!-- <uni-load-more v-if="brandList.length > 0" :status="loadingType"></uni-load-more> -->
<uni-load-more v-if="brandList.length > 0" :status="loadingType"></uni-load-more>
</view>
</template>
......@@ -36,7 +46,8 @@ export default {
brandList: [],
page: 1,
pageSize: 20,
isLogin: false
isLogin: false,
opacity: 0
};
},
created() {
......@@ -46,6 +57,16 @@ export default {
console.log('onShow');
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: {
goLogin() {
this.$router.push('Login');
......@@ -108,11 +129,56 @@ export default {
width: 100%;
height: 100%;
display: flex;
position: relative;
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;
position: sticky;
// .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 {
height: 350rpx;
width: 100%;
position: sticky;
display: flex;
flex-direction: column;
background-image: url(../../static/home-header-bg.png);
......@@ -123,25 +189,7 @@ export default {
justify-content: space-between;
margin-top: 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 {
display: flex;
......@@ -159,6 +207,37 @@ 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 {
display: flex;
flex-direction: row;
......
pagesA/integralDetail/integralDetail.vue
......@@ -21,7 +21,7 @@
<text class="item-name">{{ item.title }}</text>
<text class="item-count">{{ item.number <= 0 ? '' : '*' + item.number }}</text>
</view>
<text :class="item.integral > 0 ? 'item-integral' : 'item-integral-income'">{{ item.integral }}</text>
<text :class="item.integral > 0 ? 'item-integral' : 'item-integral-income'">{{item.integral>0?'+':''}}{{ item.integral }}</text>
</view>
<view class="item-right-bottom">
<text class="item-time">{{ item.transactionTime }}</text>
......
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