Merge remote-tracking branch 'origin/master'

chenyao

2026-01-09 ebd0ec4f51288042b6fc5bf714b1febbb63cfacc

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

@@ -1,52 +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">{{user.nickName }}</view>
          <view class="departs">
            <image
              src="@/static/images/user/department.svg"
              alt=""
            />
            <span>{{ user?.sysDept?.deptName }}</span>
          </view>
        </view>
        <view class="rightLogo">
          <image
            src="https://wrj.shuixiongit.com/aiskyminio/cloud-bucket/ztzf_app_assets/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="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="mt-20rpx">
        <div class="goOutStyle" @click="logOut">退出登录</div>
      </view>
      <div class="bottomLogo">
        <image :src="logoImage" alt="" />
      </div>
    </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>

@@ -57,11 +53,11 @@
import { useUserStore } from "@/store/index.js";
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';
const { setClipboardData, getClipboardData } = useClipboard();

const rightImage = getAssetsImage("/images/user/rightBtn.svg");
const logoImage = getAssetsImage("/images/user/logo1.png");
//
// const rightImage = getAssetsImage("/images/user/rightBtn.svg");

const userStore = useUserStore();
const user = ref("");
@@ -78,9 +74,6 @@
  });
}

function getDeviceRegion() {
  getDeviceRegionApi().then((res) => {});
}
const handelEdit = (val) => {
  if (val === 1) {
    uni.navigateTo({
@@ -105,8 +98,12 @@
  width: 100%;
  height: 100%;
}
.pageUser {
  background: url("@/static/images/user/userbg.svg")  no-repeat ;

}
.userBox {
  padding-top: 88rpx;
  padding-top: 212rpx;
}
.userName {
  font-weight: 700;
@@ -156,20 +153,28 @@
    height: 52rpx;
  }
}

.goOutBtn {
   display: flex;
   justify-content: center;
   position: absolute;
   bottom: 72rpx;
   left: 0;
   right: 0;
}
.goOutStyle {
  width: 590rpx;
  height: 76rpx;
  background: #1d6fe9;
  border-radius: 40rpx;
  width: 670rpx;
  height: 100rpx;
  background: #1D6FE9;
  border-radius: 8rpx 8rpx 8rpx 8rpx;
  font-family: "Source Han Sans CN";
  font-weight: 400;
  font-size: 28rpx;
  font-size: 36rpx;
  color: #ffffff;
  text-align: center;
  line-height: 76rpx;
  line-height: 100rpx;
  margin: auto;
  margin-top: 114rpx;

}

.personalInformation {
@@ -183,15 +188,15 @@
    height: 160rpx;

    .messagebox {
      padding: 20rpx 24rpx;
      padding: 20rpx 40rpx;
      font-family: "Source Han Sans CN";
      font-weight: 500;
      font-size: 28rpx;
      font-size: 32rpx;
      color: #000000;
    }

    .editInfo {
      padding: 20rpx 24rpx;
      padding: 20rpx 40rpx;
      color: rgba(0, 0, 0, 0.5);
      font-family: "Source Han Sans CN";
      font-weight: 400;
@@ -207,13 +212,13 @@
  }

  .message {
    background: url(https://wrj.shuixiongit.com/aiskyminio/cloud-bucket/ztzf_app_assets/images/user/info.png)
    background: url('@/static/images/user/info.svg')
      no-repeat center;
    background-size: 100% 100%;
  }

  .passwordBox {
    background: url(https://wrj.shuixiongit.com/aiskyminio/cloud-bucket/ztzf_app_assets/images/user/password.png)
    background: url('@/static/images/user/password.svg')
      no-repeat center;
    background-size: 100% 100%;
  }