liyongli 2 тижнів тому
батько
коміт
c9341374cc

+ 28 - 0
bash.exe.stackdump

@@ -0,0 +1,28 @@
+Stack trace:
+Frame         Function      Args
+0007FFFF9800  00021005FE8E (000210285F68, 00021026AB6E, 0007FFFF9800, 0007FFFF8700) msys-2.0.dll+0x1FE8E
+0007FFFF9800  0002100467F9 (000000000000, 000000000000, 000000000000, 0007FFFF9AD8) msys-2.0.dll+0x67F9
+0007FFFF9800  000210046832 (000210286019, 0007FFFF96B8, 0007FFFF9800, 000000000000) msys-2.0.dll+0x6832
+0007FFFF9800  000210068CF6 (000000000000, 000000000000, 000000000000, 000000000000) msys-2.0.dll+0x28CF6
+0007FFFF9800  000210068E24 (0007FFFF9810, 000000000000, 000000000000, 000000000000) msys-2.0.dll+0x28E24
+0007FFFF9AE0  00021006A225 (0007FFFF9810, 000000000000, 000000000000, 000000000000) msys-2.0.dll+0x2A225
+End of stack trace
+Loaded modules:
+000100400000 bash.exe
+7FF97F240000 ntdll.dll
+7FF97E0F0000 KERNEL32.DLL
+7FF97C820000 KERNELBASE.dll
+7FF97D0C0000 USER32.dll
+7FF97CBF0000 win32u.dll
+7FF97EEF0000 GDI32.dll
+7FF97C420000 gdi32full.dll
+7FF97CD50000 msvcp_win.dll
+7FF97C560000 ucrtbase.dll
+000210040000 msys-2.0.dll
+7FF97DE90000 advapi32.dll
+7FF97EE40000 msvcrt.dll
+7FF97DC00000 sechost.dll
+7FF97EA90000 RPCRT4.dll
+7FF97BA10000 CRYPTBASE.DLL
+7FF97CC20000 bcryptPrimitives.dll
+7FF97EC70000 IMM32.DLL

+ 3 - 2
package.json

@@ -27,9 +27,10 @@
     "eslint": "^6.8.0",
     "eslint-plugin-vue": "^7.20.0",
     "sass": "^1.63.6",
-    "sass-loader": "^7.3.1",
+    "sass-loader": "^10.4.1", 
     "unplugin-vue-components": "^0.22.11",
