Commit cbe43c25 by wjw

ww--我的页面修改

parent 4034dfe5
...@@ -241,7 +241,6 @@ App({ ...@@ -241,7 +241,6 @@ App({
break break
} }
funcUserInfo.userType = 0
wx.setStorageSync('userInfo', funcUserInfo) wx.setStorageSync('userInfo', funcUserInfo)
// 如果用户身份有更新,则自动跳转到首页 // 如果用户身份有更新,则自动跳转到首页
......
...@@ -20,7 +20,6 @@ Page({ ...@@ -20,7 +20,6 @@ Page({
scroll: '400rpx', scroll: '400rpx',
}, },
navigationScroll: 0, navigationScroll: 0,
isCheckPermission: false, isCheckPermission: false,
imageBase: App.globalData.appImageBase, imageBase: App.globalData.appImageBase,
imageResourcesBase: App.globalData.appResourcesBase, imageResourcesBase: App.globalData.appResourcesBase,
...@@ -331,11 +330,16 @@ Page({ ...@@ -331,11 +330,16 @@ Page({
funcStatusText = '审核失败' funcStatusText = '审核失败'
break break
} }
let navigationColor = '#ffffff'
if (funcUserInfo.userType === 0) {
navigationColor = '#000000'
}
this.setData({ this.setData({
type: funcUserInfo.userType, type: funcUserInfo.userType,
statusText: funcStatusText, statusText: funcStatusText,
isRegister: true, isRegister: true,
userInfo: funcUserInfo userInfo: funcUserInfo,
'navigationStyle.normal.color': navigationColor
}) })
App.login({ App.login({
timeout: 0, timeout: 0,
...@@ -579,7 +583,7 @@ Page({ ...@@ -579,7 +583,7 @@ Page({
}, },
onPageScroll: function (event) { onPageScroll: function (event) {
console.log(this.scrollLock) // console.log(this.scrollLock)
// 优化滚动事件触发频率 // 优化滚动事件触发频率
if (this.scrollLock) return if (this.scrollLock) return
...@@ -589,7 +593,7 @@ Page({ ...@@ -589,7 +593,7 @@ Page({
navigationScroll: event.scrollTop navigationScroll: event.scrollTop
}) })
console.log(this.data.navigationScroll) // console.log(this.data.navigationScroll)
// 恢复滚动事件 // 恢复滚动事件
this.scrollTimer = setTimeout(() => { this.scrollTimer = setTimeout(() => {
......
<navigation class="navigation" titleText="我的" scrollStyle="{{navigationStyle}}" scrollHeight="{{navigationScroll}}"></navigation> <navigation class="navigation" titleText="我的" color="{{navigationColor}}" scrollStyle="{{navigationStyle}}" scrollHeight="{{navigationScroll}}"></navigation>
<view class="container"> <view class="container con-s">
<view class="mine" wx:if="{{type !== 1}}"> <view class="mine" style="height: 416rpx" wx:if="{{type !== 1}}">
<image class="background-image" src="./image/mine.png"></image> <image class="background-image" src="{{imageResourcesBase + 'mine/home/visitor-bg.png'}}"></image>
<view class="row align-c"> <view class="row align-c">
<view class="mine-avatar" bindtap="checkRegister"> <view class="mine-avatar" bindtap="checkRegister">
<image src="{{userInfo.avatar ? userInfo.avatar : './image/avatar.png'}}"></image> <image src="{{userInfo.avatar ? userInfo.avatar : './image/avatar.png'}}"></image>
...@@ -33,10 +33,9 @@ ...@@ -33,10 +33,9 @@
</view> </view>
</view> </view>
<view class="mine" style="height:512rpx" wx:if="{{type == 1}}"> <view class="mine" style="height:416rpx" wx:if="{{type == 1}}">
<image class="background-image" style="height:512rpx;" <image class="background-image" src="{{imageResourcesBase + 'mine/home/ownerBg.png'}}"></image>
src="http://upload.miaomiao-bao.com/8f046202008201043321555.jpg"></image> <view class="row align-c">
<view class="row align-c approve">
<view class="mine-avatar mine-avatar-special"> <view class="mine-avatar mine-avatar-special">
<image src="{{userInfo.avatar}}"></image> <image src="{{userInfo.avatar}}"></image>
</view> </view>
...@@ -60,6 +59,7 @@ ...@@ -60,6 +59,7 @@
</view> </view>
</view> </view>
<view class="col align-c">
<view class="coupon row align-c" bindtap="goCouponInput" wx:if="{{isCheckPermission}}"> <view class="coupon row align-c" bindtap="goCouponInput" wx:if="{{isCheckPermission}}">
<view class="cpopon-info col"> <view class="cpopon-info col">
<text>券码核销</text> <text>券码核销</text>
...@@ -70,7 +70,6 @@ ...@@ -70,7 +70,6 @@
</view> </view>
</view> </view>
<view class="status row con-b align-c" wx:if="{{type !== 1}}"> <view class="status row con-b align-c" wx:if="{{type !== 1}}">
<view class="status-symbol col"> <view class="status-symbol col">
<text>业主认证</text> <text>业主认证</text>
...@@ -331,6 +330,7 @@ ...@@ -331,6 +330,7 @@
<image src="{{imageBase + 'icon/arrow-r-2.png'}}"></image> <image src="{{imageBase + 'icon/arrow-r-2.png'}}"></image>
</view> </view>
</view> </view>
</view>
</view> </view>
<!-- 业主弹出层 --> <!-- 业主弹出层 -->
......
.container { .container {
background: linear-gradient(180deg, #fff 10%, #F3F4F6 20%);
min-height: 100vh; min-height: 100vh;
/* background: #F3F4F6 */ background: #F3F4F6
} }
.navigation { .navigation {
...@@ -324,10 +323,6 @@ ...@@ -324,10 +323,6 @@
height: 30rpx; height: 30rpx;
} }
.approve {
padding-top: 100rpx;
}
.approve-icon { .approve-icon {
width: 168rpx; width: 168rpx;
height: 103rpx; height: 103rpx;
......
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 sign in to comment