fix: s

zhengyiming

2025-11-07 e9ce7a54edc42dbc12d039133b5954d259ddeefb

fix: s

 apps/underTakeMiniApp/src/constants/router.ts

@@ -6,7 +6,7 @@
  mineUserPolicy = '/subpackages/login/mineUserPolicy/mineUserPolicy',
  privacyPolicy = '/subpackages/login/privacyPolicy/privacyPolicy',
  registerForm = '/subpackages/login/registerForm/registerForm',
  // home = '/pages/home/index',
  home = '/pages/home/index',
  mine = '/pages/mine/index',
  workbenches = '/pages/workbenches/workbenches',
  editRichContent = '/subpackages/editRichContent/editRichContent',

 apps/underTakeMiniApp/src/constants/tabBar.ts

@@ -1,11 +1,6 @@
export const TabBarPageRouter = {
  // Home: '/pages/home/index',
  Workbenches: '/pages/workbenches/workbenches',
  Mine: '/pages/mine/index',
};

export const TabBarPageRouterList = [
  // TabBarPageRouter.Home,
  TabBarPageRouter.Workbenches,
  TabBarPageRouter.Mine,
];
export const TabBarPageRouterList = [TabBarPageRouter.Workbenches, TabBarPageRouter.Mine];

 apps/underTakeMiniApp/src/custom-tab-bar/index.tsx

@@ -49,7 +49,7 @@
  click: (url: string, index: number) => typeof url === 'string',
};

const whitePageList = [RouterPath.home, RouterPath.workbenches, RouterPath.mine];
const whitePageList = [RouterPath.workbenches, RouterPath.mine];

