Merge branch 'feature/v9.0/9.0.4'

罗广辉

2026-06-18 44dd9c4eb8a2489c63a5eb53fd4254bbb3510e95

 src/pages/user/index.vue

@@ -10,7 +10,7 @@
          <view class="userName">{{ userStore?.userInfo?.nick_name }}</view>
          <view class="departs">
            <image
              src="https://wrj.shuixiongit.com/aiskyminio/cloud-bucket/ztzf_app_assets/images/user/mobile.svg"
              src="https://wrj.shuixiongit.com/aiskyminio/cloud-bucket/ztzf_app_assets/images/user/mobile.png"
              alt=""
            />
            <span>{{ user.deptName }}</span>
@@ -28,20 +28,14 @@
          <div class="messagebox">个人信息</div>
          <div class="editInfo" @click="handelEdit(1)">
            点击编辑
            <image
              :src="rightImage"
              alt=""
            />
            <image :src="rightImage" alt="" />
          </div>
        </div>
        <div class="passwordBox">
          <div class="messagebox">修改密码</div>
          <div class="editInfo" @click="handelEdit(2)">
            点击编辑
            <image
              :src="rightImage"
              alt=""
            />
            <image :src="rightImage" alt="" />
          </div>
        </div>
      </view>
@@ -50,10 +44,7 @@
        <div class="goOutStyle" @click="logOut">退出登录</div>
      </view>
      <div class="bottomLogo">
        <image
          :src="logoImage"
          alt=""
        />
        <image :src="logoImage" alt="" />
      </div>
    </view>
  </view>
@@ -62,14 +53,12 @@
<script setup>
import { getAssetsImage } from "@/utils/index.js";
import { getUserInfo } from "@/api/user/index.js";
import { useClipboard } from "@/hooks";
import { useUserStore } from "@/store/index.js";
import { onShow } from "@dcloudio/uni-app";
import { getDeviceRegionApi } from "@/api/map.js";

const { setClipboardData, getClipboardData } = useClipboard();

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

const userStore = useUserStore();
@@ -101,10 +90,10 @@
    });
  }
};
// 登录鉴权，微信小程序端点击tabbar的底层逻辑不触发uni.switchTab，需要在页面onShow生命周期中校验权限
onShow(async () => {
  getDeviceRegion();
onShow(() => {
  getUserInfoData();

  // #ifndef MP-WEIXIN
  uni.setTabBarItem({
    index: 2, // Tab 的索引（从0开始）
    visible: false,
@@ -113,6 +102,7 @@
    index: 3, // Tab
    visible: true,
  });
  // #endif
});
</script>
<style scoped lang="scss">
@@ -123,6 +113,11 @@
.userBox {
  padding-top: 88rpx;
}
/* #ifdef MP-WEIXIN */
.userBox {
   padding-top: 180rpx;
}
/* #endif */
.userName {
  font-weight: 700;
  font-size: 36rpx;
@@ -222,13 +217,13 @@
  }

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

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