zhoux 1 год назад
Родитель
Сommit
5bbc749c15
1 измененных файлов с 20 добавлено и 16 удалено
  1. 20 16
      pages/mine/mine.wxml

+ 20 - 16
pages/mine/mine.wxml

@@ -17,9 +17,9 @@
     <view style="margin-top: 40rpx;display: flex;">
       <!-- 头像 -->
       <!-- <open-data type="userAvatarUrl" class='wx-avatar'></open-data> -->
-      <button  class='wx-avatar' style="margin: 0;padding: 0;" open-type="chooseAvatar" bind:chooseavatar="onChooseAvatar">
-      <image class='wx-avatar' style="border:0" src="{{avatarUrl}}"></image>
-    </button>
+      <button class='wx-avatar' style="margin: 0;padding: 0;" open-type="chooseAvatar" bind:chooseavatar="onChooseAvatar">
+        <image class='wx-avatar' style="border:0" src="{{avatarUrl}}"></image>
+      </button>
 
       <view style="margin-left: 30rpx;width: calc(100% - 200rpx);">
         <!-- 昵称 -->
@@ -27,8 +27,8 @@
           <view style="width: 85%;">
             你好 {{staffName?staffName:''}}
           </view>
-          <view style="width: 15%;margin-top: -10rpx;"  catchtap="handleWxService">
-            <view style="display: flex;justify-content: center;" >
+          <view style="width: 15%;margin-top: -10rpx;" catchtap="handleWxService">
+            <view style="display: flex;justify-content: center;">
               <image src="{{imageUrl + '/wx.png'}}" style="width: 45rpx;height:45rpx;" />
             </view>
             <view style="font-weight: 200;font-size: 9px;display: flex;justify-content: center;">官方客服</view>
@@ -55,22 +55,26 @@
           <view style="display: flex;flex-direction: row;">
             <!--授权数量-->
             <view wx:if="{{empowerInfo}}" style="font-weight: 300;">{{empowerInfo}}</view>
-            <view wx:if="{{!contains2099}}">{{$t['cpEndDate'] + ':' + cpEndDate}}
-            </view>
-            <view wx:if="{{dueFlag}}" style="color:#e00808;margin-left: 20rpx;">{{dueFlag?$t['dueText']:''}}</view>
+
           </view>
+          
           <!--到期日期前15天显示续费-->
           <dk-tag wx:if="{{dueButtonFlag}}" padding="0 20rpx" height="30rpx" color="#FF7B1A" textColor="#FFFFFF" radius="5rpx" roundFlag="{{true}}" marginRight="12rpx" value="续费" catchtap="handleRecharge"></dk-tag>
           <!--放到下方-->
           <!-- <dk-tag wx:else="{{!dueButtonFlag}}" padding="0 20rpx" height="30rpx" color="#3E69F6" textColor="#FFFFFF" radius="5rpx" roundFlag="{{true}}" marginRight="12rpx" value="增加授权" catchtap="toAddRole"></dk-tag> -->
         </view>
+        <view style="display: flex ;font-weight: 400; font-size: 9px;">
+            <view wx:if="{{!contains2099}}">{{$t['cpEndDate'] + ':' + cpEndDate}}
+            </view>
+            <view wx:if="{{dueFlag}}" style="color:#e00808;margin-left: 20rpx;">{{dueFlag?$t['dueText']:''}}</view>
+          </view>
       </view>
     </view>
   </view>
 </view>
 
 <!--待办工作-->
-<view class="content" style="padding-top: {{ (statusHeight + 210) + 'rpx'}};">
+<view class="content" style="padding-top: {{ (statusHeight + ((contains2099 && !dueFlag)?190: 240)) + 'rpx'}};">
   <!--待办工作-->
   <view class="todo-view" wx:if="{{waitMenuFlag}}">
     <view class="todo-view-title">待办工作</view>
@@ -168,13 +172,13 @@
 
 
 <!-- 退出 -->
-<view style="display: flex; justify-content: space-between; margin: 100rpx 30rpx;">  
-  <view style="flex: 1; margin: 1vw;">  
-    <van-button custom-style="height:88rpx;border-radius:15rpx;" style="width: 100%;" color="#3E69F6" size="large" bind:tap="LogInAgain">重新登录</van-button>  
-  </view>  
-  <view style="flex: 1;  margin: 1vw;">  
-    <van-button custom-style="height:88rpx;border-radius:15rpx;" style="width: 100%;" color="#3E69F6" size="large" bind:tap="logout">退出</van-button>  
-  </view>  
+<view style="display: flex; justify-content: space-between; margin: 100rpx 30rpx;">
+  <view style="flex: 1; margin: 1vw;">
+    <van-button custom-style="height:88rpx;border-radius:15rpx;" style="width: 100%;" color="#3E69F6" size="large" bind:tap="LogInAgain">重新登录</van-button>
+  </view>
+  <view style="flex: 1;  margin: 1vw;">
+    <van-button custom-style="height:88rpx;border-radius:15rpx;" style="width: 100%;" color="#3E69F6" size="large" bind:tap="logout">退出</van-button>
+  </view>
 </view>
 
 <van-dialog id="van-dialog" />