-    "vue-loader-v16": "16.0.0-beta.5.4"
+    "vue-loader-v16": "16.0.0-beta.5.4",
+    "webpack": "^4.46.0" 
   },
   "eslintConfig": {
     "root": true,

+ 87 - 62
pnpm-lock.yaml

@@ -32,13 +32,13 @@ importers:
     devDependencies:
       '@vue/cli-plugin-babel':
         specifier: ~4.5.19
-        version: 4.5.19(@vue/cli-service@4.5.19)(core-js@3.26.1)(vue@3.2.45)
+        version: 4.5.19(@vue/cli-service@4.5.19(@vue/compiler-sfc@3.2.45)(lodash@4.17.21)(sass-loader@10.5.2(sass@1.63.6)(webpack@4.46.0))(vue@3.2.45))(core-js@3.26.1)(vue@3.2.45)
       '@vue/cli-plugin-eslint':
         specifier: ~4.5.19
-        version: 4.5.19(@vue/cli-service@4.5.19)(eslint@6.8.0)
+        version: 4.5.19(@vue/cli-service@4.5.19(@vue/compiler-sfc@3.2.45)(lodash@4.17.21)(sass-loader@10.5.2(sass@1.63.6)(webpack@4.46.0))(vue@3.2.45))(eslint@6.8.0)
       '@vue/cli-service':
         specifier: ~4.5.19
-        version: 4.5.19(@vue/compiler-sfc@3.2.45)(lodash@4.17.21)(sass-loader@7.3.1)(vue@3.2.45)
+        version: 4.5.19(@vue/compiler-sfc@3.2.45)(lodash@4.17.21)(sass-loader@10.5.2(sass@1.63.6)(webpack@4.46.0))(vue@3.2.45)
       '@vue/compiler-sfc':
         specifier: ^3.2.45
         version: 3.2.45
@@ -58,14 +58,17 @@ importers:
         specifier: ^1.63.6
         version: 1.63.6
       sass-loader:
-        specifier: ^7.3.1
-        version: 7.3.1(webpack@4.46.0)
+        specifier: ^10.4.1
+        version: 10.5.2(sass@1.63.6)(webpack@4.46.0)
       unplugin-vue-components:
         specifier: ^0.22.11
-        version: 0.22.11(vue@3.2.45)
+        version: 0.22.11(@babel/parser@7.22.6)(vue@3.2.45)
       vue-loader-v16:
         specifier: 16.0.0-beta.5.4
         version: 16.0.0-beta.5.4
+      webpack:
+        specifier: ^4.46.0
+        version: 4.46.0
 
 packages:
 
@@ -1706,10 +1709,6 @@ packages:
   cliui@7.0.4:
     resolution: {integrity: sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==}
 
-  clone-deep@4.0.1:
-    resolution: {integrity: sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==}
-    engines: {node: '>=6'}
-
   clone@1.0.4:
     resolution: {integrity: sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==}
     engines: {node: '>=0.8'}
@@ -2696,7 +2695,7 @@ packages:
     resolution: {integrity: sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==}
     engines: {node: '>= 4.0'}
     os: [darwin]
-    deprecated: The v1 package contains DANGEROUS / INSECURE binaries. Upgrade to safe fsevents v2
+    deprecated: Upgrade to fsevents v2 to mitigate potential security issues
 
   fsevents@2.3.2:
     resolution: {integrity: sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==}
@@ -3089,10 +3088,12 @@ packages:
   is-accessor-descriptor@0.1.6:
     resolution: {integrity: sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==}
     engines: {node: '>=0.10.0'}
+    deprecated: Please upgrade to v0.1.7
 
   is-accessor-descriptor@1.0.0:
     resolution: {integrity: sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==}
     engines: {node: '>=0.10.0'}
+    deprecated: Please upgrade to v1.0.1
 
   is-arguments@1.1.1:
     resolution: {integrity: sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==}
@@ -3145,10 +3146,12 @@ packages:
   is-data-descriptor@0.1.4:
     resolution: {integrity: sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==}
     engines: {node: '>=0.10.0'}
+    deprecated: Please upgrade to v0.1.5
 
   is-data-descriptor@1.0.0:
     resolution: {integrity: sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==}
     engines: {node: '>=0.10.0'}
+    deprecated: Please upgrade to v1.0.1
 
   is-date-object@1.0.5:
     resolution: {integrity: sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==}
@@ -3410,6 +3413,10 @@ packages:
     resolution: {integrity: sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==}
     engines: {node: '>=0.10.0'}
 
+  klona@2.0.6:
+    resolution: {integrity: sha512-dhG34DXATL5hSxJbIexCft8FChFXtmskoZYnoPWjXQuebWYCNkVeV3KkGegCK9CP1oswI/vQibS2GY7Em/sJJA==}
+    engines: {node: '>= 8'}
+
   ko-sleep@1.1.4:
     resolution: {integrity: sha512-s05WGpvvzyTuRlRE8fM7ru2Z3O+InbJuBcckTWKg2W+2c1k6SnFa3IfiSSt0/peFrlYAXgNoxuJWWVNmWh+K/A==}
 
@@ -4525,11 +4532,21 @@ packages:
   safer-buffer@2.1.2:
     resolution: {integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==}
 
-  sass-loader@7.3.1:
-    resolution: {integrity: sha512-tuU7+zm0pTCynKYHpdqaPpe+MMTQ76I9TPZ7i4/5dZsigE350shQWe5EZNl5dBidM49TPET75tNqRbcsUZWeNA==}
-    engines: {node: '>= 6.9.0'}
+  sass-loader@10.5.2:
+    resolution: {integrity: sha512-vMUoSNOUKJILHpcNCCyD23X34gve1TS7Rjd9uXHeKqhvBG39x6XbswFDtpbTElj6XdMFezoWhkh5vtKudf2cgQ==}
+    engines: {node: '>= 10.13.0'}
     peerDependencies:
-      webpack: ^3.0.0 || ^4.0.0
+      fibers: '>= 3.1.0'
+      node-sass: ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0 || ^9.0.0
+      sass: ^1.3.0
+      webpack: ^4.36.0 || ^5.0.0
+    peerDependenciesMeta:
+      fibers:
+        optional: true
+      node-sass:
+        optional: true
+      sass:
+        optional: true
 
   sass@1.63.6:
     resolution: {integrity: sha512-MJuxGMHzaOW7ipp+1KdELtqKbfAWbH7OLIdoSMnVe3EXPMTmxTmlaZDCTsgIpPCs3w99lLo9/zDKkOrJuT5byw==}
@@ -4568,6 +4585,11 @@ packages:
     resolution: {integrity: sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==}
     hasBin: true
 
+  semver@7.7.1:
+    resolution: {integrity: sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==}
+    engines: {node: '>=10'}
+    hasBin: true
+
   send@0.18.0:
     resolution: {integrity: sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==}
     engines: {node: '>= 0.8.0'}
@@ -4606,10 +4628,6 @@ packages:
     resolution: {integrity: sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==}
     hasBin: true
 
-  shallow-clone@3.0.1:
-    resolution: {integrity: sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==}
-    engines: {node: '>=8'}
-
   shebang-command@1.2.0:
     resolution: {integrity: sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==}
     engines: {node: '>=0.10.0'}
@@ -6601,9 +6619,10 @@ snapshots:
       '@vue/babel-plugin-jsx': 1.1.5(@babel/core@7.22.6)
       '@vue/babel-preset-jsx': 1.4.0(@babel/core@7.22.6)(vue@3.2.45)
       babel-plugin-dynamic-import-node: 2.3.3
-      core-js: 3.26.1
       core-js-compat: 3.31.0
       semver: 6.3.0
+    optionalDependencies:
+      core-js: 3.26.1
       vue: 3.2.45
     transitivePeerDependencies:
       - supports-color
@@ -6619,6 +6638,7 @@ snapshots:
       '@vue/babel-sugar-inject-h': 1.4.0(@babel/core@7.22.6)
       '@vue/babel-sugar-v-model': 1.4.0(@babel/core@7.22.6)
       '@vue/babel-sugar-v-on': 1.4.0(@babel/core@7.22.6)
+    optionalDependencies:
       vue: 3.2.45
 
   '@vue/babel-sugar-composition-api-inject-h@1.4.0(@babel/core@7.22.6)':
@@ -6660,11 +6680,11 @@ snapshots:
 
   '@vue/cli-overlay@4.5.19': {}
 
-  '@vue/cli-plugin-babel@4.5.19(@vue/cli-service@4.5.19)(core-js@3.26.1)(vue@3.2.45)':
+  '@vue/cli-plugin-babel@4.5.19(@vue/cli-service@4.5.19(@vue/compiler-sfc@3.2.45)(lodash@4.17.21)(sass-loader@10.5.2(sass@1.63.6)(webpack@4.46.0))(vue@3.2.45))(core-js@3.26.1)(vue@3.2.45)':
     dependencies:
       '@babel/core': 7.22.6
       '@vue/babel-preset-app': 4.5.19(@babel/core@7.22.6)(core-js@3.26.1)(vue@3.2.45)
-      '@vue/cli-service': 4.5.19(@vue/compiler-sfc@3.2.45)(lodash@4.17.21)(sass-loader@7.3.1)(vue@3.2.45)
+      '@vue/cli-service': 4.5.19(@vue/compiler-sfc@3.2.45)(lodash@4.17.21)(sass-loader@10.5.2(sass@1.63.6)(webpack@4.46.0))(vue@3.2.45)
       '@vue/cli-shared-utils': 4.5.19
       babel-loader: 8.3.0(@babel/core@7.22.6)(webpack@4.46.0)
       cache-loader: 4.1.0(webpack@4.46.0)
@@ -6677,9 +6697,9 @@ snapshots:
       - webpack-cli
       - webpack-command
 
-  '@vue/cli-plugin-eslint@4.5.19(@vue/cli-service@4.5.19)(eslint@6.8.0)':
+  '@vue/cli-plugin-eslint@4.5.19(@vue/cli-service@4.5.19(@vue/compiler-sfc@3.2.45)(lodash@4.17.21)(sass-loader@10.5.2(sass@1.63.6)(webpack@4.46.0))(vue@3.2.45))(eslint@6.8.0)':
     dependencies:
-      '@vue/cli-service': 4.5.19(@vue/compiler-sfc@3.2.45)(lodash@4.17.21)(sass-loader@7.3.1)(vue@3.2.45)
+      '@vue/cli-service': 4.5.19(@vue/compiler-sfc@3.2.45)(lodash@4.17.21)(sass-loader@10.5.2(sass@1.63.6)(webpack@4.46.0))(vue@3.2.45)
       '@vue/cli-shared-utils': 4.5.19
       eslint: 6.8.0
       eslint-loader: 2.2.1(eslint@6.8.0)(webpack@4.46.0)
@@ -6692,16 +6712,16 @@ snapshots:
       - webpack-cli
       - webpack-command
 
-  '@vue/cli-plugin-router@4.5.19(@vue/cli-service@4.5.19)':
+  '@vue/cli-plugin-router@4.5.19(@vue/cli-service@4.5.19(@vue/compiler-sfc@3.2.45)(lodash@4.17.21)(sass-loader@10.5.2(sass@1.63.6)(webpack@4.46.0))(vue@3.2.45))':
     dependencies:
-      '@vue/cli-service': 4.5.19(@vue/compiler-sfc@3.2.45)(lodash@4.17.21)(sass-loader@7.3.1)(vue@3.2.45)
+      '@vue/cli-service': 4.5.19(@vue/compiler-sfc@3.2.45)(lodash@4.17.21)(sass-loader@10.5.2(sass@1.63.6)(webpack@4.46.0))(vue@3.2.45)
       '@vue/cli-shared-utils': 4.5.19
 
-  '@vue/cli-plugin-vuex@4.5.19(@vue/cli-service@4.5.19)':
+  '@vue/cli-plugin-vuex@4.5.19(@vue/cli-service@4.5.19(@vue/compiler-sfc@3.2.45)(lodash@4.17.21)(sass-loader@10.5.2(sass@1.63.6)(webpack@4.46.0))(vue@3.2.45))':
     dependencies:
-      '@vue/cli-service': 4.5.19(@vue/compiler-sfc@3.2.45)(lodash@4.17.21)(sass-loader@7.3.1)(vue@3.2.45)
+      '@vue/cli-service': 4.5.19(@vue/compiler-sfc@3.2.45)(lodash@4.17.21)(sass-loader@10.5.2(sass@1.63.6)(webpack@4.46.0))(vue@3.2.45)
 
-  '@vue/cli-service@4.5.19(@vue/compiler-sfc@3.2.45)(lodash@4.17.21)(sass-loader@7.3.1)(vue@3.2.45)':
+  '@vue/cli-service@4.5.19(@vue/compiler-sfc@3.2.45)(lodash@4.17.21)(sass-loader@10.5.2(sass@1.63.6)(webpack@4.46.0))(vue@3.2.45)':
     dependencies:
       '@intervolga/optimize-cssnano-plugin': 1.0.6(webpack@4.46.0)
       '@soda/friendly-errors-webpack-plugin': 1.8.1(webpack@4.46.0)
@@ -6710,12 +6730,11 @@ snapshots:
       '@types/webpack': 4.41.33
       '@types/webpack-dev-server': 3.11.6(debug@4.3.4)
       '@vue/cli-overlay': 4.5.19
-      '@vue/cli-plugin-router': 4.5.19(@vue/cli-service@4.5.19)
-      '@vue/cli-plugin-vuex': 4.5.19(@vue/cli-service@4.5.19)
+      '@vue/cli-plugin-router': 4.5.19(@vue/cli-service@4.5.19(@vue/compiler-sfc@3.2.45)(lodash@4.17.21)(sass-loader@10.5.2(sass@1.63.6)(webpack@4.46.0))(vue@3.2.45))
+      '@vue/cli-plugin-vuex': 4.5.19(@vue/cli-service@4.5.19(@vue/compiler-sfc@3.2.45)(lodash@4.17.21)(sass-loader@10.5.2(sass@1.63.6)(webpack@4.46.0))(vue@3.2.45))
       '@vue/cli-shared-utils': 4.5.19
-      '@vue/compiler-sfc': 3.2.45
       '@vue/component-compiler-utils': 3.3.0(lodash@4.17.21)
-      '@vue/preload-webpack-plugin': 1.1.2(html-webpack-plugin@3.2.0)(webpack@4.46.0)
+      '@vue/preload-webpack-plugin': 1.1.2(html-webpack-plugin@3.2.0(webpack@4.46.0))(webpack@4.46.0)
       '@vue/web-component-wrapper': 1.3.0
       acorn: 7.4.1
       acorn-walk: 7.2.0
@@ -6748,12 +6767,11 @@ snapshots:
       pnp-webpack-plugin: 1.7.0
       portfinder: 1.0.32(supports-color@6.1.0)
       postcss-loader: 3.0.0
-      sass-loader: 7.3.1(webpack@4.46.0)
       ssri: 8.0.1
       terser-webpack-plugin: 1.4.5(webpack@4.46.0)
       thread-loader: 2.1.3(webpack@4.46.0)
-      url-loader: 2.3.0(file-loader@4.3.0)(webpack@4.46.0)
-      vue-loader: 15.10.1(@vue/compiler-sfc@3.2.45)(cache-loader@4.1.0)(css-loader@3.6.0)(lodash@4.17.21)(webpack@4.46.0)
+      url-loader: 2.3.0(file-loader@4.3.0(webpack@4.46.0))(webpack@4.46.0)
+      vue-loader: 15.10.1(@vue/compiler-sfc@3.2.45)(cache-loader@4.1.0(webpack@4.46.0))(css-loader@3.6.0(webpack@4.46.0))(lodash@4.17.21)(webpack@4.46.0)
       vue-style-loader: 4.1.3
       webpack: 4.46.0
       webpack-bundle-analyzer: 3.9.0
@@ -6761,6 +6779,8 @@ snapshots:
       webpack-dev-server: 3.11.3(webpack@4.46.0)
       webpack-merge: 4.2.2
     optionalDependencies:
+      '@vue/compiler-sfc': 3.2.45
+      sass-loader: 10.5.2(sass@1.63.6)(webpack@4.46.0)
       vue-loader-v16: vue-loader@16.8.3(@vue/compiler-sfc@3.2.45)(vue@3.2.45)(webpack@4.46.0)
     transitivePeerDependencies:
       - arc-templates
@@ -6936,7 +6956,7 @@ snapshots:
       - walrus
       - whiskers
 
-  '@vue/preload-webpack-plugin@1.1.2(html-webpack-plugin@3.2.0)(webpack@4.46.0)':
+  '@vue/preload-webpack-plugin@1.1.2(html-webpack-plugin@3.2.0(webpack@4.46.0))(webpack@4.46.0)':
     dependencies:
       html-webpack-plugin: 3.2.0(webpack@4.46.0)
       webpack: 4.46.0
@@ -7809,12 +7829,6 @@ snapshots:
       strip-ansi: 6.0.1
       wrap-ansi: 7.0.0
 
-  clone-deep@4.0.1:
-    dependencies:
-      is-plain-object: 2.0.4
-      kind-of: 6.0.3
-      shallow-clone: 3.0.1
-
   clone@1.0.4: {}
 
   coa@2.0.2:
@@ -7896,6 +7910,7 @@ snapshots:
   consolidate@0.15.1(lodash@4.17.21):
     dependencies:
       bluebird: 3.7.2
+    optionalDependencies:
       lodash: 4.17.21
 
   constants-browserify@1.0.0: {}
@@ -8142,16 +8157,19 @@ snapshots:
   debug@2.6.9(supports-color@6.1.0):
     dependencies:
       ms: 2.0.0
+    optionalDependencies:
       supports-color: 6.1.0
 
   debug@3.2.7(supports-color@6.1.0):
     dependencies:
       ms: 2.1.3
+    optionalDependencies:
       supports-color: 6.1.0
 
   debug@4.3.4(supports-color@6.1.0):
     dependencies:
       ms: 2.1.2
+    optionalDependencies:
       supports-color: 6.1.0
 
   decamelize@1.2.0: {}
@@ -8834,7 +8852,7 @@ snapshots:
       readable-stream: 2.3.8
 
   follow-redirects@1.15.2(debug@4.3.4):
-    dependencies:
+    optionalDependencies:
       debug: 4.3.4(supports-color@6.1.0)
 
   for-each@0.3.3:
@@ -9623,6 +9641,8 @@ snapshots:
 
   kind-of@6.0.3: {}
 
+  klona@2.0.6: {}
+
   ko-sleep@1.1.4:
     dependencies:
       ms: 2.1.3
@@ -10559,7 +10579,7 @@ snapshots:
   progress@2.0.3: {}
 
   promise-inflight@1.0.1(bluebird@3.7.2):
-    dependencies:
+    optionalDependencies:
       bluebird: 3.7.2
 
   proxy-addr@2.0.7:
@@ -10883,14 +10903,16 @@ snapshots:
 
   safer-buffer@2.1.2: {}
 
-  sass-loader@7.3.1(webpack@4.46.0):
+  sass-loader@10.5.2(sass@1.63.6)(webpack@4.46.0):
     dependencies:
-      clone-deep: 4.0.1
-      loader-utils: 1.4.2
+      klona: 2.0.6
+      loader-utils: 2.0.4
       neo-async: 2.6.2
-      pify: 4.0.1
-      semver: 6.3.0
+      schema-utils: 3.3.0
+      semver: 7.7.1
       webpack: 4.46.0
+    optionalDependencies:
+      sass: 1.63.6
 
   sass@1.63.6:
     dependencies:
@@ -10932,6 +10954,8 @@ snapshots:
 
   semver@6.3.0: {}
 
+  semver@7.7.1: {}
+
   send@0.18.0(supports-color@6.1.0):
     dependencies:
       debug: 2.6.9(supports-color@6.1.0)
@@ -10999,10 +11023,6 @@ snapshots:
       inherits: 2.0.4
       safe-buffer: 5.2.1
 
-  shallow-clone@3.0.1:
-    dependencies:
-      kind-of: 6.0.3
-
   shebang-command@1.2.0:
     dependencies:
       shebang-regex: 1.0.0
@@ -11537,7 +11557,7 @@ snapshots:
 
   unpipe@1.0.0: {}
 
-  unplugin-vue-components@0.22.11(vue@3.2.45):
+  unplugin-vue-components@0.22.11(@babel/parser@7.22.6)(vue@3.2.45):
     dependencies:
       '@antfu/utils': 0.7.5
       '@rollup/pluginutils': 5.0.2
@@ -11550,6 +11570,8 @@ snapshots:
       resolve: 1.22.2
       unplugin: 1.3.2
       vue: 3.2.45
+    optionalDependencies:
+      '@babel/parser': 7.22.6
     transitivePeerDependencies:
       - rollup
       - supports-color
@@ -11584,13 +11606,14 @@ snapshots:
 
   urix@0.1.0: {}
 
-  url-loader@2.3.0(file-loader@4.3.0)(webpack@4.46.0):
+  url-loader@2.3.0(file-loader@4.3.0(webpack@4.46.0))(webpack@4.46.0):
     dependencies:
-      file-loader: 4.3.0(webpack@4.46.0)
       loader-utils: 1.4.2
       mime: 2.6.0
       schema-utils: 2.7.1
       webpack: 4.46.0
+    optionalDependencies:
+      file-loader: 4.3.0(webpack@4.46.0)
 
   url-parse@1.5.10:
     dependencies:
@@ -11725,17 +11748,18 @@ snapshots:
       - uglify-js
       - webpack-cli
 
-  vue-loader@15.10.1(@vue/compiler-sfc@3.2.45)(cache-loader@4.1.0)(css-loader@3.6.0)(lodash@4.17.21)(webpack@4.46.0):
+  vue-loader@15.10.1(@vue/compiler-sfc@3.2.45)(cache-loader@4.1.0(webpack@4.46.0))(css-loader@3.6.0(webpack@4.46.0))(lodash@4.17.21)(webpack@4.46.0):
     dependencies:
-      '@vue/compiler-sfc': 3.2.45
       '@vue/component-compiler-utils': 3.3.0(lodash@4.17.21)
-      cache-loader: 4.1.0(webpack@4.46.0)
       css-loader: 3.6.0(webpack@4.46.0)
       hash-sum: 1.0.2
       loader-utils: 1.4.2
       vue-hot-reload-api: 2.3.4
       vue-style-loader: 4.1.3
       webpack: 4.46.0
+    optionalDependencies:
+      '@vue/compiler-sfc': 3.2.45
+      cache-loader: 4.1.0(webpack@4.46.0)
     transitivePeerDependencies:
       - arc-templates
       - atpl
@@ -11793,12 +11817,13 @@ snapshots:
 
   vue-loader@16.8.3(@vue/compiler-sfc@3.2.45)(vue@3.2.45)(webpack@4.46.0):
     dependencies:
-      '@vue/compiler-sfc': 3.2.45
       chalk: 4.1.2
       hash-sum: 2.0.0
       loader-utils: 2.0.4
-      vue: 3.2.45
       webpack: 4.46.0
+    optionalDependencies:
+      '@vue/compiler-sfc': 3.2.45
+      vue: 3.2.45
     optional: true
 
   vue-style-loader@4.1.3:

+ 3 - 0
src/config/page.json

@@ -84,5 +84,8 @@
     },
     "toupiao": {
         "title": "第十一届“陕西好青年”候选人选风采展示"
+    },
+    "fenghui": {
+        "title": "中亚峰会投票"
     }
 }

