liuyao 1 rok pred
rodič
commit
ffe5f428b4
2 zmenil súbory, kde vykonal 21 pridanie a 9 odobranie
  1. 12 8
      pages/mine/mine.wxml
  2. 9 1
      pages/mine/mine.wxss

+ 12 - 8
pages/mine/mine.wxml

@@ -7,13 +7,17 @@
   <image src="{{imageUrl + 'home-back.png'}}" class="head-image"></image>
   <!-- 公司 -->
   <view class="company" style="top:{{statusHeight + 'rpx'}}">
-    <view style="display: flex;align-items: center;" catchtap="changeCp">
-      <view class="company-change-class">
-        {{companyName?companyName:''}}
+    <view style="display: flex;align-items: center;align-content: center;">
+      <view style="display: flex;align-items: center;line-height: 22px;" catchtap="changeCp">
+        <view class="company-change-class">
+          {{companyName?companyName:''}}
+        </view>
+        <image src="/static/image/triangle.png" style="width: 28rpx;height:28rpx;"></image>
+      </view>
+      <view class="cp-setting" catch:tap="toSetting">
+        <van-icon name="setting-o" />
       </view>
-      <image src="/static/image/triangle.png" style="width: 28rpx;height:28rpx;"></image>
     </view>
-
     <view style="margin-top: 40rpx;display: flex;">
       <!-- 头像 -->
       <!-- <open-data type="userAvatarUrl" class='wx-avatar'></open-data> -->
@@ -131,9 +135,9 @@
       </view>
     </view>
     <!--商户设置-->
-    <view class="todo-view" style="margin-bottom: 4rpx;">
+    <!-- <view class="todo-view" style="margin-bottom: 4rpx;">
       <view class="todo-view-title" catch:tap="toSetting">{{$t['settingCommany']}}</view>
-    </view>
+    </view> -->
     <!--操作手册-->
     <!-- <view class="todo-view" style="margin-bottom: 4rpx;">
       <view style="display: flex;justify-content: space-between;">
@@ -190,7 +194,7 @@
 
 
 <!-- 退出 -->
-<view style="display: flex; justify-content: space-between; margin: 100rpx 30rpx;">
+<view style="display: flex; justify-content: space-between; margin: 50rpx 40rpx;">
   <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>

+ 9 - 1
pages/mine/mine.wxss

@@ -431,7 +431,8 @@ page {
 .company-change-class {
 	margin-right: 10rpx;
 	font-size: 16px;
-	font-weight: 500;
+  font-weight: 500;
+  text-align: center;
 }
 
 .head-image {
@@ -445,4 +446,11 @@ page {
 	margin-right: 40rpx;
 	width: calc(100% - 80rpx);
 	background: #FFFFFF;
+}
+
+.cp-setting{
+  margin-left: 30rpx;
+  display: flex;
+  align-items: center;
+  padding: 6rpx;
 }