Merge remote-tracking branch 'origin/master'

chenyao

2025-11-26 f685c364f07ee6f12b3ffd368a93eb0dad26090e

Merge remote-tracking branch 'origin/master'

 src/pages/work/index.vue

@@ -31,7 +31,7 @@

        } else if (data.type === 'workid') {
            uni.navigateTo({
                url: `/subPackages/workDetail/index?eventNum=${data.eventNum}&totalNum=${data.totalNum}&keyword=${data.keyword}&aiType=${data.aiType}`
                url: `/subPackages/workDetail/index?eventNum=${data.eventNum}&totalNum=${data.totalNum}&keyword=${data.keyword}&aiType=${data.aiType}&status=${data.status}`
            });
        } else if (data.type === 'bigImage') {
            uni.navigateTo({

 src/subPackages/droneConsole/index.vue

@@ -18,9 +18,18 @@

function onPostMessage(data) {
  if (data.type === 'back'){
    // uni.navigateTo({
    //   url: `/subPackages/inProgress/index?wayLineJodInfoId=${data.taskDetails.id}`
    // });
    // #ifdef H5
    window.history.back()
    // #endif

    // #ifdef APP-PLUS
    uni.navigateBack({
      delta: 1 // 返回的页面数，默认1（返回上一页）
    });
    // #endif
  }
}


 src/subPackages/workDetail/index.vue

@@ -15,13 +15,13 @@
    const viewUrl = ref('')
    onLoad( (options) => {
        const eventNum= options.eventNum;
        viewUrl.value = getWebViewUrl('/workDetail', {eventNum:eventNum,totalNum:options.totalNum,keyword:options.keyword,aiType:options.aiType,wLJobInfoId:options.wLJobInfoId})
        viewUrl.value = getWebViewUrl('/workDetail', {eventNum:eventNum,totalNum:options.totalNum,keyword:options.keyword,aiType:options.aiType,wLJobInfoId:options.wLJobInfoId,status:options.status})
    });

    function onPostMessage(data) {

      if (data.type === 'workback'){
uni.setStorageSync('joinParams', {
      uni.setStorageSync('joinParams', {
                type: 'add'
            });
        uni.switchTab({