|
@@ -148,11 +148,13 @@
|
|
|
</view>
|
|
|
|
|
|
<!-- 我的 -->
|
|
|
- <view wx:elif="{{indexPage==2}}" class="me" style="height: calc(100vh - 105rpx - {{safeBottomHeight}}rpx - 22rpx - {{navBarHeight}}px);">
|
|
|
- <view class="head-logo">
|
|
|
+ <view wx:elif="{{indexPage==2}}" class="me" style="height: calc(100vh - 105rpx - {{safeBottomHeight}}rpx - 22rpx - {{navBarHeight}}px); display: flex; flex-direction: column;">
|
|
|
+
|
|
|
+ <view class="head-logo" bind:tap="{{isLogin?'':'onTapLogin'}}">
|
|
|
<image mode="scaleToFill" src="{{userPic}}"></image>
|
|
|
<text class="nick_name" wx:if="{{nickName}}">{{nickName}}</text>
|
|
|
</view>
|
|
|
+
|
|
|
<view class="br"></view>
|
|
|
<view class="list">
|
|
|
<view class="li">
|
|
@@ -160,8 +162,10 @@
|
|
|
<image mode="widthFix" style="width: 40rpx; height: 40rpx;" src="./../../../img/o.png"></image>
|
|
|
</view>
|
|
|
<view class="button">
|
|
|
- <button open-type="feedback">建议与反馈</button>
|
|
|
- <image class="j" src="./../../../img/b.png"></image>
|
|
|
+ <button class="between_text" open-type="feedback">建议与反馈</button>
|
|
|
+ <button class="between_image" open-type="feedback">
|
|
|
+ <image class="j" src="./../../../img/b.png"></image>
|
|
|
+ </button>
|
|
|
</view>
|
|
|
</view>
|
|
|
<view class="li">
|
|
@@ -174,14 +178,15 @@
|
|
|
</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
- <view wx:if="{{isLogin}}" class="login">
|
|
|
- <view bindtap="onTapLogin" class="{{!isLogin ? 'action' : ''}}">
|
|
|
- {{isLogin ? '退出登录' : "登录"}}
|
|
|
+ <view wx:if="{{isLogin}}" style="flex: 1;display: flex;">
|
|
|
+ <view class="login">
|
|
|
+ <view bindtap="onTapLogin" class="{{!isLogin ? 'action' : ''}}">
|
|
|
+ {{isLogin ? '退出登录' : "登录"}}
|
|
|
+ </view>
|
|
|
</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
-
|
|
|
</view>
|
|
|
|
|
|
<view style="height: calc(105rpx + {{safeBottomHeight}}rpx); flex-direction: column; display: flex;background-color: white;">
|