Merge remote-tracking branch 'origin/master'

罗广辉

2026-01-09 d07c8e0b866dfadd65f12cbe3c9c74c800b0619a

 uniapps/work-app/src/pages/user/index.vue

@@ -1,45 +1,48 @@
<!-- 我的 -->
<template>
  <view class="page-wrap">
    <view class="userBox">
      <view class="flex items-center pb-30rpx pl-30rpx pr-20rpx">
        <view class="mr-20rpx">
          <u-avatar :src="user.avatar || defaultAvatar" size="70" />
        </view>
        <view class="flex-1">
          <view class="userName">{{user.nickName }}</view>
          <view class="departs">
            <image
              src="@/static/images/user/department.svg"
              alt=""
            />
            <span>{{ user?.sysDept?.deptName }}</span>
          </view>
        </view>

      </view>
      <view class="personalInformation">
        <div class="message">
          <div class="messagebox">个人资料</div>
          <div class="editInfo" @click="handelEdit(1)">
            点击编辑
            <image :src="rightImage" alt="" />
          </div>
        </div>
        <div class="passwordBox">
          <div class="messagebox">修改密码</div>
          <div class="editInfo" @click="handelEdit(2)">
            点击编辑
            <image :src="rightImage" alt="" />
          </div>
        </div>
      </view>

      <view class="goOutBtn">
        <div class="goOutStyle" @click="logOut">退出登录</div>
      </view>

    </view>
<view class="pageUser">
   <view class="userBox">
     <view class="flex items-center pb-30rpx pl-30rpx pr-20rpx">
       <view class="mr-20rpx">
         <u-avatar :src="user.avatar || defaultAvatar" size="70" />
       </view>
       <view class="flex-1">
         <view class="userName">{{user.nickName }}</view>
         <view class="departs">
           <image
             src="@/static/images/user/department.svg"
             alt=""
           />
           <span>{{ user?.sysDept?.deptName }}</span>
         </view>
       </view>
	
     </view>
     <view class="personalInformation">
       <div class="message">
         <div class="messagebox">个人资料</div>
         <div class="editInfo" @click="handelEdit(1)">
           点击编辑
           <image :src="rightImage" alt="" />
         </div>
       </div>
       <div class="passwordBox">
         <div class="messagebox">修改密码</div>
         <div class="editInfo" @click="handelEdit(2)">
           点击编辑
           <image :src="rightImage" alt="" />
         </div>
       </div>
     </view>
	
     <view class="goOutBtn">
       <div class="goOutStyle" @click="logOut">退出登录</div>
     </view>
	
   </view>
	  
</view>
  </view>
</template>

@@ -96,7 +99,7 @@
  height: 100%;
}
.pageUser {
  background: url("@/static/images/user/userbg.svg")  no-repeat center;
  background: url("@/static/images/user/userbg.svg")  no-repeat ;

}
.userBox {