Merge remote-tracking branch 'origin/master'

罗广辉

2026-01-15 04a859aa95b231c032c71d06518497a973c2f4e8

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

@@ -1,48 +1,45 @@
<!-- 我的 -->
<template>
  <view class="page-wrap">
<view class="pageUser">
   <view class="userBox">
     <view class="flex items-center pb-30rpx pl-30rpx pr-20rpx">
       <view class="mr-20rpx">
         <u-avatar @click="uploadAvatar" :src="user.avatar || showDefaultHeader" 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 class="pageUser">
      <view class="userBox">
        <view class="flex items-center pb-30rpx pl-30rpx pr-20rpx">
          <view class="mr-20rpx">
            <u-avatar @click="uploadAvatar" :src="user.avatar || showDefaultHeader" size="70" />
          </view>
          <view class="flex-1">
            <view class="userName">{{user.nickName }}</view>
            <view class="departs">
              <image
                src="@/static/images/user/department.png"
                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>

@@ -54,7 +51,7 @@
import { onShow } from "@dcloudio/uni-app";
import { getDeviceRegionApi } from "@/api/map.js";
import defaultAvatar  from '/static/images/defaultAvatar.svg'
import rightImage from '@/static/images/user/rightBtn.svg';
import rightImage from '@/static/images/user/rightBtn.png';
import showDefaultHeader from "@/static/images/user/default-header.png";
const { setClipboardData, getClipboardData } = useClipboard();
//
@@ -100,7 +97,7 @@
  height: 100%;
}
.pageUser {
  background-image: url("../../static/images/user/userbg.svg")  no-repeat;
  background: url("https://wrj.shuixiongit.com/aiskyminio/cloud-bucket/ja-app-wx/images/user/user-bg.png")  no-repeat ;
  background-size: 100%;
}
.userBox {
@@ -213,13 +210,13 @@
  }

  .message {
    background: url('@/static/images/user/info.svg')
    background: url('@/static/images/user/info.png')
      no-repeat center;
    background-size: 100% 100%;
  }

  .passwordBox {
    background: url('@/static/images/user/password.svg')
    background: url('@/static/images/user/password.png')
      no-repeat center;
    background-size: 100% 100%;
  }