Browse Source

Merge branch 'feature/v1.1.17' into dev/v1.1.17_tsz

tangshizhe 2 weeks ago
parent
commit
1245be86eb

+ 1 - 1
apps/mobile/vite.config.js

@@ -38,7 +38,7 @@ export default defineConfig(({ mode, command }) => {
   return {
   return {
     base: env.VITE_APP_BASE_PUBLIC,
     base: env.VITE_APP_BASE_PUBLIC,
     build: {
     build: {
-      sourcemap: true,
+      sourcemap: false,
       outDir: '../../dist/jy_mobile',
       outDir: '../../dist/jy_mobile',
       emptyOutDir: true,
       emptyOutDir: true,
       // terserOptions: {
       // terserOptions: {

+ 1 - 1
plugins/leave-source/src/lib/pc/content-dialog.vue

@@ -4,7 +4,7 @@ import AnimatedOverlay from '../../components/dialog/AnimatedOverlay.vue'
 import { useContactMeLogic, usePreLeaveInfo } from '../../utils/hooks.js'
 import { useContactMeLogic, usePreLeaveInfo } from '../../utils/hooks.js'
 import { showToast } from '../../utils/toast'
 import { showToast } from '../../utils/toast'
 import ContentCard from './components/content-card.vue'
 import ContentCard from './components/content-card.vue'
-import PhoneConfirmDialog from './components/PhoneConfirmDialog.vue'
+import PhoneConfirmDialog from './components/phoneConfirmDialog.vue'
 import PhoneEditDialog from './components/PhoneEditDialog.vue'
 import PhoneEditDialog from './components/PhoneEditDialog.vue'
 import SubMitSuccess from './components/SubMitSuccess.vue'
 import SubMitSuccess from './components/SubMitSuccess.vue'
 
 

+ 1 - 1
plugins/leave-source/src/utils/leave.js

@@ -1,5 +1,5 @@
 import Vue from 'vue'
 import Vue from 'vue'
-import PhoneConfirmDialog from '../lib/pc/components/PhoneConfirmDialog.vue'
+import PhoneConfirmDialog from '../lib/pc/components/phoneConfirmDialog.vue'
 import PCLeaveDialog from '../lib/pc/content-dialog.vue'
 import PCLeaveDialog from '../lib/pc/content-dialog.vue'
 import PCLeavePopover from '../lib/pc/content-popover.vue'
 import PCLeavePopover from '../lib/pc/content-popover.vue'
 import MobileLeavePopup from '../lib/mobile/content-popup.vue'
 import MobileLeavePopup from '../lib/mobile/content-popup.vue'

+ 28 - 0
pnpm-lock.yaml

@@ -317,6 +317,9 @@ importers:
       '@jy/plugin-bind-phone':
       '@jy/plugin-bind-phone':
         specifier: workspace:^
         specifier: workspace:^
         version: link:../../plugins/bind-phone-mobile
         version: link:../../plugins/bind-phone-mobile
+      '@jy/plugin-leave-source':
+        specifier: workspace:^
+        version: link:../../plugins/leave-source
       '@jy/util':
       '@jy/util':
         specifier: workspace:^
         specifier: workspace:^
         version: link:../../packages/util
         version: link:../../packages/util
@@ -4002,6 +4005,7 @@ packages:
     engines: {node: '>= 10.0.0'}
     engines: {node: '>= 10.0.0'}
     cpu: [arm]
     cpu: [arm]
     os: [linux]
     os: [linux]
+    libc: [glibc]
     requiresBuild: true
     requiresBuild: true
     dev: true
     dev: true
     optional: true
     optional: true
@@ -4011,6 +4015,7 @@ packages:
     engines: {node: '>= 10.0.0'}
     engines: {node: '>= 10.0.0'}
     cpu: [arm]
     cpu: [arm]
     os: [linux]
     os: [linux]
+    libc: [musl]
     requiresBuild: true
     requiresBuild: true
     dev: true
     dev: true
     optional: true
     optional: true
@@ -4020,6 +4025,7 @@ packages:
     engines: {node: '>= 10.0.0'}
     engines: {node: '>= 10.0.0'}
     cpu: [arm64]
     cpu: [arm64]
     os: [linux]
     os: [linux]
+    libc: [glibc]
     requiresBuild: true
     requiresBuild: true
     dev: true
     dev: true
     optional: true
     optional: true
@@ -4029,6 +4035,7 @@ packages:
     engines: {node: '>= 10.0.0'}
     engines: {node: '>= 10.0.0'}
     cpu: [arm64]
     cpu: [arm64]
     os: [linux]
     os: [linux]
+    libc: [musl]
     requiresBuild: true
     requiresBuild: true
     dev: true
     dev: true
     optional: true
     optional: true
@@ -4038,6 +4045,7 @@ packages:
     engines: {node: '>= 10.0.0'}
     engines: {node: '>= 10.0.0'}
     cpu: [x64]
     cpu: [x64]
     os: [linux]
     os: [linux]
+    libc: [glibc]
     requiresBuild: true
     requiresBuild: true
     dev: true
     dev: true
     optional: true
     optional: true
@@ -4047,6 +4055,7 @@ packages:
     engines: {node: '>= 10.0.0'}
     engines: {node: '>= 10.0.0'}
     cpu: [x64]
     cpu: [x64]
     os: [linux]
     os: [linux]
+    libc: [musl]
     requiresBuild: true
     requiresBuild: true
     dev: true
     dev: true
     optional: true
     optional: true
@@ -4254,6 +4263,7 @@ packages:
     resolution: {integrity: sha512-RkdOTu2jK7brlu+ZwjMIZfdV2sSYHK2qR08FUWcIoqJC2eywHbXr0L8T/pONFwkGukQqERDheaGTeedG+rra6Q==}
     resolution: {integrity: sha512-RkdOTu2jK7brlu+ZwjMIZfdV2sSYHK2qR08FUWcIoqJC2eywHbXr0L8T/pONFwkGukQqERDheaGTeedG+rra6Q==}
     cpu: [arm]
     cpu: [arm]
     os: [linux]
     os: [linux]
+    libc: [glibc]
     requiresBuild: true
     requiresBuild: true
     dev: true
     dev: true
     optional: true
     optional: true
@@ -4262,6 +4272,7 @@ packages:
     resolution: {integrity: sha512-3kJ8pgfBt6CIIr1o+HQA7OZ9mp/zDk3ctekGl9qn/pRBgrRgfwiffaUmqioUGN9hv0OHv2gxmvdKOkARCtRb8Q==}
     resolution: {integrity: sha512-3kJ8pgfBt6CIIr1o+HQA7OZ9mp/zDk3ctekGl9qn/pRBgrRgfwiffaUmqioUGN9hv0OHv2gxmvdKOkARCtRb8Q==}
     cpu: [arm]
     cpu: [arm]
     os: [linux]
     os: [linux]
+    libc: [musl]
     requiresBuild: true
     requiresBuild: true
     dev: true
     dev: true
     optional: true
     optional: true
@@ -4270,6 +4281,7 @@ packages:
     resolution: {integrity: sha512-k3dOKCfIVixWjG7OXTCOmDfJj3vbdhN0QYEqB+OuGArOChek22hn7Uy5A/gTDNAcCy5v2YcXRJ/Qcnm4/ma1xw==}
     resolution: {integrity: sha512-k3dOKCfIVixWjG7OXTCOmDfJj3vbdhN0QYEqB+OuGArOChek22hn7Uy5A/gTDNAcCy5v2YcXRJ/Qcnm4/ma1xw==}
     cpu: [arm64]
     cpu: [arm64]
     os: [linux]
     os: [linux]
+    libc: [glibc]
     requiresBuild: true
     requiresBuild: true
     dev: true
     dev: true
     optional: true
     optional: true
@@ -4278,6 +4290,7 @@ packages:
     resolution: {integrity: sha512-PmI1vxQetnM58ZmDFl9/Uk2lpBBby6B6rF4muJc65uZbxCs0EA7hhKCk2PKlmZKuyVSHAyIw3+/SiuMLxKxWog==}
     resolution: {integrity: sha512-PmI1vxQetnM58ZmDFl9/Uk2lpBBby6B6rF4muJc65uZbxCs0EA7hhKCk2PKlmZKuyVSHAyIw3+/SiuMLxKxWog==}
     cpu: [arm64]
     cpu: [arm64]
     os: [linux]
     os: [linux]
+    libc: [musl]
     requiresBuild: true
     requiresBuild: true
     dev: true
     dev: true
     optional: true
     optional: true
@@ -4286,6 +4299,7 @@ packages:
     resolution: {integrity: sha512-9UmI0VzGmNJ28ibHW2GpE2nF0PBQqsyiS4kcJ5vK+wuwGnV5RlqdczVocDSUfGX/Na7/XINRVoUgJyFIgipoRg==}
     resolution: {integrity: sha512-9UmI0VzGmNJ28ibHW2GpE2nF0PBQqsyiS4kcJ5vK+wuwGnV5RlqdczVocDSUfGX/Na7/XINRVoUgJyFIgipoRg==}
     cpu: [loong64]
     cpu: [loong64]
     os: [linux]
     os: [linux]
+    libc: [glibc]
     requiresBuild: true
     requiresBuild: true
     dev: true
     dev: true
     optional: true
     optional: true
@@ -4294,6 +4308,7 @@ packages:
     resolution: {integrity: sha512-7nR2KY8oEOUTD3pBAxIBBbZr0U7U+R9HDTPNy+5nVVHDXI4ikYniH1oxQz9VoB5PbBU1CZuDGHkLJkd3zLMWsg==}
     resolution: {integrity: sha512-7nR2KY8oEOUTD3pBAxIBBbZr0U7U+R9HDTPNy+5nVVHDXI4ikYniH1oxQz9VoB5PbBU1CZuDGHkLJkd3zLMWsg==}
     cpu: [ppc64]
     cpu: [ppc64]
     os: [linux]
     os: [linux]
+    libc: [glibc]
     requiresBuild: true
     requiresBuild: true
     dev: true
     dev: true
     optional: true
     optional: true
@@ -4302,6 +4317,7 @@ packages:
     resolution: {integrity: sha512-nlcl3jgUultKROfZijKjRQLUu9Ma0PeNv/VFHkZiKbXTBQXhpytS8CIj5/NfBeECZtY2FJQubm6ltIxm/ftxpw==}
     resolution: {integrity: sha512-nlcl3jgUultKROfZijKjRQLUu9Ma0PeNv/VFHkZiKbXTBQXhpytS8CIj5/NfBeECZtY2FJQubm6ltIxm/ftxpw==}
     cpu: [riscv64]
     cpu: [riscv64]
     os: [linux]
     os: [linux]
+    libc: [glibc]
     requiresBuild: true
     requiresBuild: true
     dev: true
     dev: true
     optional: true
     optional: true
@@ -4310,6 +4326,7 @@ packages:
     resolution: {integrity: sha512-HJV65KLS51rW0VY6rvZkiieiBnurSzpzore1bMKAhunQiECPuxsROvyeaot/tcK3A3aGnI+qTHqisrpSgQrpgA==}
     resolution: {integrity: sha512-HJV65KLS51rW0VY6rvZkiieiBnurSzpzore1bMKAhunQiECPuxsROvyeaot/tcK3A3aGnI+qTHqisrpSgQrpgA==}
     cpu: [riscv64]
     cpu: [riscv64]
     os: [linux]
     os: [linux]
+    libc: [musl]
     requiresBuild: true
     requiresBuild: true
     dev: true
     dev: true
     optional: true
     optional: true
@@ -4318,6 +4335,7 @@ packages:
     resolution: {integrity: sha512-NITBOCv3Qqc6hhwFt7jLV78VEO/il4YcBzoMGGNxznLgRQf43VQDae0aAzKiBeEPIxnDrACiMgbqjuihx08OOw==}
     resolution: {integrity: sha512-NITBOCv3Qqc6hhwFt7jLV78VEO/il4YcBzoMGGNxznLgRQf43VQDae0aAzKiBeEPIxnDrACiMgbqjuihx08OOw==}
     cpu: [s390x]
     cpu: [s390x]
     os: [linux]
     os: [linux]
+    libc: [glibc]
     requiresBuild: true
     requiresBuild: true
     dev: true
     dev: true
     optional: true
     optional: true
@@ -4326,6 +4344,7 @@ packages:
     resolution: {integrity: sha512-+E/lYl6qu1zqgPEnTrs4WysQtvc/Sh4fC2nByfFExqgYrqkKWp1tWIbe+ELhixnenSpBbLXNi6vbEEJ8M7fiHw==}
     resolution: {integrity: sha512-+E/lYl6qu1zqgPEnTrs4WysQtvc/Sh4fC2nByfFExqgYrqkKWp1tWIbe+ELhixnenSpBbLXNi6vbEEJ8M7fiHw==}
     cpu: [x64]
     cpu: [x64]
     os: [linux]
     os: [linux]
+    libc: [glibc]
     requiresBuild: true
     requiresBuild: true
     dev: true
     dev: true
     optional: true
     optional: true
@@ -4334,6 +4353,7 @@ packages:
     resolution: {integrity: sha512-a6WIAp89p3kpNoYStITT9RbTbTnqarU7D8N8F2CV+4Cl9fwCOZraLVuVFvlpsW0SbIiYtEnhCZBPLoNdRkjQFw==}
     resolution: {integrity: sha512-a6WIAp89p3kpNoYStITT9RbTbTnqarU7D8N8F2CV+4Cl9fwCOZraLVuVFvlpsW0SbIiYtEnhCZBPLoNdRkjQFw==}
     cpu: [x64]
     cpu: [x64]
     os: [linux]
     os: [linux]
+    libc: [musl]
     requiresBuild: true
     requiresBuild: true
     dev: true
     dev: true
     optional: true
     optional: true
@@ -5614,6 +5634,7 @@ packages:
     resolution: {integrity: sha512-34gw7PjDGB9JgePJEmhEqBhWvCiiWCuXsL9hYphDF7crW7UgI05gyBAi6MF58uGcMOiOqSJ2ybEeCvHcq0BCmQ==}
     resolution: {integrity: sha512-34gw7PjDGB9JgePJEmhEqBhWvCiiWCuXsL9hYphDF7crW7UgI05gyBAi6MF58uGcMOiOqSJ2ybEeCvHcq0BCmQ==}
     cpu: [arm64]
     cpu: [arm64]
     os: [linux]
     os: [linux]
+    libc: [glibc]
     requiresBuild: true
     requiresBuild: true
     dev: true
     dev: true
     optional: true
     optional: true
@@ -5622,6 +5643,7 @@ packages:
     resolution: {integrity: sha512-RyMIx6Uf53hhOtJDIamSbTskA99sPHS96wxVE/bJtePJJtpdKGXO1wY90oRdXuYOGOTuqjT8ACccMc4K6QmT3w==}
     resolution: {integrity: sha512-RyMIx6Uf53hhOtJDIamSbTskA99sPHS96wxVE/bJtePJJtpdKGXO1wY90oRdXuYOGOTuqjT8ACccMc4K6QmT3w==}
     cpu: [arm64]
     cpu: [arm64]
     os: [linux]
     os: [linux]
+    libc: [musl]
     requiresBuild: true
     requiresBuild: true
     dev: true
     dev: true
     optional: true
     optional: true
@@ -5630,6 +5652,7 @@ packages:
     resolution: {integrity: sha512-D8Vae74A4/a+mZH0FbOkFJL9DSK2R6TFPC9M+jCWYia/q2einCubX10pecpDiTmkJVUH+y8K3BZClycD8nCShA==}
     resolution: {integrity: sha512-D8Vae74A4/a+mZH0FbOkFJL9DSK2R6TFPC9M+jCWYia/q2einCubX10pecpDiTmkJVUH+y8K3BZClycD8nCShA==}
     cpu: [ppc64]
     cpu: [ppc64]
     os: [linux]
     os: [linux]
+    libc: [glibc]
     requiresBuild: true
     requiresBuild: true
     dev: true
     dev: true
     optional: true
     optional: true
@@ -5638,6 +5661,7 @@ packages:
     resolution: {integrity: sha512-frxL4OrzOWVVsOc96+V3aqTIQl1O2TjgExV4EKgRY09AJ9leZpEg8Ak9phadbuX0BA4k8U5qtvMSQQGGmaJqcQ==}
     resolution: {integrity: sha512-frxL4OrzOWVVsOc96+V3aqTIQl1O2TjgExV4EKgRY09AJ9leZpEg8Ak9phadbuX0BA4k8U5qtvMSQQGGmaJqcQ==}
     cpu: [riscv64]
     cpu: [riscv64]
     os: [linux]
     os: [linux]
+    libc: [glibc]
     requiresBuild: true
     requiresBuild: true
     dev: true
     dev: true
     optional: true
     optional: true
@@ -5646,6 +5670,7 @@ packages:
     resolution: {integrity: sha512-mJ5vuDaIZ+l/acv01sHoXfpnyrNKOk/3aDoEdLO/Xtn9HuZlDD6jKxHlkN8ZhWyLJsRBxfv9GYM2utQ1SChKew==}
     resolution: {integrity: sha512-mJ5vuDaIZ+l/acv01sHoXfpnyrNKOk/3aDoEdLO/Xtn9HuZlDD6jKxHlkN8ZhWyLJsRBxfv9GYM2utQ1SChKew==}
     cpu: [riscv64]
     cpu: [riscv64]
     os: [linux]
     os: [linux]
+    libc: [musl]
     requiresBuild: true
     requiresBuild: true
     dev: true
     dev: true
     optional: true
     optional: true
@@ -5654,6 +5679,7 @@ packages:
     resolution: {integrity: sha512-kELo8ebBVtb9sA7rMe1Cph4QHreByhaZ2QEADd9NzIQsYNQpt9UkM9iqr2lhGr5afh885d/cB5QeTXSbZHTYPg==}
     resolution: {integrity: sha512-kELo8ebBVtb9sA7rMe1Cph4QHreByhaZ2QEADd9NzIQsYNQpt9UkM9iqr2lhGr5afh885d/cB5QeTXSbZHTYPg==}
     cpu: [s390x]
     cpu: [s390x]
     os: [linux]
     os: [linux]
+    libc: [glibc]
     requiresBuild: true
     requiresBuild: true
     dev: true
     dev: true
     optional: true
     optional: true
@@ -5662,6 +5688,7 @@ packages:
     resolution: {integrity: sha512-C3ZAHugKgovV5YvAMsxhq0gtXuwESUKc5MhEtjBpLoHPLYM+iuwSj3lflFwK3DPm68660rZ7G8BMcwSro7hD5w==}
     resolution: {integrity: sha512-C3ZAHugKgovV5YvAMsxhq0gtXuwESUKc5MhEtjBpLoHPLYM+iuwSj3lflFwK3DPm68660rZ7G8BMcwSro7hD5w==}
     cpu: [x64]
     cpu: [x64]
     os: [linux]
     os: [linux]
+    libc: [glibc]
     requiresBuild: true
     requiresBuild: true
     dev: true
     dev: true
     optional: true
     optional: true
@@ -5670,6 +5697,7 @@ packages:
     resolution: {integrity: sha512-rV0YSoyhK2nZ4vEswT/QwqzqQXw5I6CjoaYMOX0TqBlWhojUf8P94mvI7nuJTeaCkkds3QE4+zS8Ko+GdXuZtA==}
     resolution: {integrity: sha512-rV0YSoyhK2nZ4vEswT/QwqzqQXw5I6CjoaYMOX0TqBlWhojUf8P94mvI7nuJTeaCkkds3QE4+zS8Ko+GdXuZtA==}
     cpu: [x64]
     cpu: [x64]
     os: [linux]
     os: [linux]
+    libc: [musl]
     requiresBuild: true
     requiresBuild: true
     dev: true
     dev: true
     optional: true
     optional: true