export default {
  name: 'CustomTabBar',

 apps/underTakeMiniApp/src/pages/mine/index.vue

@@ -89,7 +89,7 @@
        >
      </template>
    </ContentView>
    <CustomerServiceButton />
    <!-- <CustomerServiceButton /> -->
  </PageLayoutWithBg>
</template>

@@ -110,7 +110,7 @@
import { Message } from '@12333/utils';
import { useUserStore } from '@/stores/modules/user';
import { useQueryClient } from '@tanstack/vue-query';
import { TaskDetailWelfareItem, CustomerServiceButton, Cell } from '@12333/components';
import { TaskDetailWelfareItem, Cell } from '@12333/components';
import { EnumUserGender } from '@12333/constants';

const userStore = useUserStore();

 apps/underTakeMiniApp/src/pages/workbenches/workbenches.vue

@@ -5,6 +5,7 @@
</template>

<script setup lang="ts">
import PageLayoutWithBg from '@/components/Layout/PageLayoutWithBg.vue';
import InnerPage from './InnerPage.vue';

defineOptions({

 packages/utils/message.tsx

@@ -40,6 +40,7 @@
    } = options;
    return new Promise((resolve, reject) => {
      Portal.add((key) => {
        console.log('key: ', key);
        return (
          //@ts-ignore
          <Portal.Container keyNumber={key} delayOpen>

 pnpm-lock.yaml

@@ -5924,13 +5924,13 @@
      '@jimp/utils': 0.22.12
    dev: true

  /@jimp/plugin-blit@0.9.8(@jimp/custom@0.22.12):
  /@jimp/plugin-blit@0.9.8(@jimp/custom@0.9.8):
    resolution: {integrity: sha512-6xTDomxJybhBcby1IUVaPydZFhxf+V0DRgfDlVK81kR9kSCoshJpzWqDuWrMqjNEPspPE7jRQwHMs0FdU7mVwQ==}
    peerDependencies:
      '@jimp/custom': '>=0.3.5'
    dependencies:
      '@babel/runtime': 7.25.6
      '@jimp/custom': 0.22.12
      '@jimp/custom': 0.9.8
      '@jimp/utils': 0.9.8
      core-js: 3.38.1
    dev: true
@@ -5944,13 +5944,13 @@
      '@jimp/utils': 0.22.12
    dev: true

  /@jimp/plugin-blur@0.9.8(@jimp/custom@0.22.12):
  /@jimp/plugin-blur@0.9.8(@jimp/custom@0.9.8):
    resolution: {integrity: sha512-dqbxuNFBRbmt35iIRacdgma7nlXklmPThsKcGWNTDmqb/hniK5IC+0xSPzBV4qMI2fLGP39LWHqqDZ0xDz14dA==}
    peerDependencies:
      '@jimp/custom': '>=0.3.5'
    dependencies:
      '@babel/runtime': 7.25.6
      '@jimp/custom': 0.22.12
      '@jimp/custom': 0.9.8
      '@jimp/utils': 0.9.8
      core-js: 3.38.1
    dev: true
@@ -5985,13 +5985,13 @@
      tinycolor2: 1.6.0
    dev: true

  /@jimp/plugin-color@0.9.8(@jimp/custom@0.22.12):
  /@jimp/plugin-color@0.9.8(@jimp/custom@0.9.8):
    resolution: {integrity: sha512-SDHxOQsJHpt75hk6+sSlCPc2B3UJlXosFW+iLZ11xX1Qr0IdDtbfYlIoPmjKQFIDUNzqLSue/z7sKQ1OMZr/QA==}
    peerDependencies:
      '@jimp/custom': '>=0.3.5'
    dependencies:
      '@babel/runtime': 7.25.6
      '@jimp/custom': 0.22.12
      '@jimp/custom': 0.9.8
      '@jimp/utils': 0.9.8
      core-js: 3.38.1
      tinycolor2: 1.6.0
@@ -6022,9 +6022,9 @@
    dependencies:
      '@babel/runtime': 7.25.6
      '@jimp/custom': 0.9.8
      '@jimp/plugin-blit': 0.9.8(@jimp/custom@0.22.12)
      '@jimp/plugin-resize': 0.9.8(@jimp/custom@0.22.12)
      '@jimp/plugin-scale': 0.9.8(@jimp/custom@0.22.12)(@jimp/plugin-resize@0.9.8)
      '@jimp/plugin-blit': 0.9.8(@jimp/custom@0.9.8)
      '@jimp/plugin-resize': 0.9.8(@jimp/custom@0.9.8)
      '@jimp/plugin-scale': 0.9.8(@jimp/custom@0.9.8)(@jimp/plugin-resize@0.9.8)
      '@jimp/utils': 0.9.8
      core-js: 3.38.1
    dev: true
@@ -6054,9 +6054,9 @@
    dependencies:
      '@babel/runtime': 7.25.6
      '@jimp/custom': 0.9.8
      '@jimp/plugin-crop': 0.9.8(@jimp/custom@0.22.12)
      '@jimp/plugin-resize': 0.9.8(@jimp/custom@0.22.12)
      '@jimp/plugin-scale': 0.9.8(@jimp/custom@0.22.12)(@jimp/plugin-resize@0.9.8)
      '@jimp/plugin-crop': 0.9.8(@jimp/custom@0.9.8)
      '@jimp/plugin-resize': 0.9.8(@jimp/custom@0.9.8)
      '@jimp/plugin-scale': 0.9.8(@jimp/custom@0.9.8)(@jimp/plugin-resize@0.9.8)
      '@jimp/utils': 0.9.8
      core-js: 3.38.1
    dev: true
@@ -6070,13 +6070,13 @@
      '@jimp/utils': 0.22.12
    dev: true

  /@jimp/plugin-crop@0.9.8(@jimp/custom@0.22.12):
  /@jimp/plugin-crop@0.9.8(@jimp/custom@0.9.8):
    resolution: {integrity: sha512-Nv/6AIp4aJmbSIH2uiIqm+kSoShKM8eaX2fyrUTj811kio0hwD3f/vIxrWebvAqwDZjAFIAmMufFoFCVg6caoQ==}
    peerDependencies:
      '@jimp/custom': '>=0.3.5'
    dependencies:
      '@babel/runtime': 7.25.6
      '@jimp/custom': 0.22.12
      '@jimp/custom': 0.9.8
      '@jimp/utils': 0.9.8
      core-js: 3.38.1
    dev: true
@@ -6160,7 +6160,7 @@
    dependencies:
      '@babel/runtime': 7.25.6
      '@jimp/custom': 0.9.8
      '@jimp/plugin-rotate': 0.9.8(@jimp/custom@0.22.12)(@jimp/plugin-blit@0.9.8)(@jimp/plugin-crop@0.9.8)(@jimp/plugin-resize@0.9.8)
      '@jimp/plugin-rotate': 0.9.8(@jimp/custom@0.9.8)(@jimp/plugin-blit@0.9.8)(@jimp/plugin-crop@0.9.8)(@jimp/plugin-resize@0.9.8)
      '@jimp/utils': 0.9.8
      core-js: 3.38.1
    dev: true
@@ -6267,7 +6267,7 @@
    dependencies:
      '@babel/runtime': 7.25.6
      '@jimp/custom': 0.9.8
      '@jimp/plugin-blit': 0.9.8(@jimp/custom@0.22.12)
      '@jimp/plugin-blit': 0.9.8(@jimp/custom@0.9.8)
      '@jimp/utils': 0.9.8
      core-js: 3.38.1
      load-bmfont: 1.4.2
@@ -6284,13 +6284,13 @@
      '@jimp/utils': 0.22.12
    dev: true

  /@jimp/plugin-resize@0.9.8(@jimp/custom@0.22.12):
  /@jimp/plugin-resize@0.9.8(@jimp/custom@0.9.8):
    resolution: {integrity: sha512-L80NZ+HKsiKFyeDc6AfneC4+5XACrdL2vnyAVfAAsb3pmamgT/jDInWvvGhyI0Y76vx2w6XikplzEznW/QQvWg==}
    peerDependencies:
      '@jimp/custom': '>=0.3.5'
    dependencies:
      '@babel/runtime': 7.25.6
      '@jimp/custom': 0.22.12
      '@jimp/custom': 0.9.8
      '@jimp/utils': 0.9.8
      core-js: 3.38.1
    dev: true
@@ -6310,7 +6310,7 @@
      '@jimp/utils': 0.22.12
    dev: true

  /@jimp/plugin-rotate@0.9.8(@jimp/custom@0.22.12)(@jimp/plugin-blit@0.9.8)(@jimp/plugin-crop@0.9.8)(@jimp/plugin-resize@0.9.8):
  /@jimp/plugin-rotate@0.9.8(@jimp/custom@0.9.8)(@jimp/plugin-blit@0.9.8)(@jimp/plugin-crop@0.9.8)(@jimp/plugin-resize@0.9.8):
    resolution: {integrity: sha512-bpqzQheISYnBXKyU1lIj46uR7mRs0UhgEREWK70HnvFJSlRshdcoNMIrKamyrJeFdJrkYPSfR/a6D0d5zsWf1Q==}
    peerDependencies:
      '@jimp/custom': '>=0.3.5'
@@ -6319,10 +6319,10 @@
      '@jimp/plugin-resize': '>=0.3.5'
    dependencies:
      '@babel/runtime': 7.25.6
      '@jimp/custom': 0.22.12
      '@jimp/plugin-blit': 0.9.8(@jimp/custom@0.22.12)
      '@jimp/plugin-crop': 0.9.8(@jimp/custom@0.22.12)
      '@jimp/plugin-resize': 0.9.8(@jimp/custom@0.22.12)
      '@jimp/custom': 0.9.8
      '@jimp/plugin-blit': 0.9.8(@jimp/custom@0.9.8)
      '@jimp/plugin-crop': 0.9.8(@jimp/custom@0.9.8)
      '@jimp/plugin-resize': 0.9.8(@jimp/custom@0.9.8)
      '@jimp/utils': 0.9.8
      core-js: 3.38.1
    dev: true
@@ -6338,15 +6338,15 @@
      '@jimp/utils': 0.22.12
    dev: true

  /@jimp/plugin-scale@0.9.8(@jimp/custom@0.22.12)(@jimp/plugin-resize@0.9.8):
  /@jimp/plugin-scale@0.9.8(@jimp/custom@0.9.8)(@jimp/plugin-resize@0.9.8):
    resolution: {integrity: sha512-QU3ZS4Lre8nN66U9dKCOC4FNfaOh/QJFYUmQPKpPS924oYbtnm4OlmsdfpK2hVMSVVyVOis8M+xpA1rDBnIp7w==}
    peerDependencies:
      '@jimp/custom': '>=0.3.5'
      '@jimp/plugin-resize': '>=0.3.5'
    dependencies:
      '@babel/runtime': 7.25.6
      '@jimp/custom': 0.22.12
      '@jimp/plugin-resize': 0.9.8(@jimp/custom@0.22.12)
      '@jimp/custom': 0.9.8
      '@jimp/plugin-resize': 0.9.8(@jimp/custom@0.9.8)
      '@jimp/utils': 0.9.8
      core-js: 3.38.1
    dev: true
@@ -6373,8 +6373,8 @@
    dependencies:
      '@babel/runtime': 7.25.6
      '@jimp/custom': 0.9.8
      '@jimp/plugin-blur': 0.9.8(@jimp/custom@0.22.12)
      '@jimp/plugin-resize': 0.9.8(@jimp/custom@0.22.12)
      '@jimp/plugin-blur': 0.9.8(@jimp/custom@0.9.8)
      '@jimp/plugin-resize': 0.9.8(@jimp/custom@0.9.8)
      '@jimp/utils': 0.9.8
      core-js: 3.38.1
    dev: true
@@ -6401,8 +6401,8 @@
    dependencies:
      '@babel/runtime': 7.25.6
      '@jimp/custom': 0.9.8
      '@jimp/plugin-color': 0.9.8(@jimp/custom@0.22.12)
      '@jimp/plugin-resize': 0.9.8(@jimp/custom@0.22.12)
      '@jimp/plugin-color': 0.9.8(@jimp/custom@0.9.8)
      '@jimp/plugin-resize': 0.9.8(@jimp/custom@0.9.8)
      '@jimp/utils': 0.9.8
      core-js: 3.38.1
    dev: true
@@ -6446,13 +6446,13 @@
    dependencies:
      '@babel/runtime': 7.25.6
      '@jimp/custom': 0.9.8
      '@jimp/plugin-blit': 0.9.8(@jimp/custom@0.22.12)
      '@jimp/plugin-blur': 0.9.8(@jimp/custom@0.22.12)
      '@jimp/plugin-blit': 0.9.8(@jimp/custom@0.9.8)
      '@jimp/plugin-blur': 0.9.8(@jimp/custom@0.9.8)
      '@jimp/plugin-circle': 0.9.8(@jimp/custom@0.9.8)
      '@jimp/plugin-color': 0.9.8(@jimp/custom@0.22.12)
      '@jimp/plugin-color': 0.9.8(@jimp/custom@0.9.8)
      '@jimp/plugin-contain': 0.9.8(@jimp/custom@0.9.8)(@jimp/plugin-blit@0.9.8)(@jimp/plugin-resize@0.9.8)(@jimp/plugin-scale@0.9.8)
      '@jimp/plugin-cover': 0.9.8(@jimp/custom@0.9.8)(@jimp/plugin-crop@0.9.8)(@jimp/plugin-resize@0.9.8)(@jimp/plugin-scale@0.9.8)
      '@jimp/plugin-crop': 0.9.8(@jimp/custom@0.22.12)
      '@jimp/plugin-crop': 0.9.8(@jimp/custom@0.9.8)
      '@jimp/plugin-displace': 0.9.8(@jimp/custom@0.9.8)
      '@jimp/plugin-dither': 0.9.8(@jimp/custom@0.9.8)
      '@jimp/plugin-fisheye': 0.9.8(@jimp/custom@0.9.8)
@@ -6462,9 +6462,9 @@
      '@jimp/plugin-mask': 0.9.8(@jimp/custom@0.9.8)
      '@jimp/plugin-normalize': 0.9.8(@jimp/custom@0.9.8)
      '@jimp/plugin-print': 0.9.8(@jimp/custom@0.9.8)(@jimp/plugin-blit@0.9.8)
      '@jimp/plugin-resize': 0.9.8(@jimp/custom@0.22.12)
      '@jimp/plugin-rotate': 0.9.8(@jimp/custom@0.22.12)(@jimp/plugin-blit@0.9.8)(@jimp/plugin-crop@0.9.8)(@jimp/plugin-resize@0.9.8)
      '@jimp/plugin-scale': 0.9.8(@jimp/custom@0.22.12)(@jimp/plugin-resize@0.9.8)
      '@jimp/plugin-resize': 0.9.8(@jimp/custom@0.9.8)
      '@jimp/plugin-rotate': 0.9.8(@jimp/custom@0.9.8)(@jimp/plugin-blit@0.9.8)(@jimp/plugin-crop@0.9.8)(@jimp/plugin-resize@0.9.8)
      '@jimp/plugin-scale': 0.9.8(@jimp/custom@0.9.8)(@jimp/plugin-resize@0.9.8)
      '@jimp/plugin-shadow': 0.9.8(@jimp/custom@0.9.8)(@jimp/plugin-blur@0.9.8)(@jimp/plugin-resize@0.9.8)
      '@jimp/plugin-threshold': 0.9.8(@jimp/custom@0.9.8)(@jimp/plugin-color@0.9.8)(@jimp/plugin-resize@0.9.8)
      core-js: 3.38.1