Merge remote-tracking branch 'origin/master'

罗广辉

2025-11-06 6b37a109ee12c3e1ae1d701f125d32df5cc1c113

Merge remote-tracking branch 'origin/master'

 src/manifest.json

@@ -58,7 +58,15 @@
                "dSYMs" : false
            },
            /* SDK配置 */
            "sdkConfigs" : {}
            "sdkConfigs" : {},
            "icons" : {
                "android" : {
                    "hdpi" : "src/static/images/app-logo.png",
                    "xhdpi" : "src/static/images/app-logo.png",
                    "xxhdpi" : "src/static/images/app-logo.png",
                    "xxxhdpi" : "src/static/images/app-logo.png"
                }
            }
        }
    },
    /* 快应用特有相关 */

 src/pages/login/index.vue

@@ -5,19 +5,12 @@
    <div class="title">掌控智飞</div>
    <div class="user-name">
      <image :src="usernameSvg"/>
      <input
        v-model="loginForm.username"
        placeholder="请输入用户名"
      />
            <input v-model="loginForm.username" placeholder="请输入用户名" />

    </div>
    <div class="pass-word">
      <image :src="passwordSvg"/>
      <input
        v-model="loginForm.password"
        type="password"
        placeholder="请输入密码"
      />
            <input v-model="loginForm.password" type="password" placeholder="请输入密码" />
    </div>

    <button class="login-btn" :style="[inputStyle]" @tap="submit">
@@ -30,13 +23,21 @@

<script setup>
import md5 from "js-md5";
import {loginByUsername} from "@/api/user/index.js";
import {useUserStore} from "@/store/index.js";
    import {
        loginByUsername
    } from "@/api/user/index.js";
    import {
        useUserStore
    } from "@/store/index.js";
import droneSvg from '@/static/images/login/droneSvg.svg'
import usernameSvg from '@/static/images/login/username.svg'
import passwordSvg from '@/static/images/login/password.svg'
import logoSvg from '@/static/images/login/logo.svg'
import {HOME_PATH, LOGIN_PATH, removeQueryString} from "@/router";
    import {
        HOME_PATH,
        LOGIN_PATH,
        removeQueryString
    } from "@/router";

const userStore = useUserStore();
const loginForm = ref({
@@ -64,7 +65,8 @@
    code: "",
    key: "",
  };
  loginByUsername(
        try {
            const res = await loginByUsername(
    userInfo.tenantId,
    userInfo.deptId,
    userInfo.roleId,
@@ -73,12 +75,20 @@
    userInfo.type,
    userInfo.key,
    userInfo.code
  ).then((res) => {
            );
    userStore.setUserInfo(res.data);
    uni.reLaunch({
      url: "/pages/user/index",
    });
        } catch (error) {
            const errorMsg =error.data?.error_description !=="Bad credentials" ? error.data?.error_description:  "登录失败，请重试";
            uni.showToast({
                title: errorMsg,
                icon: "none",
                duration: 2000
  });

        }
}

onLoad((options) => {
@@ -125,7 +135,9 @@
    text-align: center;
    margin-bottom: 168rpx;
  }
  .user-name,.pass-word {

        .user-name,
        .pass-word {
    display: flex;
    //justify-content: center;
    align-items: center;
@@ -133,28 +145,32 @@
    margin-right: 58rpx;
    height: 118rpx;
    border-bottom: 2rpx solid #E3E3E3;

    image {
      width: 40rpx;
      height: 40rpx;
      margin-right: 12rpx;
    }

    :deep(uni-input) {
      height: 40rpx;
      line-height: 40rpx;
      width: 80%;
      margin-top: 20rpx;
    }

    :deep(.uni-input-placeholder) {
      font-size: 32rpx;
      color: #E3E3E3;
      font-weight: 500;
    }

    //:deep(.uni-input-input) {
    //  top: 10px !important;
    //}
  }
  .pass-word {
  }

        .pass-word {}

  input {
    @apply pb-6rpx mb-10rpx text-left;

 src/pages/user/index.vue

@@ -1,7 +1,7 @@
<!-- 我的 -->
<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" />
@@ -36,13 +36,13 @@
    </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%;

  }
.userBox {
    padding-top: 88rpx;
  }

  .userName {
    font-weight: 700;
    font-size: 36rpx;

 src/static/images/app-logo.png

 src/static/images/tabbar/icon_home1.png

 src/static/images/tabbar/icon_home2.png

 src/static/images/tabbar/icon_home_selected.png

 src/static/images/tabbar/icon_list.png

 src/static/images/tabbar/icon_list_selected.png

 src/static/images/tabbar/icon_me.png

 src/static/images/tabbar/icon_me_selected.png

 src/static/images/tabbar/icon_order.png

 src/static/images/tabbar/icon_order_selected.png