fix：解决合并分支冲突

apps/mobile/src/components/mine/MineHeader.vue

@@ -505,7 +505,61 @@ export default {
         window.location.href = '/jyapp/free/customer'
       }
     },
-<<<<<<< HEAD
+    // 获取超级订阅活动配置
+    async getVipActivityConfig() {
+      const { data } = await vipGiftActivityConfigAjax()
+      if (data) {
+        const { startTime, endTime } = data
+        // 校验时间有效性
+        const isValidPeriod =
+          startTime && endTime && parseInt(startTime) < parseInt(endTime)
+        const nowTime = Math.floor(Date.now() / 1000)
+        this.vipGiftPeriod =
+          isValidPeriod &&
+          nowTime >= parseInt(startTime) &&
+          nowTime <= parseInt(endTime)
+      }
+    },
+    // 送好友
+    sendToFriend() {
+      const nowTime = Date.now()
+      const expireTime = this.activeAccountType.vipEntTime
+      if (!this.accountInfo.hasVip) {
+        // 非超级订阅
+        return this.$dialog
+          .alert({
+            title: '温馨提示',
+            message:
+              '您当前不是超级订阅会员，无法赠送给好友，您可以先购买后再赠送给好友。',
+            confirmButtonText: '去购买',
+            className: 'j-confirm-dialog'
+          })
+          .then(() => {
+            this.$router.push('/order/create/svip?type=buy')
+          })
+      } else if (this.accountInfo.hasVip && this.giftMonth < 1) {
+        // 是超级订阅 & 有到期时间 & 到期时间距现在不足1个月
+        return this.$dialog
+          .alert({
+            title: '温馨提示',
+            message:
+              '您当前剩余订阅周期不满1个月，无法赠送给好友。您可以先续费后再赠送给好友。',
+            confirmButtonText: '去续费',
+            className: 'j-confirm-dialog'
+          })
+          .then(() => {
+            this.$router.push('/order/create/svip?type=renew')
+          })
+      } else {
+        this.$router.push('/giving/friend')
+      }
+    },
+    async getGiftSource() {
+      const { data } = await getSubResourcesAjax()
+      if (data) {
+        this.giftMonth = data?.gifted
+      }
+    },
     bindPhoneJumpSetting() {
       return {
         props: {
@@ -604,61 +658,6 @@ export default {
         next: () => {
           this.renewConsult()
         }
-=======
-    // 获取超级订阅活动配置
-    async getVipActivityConfig() {
-      const { data } = await vipGiftActivityConfigAjax()
-      if (data) {
-        const { startTime, endTime } = data
-        // 校验时间有效性
-        const isValidPeriod =
-          startTime && endTime && parseInt(startTime) < parseInt(endTime)
-        const nowTime = Math.floor(Date.now() / 1000)
-        this.vipGiftPeriod =
-          isValidPeriod &&
-          nowTime >= parseInt(startTime) &&
-          nowTime <= parseInt(endTime)
-      }
-    },
-    // 送好友
-    sendToFriend() {
-      const nowTime = Date.now()
-      const expireTime = this.activeAccountType.vipEntTime
-      if (!this.accountInfo.hasVip) {
-        // 非超级订阅
-        return this.$dialog
-          .alert({
-            title: '温馨提示',
-            message:
-              '您当前不是超级订阅会员，无法赠送给好友，您可以先购买后再赠送给好友。',
-            confirmButtonText: '去购买',
-            className: 'j-confirm-dialog'
-          })
-          .then(() => {
-            this.$router.push('/order/create/svip?type=buy')
-          })
-      } else if (this.accountInfo.hasVip && this.giftMonth < 1) {
-        // 是超级订阅 & 有到期时间 & 到期时间距现在不足1个月
-        return this.$dialog
-          .alert({
-            title: '温馨提示',
-            message:
-              '您当前剩余订阅周期不满1个月，无法赠送给好友。您可以先续费后再赠送给好友。',
-            confirmButtonText: '去续费',
-            className: 'j-confirm-dialog'
-          })
-          .then(() => {
-            this.$router.push('/order/create/svip?type=renew')
-          })
-      } else {
-        this.$router.push('/giving/friend')
-      }
-    },
-    async getGiftSource() {
-      const { data } = await getSubResourcesAjax()
-      if (data) {
-        this.giftMonth = data?.gifted
->>>>>>> main
       }
     }
   }

pnpm-lock.yaml

@@ -107,14 +107,10 @@ importers:
         version: 2.15.23-rc(vue@2.7.16)
       excellentexport:
         specifier: ^3.8.1
-<<<<<<< HEAD
         version: 3.8.1
-=======
-        version: 3.9.9
       html2canvas:
         specifier: ^1.4.1
         version: 1.4.1
->>>>>>> main
       js-cookie:
         specifier: ^3.0.1
         version: 3.0.1
@@ -132,14 +128,10 @@ importers:
         version: 2.0.6
       v-charts:
         specifier: 1.19.0
-<<<<<<< HEAD
         version: 1.19.0(echarts@4.8.0)(vue@2.7.16)(zrender@4.3.2)
-=======
-        version: 1.19.0(echarts@4.8.0)(vue@2.7.16)(zrender@4.3.3)
       vue-clipboard2:
         specifier: ^0.3.3
         version: 0.3.3
->>>>>>> main
       vue-cookies:
         specifier: ^1.7.4
         version: 1.7.4
@@ -294,7 +286,7 @@ importers:
         version: 5.19.2
       unplugin-vue-components:
         specifier: ^0.25.1
-        version: 0.25.1(rollup@0.58.2)(vue@2.7.16)
+        version: 0.25.1(vue@2.7.16)
       vite:
         specifier: ^4.5.3
         version: 4.5.3(less@4.1.3)(sass@1.71.1)(terser@5.19.2)
@@ -870,7 +862,7 @@ importers:
         version: 5.19.2
       unplugin-vue-components:
         specifier: ^0.25.1
-        version: 0.25.1(rollup@0.58.2)(vue@2.7.16)
+        version: 0.25.1(vue@2.7.16)
       vite:
         specifier: ^4.5.3
         version: 4.5.3(less@4.1.3)(sass@1.71.1)(terser@5.19.2)
@@ -891,65 +883,65 @@ importers:
     dependencies:
       qs:
         specifier: ^6.11.2
-        version: 6.14.0
+        version: 6.11.2
     devDependencies:
       '@jonny1994/postcss-px-to-viewport':
         specifier: ^1.1.0
-        version: 1.1.0(postcss@8.5.3)
+        version: 1.1.0(postcss@8.4.38)
       '@nabla/vite-plugin-eslint':
         specifier: ^2.0.2
-        version: 2.0.5(eslint@8.57.1)(vite@4.5.9)
+        version: 2.0.2(eslint@8.57.0)(vite@4.5.3)
       '@rushstack/eslint-patch':
         specifier: ^1.1.0
-        version: 1.10.5
+        version: 1.1.0
       '@vitejs/plugin-vue2':
         specifier: ^2.2.0
-        version: 2.3.3(vite@4.5.9)(vue@2.7.16)
+        version: 2.2.0(vite@4.5.3)(vue@2.7.16)
       '@vue/eslint-config-prettier':
         specifier: ^7.0.0
-        version: 7.1.0(eslint@8.57.1)(prettier@2.8.8)
+        version: 7.0.0(eslint@8.57.0)(prettier@2.5.1)
       autoprefixer:
         specifier: ^10.4.14
-        version: 10.4.20(postcss@8.5.3)
+        version: 10.4.14(postcss@8.4.38)
       eslint:
         specifier: ^8.57.0
-        version: 8.57.1
+        version: 8.57.0
       eslint-plugin-vue:
         specifier: ^9.22.0
-        version: 9.32.0(eslint@8.57.1)
+        version: 9.28.0(eslint@8.57.0)
       less:
         specifier: ^4.1.3
-        version: 4.2.2
+        version: 4.1.3
       prettier:
         specifier: ^2.5.1
-        version: 2.8.8
+        version: 2.5.1
       rollup-plugin-visualizer:
         specifier: ^5.9.2
-        version: 5.14.0(rollup@0.58.2)
+        version: 5.9.2(rollup@0.58.2)
       sass:
         specifier: ^1.63.2
-        version: 1.85.1
+        version: 1.71.1
       terser:
         specifier: ^5.14.2
-        version: 5.39.0
+        version: 5.19.2
       unplugin-vue-components:
         specifier: ^0.25.1
-        version: 0.25.2(rollup@0.58.2)(vue@2.7.16)
+        version: 0.25.1(vue@2.7.16)
       vite:
         specifier: ^4.5.3
-        version: 4.5.9(less@4.2.2)(sass@1.85.1)(terser@5.39.0)
+        version: 4.5.3(less@4.1.3)(sass@1.71.1)(terser@5.19.2)
       vite-plugin-compression:
         specifier: ^0.5.1
-        version: 0.5.1(vite@4.5.9)
+        version: 0.5.1(vite@4.5.3)
       vite-plugin-css-injected-by-js:
         specifier: ^3.1.0
-        version: 3.5.2(vite@4.5.9)
+        version: 3.1.0(vite@4.5.3)
       vite-plugin-ejs:
         specifier: 1.6.4
         version: 1.6.4
       vite-plugin-externals:
         specifier: ^0.6.2
-        version: 0.6.2(vite@4.5.9)
+        version: 0.6.2(vite@4.5.3)
 
   plugins/login-auth:
     dependencies:
@@ -4080,160 +4072,7 @@ packages:
     engines: {node: '>= 8'}
     dependencies:
       '@nodelib/fs.scandir': 2.1.5
-<<<<<<< HEAD
       fastq: 1.15.0
-=======
-      fastq: 1.19.0
-
-  /@parcel/watcher-android-arm64@2.5.1:
-    resolution: {integrity: sha512-KF8+j9nNbUN8vzOFDpRMsaKBHZ/mcjEjMToVMJOhTozkDonQFFrRcfdLWn6yWKCmJKmdVxSgHiYvTCef4/qcBA==}
-    engines: {node: '>= 10.0.0'}
-    cpu: [arm64]
-    os: [android]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /@parcel/watcher-darwin-arm64@2.5.1:
-    resolution: {integrity: sha512-eAzPv5osDmZyBhou8PoF4i6RQXAfeKL9tjb3QzYuccXFMQU0ruIc/POh30ePnaOyD1UXdlKguHBmsTs53tVoPw==}
-    engines: {node: '>= 10.0.0'}
-    cpu: [arm64]
-    os: [darwin]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /@parcel/watcher-darwin-x64@2.5.1:
-    resolution: {integrity: sha512-1ZXDthrnNmwv10A0/3AJNZ9JGlzrF82i3gNQcWOzd7nJ8aj+ILyW1MTxVk35Db0u91oD5Nlk9MBiujMlwmeXZg==}
-    engines: {node: '>= 10.0.0'}
-    cpu: [x64]
-    os: [darwin]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /@parcel/watcher-freebsd-x64@2.5.1:
-    resolution: {integrity: sha512-SI4eljM7Flp9yPuKi8W0ird8TI/JK6CSxju3NojVI6BjHsTyK7zxA9urjVjEKJ5MBYC+bLmMcbAWlZ+rFkLpJQ==}
-    engines: {node: '>= 10.0.0'}
-    cpu: [x64]
-    os: [freebsd]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /@parcel/watcher-linux-arm-glibc@2.5.1:
-    resolution: {integrity: sha512-RCdZlEyTs8geyBkkcnPWvtXLY44BCeZKmGYRtSgtwwnHR4dxfHRG3gR99XdMEdQ7KeiDdasJwwvNSF5jKtDwdA==}
-    engines: {node: '>= 10.0.0'}
-    cpu: [arm]
-    os: [linux]
-    libc: [glibc]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /@parcel/watcher-linux-arm-musl@2.5.1:
-    resolution: {integrity: sha512-6E+m/Mm1t1yhB8X412stiKFG3XykmgdIOqhjWj+VL8oHkKABfu/gjFj8DvLrYVHSBNC+/u5PeNrujiSQ1zwd1Q==}
-    engines: {node: '>= 10.0.0'}
-    cpu: [arm]
-    os: [linux]
-    libc: [musl]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /@parcel/watcher-linux-arm64-glibc@2.5.1:
-    resolution: {integrity: sha512-LrGp+f02yU3BN9A+DGuY3v3bmnFUggAITBGriZHUREfNEzZh/GO06FF5u2kx8x+GBEUYfyTGamol4j3m9ANe8w==}
-    engines: {node: '>= 10.0.0'}
-    cpu: [arm64]
-    os: [linux]
-    libc: [glibc]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /@parcel/watcher-linux-arm64-musl@2.5.1:
-    resolution: {integrity: sha512-cFOjABi92pMYRXS7AcQv9/M1YuKRw8SZniCDw0ssQb/noPkRzA+HBDkwmyOJYp5wXcsTrhxO0zq1U11cK9jsFg==}
-    engines: {node: '>= 10.0.0'}
-    cpu: [arm64]
-    os: [linux]
-    libc: [musl]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /@parcel/watcher-linux-x64-glibc@2.5.1:
-    resolution: {integrity: sha512-GcESn8NZySmfwlTsIur+49yDqSny2IhPeZfXunQi48DMugKeZ7uy1FX83pO0X22sHntJ4Ub+9k34XQCX+oHt2A==}
-    engines: {node: '>= 10.0.0'}
-    cpu: [x64]
-    os: [linux]
-    libc: [glibc]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /@parcel/watcher-linux-x64-musl@2.5.1:
-    resolution: {integrity: sha512-n0E2EQbatQ3bXhcH2D1XIAANAcTZkQICBPVaxMeaCVBtOpBZpWJuf7LwyWPSBDITb7In8mqQgJ7gH8CILCURXg==}
-    engines: {node: '>= 10.0.0'}
-    cpu: [x64]
-    os: [linux]
-    libc: [musl]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /@parcel/watcher-win32-arm64@2.5.1:
-    resolution: {integrity: sha512-RFzklRvmc3PkjKjry3hLF9wD7ppR4AKcWNzH7kXR7GUe0Igb3Nz8fyPwtZCSquGrhU5HhUNDr/mKBqj7tqA2Vw==}
-    engines: {node: '>= 10.0.0'}
-    cpu: [arm64]
-    os: [win32]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /@parcel/watcher-win32-ia32@2.5.1:
-    resolution: {integrity: sha512-c2KkcVN+NJmuA7CGlaGD1qJh1cLfDnQsHjE89E60vUEMlqduHGCdCLJCID5geFVM0dOtA3ZiIO8BoEQmzQVfpQ==}
-    engines: {node: '>= 10.0.0'}
-    cpu: [ia32]
-    os: [win32]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /@parcel/watcher-win32-x64@2.5.1:
-    resolution: {integrity: sha512-9lHBdJITeNR++EvSQVUcaZoWupyHfXe1jZvGZ06O/5MflPcuPLtEphScIBL+AiCWBO46tDSHzWyD0uDmmZqsgA==}
-    engines: {node: '>= 10.0.0'}
-    cpu: [x64]
-    os: [win32]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /@parcel/watcher@2.5.1:
-    resolution: {integrity: sha512-dfUnCxiN9H4ap84DvD2ubjw+3vUNpstxa0TneY/Paat8a3R4uQZDLSvWjmznAY/DoahqTHl9V46HF/Zs3F29pg==}
-    engines: {node: '>= 10.0.0'}
-    requiresBuild: true
-    dependencies:
-      detect-libc: 1.0.3
-      is-glob: 4.0.3
-      micromatch: 4.0.8
-      node-addon-api: 7.1.1
-    optionalDependencies:
-      '@parcel/watcher-android-arm64': 2.5.1
-      '@parcel/watcher-darwin-arm64': 2.5.1
-      '@parcel/watcher-darwin-x64': 2.5.1
-      '@parcel/watcher-freebsd-x64': 2.5.1
-      '@parcel/watcher-linux-arm-glibc': 2.5.1
-      '@parcel/watcher-linux-arm-musl': 2.5.1
-      '@parcel/watcher-linux-arm64-glibc': 2.5.1
-      '@parcel/watcher-linux-arm64-musl': 2.5.1
-      '@parcel/watcher-linux-x64-glibc': 2.5.1
-      '@parcel/watcher-linux-x64-musl': 2.5.1
-      '@parcel/watcher-win32-arm64': 2.5.1
-      '@parcel/watcher-win32-ia32': 2.5.1
-      '@parcel/watcher-win32-x64': 2.5.1
-    dev: true
-    optional: true
->>>>>>> main
 
   /@pkgr/core@0.1.1:
     resolution: {integrity: sha512-cq8o4cWH0ibXh9VGi5P20Tu9XF/0fFXl9EUinr9QfTM7a7p0oTA4iJRCQWppXR1Pg8dSM0UCItCkPwsk9qWWYA==}
@@ -4400,7 +4239,6 @@ packages:
     resolution: {integrity: sha512-mS6wQ6Do6/wmrF9aTFVpIJ3/IDXhg1EZcQFYHZLHqw6AzMBjTHWnCG35HxSqUNphh0EHqSM6wRTT8HsL1C0x5g==}
     cpu: [arm]
     os: [linux]
-    libc: [glibc]
     requiresBuild: true
     dev: true
     optional: true
@@ -4409,7 +4247,6 @@ packages:
     resolution: {integrity: sha512-EfI3hzYAy5vFNDqpXsNxXcgRDcFHUWSx5nnRSCKwXuQlI5J9dD84g2Usw81n3FLBNsGCegKGwwTVsSKK9cooSQ==}
     cpu: [arm]
     os: [linux]
-    libc: [musl]
     requiresBuild: true
     dev: true
     optional: true
@@ -4427,11 +4264,7 @@ packages:
     resolution: {integrity: sha512-9lhc4UZstsegbNLhH0Zu6TqvDfmhGzuCWtcTFXY10VjLLUe4Mr0Ye2L3rrtHaDd/J5+tFMEuo5LTCSCMXWfUKw==}
     cpu: [arm64]
     os: [linux]
-<<<<<<< HEAD
     libc: [glibc]
-=======
-    libc: [musl]
->>>>>>> main
     requiresBuild: true
     dev: true
     optional: true
@@ -4440,11 +4273,7 @@ packages:
     resolution: {integrity: sha512-nDY6Yz5xS/Y4M2i9JLQd3Rofh5OR8Bn8qe3Mv/qCVpHFlwtZSBYSPaU4mrGazWkXrdQ98GB//H0BirGR/SKFSw==}
     cpu: [arm64]
     os: [linux]
-<<<<<<< HEAD
     libc: [musl]
-=======
-    libc: [glibc]
->>>>>>> main
     requiresBuild: true
     dev: true
     optional: true
@@ -4498,11 +4327,7 @@ packages:
     resolution: {integrity: sha512-DNGZvZDO5YF7jN5fX8ZqmGLjZEXIJRdJEdTFMhiyXqyXubBa0WVLDWSNlQ5JR2PNgDbEV1VQowhVRUh+74D+RA==}
     cpu: [x64]
     os: [linux]
-<<<<<<< HEAD
     libc: [glibc]
-=======
-    libc: [musl]
->>>>>>> main
     requiresBuild: true
     dev: true
     optional: true
@@ -5626,7 +5451,7 @@ packages:
       vite: ^3.0.0 || ^4.0.0
       vue: ^2.7.0-0
     dependencies:
-      vite: 4.5.3(less@4.1.3)(sass@1.71.1)(terser@5.19.2)
+      vite: 4.5.3(less@4.1.3)(sass@1.63.2)(terser@5.19.2)
       vue: 2.7.16
     dev: true
 
@@ -7682,11 +7507,11 @@ packages:
     peerDependencies:
       postcss: ^8.1.0
     dependencies:
-      browserslist: 4.21.9
-      caniuse-lite: 1.0.30001517
+      browserslist: 4.23.3
+      caniuse-lite: 1.0.30001659
       fraction.js: 4.2.0
       normalize-range: 0.1.2
-      picocolors: 1.0.0
+      picocolors: 1.1.0
       postcss: 8.4.35
       postcss-value-parser: 4.2.0
     dev: true
@@ -14601,7 +14426,7 @@ packages:
     engines: {node: ^10 || ^12 || >=14}
     dependencies:
       nanoid: 3.3.7
-      picocolors: 1.0.0
+      picocolors: 1.1.0
       source-map-js: 1.2.0
     dev: true
 
@@ -15486,17 +15311,12 @@ packages:
     resolution: {integrity: sha512-mEugaLK+YfkijB4fx0e6kImuJdCIt2LxCRcbEYPqRGCs4F2ogyfZU5IAZRdjCP8JPq2AtdNoC/Dux63d9Kiryg==}
     dev: true
 
-<<<<<<< HEAD
-  /selfsigned@2.1.1:
-    resolution: {integrity: sha512-GSL3aowiF7wa/WtSFwnUrludWFoNhftq8bUkH9pkzjpN2XSPOAYEgg6e0sS9s0rZwgJzJiQRPU18A6clnoW5wQ==}
-=======
   /select@1.1.2:
     resolution: {integrity: sha512-OwpTSOfy6xSs1+pwcNrv0RBMOzI39Lp3qQKUTPVVPRjCdNa5JH/oPRiqsesIskK8TVgmRiHwO4KXlV2Li9dANA==}
     dev: false
 
-  /selfsigned@2.4.1:
-    resolution: {integrity: sha512-th5B4L2U+eGLq1TVh7zNRGBapioSORUeymIydxgFpwww9d2qyKvtuPU2jJuHvYAwwqi2Y596QBL3eEqcPEYL8Q==}
->>>>>>> main
+  /selfsigned@2.1.1:
+    resolution: {integrity: sha512-GSL3aowiF7wa/WtSFwnUrludWFoNhftq8bUkH9pkzjpN2XSPOAYEgg6e0sS9s0rZwgJzJiQRPU18A6clnoW5wQ==}
     engines: {node: '>=10'}
     dependencies:
       node-forge: 1.3.1
@@ -16294,17 +16114,12 @@ packages:
     resolution: {integrity: sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==}
     dev: true
 
-<<<<<<< HEAD
-  /tinybench@2.5.1:
-    resolution: {integrity: sha512-65NKvSuAVDP/n4CqH+a9w2kTlLReS9vhsAP06MWx+/89nMinJyB2icyl58RIcqCmIggpojIGeuJGhjU1aGMBSg==}
-=======
   /tiny-emitter@2.1.0:
     resolution: {integrity: sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q==}
     dev: false
 
-  /tinybench@2.9.0:
-    resolution: {integrity: sha512-0+DUvqWMValLmha6lr4kD8iAMK1HzV0/aKnCtWb9v9641TnP/MFb7Pc2bxoxQjTXAErryXVgUOfv2YqNllqGeg==}
->>>>>>> main
+  /tinybench@2.5.1:
+    resolution: {integrity: sha512-65NKvSuAVDP/n4CqH+a9w2kTlLReS9vhsAP06MWx+/89nMinJyB2icyl58RIcqCmIggpojIGeuJGhjU1aGMBSg==}
     dev: true
 
   /tinyexec@0.3.0:
@@ -16818,6 +16633,35 @@ packages:
       - supports-color
     dev: true
 
+  /unplugin-vue-components@0.25.1(vue@2.7.16):
+    resolution: {integrity: sha512-kzS2ZHVMaGU2XEO2keYQcMjNZkanDSGDdY96uQT9EPe+wqSZwwgbFfKVJ5ti0+8rGAcKHColwKUvctBhq2LJ3A==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@babel/parser': ^7.15.8
+      '@nuxt/kit': ^3.2.2
+      vue: 2 || 3
+    peerDependenciesMeta:
+      '@babel/parser':
+        optional: true
+      '@nuxt/kit':
+        optional: true
+    dependencies:
+      '@antfu/utils': 0.7.10
+      '@rollup/pluginutils': 5.1.0(rollup@0.58.2)
+      chokidar: 3.5.3
+      debug: 4.3.7
+      fast-glob: 3.3.2
+      local-pkg: 0.4.3
+      magic-string: 0.30.8
+      minimatch: 9.0.5
+      resolve: 1.22.8
+      unplugin: 1.5.1
+      vue: 2.7.16
+    transitivePeerDependencies:
+      - rollup
+      - supports-color
+    dev: true
+
   /unplugin@1.0.1:
     resolution: {integrity: sha512-aqrHaVBWW1JVKBHmGo33T5TxeL0qWzfvjWokObHA9bYmN7eNDkwOxmLjhioHl9878qDFMAaT51XNroRyuz7WxA==}
     dependencies:
@@ -17106,7 +16950,7 @@ packages:
       es-module-lexer: 0.4.1
       fs-extra: 10.1.0
       magic-string: 0.25.9
-      vite: 4.5.3(less@4.1.3)(sass@1.71.1)(terser@5.19.2)
+      vite: 4.5.3(less@4.1.3)(sass@1.63.2)(terser@5.19.2)
     dev: true
 
   /vite-plugin-html-redirect@1.0.4:
@@ -17150,7 +16994,7 @@ packages:
       - supports-color
     dev: true
 
-  /vite@4.5.1(@types/node@20.4.5)(sass@1.63.2):
+  /vite@4.5.1(@types/node@20.4.5):
     resolution: {integrity: sha512-AXXFaAJ8yebyqzoNB9fu2pHoo/nWX+xZlaRwoeYUxEqBO+Zj4msE5G+BhGBll9lYEKv9Hfks52PAF2X7qDYXQA==}
     engines: {node: ^14.18.0 || >=16.0.0}
     hasBin: true
@@ -17182,45 +17026,6 @@ packages:
       esbuild: 0.18.20
       postcss: 8.4.38
       rollup: 3.29.4
-      sass: 1.63.2
-    optionalDependencies:
-      fsevents: 2.3.3
-    dev: true
-
-  /vite@4.5.1(@types/node@20.4.5)(sass@1.71.1)(terser@5.19.2):
-    resolution: {integrity: sha512-AXXFaAJ8yebyqzoNB9fu2pHoo/nWX+xZlaRwoeYUxEqBO+Zj4msE5G+BhGBll9lYEKv9Hfks52PAF2X7qDYXQA==}
-    engines: {node: ^14.18.0 || >=16.0.0}
-    hasBin: true
-    peerDependencies:
-      '@types/node': '>= 14'
-      less: '*'
-      lightningcss: ^1.21.0
-      sass: '*'
-      stylus: '*'
-      sugarss: '*'
-      terser: ^5.4.0
-    peerDependenciesMeta:
-      '@types/node':
-        optional: true
-      less:
-        optional: true
-      lightningcss:
-        optional: true
-      sass:
-        optional: true
-      stylus:
-        optional: true
-      sugarss:
-        optional: true
-      terser:
-        optional: true
-    dependencies:
-      '@types/node': 20.4.5
-      esbuild: 0.18.20
-      postcss: 8.4.38
-      rollup: 3.29.4
-      sass: 1.71.1
-      terser: 5.19.2
     optionalDependencies:
       fsevents: 2.3.3
     dev: true
@@ -17529,7 +17334,7 @@ packages:
       strip-literal: 1.3.0
       tinybench: 2.5.1
       tinypool: 0.7.0
-      vite: 4.5.1(@types/node@20.4.5)(sass@1.71.1)(terser@5.19.2)
+      vite: 4.5.1(@types/node@20.4.5)
       vite-node: 0.34.6(@types/node@20.4.5)(sass@1.71.1)(terser@5.19.2)
       why-is-node-running: 2.2.2
     transitivePeerDependencies:
@@ -17594,7 +17399,7 @@ packages:
       strip-literal: 1.3.0
       tinybench: 2.5.1
       tinypool: 0.7.0
-      vite: 4.5.1(@types/node@20.4.5)(sass@1.63.2)
+      vite: 5.2.8(@types/node@20.4.5)(sass@1.63.2)
       vite-node: 0.34.6(@types/node@20.4.5)(sass@1.63.2)
       why-is-node-running: 2.2.2
     transitivePeerDependencies:
@@ -17659,7 +17464,7 @@ packages:
       strip-literal: 1.3.0
       tinybench: 2.5.1
       tinypool: 0.7.0
-      vite: 4.5.1(@types/node@20.4.5)(sass@1.71.1)(terser@5.19.2)
+      vite: 5.2.8(@types/node@20.4.5)(sass@1.71.1)(terser@5.19.2)
       vite-node: 0.34.6(@types/node@20.4.5)(sass@1.71.1)(terser@5.19.2)
       why-is-node-running: 2.2.2
     transitivePeerDependencies:
@@ -17687,19 +17492,14 @@ packages:
       vue: 2.7.16
     dev: false
 
-<<<<<<< HEAD
-  /vue-cookies@1.7.4:
-    resolution: {integrity: sha512-mOS5Btr8V9zvAtkmQ7/TfqJIropOx7etDAgBywPCmHjvfJl2gFbH2XgoMghleLoyyMTi5eaJss0mPN7arMoslA==}
-=======
   /vue-clipboard2@0.3.3:
     resolution: {integrity: sha512-aNWXIL2DKgJyY/1OOeITwAQz1fHaCIGvUFHf9h8UcoQBG5a74MkdhS/xqoYe7DNZdQmZRL+TAdIbtUs9OyVjbw==}
     dependencies:
       clipboard: 2.0.11
     dev: false
 
-  /vue-cookies@1.8.6:
-    resolution: {integrity: sha512-e2kYaHj1Y/zVsBSM3KWlOoVJ5o3l4QZjytNU7xdCgmkw3521CMUerqHekBGZKXXC1oRxYljBeeOK2SCel6cKuw==}
->>>>>>> main
+  /vue-cookies@1.7.4:
+    resolution: {integrity: sha512-mOS5Btr8V9zvAtkmQ7/TfqJIropOx7etDAgBywPCmHjvfJl2gFbH2XgoMghleLoyyMTi5eaJss0mPN7arMoslA==}
     dev: false
 
   /vue-demi@0.14.6(vue@2.7.14):
@@ -18127,19 +17927,17 @@ packages:
     resolution: {integrity: sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw==}
     dev: true
 
-<<<<<<< HEAD
+  /vue-waterfall-easy@2.4.4:
+    resolution: {integrity: sha512-5OkpT2FPNC3rHBy858zk/nmJxqdPaGmj/KVbmA6dgcvtsovKMa+zuf/Z7F+S2NnObeavpIBztTWgcH3S42ZD+g==}
+    engines: {node: '>= 6.0.0', npm: '>= 3.0.0'}
+    dev: true
+
   /vue@2.7.14:
     resolution: {integrity: sha512-b2qkFyOM0kwqWFuQmgd4o+uHGU7T+2z3T+WQp8UBjADfEv2n4FEMffzBmCKNP0IGzOEEfYjvtcC62xaSKeQDrQ==}
     deprecated: Vue 2 has reached EOL and is no longer actively maintained. See https://v2.vuejs.org/eol/ for more details.
     dependencies:
       '@vue/compiler-sfc': 2.7.14
       csstype: 3.1.2
-=======
-  /vue-waterfall-easy@2.4.4:
-    resolution: {integrity: sha512-5OkpT2FPNC3rHBy858zk/nmJxqdPaGmj/KVbmA6dgcvtsovKMa+zuf/Z7F+S2NnObeavpIBztTWgcH3S42ZD+g==}
-    engines: {node: '>= 6.0.0', npm: '>= 3.0.0'}
-    dev: true
->>>>>>> main
 
   /vue@2.7.16:
     resolution: {integrity: sha512-4gCtFXaAA3zYZdTp5s4Hl2sozuySsgz4jy1EnpBHNfpMa9dK1ZCG7viqBPCwXtmgc8nHqUsAu3G4gtmXkkY3Sw==}