Merge branch 'ch/bug7830' of eta_front/eta_mobile_front into master

src/layouts/Index.vue

@@ -56,26 +56,26 @@ getCompanyName()
             </div>
             <van-popover v-model:show="showUserInfo" placement="bottom-end">
                 <div class="userinfo-box_pad" v-if="userInfo">
-                    <div class="info-item">
-                        <span>姓名：</span>
-                        <span>{{userInfo.RealName}}</span>
+                    <div class="item">
+                        <div class="label">姓名：</div>
+                        <div class="content">{{ userInfo.RealName }}</div>
                     </div>
-                    <div class="info-item">
-                        <span>ID：</span>
-                        <span>{{userInfo.AdminName}}</span>
+                    <div class="item">
+                        <div class="label">ID：</div>
+                        <div class="content">{{ userInfo.AdminName }}</div>
                     </div>
-                    <div class="info-item">
-                        <span>公司名称：</span>
-                        <span>{{ CompanyName }}</span>
+                    <div class="item">
+                        <div class="label">{{ $t('my.company_name') }}：</div>
+                        <div class="content">{{ CompanyName }}</div>
                     </div>
-                    <div class="info-item">
-                        <span>所属部门：</span>
-                        <span>{{userInfo.GroupName || userInfo.DepartmentName}}</span>
-                    </div>
-                    <div class="info-item">
-                        <span>角色：</span>
-                        <span>{{userInfo.RoleName}}</span>
+                    <div class="item">
+                        <div class="label">{{ $t('my.department') }}：</div>
+                        <div class="content">{{ userInfo.DepartmentName + (userInfo.GroupName ? '/' : '') + userInfo.GroupName}}</div>
                     </div>
+                    <div class="item">
+                        <div class="label">{{ $t('my.role') }}：</div>
+                        <div class="content">{{userInfo.RoleName}}</div>
+                    </div> 
                     <van-button class="login_out_btn" block type="primary" round @click="handleLoginOut">退出登录</van-button>
                 </div>
                 <template #reference>
@@ -101,14 +101,19 @@ getCompanyName()
 @media screen and (min-width:650px){
     .userinfo-box_pad{
         padding: 20px;
-        .info-item{
+        .item{
+            max-width: 400px;
+            line-height: 20px;
             padding: 5px 0;
-        }
-        .login_out_btn{
-            width: 50%;
-            margin-top: 20px;
-            margin-left: auto;
-            margin-right: auto;
+            color: $font-grey;
+            .label {
+                font-size: 12px;
+                color: $font-grey_999;
+            }
+            .content {
+                font-size: 14px;
+                color: #333333;
+            }
         }
     }
 }

src/views/tabbar/Home.vue

@@ -525,7 +525,7 @@ getSetTitle()
         }
         .list{
             gap: 20px;
-            justify-content: center;
+            // justify-content: center;
             .item-box{
                 width: 260px;
                 min-height: 161px;