Merge remote-tracking branch 'origin/master'

chenyao

2025-10-29 a27b5ac3a2fea69bf07e5f492b274ff986c11cc0

Merge remote-tracking branch 'origin/master'

 pnpm-lock.yaml

@@ -62,6 +62,9 @@
  dayjs:
    specifier: ^1.11.18
    version: 1.11.18
  js-audio-recorder:
    specifier: ^1.0.7
    version: 1.0.7
  js-base64:
    specifier: ^3.7.4
    version: 3.7.4
@@ -157,9 +160,6 @@
  sass-loader:
    specifier: ^16.0.4
    version: 16.0.4(sass@1.79.6)
  simple-git-hooks:
    specifier: ^2.13.1
    version: 2.13.1
  stylelint:
    specifier: ^16.23.0
    version: 16.23.0(typescript@5.9.3)
@@ -7821,6 +7821,10 @@
    resolution: {integrity: sha512-9IXdWudL61npZjvLuVe/ktHiA41iE8qFyLB+4VDTblEsWBzeg8WQTlktdUK4CdncUqtUgUg0bbOmTE2bKBKaBQ==}
    dev: false

  /js-audio-recorder@1.0.7:
    resolution: {integrity: sha512-JiDODCElVHGrFyjGYwYyNi7zCbKk9va9C77w+zCPMmi4C6ix7zsX2h3ddHugmo4dOTOTCym9++b/wVW9nC0IaA==}
    dev: false

  /js-base64@3.7.4:
    resolution: {integrity: sha512-wpM/wi20Tl+3ifTyi0RdDckS4YTD4Lf953mBRrpG8547T7hInHNPEj8+ck4gB8VDcGyeAWFK++Wb/fU1BeavKQ==}
    dev: false
@@ -9931,12 +9935,6 @@
  /signal-exit@4.1.0:
    resolution: {integrity: sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==}
    engines: {node: '>=14'}
    dev: true

  /simple-git-hooks@2.13.1:
    resolution: {integrity: sha512-WszCLXwT4h2k1ufIXAgsbiTOazqqevFCIncOuUBZJ91DdvWcC5+OFkluWRQPrcuSYd8fjq+o2y1QfWqYMoAToQ==}
    hasBin: true
    requiresBuild: true
    dev: true

  /sirv@3.0.2:

 src/App.vue

@@ -53,6 +53,6 @@
 color: #222324 !important;
}
.uni-page-head {
    background-image: url(/drone-app/src/static/images/user/allBg.svg) !important;
  background: transparent !important;
}
</style>

 src/pages/user/index.vue

@@ -14,25 +14,27 @@
                </view>
            </view>
            <view class="rightLogo">
                <img src="/src/static/images/user/logo2.svg" alt="" />
        <img src="/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)">点击编辑
                <img src="/src/static/images/user/rightBtn.svg" alt="" /></div>
          <img src="/src/static/images/user/rightBtn.svg" alt="" />
        </div>
            </div>
            <div class="passwordBox">
                <div class="messagebox">修改密码</div>
                <div class="editInfo" @click="handelEdit(2)">点击编辑 <img src="/src/static/images/user/rightBtn.svg" alt="" /></div>
        <div class="editInfo" @click="handelEdit(2)">点击编辑 <img src="/src/static/images/user/rightBtn.svg" alt="" />
        </div>
            </div>
        </view>

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

@@ -115,8 +117,7 @@
    }

    .userName {
        font-family: "Source Han Sans CN";
        font-weight: 500;
    font-weight: 700;
        font-size: 36rpx;
        color: #000000;

@@ -139,7 +140,13 @@
    .rightLogo {
        width: 200rpx;
        height: 80rpx;

    img {
      width: 100%;
      height: 100%;
    }
  }

       .bottomLogo {
           position: absolute;
           bottom:50rpx;
@@ -147,7 +154,13 @@
           right: 0;
           margin: 0 auto;
           text-align: center;

    img {
      width: 128rpx;
      height: 52rpx;
       }
  }

    .goOutStyle {
        width: 590rpx;
        height: 76rpx;
@@ -172,6 +185,7 @@
        .passwordBox {
            width: 340rpx;
            height:160rpx;

            .messagebox{
                padding: 20rpx 24rpx;
                font-family: "Source Han Sans CN";
@@ -179,6 +193,7 @@
                font-size: 28rpx;
                color: #000000;
            }

            .editInfo {
                padding: 20rpx 24rpx;
                color: rgba(0, 0, 0, 0.5);
@@ -187,6 +202,7 @@
                font-size: 24rpx;
                display: flex;
                align-items: center;

                img{
                    width: 28rpx;
                    height: 28rpx;
@@ -195,13 +211,13 @@
        }

        .message {
            background: url('/src/static/images/user/info.svg') no-repeat center;
      background: url('/src/static/images/user/info.png') no-repeat center;
            background-size: 100% 100%;

        }

        .passwordBox {
            background: url('/src/static/images/user/password.svg') no-repeat center;
      background: url('/src/static/images/user/password.png') no-repeat center;
            background-size: 100% 100%;

        }

 src/static/images/user/info.png

 src/static/images/user/logo1.png

 src/static/images/user/logo2.png

 src/static/images/user/password.png

 src/subPackages/inProgress/index.vue

@@ -1,15 +1,15 @@
<template>
  <WebViewPlus :src="`${viewUrl}`" @webMessage="onPostMessage"/>
  <WebViewPlus v-if="showComponent" :src="`${viewUrl}`" @webMessage="onPostMessage"/>
</template>

<script setup>
import WebViewPlus from "@/components/WebViewPlus.vue";
import {getWebViewUrl} from "@/utils/index.js";
import {onLoad} from "@dcloudio/uni-app";
import {onHide, onLoad, onShow} from "@dcloudio/uni-app";

const wayLineJodInfoId = ref(null)
const viewUrl = ref('')

const showComponent = ref(false)
function onPostMessage(data) {
  if (data.type === 'back') {
    uni.switchTab({
@@ -26,6 +26,14 @@
  wayLineJodInfoId.value = options.wayLineJodInfoId
  viewUrl.value = getWebViewUrl('/TaskInProgress', {wayLineJodInfoId: wayLineJodInfoId.value})
})

onShow(function () {
  showComponent.value = true
})

onHide(() =>{
  showComponent.value = false
})
</script>

<style scoped lang="scss">

 src/subPackages/workDetail/index.vue

@@ -36,10 +36,8 @@

<style lang="scss" scoped>
    .workDetailContainer {
        padding: 0 10px;
width: 100%;
    height: 100%;
    background: url('/src/static/images/user/allBg.svg') no-repeat center center;
    background-size: cover;