Merge branch 'ymf' of https://newgitea.sxczgkj.cn/czg_team/cashier_wx into gyq

2025-09-28 13:58:15 +08:00
parent 9d7cbf84b9 a8c2096096
commit 7895455b97
6 changed files with 217 additions and 39 deletions
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -4,31 +4,34 @@ settings:
  autoInstallPeers: true
  excludeLinksFromLockfile: false

-dependencies:
-  '@dcloudio/uni-app':
-    specifier: ^2.0.2-4040520250103001
-    version: 2.0.2-4070620250821001(@dcloudio/types@3.4.21)(@vue/composition-api@1.7.2)
-  bignumber.js:
-    specifier: ^9.3.1
-    version: 9.3.1
-  dayjs:
-    specifier: ^1.11.13
-    version: 1.11.18
-  jsbarcode:
-    specifier: ^3.11.6
-    version: 3.12.1
-  lodash:
-    specifier: ^4.17.21
-    version: 4.17.21
-  pinia:
-    specifier: ^2.3.1
-    version: 2.3.1(@vue/composition-api@1.7.2)(vue@3.5.21)
-  pinia-plugin-unistorage:
-    specifier: ^0.1.2
-    version: 0.1.2
-  ysk-utils:
-    specifier: ^1.0.35
-    version: 1.0.35
+importers:
+
+  .:
+    dependencies:
+      '@dcloudio/uni-app':
+        specifier: ^2.0.2-4040520250103001
+        version: 2.0.2-4070620250821001(@dcloudio/types@3.4.21)(@vue/composition-api@1.7.2(vue@3.5.22))
+      bignumber.js:
+        specifier: ^9.3.1
+        version: 9.3.1
+      dayjs:
+        specifier: ^1.11.13
+        version: 1.11.18
+      jsbarcode:
+        specifier: ^3.11.6
+        version: 3.12.1
+      lodash:
+        specifier: ^4.17.21
+        version: 4.17.21
+      pinia:
+        specifier: ^2.3.1
+        version: 2.3.1(@vue/composition-api@1.7.2(vue@3.5.22))(vue@3.5.22)
+      pinia-plugin-unistorage:
+        specifier: ^0.1.2
+        version: 0.1.2
+      ysk-utils:
+        specifier: ^1.0.35
+        version: 1.0.35

 packages:

@@ -264,6 +267,20 @@ packages:
    peerDependenciesMeta:
      typescript:
        optional: true
+<<<<<<< HEAD
+=======
+
+  ysk-utils@1.0.35:
+    resolution: {integrity: sha512-kxPtEk5zs0HjdazbH2l2x1Tm5BUpmj1MBiOnb9Xquuj2hW2NtICtq+JB6RWFO7tzAAnOC5MRw366VOKceyeK5Q==}
+
+snapshots:
+
+  '@babel/helper-string-parser@7.27.1': {}
+
+  '@babel/helper-validator-identifier@7.27.1': {}
+
+  '@babel/parser@7.28.4':
+>>>>>>> a8c20960968cbcde30318c14633993aaff66a437
    dependencies:
      '@vue/compiler-dom': 3.5.21
      '@vue/compiler-sfc': 3.5.21
@@ -272,8 +289,140 @@ packages:
      '@vue/shared': 3.5.21
    dev: false

+<<<<<<< HEAD
  /ysk-utils@1.0.35:
    resolution: {integrity: sha512-kxPtEk5zs0HjdazbH2l2x1Tm5BUpmj1MBiOnb9Xquuj2hW2NtICtq+JB6RWFO7tzAAnOC5MRw366VOKceyeK5Q==}