+ 2 - 2
src/view/SilkRoadSpringFestivalGala/index.vue

@@ -193,7 +193,7 @@ function changePage(type) {
 @keyframes loading {
   @for $i from 0 through 3 {
     #{percentage($i * 0.33)} {
-      opacity: $i/3 * 0.5 + 0.5;
+      opacity: calc($i/3 * 0.5 + 0.5);
     }
   }
 }
@@ -281,7 +281,7 @@ function changePage(type) {
 @keyframes rainbow {
   @for $i from 0 through 20 {
     #{percentage($i * 0.05)} {
-      color: hsl(random(360%), 75, 75);
+      color: hsl(random(360), 75%, 75%);
     }
   }
 }

+ 48 - 0
src/view/fenghui/index.js

@@ -0,0 +1,48 @@
+import App from "./index.vue";
+import "@/assets/js/common";
+import { createApp } from "vue";
+import { getPageParameters, environment } from "../../config/pageConfig";
+
+// 判断环境
+environment();
+window.$originData = getPageParameters();
+console.log(window.$originData.orginParames);
+createApp(App).mount("#app")
+
+// 分享
+window.weixin_Share_Init(
+  window.$originData.orginParames.title || "",
+  "这是世界杯",
+  "https://cxzx.smcic.net/topic/highSpeed/img/logo3.png",
+  "https://cxzx.smcic.net/topic/activity/WorldCup.html?" + Date.now()
+);
+
+var SL = new window.SmcicLogger("shanshipin", "c6124d95");
+SL.Util.SetUrl("https://collect.smcic.net:8443/");
+SL.Systematic.Init({
+  appid: "c6124d95",
+  channel: "shanshipin",
+  model: "",
+  os: "",
+  os_version: "",
+  carrier: "",
+  network_type: "",
+  ip: "",
+  app_name: "",
+  app_version: "",
+  build_version: "",
+  platform_type: "",
+});
+SL.Content.CommodityDetail({
+  commodity_detail_source: "活动",
+  commodity_id: "",
+  commodity_name: window.$originData.orginParames.title || "",
+  publisher_name: "",
+  publisher_id: "",
+  review_count: 0,
+  comment_count: 0,
+  collect_count: 0,
+  share_count: 0,
+  like_count: 0,
+  tag: [],
+});

