Merge remote-tracking branch 'origin/master'

chenyao

2026-06-30 4b3c357f2fa24a27eac3fe59cbf64e34255ab212

 pnpm-lock.yaml

@@ -395,7 +395,7 @@
        version: 3.5.27
      postcss-pxtorem:
        specifier: 'catalog:'
        version: 6.1.0(postcss@8.5.6)
        version: 6.1.0(postcss@5.2.18)
      sass:
        specifier: 'catalog:'
        version: 1.97.2
@@ -947,6 +947,9 @@
      '@dcloudio/uni-ui':
        specifier: ^1.5.11
        version: 1.5.11
      '@ztzf/utils':
        specifier: workspace:*
        version: link:../../packages/utils
      dayjs:
        specifier: ^1.11.18
        version: 1.11.19
@@ -2035,8 +2038,8 @@
  '@dcloudio/uni-app-vue@3.0.0-4070520250711001':
    resolution: {integrity: sha512-/ISF+1xrcvUtcote+LfLyk/pyizTjEY6/3HZgBsOfXchkZBz0fkTWgnj5RHYeqwD7aHLsOJX93eaazNMnzD9Zw==}

  '@dcloudio/uni-app-x@0.7.100':
    resolution: {integrity: sha512-aiRJ/A5Gak24aYKbPrEB6dJycqLpL8/24hqiUOezxFcEYVjNn18UBHSwGGuFUNRw3j3RhEaFzPL5n+reQTXRjg==}
  '@dcloudio/uni-app-x@0.7.124':
    resolution: {integrity: sha512-QqiIa0t7kg6xweh58QgiEx0zX6d0CBzkb8TJz3rx8N2cTH5k2w32iSyQaDzfjSmqQITZDbWNlBxlyWUY0i4pyA==}

  '@dcloudio/uni-app@3.0.0-4070520250711001':
    resolution: {integrity: sha512-rR1SGJknJyDy80vb47yDICXcZrV11KJ5yhNG8aC+kH2ZL338faBrdOQgqqN/XJegVxJdTfv1KqUXuaShMWTZGA==}
@@ -7843,6 +7846,7 @@
  prebuild-install@7.1.3:
    resolution: {integrity: sha512-8Mf2cbV7x1cXPUILADGI3wuhfqWvtiLA1iclTDbFRZkgRQS0NqsPZphna9V+HyTEadheuPmjaJMsbzKQFOzLug==}
    engines: {node: '>=10'}
    deprecated: No longer maintained. Please contact the author of the relevant native addon; alternatives are available.
    hasBin: true

  prelude-ls@1.2.1:
@@ -10582,7 +10586,7 @@

  '@dcloudio/uni-app-vue@3.0.0-4070520250711001': {}

  '@dcloudio/uni-app-x@0.7.100': {}
  '@dcloudio/uni-app-x@0.7.124': {}

  '@dcloudio/uni-app@3.0.0-4070520250711001(@dcloudio/types@3.4.29)(@nuxt/kit@3.20.2)(@vueuse/core@9.13.0(vue@3.4.21(typescript@5.9.3)))(postcss@8.5.6)(vue@3.4.21(typescript@5.9.3))':
    dependencies:
@@ -11089,7 +11093,7 @@
  '@dcloudio/uni-uts-v1@3.0.0-4070520250711001':
    dependencies:
      '@babel/code-frame': 7.28.6
      '@dcloudio/uni-app-x': 0.7.100
      '@dcloudio/uni-app-x': 0.7.124
      '@dcloudio/uts': 3.0.0-4070520250711001
      '@rollup/pluginutils': 5.3.0(rollup@4.55.3)
      '@vue/shared': 3.4.21
@@ -18273,6 +18277,10 @@
    dependencies:
      postcss: 5.2.18

  postcss-pxtorem@6.1.0(postcss@5.2.18):
    dependencies:
      postcss: 5.2.18

  postcss-pxtorem@6.1.0(postcss@8.5.6):
    dependencies:
      postcss: 8.5.6