+=======
+  '@babel/types@7.28.4':
+    dependencies:
+      '@babel/helper-string-parser': 7.27.1
+      '@babel/helper-validator-identifier': 7.27.1
+
+  '@dcloudio/types@3.4.21': {}
+
+  '@dcloudio/uni-app@2.0.2-4070620250821001(@dcloudio/types@3.4.21)(@vue/composition-api@1.7.2(vue@3.5.22))':
+    dependencies:
+      '@dcloudio/types': 3.4.21
+      '@vue/composition-api': 1.7.2(vue@3.5.22)
+
+  '@jridgewell/sourcemap-codec@1.5.5': {}
+
+  '@vue/compiler-core@3.5.22':
+    dependencies:
+      '@babel/parser': 7.28.4
+      '@vue/shared': 3.5.22
+      entities: 4.5.0
+      estree-walker: 2.0.2
+      source-map-js: 1.2.1
+
+  '@vue/compiler-dom@3.5.22':
+    dependencies:
+      '@vue/compiler-core': 3.5.22
+      '@vue/shared': 3.5.22
+
+  '@vue/compiler-sfc@3.5.22':
+    dependencies:
+      '@babel/parser': 7.28.4
+      '@vue/compiler-core': 3.5.22
+      '@vue/compiler-dom': 3.5.22
+      '@vue/compiler-ssr': 3.5.22
+      '@vue/shared': 3.5.22
+      estree-walker: 2.0.2
+      magic-string: 0.30.19
+      postcss: 8.5.6
+      source-map-js: 1.2.1
+
+  '@vue/compiler-ssr@3.5.22':
+    dependencies:
+      '@vue/compiler-dom': 3.5.22
+      '@vue/shared': 3.5.22
+
+  '@vue/composition-api@1.7.2(vue@3.5.22)':
+    dependencies:
+      vue: 3.5.22
+
+  '@vue/devtools-api@6.6.4': {}
+
+  '@vue/reactivity@3.5.22':
+    dependencies:
+      '@vue/shared': 3.5.22
+
+  '@vue/runtime-core@3.5.22':
+    dependencies:
+      '@vue/reactivity': 3.5.22
+      '@vue/shared': 3.5.22
+
+  '@vue/runtime-dom@3.5.22':
+    dependencies:
+      '@vue/reactivity': 3.5.22
+      '@vue/runtime-core': 3.5.22
+      '@vue/shared': 3.5.22
+      csstype: 3.1.3
+
+  '@vue/server-renderer@3.5.22(vue@3.5.22)':
+    dependencies:
+      '@vue/compiler-ssr': 3.5.22
+      '@vue/shared': 3.5.22
+      vue: 3.5.22
+
+  '@vue/shared@3.5.22': {}
+
+  bignumber.js@9.3.1: {}
+
+  csstype@3.1.3: {}
+
+  dayjs@1.11.18: {}
+
+  entities@4.5.0: {}
+
+  estree-walker@2.0.2: {}
+
+  jsbarcode@3.12.1: {}
+
+  lodash@4.17.21: {}
+
+  magic-string@0.30.19:
+    dependencies:
+      '@jridgewell/sourcemap-codec': 1.5.5
+
+  nanoid@3.3.11: {}
+
+  picocolors@1.1.1: {}
+
+  pinia-plugin-unistorage@0.1.2: {}
+
+  pinia@2.3.1(@vue/composition-api@1.7.2(vue@3.5.22))(vue@3.5.22):
+    dependencies:
+      '@vue/devtools-api': 6.6.4
+      vue: 3.5.22
+      vue-demi: 0.14.10(@vue/composition-api@1.7.2(vue@3.5.22))(vue@3.5.22)
+    transitivePeerDependencies:
+      - '@vue/composition-api'
+
+  postcss@8.5.6:
+    dependencies:
+      nanoid: 3.3.11
+      picocolors: 1.1.1
+      source-map-js: 1.2.1
+
+  source-map-js@1.2.1: {}
+
+  vue-demi@0.14.10(@vue/composition-api@1.7.2(vue@3.5.22))(vue@3.5.22):
+    dependencies:
+      vue: 3.5.22
+    optionalDependencies:
+      '@vue/composition-api': 1.7.2(vue@3.5.22)
+
+  vue@3.5.22:
+    dependencies:
+      '@vue/compiler-dom': 3.5.22
+      '@vue/compiler-sfc': 3.5.22
+      '@vue/runtime-dom': 3.5.22
+      '@vue/server-renderer': 3.5.22(vue@3.5.22)
+      '@vue/shared': 3.5.22
+
+  ysk-utils@1.0.35:
+>>>>>>> a8c20960968cbcde30318c14633993aaff66a437
    dependencies:
      bignumber.js: 9.3.1
    dev: false