Merge branch 'master' of http://139.196.74.78:10010/r/jagzwxm/ja_web

shuishen

2026-01-22 3c5a06b1fe06a30207da0f6dedf2dff99f1899d2

Merge branch 'master' of http://139.196.74.78:10010/r/jagzwxm/ja_web

 applications/task-work-order/src/views/orderView/orderManage/inspectionReport/index.vue

@@ -225,6 +225,7 @@

// 在线查看文档
function seeOnlineWord(item) {
    console.log(item.link,'9999')
    if (!item.link) {
        ElMessage.error('文档链接不存在')
        return

 uniapps/work-app/build/config/proxy.js

@@ -11,7 +11,7 @@
import configEnv from "../../src/config/env.js";

export const createViteProxy = (env,envName = 'development') => {
  const { VITE_APP_PROXY, VITE_API_PREFIX,VITE_APP_ENV } = env
  const { VITE_APP_PROXY, VITE_API_PREFIX,VITE_APP_ENV,VITE_API_PREFIX_GD } = env
  // 不使用代理直接返回
  if (!JSON.parse(VITE_APP_PROXY)) return undefined
  const proxy = {

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

@@ -9,10 +9,10 @@
            <u-image :src="droneSvg" mode="aspectFill" :width="70" :height="90"></u-image>
          </view>
          <view class="right">
            <view class="name">设备名称：{{ item.name }}</view>
            <view class="txt">设备类型：{{ item.type }}</view>
            <view class="txt">设备型号：{{ item.type }}</view>
          <view class="txt">设备sn：{{ item.sn }}</view>
            <view class="name">{{ item.name }}</view>
            <view class="txt">飞行器类型：{{ item.type }}</view>
            <view class="txt">飞行器型号：{{ item.model }}</view>
          <view class="txt">飞行器sn：{{ item.sn }}</view>
          </view>
        </view>
      </u-list>

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

@@ -3,7 +3,7 @@
    <!-- <u-navbar title="法律政策" @rightClick="rightClick" :autoBack="true"></u-navbar> -->
    <u-search :bgColor="'white'" v-model="noticeTitle" :show-action="true" actionText="搜索" :animation="true" @custom="handleSearch"></u-search>
    <view class="tabs-container">
      <u-tabs :list="tabs" @click="tabClick"></u-tabs>
      <u-tabs :list="tabs" lineColor="#265CFD" @click="tabClick"></u-tabs>
    </view>
    <view class="content">
      <u-list :style="{ height: 'calc(100vh - 160rpx)' }" @scrolltolower="scrolltolower" :lower-threshold="50">
@@ -137,7 +137,6 @@
    color: #4E5969;
    background: #FFFFFF;
    border-radius: 12px 12px 6px 6px;
    margin-top: 10px;
  }

  .tabs-container >>> .u-tabs__nav {

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

@@ -302,7 +302,7 @@
    @apply flex items-center justify-center py-12rpx px-0 text-30rpx border-none;
    background: #1d6fe9;
    color: white;
    height: 100rpx;
    height: 76rpx;
    border-radius: 4px 4px 4px 4px;
    margin: 100rpx 40rpx 40rpx 40rpx;


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

@@ -136,9 +136,9 @@
  try {
    const res = await droneFlightTaskApi({
      current: 1,
      size: 10,
      size: 3,
    })
    announcementList.value = res.data.data.records.slice(0, 3).map(item => ({
    announcementList.value = res.data.data.records.map(item => ({
      ...item,
      title: item.taskName,
      description: item.remark,
@@ -162,12 +162,12 @@
    try {
      const res = await sysNoticePageInfoApi({
        current: 1,
        size: 10,
        size: 3,
        noticeType: val,
      })
      // 只需要取前3条 公告
      if (val === 1) {
        regulationsList.value = res.data.data.records.slice(0, 3).map(item => ({
        regulationsList.value = res.data.data.records.map(item => ({
          ...item,
          title: item.noticeTitle,
          description: item.remark,
@@ -176,7 +176,7 @@
          like: item.like,
        }))
      } else if (val === 2) {
        policyList.value = res.data.data.records.slice(0, 3).map(item => ({
        policyList.value = res.data.data.records.map(item => ({
          ...item,
          title: item.noticeTitle,
          description: item.remark,
@@ -225,6 +225,9 @@
  height: 100%;
  display: flex;
  flex-direction: column;
  :deep(.u-swiper) {
    border-radius: 0 0 100px 100px;
  }
  :deep(.u-grid) {
    margin-top: 40rpx;
    .grid-text {

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

@@ -2,7 +2,7 @@
<template>
    <view class="register-page">
        <view class="pageBg"></view>
        <view class="content">
        <!-- <view class="content">
           <view class="row">
             <view class="label"><span class="required">*</span>手机号码</view>
             <view class="input">
@@ -36,7 +36,34 @@
                {{ countDown > 0 ? `${countDown}s后重发` : '获取验证码' }}
            </u-button>
           </view>
        </view>
        </view> -->
        <view class="detailBox">
            <div class="detailCon">
                <div class="orderRow">
                    <div class="rowTitle">手机号码</div>
                    <input type="text" v-model="formParams.userName" placeholder="请输入手机号码" class="input-item" />
                </div>
                <div class="orderRow">
                    <div class="rowTitle">昵称</div>
                    <input type="text" v-model="formParams.nikeName" placeholder="请输入昵称" class="input-item" />
                </div>
                <div class="orderRow">
                    <div class="rowTitle">密码</div>
                    <input type="password" v-model="formParams.password" placeholder="请输入密码" class="input-item" />
                </div>
                <div class="orderRow">
                    <div class="rowTitle">确认密码</div>
                    <input type="password" v-model="formParams.password2" placeholder="请输入确认密码" class="input-item" />
                </div>
                <div class="orderRow">
                    <div class="rowTitle">验证码</div>
                    <input type="text" v-model="formParams.code" placeholder="请输入验证码" class="input-item" />
                    <u-button :disabled="countDown > 0" @click="sendVerificationCode" type="primary" color="#007AFF">
                        {{ countDown > 0 ? `${countDown}s后重发` : '获取验证码' }}
                    </u-button>
                </div>
            </div>
        </view>
        <view class="register">
            <u-button type="primary" color="#007AFF" @click="register">注册</u-button>
        </view>
@@ -210,55 +237,91 @@

<style scoped lang="scss">
.register-page {
    width: 100%;
    height: 100%;
    display: flex;
    flex-direction: column;
    align-items: center;
    position: relative;
    .pageBg {
        position: fixed;
        top: 0;
        left: 0;
        // position: fixed;
        // top: 0;
        // left: 0;
        width: 100%;
        height: 100%;
        background-image: url("https://wrj.shuixiongit.com/aiskyminio/cloud-bucket/ja-app-wx/images/user/user-bg.png")  no-repeat ;
        background: url("https://wrj.shuixiongit.com/aiskyminio/cloud-bucket/ja-app-wx/images/user/user-bg.png")  no-repeat ;
        background-size: 100%;
    }
    .content {
    .detailBox {
        position: absolute;
        top: 192rpx;
        left: 24rpx;
        right: 24rpx;
        top: 180rpx;
        width: 702rpx;

        min-height: 326rpx;
        background: #FFFFFF;
        border-radius: 6px;
        padding: 20px;
        .row {
        border-radius: 12rpx;
        box-shadow: 0 4rpx 20rpx rgba(0, 0, 0, 0.05);

        .detailCon {
            padding: 0 24rpx;
        }

        .orderRow {
            display: flex;
            justify-content: space-between;
            align-items: center;
            border-bottom: 1rpx solid #f5f5f5;
            margin: 10rpx 0;
        }
        .label {
            width: 140rpx;
            font-family: Source Han Sans CN, Source Han Sans CN;
            font-weight: 400;
            font-size: 15px;
            color: #222324;
            .nike {
                margin-right: 16rpx;
            height: 96rpx;
            border-bottom: 2rpx solid #f5f5f5;
            color: #7b7b7b;


            .rowTitle {
                font-family: Source Han Sans CN, Source Han Sans CN;
                font-weight: 400;
                font-size: 30rpx;
                color: #222324;
            }
            .required {
                color: #FF4444;

            input.input-item {
                text-align: right;
                border: none !important;
                background: transparent !important;
                box-shadow: none !important;
                padding: 0 !important;
                margin: 0 !important;
                height: auto !important;

                outline: none;
                font-size: 30rpx;
                color: #222324;
                font-family: Source Han Sans CN, Source Han Sans CN;
            }
        }
        .input {
            flex: 1;
        }
        :deep(.u-input) {
            border-color: transparent;
        }
        :deep(.u-icon--right) {
            display: none;
        }
        :deep(.u-button) {
            width: 180rpx;
            :deep(.uni-input-placeholder) {
                color: #D5D5D5;
            }
            input.input-item::placeholder {
                font-size: 30rpx;
            }

            .send-code-btn {
                margin-left: 20rpx;
                width: 200rpx;
                height: 70rpx;
                line-height: 70rpx;
                font-size: 26rpx;
                background: #f5f5f5;
                color: #666;
                border-radius: 8rpx;
            }

            .send-code-btn:disabled {
                background: #e0e0e0;
                color: #999;
            }
            :deep(.u-button){
                width: 180rpx !important;
                height: 60rpx !important;
            }
        }
    }
    .register {
@@ -266,9 +329,11 @@
            position: fixed;
            left: 24rpx;
            right: 24rpx;
            bottom: 126rpx;
            bottom: 150rpx;
            font-weight: 400;
            width: 80% !important;
            height: 100rpx !important;
            height: 76rpx !important;
            font-size: 28rpx !important;
        }
    }
}

 uniapps/work-wx/src/subPackages/deviceRegistration/add.vue

@@ -34,7 +34,7 @@
                v-model="formParams.manufacturerText"
                disabled
                disabledColor="#ffffff"
                placeholder="请选择飞行器厂商"
                placeholder="请选择"
                border="none"
            ></u-input>
            <template #right>
@@ -66,7 +66,7 @@
                v-model="formParams.isModifiedText"
                disabled
                disabledColor="#ffffff"
                placeholder="请选择是否改装"
                placeholder="请选择"
                border="none"
            ></u-input>
            <template #right>
@@ -88,7 +88,7 @@
                v-model="formParams.typeText"
                disabled
                disabledColor="#ffffff"
                placeholder="请选择飞行器类型"
                placeholder="请选择"
                border="none"
            ></u-input>
            <template #right>
@@ -118,7 +118,7 @@
                ref="item1"
                @click="showPurchaseDate = true"
        >
            <u-input v-model="formParams.purchaseDate" border="none" placeholder="请选择日期" suffixIcon="calendar"></u-input>
            <u-input v-model="formParams.purchaseDate" border="none" placeholder="请选择" suffixIcon="calendar"></u-input>
        </u-form-item>
        <u-form-item
                label="有无保险"
@@ -132,7 +132,7 @@
                v-model="formParams.hasInsuranceText"
                disabled
                disabledColor="#ffffff"
                placeholder="请选择有无保险"
                placeholder="请选择"
                border="none"
            ></u-input>
            <template #right>
@@ -153,7 +153,7 @@
                v-model="formParams.regionText"
                disabled
                disabledColor="#ffffff"
                placeholder="请选择所属区域"
                placeholder="请选择(树状结构选择行政区划)"
                border="none"
            ></u-input>
            <template #right>
@@ -170,7 +170,7 @@
            <u-input
                    v-model="formParams.caacRegistrationCodeText"
                    border="none"
                    placeholder="请输入"
                    placeholder="请上传"
            ></u-input>
            <template #right>
                <u-upload
@@ -651,7 +651,7 @@
    }
    
    :deep(.u-form-item) {
        margin-bottom: 40rpx;
        margin-bottom: 20rpx;
        padding: 16rpx 24rpx 18rpx 24rpx;
        border-radius: 6px 6px 6px 6px;
        background: white;

 uniapps/work-wx/src/subPackages/deviceRegistration/details.vue

@@ -9,7 +9,7 @@
                :borderBottom="true"
                ref="item1"
        >
            <u-input v-model="formParams.name" border="none" placeholder="请输入"></u-input>
            <u-input v-model="formParams.name" border="none"></u-input>
        </u-form-item>
        <u-form-item
                label="SN(出厂序列号)"
@@ -18,7 +18,7 @@
                :borderBottom="true"
                ref="item2"
        >
            <u-input v-model="formParams.sn" border="none" placeholder="请输入"></u-input>
            <u-input v-model="formParams.sn" border="none"></u-input>
        </u-form-item>
        <u-form-item
                label="飞行器厂商"
@@ -31,7 +31,6 @@
                v-model="formParams.manufacturer"
                disabled
                disabledColor="#ffffff"
                placeholder="请选择飞行器厂商"
                border="none"
            ></u-input>
        </u-form-item>
@@ -42,7 +41,7 @@
                :borderBottom="true"
                ref="item1"
        >
            <u-input v-model="formParams.model" border="none" placeholder="请输入"></u-input>
            <u-input v-model="formParams.model" border="none"></u-input>
        </u-form-item>
        <u-form-item
                label="是否改装"
@@ -55,7 +54,6 @@
                v-model="formParams.isModified"
                disabled
                disabledColor="#ffffff"
                placeholder="请选择是否改装"
                border="none"
            ></u-input>
        </u-form-item>
@@ -70,7 +68,6 @@
                v-model="formParams.type"
                disabled
                disabledColor="#ffffff"
                placeholder="请选择飞行器类型"
                border="none"
            ></u-input>
        </u-form-item>
@@ -84,7 +81,6 @@
            <u-input
                    v-model="formParams.holder"
                    border="none"
                    placeholder="请输入"
            ></u-input>
        </u-form-item>
         <u-form-item
@@ -107,7 +103,6 @@
                v-model="formParams.hasInsurance"
                disabled
                disabledColor="#ffffff"
                placeholder="请选择有无保险"
                border="none"
            ></u-input>
        </u-form-item>
@@ -122,7 +117,6 @@
                v-model="formParams.region"
                disabled
                disabledColor="#ffffff"
                placeholder="请选择所属区域"
                border="none"
            ></u-input>
        </u-form-item>
@@ -136,7 +130,6 @@
            <u-input
                    v-model="formParams.caacRegistrationCode"
                    border="none"
                    placeholder="请输入"
            ></u-input>
        </u-form-item>
        <u-form-item
@@ -149,7 +142,6 @@
            <u-input
                    v-model="formParams.deviceImage"
                    border="none"
                    placeholder="请输入"
            ></u-input>
        </u-form-item>
        <u-form-item
@@ -162,7 +154,6 @@
            <u-input
                    v-model="formParams.remarks"
                    border="none"
                    placeholder="请输入"
            ></u-input>
        </u-form-item>
    </u-form>
@@ -397,7 +388,7 @@
    }
    
    :deep(.u-form-item) {
        margin-bottom: 40rpx;
        margin-bottom: 20rpx;
        padding: 16rpx 24rpx 18rpx 24rpx;
        border-radius: 6px 6px 6px 6px;
        background: white;

 uniapps/work-wx/src/subPackages/flightApplication/add.vue

@@ -12,7 +12,7 @@
                ref="item1"
                required
        >
            <u-input v-model="formParams.flightPlanName" border="none" placeholder="请输入飞行计划名称"></u-input>
            <u-input v-model="formParams.flightPlanName" border="none" placeholder="请输入"></u-input>
        </u-form-item>
        <u-form-item
                label="任务类型"
@@ -27,7 +27,7 @@
                v-model="formParams.flightTaskTypeText"
                disabled
                disabledColor="#ffffff"
                placeholder="请选择任务类型"
                placeholder="请选择"
                border="none"
            ></u-input>
            <template #right>
@@ -49,7 +49,7 @@
                v-model="formParams.flightRuleText"
                disabled
                disabledColor="#ffffff"
                placeholder="请选择飞行规则"
                placeholder="请选择"
                border="none"
            ></u-input>
            <template #right>
@@ -71,7 +71,7 @@
                v-model="formParams.flightModeText"
                disabled
                disabledColor="#ffffff"
                placeholder="请选择飞行方式"
                placeholder="请选择"
                border="none"
            ></u-input>
            <template #right>
@@ -116,7 +116,7 @@
                v-model="formParams.planTypeText"
                disabled
                disabledColor="#ffffff"
                placeholder="请选择计划类型"
                placeholder="请选择"
                border="none"
            ></u-input>
            <template #right>
@@ -214,7 +214,7 @@
                v-model="formParams.aircraftText"
                disabled
                disabledColor="#ffffff"
                placeholder="请选择飞行器"
                placeholder="请选择"
                border="none"
            ></u-input>
            <template #right>
@@ -236,7 +236,7 @@
                v-model="formParams.pilotText"
                disabled
                disabledColor="#ffffff"
                placeholder="请选择飞手"
                placeholder="请选择"
                border="none"
            ></u-input>
            <template #right>
@@ -259,7 +259,7 @@
                v-model="formParams.airspaceText"
                disabled
                disabledColor="#ffffff"
                placeholder="请选择空域"
                placeholder="请选择"
                border="none"
            ></u-input>
            <template #right>
@@ -281,7 +281,7 @@
                v-model="formParams.routeText"
                disabled
                disabledColor="#ffffff"
                placeholder="请选择航线"
                placeholder="请选择"
                border="none"
            ></u-input>
            <template #right>
@@ -826,7 +826,7 @@
        border-radius: 8rpx 8rpx 8rpx 8rpx;
    }
    :deep(.u-form-item) {
        margin-bottom: 40rpx;
        margin-bottom: 20rpx;
        padding: 16rpx 24rpx 18rpx 24rpx;
        border-radius: 6px 6px 6px 6px;
        background: white;

 uniapps/work-wx/src/subPackages/flightApplication/details.vue

@@ -12,7 +12,7 @@
                :borderBottom="true"
                ref="item1"
        >
            <u-input v-model="formParams.flightPlanName" border="none" placeholder="请输入飞行计划名称"></u-input>
            <u-input v-model="formParams.flightPlanName" border="none"></u-input>
        </u-form-item>
        <u-form-item
                label="任务类型"
@@ -25,7 +25,6 @@
                v-model="formParams.flightTaskType"
                disabled
                disabledColor="#ffffff"
                placeholder="请选择任务类型"
                border="none"
            ></u-input>
        </u-form-item>
@@ -40,7 +39,6 @@
                v-model="formParams.flightRule"
                disabled
                disabledColor="#ffffff"
                placeholder="请选择飞行规则"
                border="none"
            ></u-input>
        </u-form-item>
@@ -55,7 +53,6 @@
                v-model="formParams.flightMode"
                disabled
                disabledColor="#ffffff"
                placeholder="请选择飞行方式"
                border="none"
            ></u-input>
        </u-form-item>
@@ -66,7 +63,7 @@
                :borderBottom="true"
                ref="item1"
        >
            <u-input v-model="formParams.flightStartTime" border="none" placeholder="请选择日期" suffixIcon="calendar"></u-input>
            <u-input v-model="formParams.flightStartTime" border="none" suffixIcon="calendar"></u-input>
        </u-form-item>
         <u-form-item
                label="飞行活动结束日期"
@@ -75,7 +72,7 @@
                :borderBottom="true"
                ref="item1"
        >
            <u-input v-model="formParams.flightEndTime" border="none" placeholder="请选择日期" suffixIcon="calendar"></u-input>
            <u-input v-model="formParams.flightEndTime" border="none" suffixIcon="calendar"></u-input>
        </u-form-item>
        
        <u-form-item
@@ -89,7 +86,6 @@
                v-model="formParams.planType"
                disabled
                disabledColor="#ffffff"
                placeholder="请选择计划类型"
                border="none"
            ></u-input>
        </u-form-item>
@@ -100,7 +96,7 @@
                :borderBottom="true"
                ref="item1"
        >
            <u-input v-model="formParams.contactPerson" border="none" placeholder="请输入"></u-input>
            <u-input v-model="formParams.contactPerson" border="none"></u-input>
        </u-form-item>
        <u-form-item
                label="联系电话"
@@ -109,7 +105,7 @@
                :borderBottom="true"
                ref="item1"
        >
            <u-input v-model="formParams.contactPhone" border="none" placeholder="请输入"></u-input>
            <u-input v-model="formParams.contactPhone" border="none"></u-input>
        </u-form-item>
        <u-form-item
                label="承办人"
@@ -118,7 +114,7 @@
                :borderBottom="true"
                ref="item1"
        >
            <u-input v-model="formParams.undertaker" border="none" placeholder="请输入"></u-input>
            <u-input v-model="formParams.undertaker" border="none"></u-input>
        </u-form-item>
        <u-form-item
                label="承办人联系电话"
@@ -127,7 +123,7 @@
                :borderBottom="true"
                ref="item1"
        >
            <u-input v-model="formParams.undertakerPhone" border="none" placeholder="请输入"></u-input>
            <u-input v-model="formParams.undertakerPhone" border="none"></u-input>
        </u-form-item>
        <u-form-item
                label="临时空域批件"
@@ -148,7 +144,6 @@
            <u-input
                    v-model="formParams.weatherCondition"
                    border="none"
                    placeholder="请输入"
            ></u-input>
        </u-form-item>
         <view class="title form-title">飞行器/飞手</view>
@@ -163,7 +158,6 @@
                v-model="formParams.aircraftId"
                disabled
                disabledColor="#ffffff"
                placeholder="请选择飞行器"
                border="none"
            ></u-input>
        </u-form-item>
@@ -178,7 +172,6 @@
                v-model="formParams.pilotId"
                disabled
                disabledColor="#ffffff"
                placeholder="请选择飞手"
                border="none"
            ></u-input>
        </u-form-item>
@@ -194,7 +187,6 @@
                v-model="formParams.airspaceId"
                disabled
                disabledColor="#ffffff"
                placeholder="请选择空域"
                border="none"
            ></u-input>
        </u-form-item>
@@ -209,7 +201,6 @@
                v-model="formParams.routeId"
                disabled
                disabledColor="#ffffff"
                placeholder="请选择航线"
                border="none"
            ></u-input>
        </u-form-item>
@@ -463,7 +454,7 @@
        border-radius: 8rpx 8rpx 8rpx 8rpx;
    }
    :deep(.u-form-item) {
        margin-bottom: 40rpx;
        margin-bottom: 20rpx;
        padding: 16rpx 24rpx 18rpx 24rpx;
        border-radius: 6px 6px 6px 6px;
        background: white;

 uniapps/work-wx/src/subPackages/flightApplication/index.vue

@@ -12,26 +12,29 @@
            </view>
        </view>
    </view>
    <u-search v-model="formParams.flightPlanName" :bgColor="'white'" :show-action="true" actionText="搜索" :animation="true" @custom="handleSearch"></u-search>
    <view class="content">
        <view class="sp-title">
            审批记录
        </view>
        <u-list :style="{ height: 'calc(100vh - 240rpx)' }" @scrolltolower="scrolltolower" :lower-threshold="50">
            <view class="approvalRecord" v-for="(approvalRecord,approvalRecordIndex) in approvalRecords" :key="approvalRecordIndex" @click="handleClick(approvalRecord)">
                <view class="name-status">
                    <view class="name-image">
                        <u-image :src="spSvg" class="icon" width="16" height="16"></u-image>
                        <view class="name">{{approvalRecord.flightPlanName}}</view>
                    </view>
                    <view class="status">{{approvalRecord.planStatus || '无状态'}}</view>
                </view>
                <view class="txt">飞行设备：{{approvalRecord.device || '无设备'}}</view>
                <view class="txt">行政区划：{{approvalRecord.area || '无行政区划'}}</view>
                <view class="txt">飞行时间：{{approvalRecord.time || '无飞行时间'}}</view>
    <!-- <view class="search-content"> -->
        <u-search v-model="formParams.flightPlanName" :bgColor="'white'" :show-action="true" actionText="搜索" :animation="true" @custom="handleSearch"></u-search>
        <view class="content">
            <view class="sp-title">
                审批记录
            </view>
        </u-list>
    </view>
            <u-list :style="{ height: 'calc(100vh - 240rpx)' }" @scrolltolower="scrolltolower" :lower-threshold="50">
                <view class="approvalRecord" v-for="(approvalRecord,approvalRecordIndex) in approvalRecords" :key="approvalRecordIndex" @click="handleClick(approvalRecord)">
                    <view class="name-status">
                        <view class="name-image">
                            <u-image :src="spSvg" class="icon" width="16" height="16"></u-image>
                            <view class="name">{{approvalRecord.flightPlanName}}</view>
                        </view>
                        <view class="status">{{approvalRecord.planApprovalStatus || ''}}</view>
                    </view>
                    <view class="txt">飞行器：{{approvalRecord.device || ''}}</view>
                    <view class="txt">飞行任务：{{approvalRecord.flightTaskType || ''}}</view>
                    <view class="txt">飞行起飞时间：{{approvalRecord.actualTakeoffTime || ''}}</view>
                    <view class="txt">飞行降落时间：{{approvalRecord.actualLandingTime || ''}}</view>
                </view>
            </u-list>
        </view>
    <!-- </view> -->
</view>
</template>
<script setup>
@@ -109,13 +112,16 @@
</script>
<style scoped lang="scss">
.flightApplication {
    width: 100%;
    height: 100%;
    display: flex;
    flex-direction: column;
    overflow-y: hidden;
    .header-top {
        width: 100%;
        height: 280rpx;
        height: 480rpx;
        background: url("https://wrj.shuixiongit.com/aiskyminio/cloud-bucket/ja-app-wx/images/fxsq-bg.png")  no-repeat ;
          background-size: 100%;
        position: fixed;
        top: 0;
        position: relative;
        .ht-content {
            position: absolute;
            bottom: -40rpx;
@@ -131,7 +137,7 @@
                flex: 1;
                max-width: 350rpx;
                height: 166rpx;
                background: rgba(251,253,255,0.39);
                background: rgba(251,253,255,0.57);
                box-shadow: inset 0px 0px 7px 0px rgba(64,156,230,0.14), 0px 1px 3px 0px rgba(35,49,96,0.11);
                border-radius: 8px 8px 8px 8px;
                border: 1px solid #fff;
@@ -153,18 +159,11 @@
        }
    }
     :deep(.u-search) {
        position: absolute;
        width: 90%;
        left: 50%;
        transform: translateX(-50%);
        top: 350rpx !important;
        padding: 10px 20px;
        height: 68rpx;
        flex: 0;
        margin-top: 50rpx !important;
    }
    .content {
        position: absolute;
        top: 450rpx !important;
        bottom: 0;
        background: white;
        width: 100%;
        display: flex;

 uniapps/work-wx/src/subPackages/userDetail/infos/index.vue

@@ -3,7 +3,7 @@
    <view class="container">
        <view class="pageBg"></view>
        <div class="avatarBox">
            <u-avatar @click="uploadAvatar" :src="userInfo.avatar || showDefaultHeader" size="114" mode="aspectFill" />
            <u-avatar @click="uploadAvatar" :src="userInfo.avatar ? userInfo.avatar : showDefaultHeader" size="114" mode="aspectFill" />
        </div>
        <view class="detailBox">
            <div class="detailCon">
@@ -325,11 +325,11 @@

    .custom-style {
        width: 276rpx;
        height: 100rpx;
        height: 76rpx;	
    }
    :deep(.u-button.data-v-461e713c){
        width: 276rpx !important;
        height: 100rpx !important;
        height: 76rpx !important;
    }
    .note {
        position: absolute;

 uniapps/work-wx/src/subPackages/userDetail/password/index.vue

@@ -11,7 +11,6 @@
                <div class="orderRow">
                    <div class="rowTitle">密码</div>
                    <input type="password" v-model="passwordForm.password" placeholder="请输入新密码" class="input-item" />

                </div>
                <div class="orderRow">
                    <div class="rowTitle">确认密码</div>
@@ -255,9 +254,9 @@
        align-items: center;
        position: relative;
        .pageBg {
            position: fixed;
            top: 0;
            left: 0;
            // position: fixed;
            // top: 0;
            // left: 0;
            width: 100%;
            height: 100%;
            background: url("https://wrj.shuixiongit.com/aiskyminio/cloud-bucket/ja-app-wx/images/user/user-bg.png")  no-repeat ;
@@ -267,7 +266,6 @@
        .detailBox {
            position: absolute;
            top: 180rpx;
            // margin-top: 40rpx;
            width: 702rpx;

            min-height: 326rpx;
@@ -309,19 +307,12 @@
                    color: #222324;
                    font-family: Source Han Sans CN, Source Han Sans CN;
                }
        :deep(.uni-input-placeholder) {
            color: #D5D5D5;
        }
                :deep(.uni-input-placeholder) {
                    color: #D5D5D5;
                }
                input.input-item::placeholder {
                    font-size: 30rpx;
                }

                // .code-container {
                //     display: flex;
                //     align-items: center;
                //     justify-content: flex-end;
                //     width: 100%;
                // }

                .send-code-btn {
                    margin-left: 20rpx;
@@ -351,7 +342,7 @@
            bottom: 150rpx;
            :deep(.u-button){
                width: 276rpx !important;
                height: 100rpx !important;
                height: 76rpx !important;
            }
        }

@@ -361,10 +352,10 @@

        .custom-style {
            width: 276rpx;
            height: 100rpx;
            height: 76rpx;
            font-family: "Source Han Sans CN";
            font-weight: 400;
            font-size: 36rpx;
            font-size: 28rpx;
        }
    }
</style>