+ 193 - 0
src/view/fenghui/index.vue

@@ -0,0 +1,193 @@
+<template>
+    <div class="WorldContribution">
+        <van-image :width="topWidth" :height="topWidth / 1.7" :src="soundbyteJpg" />
+        <br />
+        <van-cell-group inset>
+            <van-nav-bar title="活动介绍" />
+            <p style="
+            text-indent: 2em;
+            padding: 8px 8px 0 8px;
+            text-align: justify;
+            line-height: 1.5em;
+            font-size: 16px;
+          ">
+                尽管曾经的比赛已成过眼云烟,但总有些经典瞬间无法忘却。那些年的世界杯名场面、那些与挚友一同熬夜看比赛的日子,那些因为足球而欣喜、落寞、激动、感伤的时刻,会永远铭记心中。
+            </p>
+            <p style="
+            text-indent: 2em;
+            padding: 0 8px 8px 8px;
+            text-align: justify;
+            line-height: 1.5em;
+            font-size: 16px;
+          ">
+                用户可在下方“我要投稿”上传自己与足球相关的视频,题材包含:足球技巧展示、喜爱的球队/球星、球衣收藏、印象深刻的比赛等各种足球、世界杯相关的视频,并点击“我的投稿”分享邀请好友助威。参赛作品严禁抄袭、搬运等非原创内容、涉嫌违规内容
+            </p>
+        </van-cell-group>
+        <br />
+        <van-form @submit="onSubmit">
+            <van-cell-group inset>
+                <van-nav-bar title="报名信息" />
+                <van-field required v-model="from.name" label="选手姓名" placeholder="请输入用户名"
+                    :rules="[{ validator: isString, message: '请输入正确内容' }]" />
+                <van-field required v-model="from.tel" label="联系方式" type="tel" placeholder="请输入手机号"
+                    :rules="[{ validator: isNumber, message: '请输入正确内容' }]" />
+                <van-field required v-model="from.university" label="参赛院校" placeholder="请输入院校名称"
+                    :rules="[{ validator: isString, message: '请输入正确内容' }]" />
+                <van-field required v-model="from.description" label="作品简介" placeholder="请输入简介"
+                    :rules="[{ validator: isString, message: '请输入正确内容' }]" />
+                <van-field placeholder="上传作品" required label="上传作品"
+                    :rules="[{ validator: isFile, message: '请输入正确内容' }]">
+                    <template #input>
+                        <van-uploader accept="image/*" v-model="from.file" :max-count="1" :max-size="524288000"
+                            @oversize="filesize" result-type="file">
+                            <template #preview-cover>
+                                <van-icon color="#fff" size="40" @click="previewClick" name="play-circle-o play" />
+                            </template>
+                        </van-uploader>
+                        <p style="font-size: 12px; color: #666">
+                            支持上传jpg,png等格式的图片,大小100M以内
+                        </p>
+                    </template>
+                </van-field>
+                <div style="padding: 5px">
+                    <van-button block type="danger" native-type="submit">
+                        我要报名
+                    </van-button>
+                </div>
+            </van-cell-group>
+        </van-form>
+    </div>
+</template>
+<script setup>
+// import { onMounted, reactive } from "vue";
+import { ref, reactive } from 'vue';
+import { showToast } from 'vant';
+import axios from 'axios';
+import config from '@/config/index.js';
+import soundbyteJpg from '../../assets/img/upbg.jpg';
+/**
+ * window.$originData.orginParames.title 页面标题
+ * window.$originData.orginParames.parameters 固定参数值
+ * window.$originData.urlParames url参数
+ */
+
+const preview = ref('');
+const isFile = () => {
+    return from.file && from.file.length;
+};
+const isString = v => {
+    return !!v && typeof v == 'string' && isNaN(v);
+};
+const isNumber = () => {
+    return /1[0-9]{10}/g.test(from.tel);
+};
+const topWidth = ref(window.$originData.orginParames.availWidth);
+const shanshipin = window.$shanshipin || {};
+shanshipin.Phone =
+    window.$originData.urlParames.phone || shanshipin.Phone || '';
+shanshipin.UserName =
+    decodeURI(window.$originData.urlParames.userName || '') ||
+    shanshipin.UserName ||
+    '';
+const from = reactive({
+    name: shanshipin.UserName || '',
+    tel:
+        !isNaN(shanshipin.Phone) && Number(shanshipin.Phone)
+            ? shanshipin.Phone
+            : '',
+    university: '',
+    file: [],
+});
+
+const filesize = () => showToast('超出文件大小限制');
+const previewClick = () => {
+    let getUrl = null;
+    const file = from.file[0].file;
+    if (window.createObjectURL != undefined) {
+        //basic
+        getUrl = window.createObjectURL(file);
+    } else if (window.URL != undefined) {
+        //window.URL 标准定义
+        getUrl = window.URL.createObjectURL(file);
+    } else if (window.webkitURL != undefined) {
+        //window.webkitURL是webkit的内核
+        //webkit or chrome
+        getUrl = window.webkitURL.createObjectURL(file);
+    }
+    preview.value = getUrl;
+};
+
+const onSubmit = () => {
+    if (!isFile) showToast('请上传作品');
+    const oriData = new FormData();
+    oriData.append('name', from.name);
+    oriData.append('phone', from.tel);
+    oriData.append('description', from.description);
+    oriData.append('university', from.university);
+    oriData.append('file', from.file[0].file);
+
+    showToast.loading({
+        message: '报名中...',
+        forbidClick: true,
+        duration: 0,
+    });
+    axios({
+        method: 'post',
+        url: config.base.ajax + 'store',
+        headers: {
+            'Content-Type': 'multipart/form-data',
+        },
+        data: oriData,
+    })
+        .then(() => {
+            showToast('报名成功');
+            // 清空表单内容
+            from.name = '';
+            from.tel = '';
+            from.university = '';
+            from.description = '';
+            from.file = [];
+        })
+        .catch(() => {
+            showToast('报名失败');
+        });
+};
+</script>
+<style lang="scss">
+.WorldContribution {
+    width: 100vw;
+    min-height: 100vh;
+    background-image: url(../../assets/img/bg.jpg);
+    background-size: 100% 100%;
+    font-weight: 400;
+    padding-bottom: 20px;
+
+
+    .van-hairline--bottom:after {
+        border-bottom-width: 0px;
+    }
+
+    .van-nav-bar__content {
+        background-image: url('../../assets/img/title.png');
+        background-size: 100% 100%;
+        background-repeat: no-repeat;
+        overflow: hidden;
+    }
+
+
+    .van-nav-bar__title {
+        color: #f63634;
+        font-size: 23px;
+    }
+
+
+    .van-button__text {
+        font-size: 15px;
+        font-weight: 400;
+    }
+
+    .van-uploader__preview-cover {
+        background-color: #000;
+    }
+}
+</style>