Merge remote-tracking branch 'origin/master'

罗广辉

2025-11-06 6b37a109ee12c3e1ae1d701f125d32df5cc1c113

 src/pages/user/index.vue

@@ -1,48 +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" size="70" />
       </view>
       <view class="flex-1">
         <view class="userName">{{ userStore?.userInfo?.nick_name }}</view>
         <view class="departs">
           <image src="@/static/images/user/mobile.svg" alt="" />
           <span>{{user.deptName}}</span>
         </view>
       </view>
       <view class="rightLogo">
         <image src="@/static/images/user/logo2.png" alt="" />
       </view>
     </view>
     <view class="personalInformation">
       <div class="message">
         <div class="messagebox">个人信息</div>
         <div class="editInfo" @click="handelEdit(1)">点击编辑
           <image src="@/static/images/user/rightBtn.svg" alt="" />
         </div>
       </div>
       <div class="passwordBox">
         <div class="messagebox">修改密码</div>
         <div class="editInfo" @click="handelEdit(2)">点击编辑 <image src="@/static/images/user/rightBtn.svg" alt="" />
         </div>
       </div>
     </view>

    <view class="flex items-center pb-30rpx pl-30rpx pr-20rpx">
      <view class="mr-20rpx">
        <u-avatar :src="user.avatar" size="70" />
      </view>
      <view class="flex-1">
        <view class="userName">{{ userStore?.userInfo?.nick_name }}</view>
        <view class="departs">
          <image src="@/static/images/user/mobile.svg" alt="" />
          <span>{{user.deptName}}</span>
        </view>
      </view>
      <view class="rightLogo">
        <image src="@/static/images/user/logo2.png" alt="" />
      </view>
    </view>
    <view class="personalInformation">
      <div class="message">
        <div class="messagebox">个人信息</div>
        <div class="editInfo" @click="handelEdit(1)">点击编辑
          <image src="@/static/images/user/rightBtn.svg" alt="" />
        </div>
      </div>
      <div class="passwordBox">
        <div class="messagebox">修改密码</div>
        <div class="editInfo" @click="handelEdit(2)">点击编辑 <image src="@/static/images/user/rightBtn.svg" alt="" />
        </div>
      </div>
    </view>

    <view class="mt-20rpx">
      <div class="goOutStyle" @click="logOut">退出登录</div>
    </view>
    <div class="bottomLogo"><image src="@/static/images/user/logo1.png" alt="" /></div>
     <view class="mt-20rpx">
       <div class="goOutStyle" @click="logOut">退出登录</div>
     </view>
     <div class="bottomLogo"><image src="@/static/images/user/logo1.png" alt="" /></div>
  </view>
  </view>
</template>

<script setup>
  import {
    getUserInfo,
    updateInfo,
    updatePassword

  } from '@/api/user/index.js';
  import {
    useClipboard
@@ -78,7 +78,7 @@

  function getDeviceRegion() {
    getDeviceRegionApi().then(res => {
      // console.log(res.data.data, '用户设备')

    })
  }
  const handelEdit = (val) => {
@@ -113,9 +113,10 @@
    width: 100%;
    height: 100%;

    padding-top: 88rpx;
  }

.userBox {
    padding-top: 88rpx;
}
  .userName {
    font-weight: 700;
    font-size: 36rpx;