Merge remote-tracking branch 'origin/master'

罗广辉

2025-10-21 6bf540c64b27448f36d793aaf62d4f0314d0df79

Merge remote-tracking branch 'origin/master'

 src/pages.json

@@ -173,6 +173,16 @@
          "height": "600"
        }
      },
      {
        "iconPath": "static/images/tabbar/add-work.svg",
        "selectedIconPath": "static/images/tabbar/add-work.svg",
        "pagePath": "subPackages/workDetail/addWork/index",
        "text": "",
        "style": {
          "width": "600",
          "height": "600"
        }
      },
      {
        "iconPath": "static/images/tabbar/icon_home.png",
        "selectedIconPath": "static/images/tabbar/icon_home_selected.png",

 src/pages/map/index.vue

@@ -4,8 +4,8 @@
 * @LastEditors  : yuan
 * @LastEditTime : 2025-10-20 09:21:34
 * @FilePath     : \src\pages\map\index.vue
 * @Description  : 
 * Copyright 2025 OBKoro1, All Rights Reserved. 
 * @Description  :
 * Copyright 2025 OBKoro1, All Rights Reserved.
 * 2025-10-14 17:40:58
-->
<template>
@@ -21,11 +21,25 @@
const viewUrl = getWebViewUrl("/defaultMap");

const onPostMessage = (data) => {

  if (data.type === "scanCode") {
    uni.navigateTo({
      url: "/subPackages/qrCode/index",
    });
  }else if(data.type === "jumpAddWork"){//新建工单
      uni.switchTab({
        url: "/subPackages/taskDetail/addTask/index",
      });
  }
  else if(data.type === 'jumpMapNav'){  //事件导航
           uni.navigateTo({
            url:`/subPackages/workDetail/mapWork/index?currentItem=${data.eventNum}`
          });
      } else if(data.type === 'workid'){  //事件详情
           uni.navigateTo({
            url:`/subPackages/workDetail/index?eventNum=${data.eventNum}`
          });
      }
};

onLoad(() => {});

 src/static/images/tabbar/add-work.svg

New file
@@ -0,0 +1,10 @@
<svg width="56" height="56" viewBox="0 0 56 56" fill="none" xmlns="http://www.w3.org/2000/svg">
<g id="Group 1321316217">
<g id="&#229;&#155;&#190;&#230;&#160;&#135;">
<circle id="bg" cx="28" cy="28" r="25.5" fill="#1D6FE9" stroke="white" stroke-width="3" stroke-linecap="round" stroke-linejoin="round"/>
</g>
<g id="Frame">
<path id="Vector" d="M29.051 17.3062C29.1972 17.3062 29.3373 17.3642 29.4407 17.4675C29.544 17.5709 29.6021 17.711 29.6021 17.8572V26.6735H38.4184C38.5645 26.6735 38.7047 26.7316 38.808 26.8349C38.9114 26.9382 38.9694 27.0784 38.9694 27.2245V28.3266C38.9694 28.4727 38.9114 28.6129 38.808 28.7162C38.7047 28.8195 38.5645 28.8776 38.4184 28.8776H29.6021V37.6939C29.6021 37.84 29.544 37.9802 29.4407 38.0835C29.3373 38.1869 29.1972 38.2449 29.051 38.2449H27.949C27.8029 38.2449 27.6627 38.1869 27.5594 38.0835C27.456 37.9802 27.398 37.84 27.398 37.6939V28.8776H18.5817C18.4355 28.8776 18.2954 28.8195 18.192 28.7162C18.0887 28.6129 18.0306 28.4727 18.0306 28.3266V27.2245C18.0306 27.0784 18.0887 26.9382 18.192 26.8349C18.2954 26.7316 18.4355 26.6735 18.5817 26.6735H27.398V17.8572C27.398 17.711 27.456 17.5709 27.5594 17.4675C27.6627 17.3642 27.8029 17.3062 27.949 17.3062H29.051Z" fill="white" stroke="white" stroke-width="0.4"/>
</g>
</g>
</svg>

 src/subPackages/workDetail/index.vue

@@ -19,6 +19,7 @@
    });
    
    function onPostMessage(data) {
        console.log('data',data);
      if (data.type === 'workback'){
        
        uni.switchTab({
@@ -26,7 +27,7 @@
        });
      }else if(data.type === 'jumpMapNav'){
           uni.navigateTo({
            url:`/subPackages/workDetail/mapWork/index?currentItem=${data.currentItem.event_num}`
            url:`/subPackages/workDetail/mapWork/index?currentItem=${data.eventNum}`
          });
      }
    }