diff --git a/.env.development b/.env.development index 8bb60b8..c065e15 100644 --- a/.env.development +++ b/.env.development @@ -2,3 +2,5 @@ VITE_API_URL=/api VITE_API_TIME_OUT=30000 VITE_PASSWORD_SECRET_KEY===ad-distribute= VITE_IMAGE_DOMAIN=https://hccake-img.oss-cn-shanghai.aliyuncs.com +# 用来回显图片 +VITE_SERVERURL=http://39.100.77.21:8001 \ No newline at end of file diff --git a/.env.production b/.env.production index 2885bd4..f608eb6 100644 --- a/.env.production +++ b/.env.production @@ -2,3 +2,5 @@ VITE_API_URL=/api VITE_API_TIME_OUT=10000 VITE_PASSWORD_SECRET_KEY===ad-distribute= VITE_IMAGE_DOMAIN=https://hccake-img.oss-cn-shanghai.aliyuncs.com +# 用来回显图片 +VITE_SERVERURL=http://39.100.77.21:8000 \ No newline at end of file diff --git a/dist.zip b/dist.zip deleted file mode 100644 index c788ca0..0000000 Binary files a/dist.zip and /dev/null differ diff --git a/index.html b/index.html index 9d6b6ab..63c0e4e 100644 --- a/index.html +++ b/index.html @@ -232,7 +232,7 @@ + diff --git a/package.json b/package.json index 9b57408..6249161 100644 --- a/package.json +++ b/package.json @@ -29,9 +29,11 @@ "ant-design-vue": "^3.2.20", "area-data": "^5.0.6", "axios": "^1.4.0", + "babel-polyfill": "^6.26.0", "cropperjs": "^1.5.13", "crypto-js": "^4.1.1", "dayjs": "^1.11.7", + "js-cookie": "^3.0.5", "json-bigint": "^1.0.0", "mitt": "^3.0.0", "nprogress": "^0.2.0", @@ -41,6 +43,7 @@ "vue-area-linkage": "^5.1.0", "vue-clipboard3": "^2.0.0", "vue-i18n": "^9.2.2", + "vue-image-crop-upload": "^3.0.3", "vue-router": "^4.2.1" }, "devDependencies": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 8d65768..fa0d483 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -38,6 +38,9 @@ dependencies: axios: specifier: ^1.4.0 version: 1.4.0 + babel-polyfill: + specifier: ^6.26.0 + version: 6.26.0 cropperjs: specifier: ^1.5.13 version: 1.5.13 @@ -47,6 +50,9 @@ dependencies: dayjs: specifier: ^1.11.7 version: 1.11.7 + js-cookie: + specifier: ^3.0.5 + version: 3.0.5 json-bigint: specifier: ^1.0.0 version: 1.0.0 @@ -74,6 +80,9 @@ dependencies: vue-i18n: specifier: ^9.2.2 version: 9.2.2(vue@3.3.4) + vue-image-crop-upload: + specifier: ^3.0.3 + version: 3.0.3 vue-router: specifier: ^4.2.1 version: 4.2.1(vue@3.3.4) @@ -1174,7 +1183,7 @@ packages: dev: false /@transloadit/prettier-bytes@0.0.7: - resolution: {integrity: sha512-VeJbUb0wEKbcwaSlj5n+LscBl9IPgLPkHVGBkh00cztv6X4L/TJXK58LzFuBKX7/GAfiGhIwH67YTLTlzvIzBA==, tarball: https://registry.npm.taobao.org/@transloadit/prettier-bytes/-/prettier-bytes-0.0.7.tgz} + resolution: {integrity: sha512-VeJbUb0wEKbcwaSlj5n+LscBl9IPgLPkHVGBkh00cztv6X4L/TJXK58LzFuBKX7/GAfiGhIwH67YTLTlzvIzBA==} /@tsconfig/node10@1.0.9: resolution: {integrity: sha512-jNsYVVxU8v5g43Erja32laIDHXeoNvFEpX33OK4d6hljo3jDhCBDhx5dhCCTMWUojscpAagGiRkBKxpdl9fxqA==} @@ -1383,13 +1392,13 @@ packages: dev: true /@uppy/companion-client@2.2.2: - resolution: {integrity: sha512-5mTp2iq97/mYSisMaBtFRry6PTgZA6SIL7LePteOV5x0/DxKfrZW3DEiQERJmYpHzy7k8johpm2gHnEKto56Og==, tarball: https://registry.npm.taobao.org/@uppy/companion-client/-/companion-client-2.2.2.tgz} + resolution: {integrity: sha512-5mTp2iq97/mYSisMaBtFRry6PTgZA6SIL7LePteOV5x0/DxKfrZW3DEiQERJmYpHzy7k8johpm2gHnEKto56Og==} dependencies: '@uppy/utils': 4.1.3 namespace-emitter: 2.0.1 /@uppy/core@2.3.4: - resolution: {integrity: sha512-iWAqppC8FD8mMVqewavCz+TNaet6HPXitmGXpGGREGrakZ4FeuWytVdrelydzTdXx6vVKkOmI2FLztGg73sENQ==, tarball: https://registry.npm.taobao.org/@uppy/core/-/core-2.3.4.tgz} + resolution: {integrity: sha512-iWAqppC8FD8mMVqewavCz+TNaet6HPXitmGXpGGREGrakZ4FeuWytVdrelydzTdXx6vVKkOmI2FLztGg73sENQ==} dependencies: '@transloadit/prettier-bytes': 0.0.7 '@uppy/store-default': 2.1.1 @@ -1401,15 +1410,15 @@ packages: preact: 10.13.2 /@uppy/store-default@2.1.1: - resolution: {integrity: sha512-xnpTxvot2SeAwGwbvmJ899ASk5tYXhmZzD/aCFsXePh/v8rNvR2pKlcQUH7cF/y4baUGq3FHO/daKCok/mpKqQ==, tarball: https://registry.npm.taobao.org/@uppy/store-default/-/store-default-2.1.1.tgz} + resolution: {integrity: sha512-xnpTxvot2SeAwGwbvmJ899ASk5tYXhmZzD/aCFsXePh/v8rNvR2pKlcQUH7cF/y4baUGq3FHO/daKCok/mpKqQ==} /@uppy/utils@4.1.3: - resolution: {integrity: sha512-nTuMvwWYobnJcytDO3t+D6IkVq/Qs4Xv3vyoEZ+Iaf8gegZP+rEyoaFT2CK5XLRMienPyqRqNbIfRuFaOWSIFw==, tarball: https://registry.npm.taobao.org/@uppy/utils/-/utils-4.1.3.tgz} + resolution: {integrity: sha512-nTuMvwWYobnJcytDO3t+D6IkVq/Qs4Xv3vyoEZ+Iaf8gegZP+rEyoaFT2CK5XLRMienPyqRqNbIfRuFaOWSIFw==} dependencies: lodash.throttle: 4.1.1 /@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4): - resolution: {integrity: sha512-YWOQ6myBVPs+mhNjfdWsQyMRWUlrDLMoaG7nvf/G6Y3GKZf8AyjFDjvvJ49XWQ+DaZOftGkHmF1uh/DBeGivJQ==, tarball: https://registry.npm.taobao.org/@uppy/xhr-upload/-/xhr-upload-2.1.3.tgz} + resolution: {integrity: sha512-YWOQ6myBVPs+mhNjfdWsQyMRWUlrDLMoaG7nvf/G6Y3GKZf8AyjFDjvvJ49XWQ+DaZOftGkHmF1uh/DBeGivJQ==} peerDependencies: '@uppy/core': ^2.3.3 dependencies: @@ -1709,7 +1718,7 @@ packages: - vue /@wangeditor/basic-modules@1.1.7(@wangeditor/core@1.1.19)(dom7@3.0.0)(lodash.throttle@4.1.1)(nanoid@3.3.6)(slate@0.72.8)(snabbdom@3.5.1): - resolution: {integrity: sha512-cY9CPkLJaqF05STqfpZKWG4LpxTMeGSIIF1fHvfm/mz+JXatCagjdkbxdikOuKYlxDdeqvOeBmsUBItufDLXZg==, tarball: https://registry.npm.taobao.org/@wangeditor/basic-modules/-/basic-modules-1.1.7.tgz} + resolution: {integrity: sha512-cY9CPkLJaqF05STqfpZKWG4LpxTMeGSIIF1fHvfm/mz+JXatCagjdkbxdikOuKYlxDdeqvOeBmsUBItufDLXZg==} peerDependencies: '@wangeditor/core': 1.x dom7: ^3.0.0 @@ -1728,7 +1737,7 @@ packages: dev: false /@wangeditor/code-highlight@1.0.3(@wangeditor/core@1.1.19)(dom7@3.0.0)(slate@0.72.8)(snabbdom@3.5.1): - resolution: {integrity: sha512-iazHwO14XpCuIWJNTQTikqUhGKyqj+dUNWJ9288Oym9M2xMVHvnsOmDU2sgUDWVy+pOLojReMPgXCsvvNlOOhw==, tarball: https://registry.npm.taobao.org/@wangeditor/code-highlight/-/code-highlight-1.0.3.tgz} + resolution: {integrity: sha512-iazHwO14XpCuIWJNTQTikqUhGKyqj+dUNWJ9288Oym9M2xMVHvnsOmDU2sgUDWVy+pOLojReMPgXCsvvNlOOhw==} peerDependencies: '@wangeditor/core': 1.x dom7: ^3.0.0 @@ -1822,7 +1831,7 @@ packages: snabbdom: 3.5.1 /@wangeditor/editor-for-vue@5.1.12(@wangeditor/editor@5.1.23)(vue@3.3.4): - resolution: {integrity: sha512-0Ds3D8I+xnpNWezAeO7HmPRgTfUxHLMd9JKcIw+QzvSmhC5xUHbpCcLU+KLmeBKTR/zffnS5GQo6qi3GhTMJWQ==, tarball: https://registry.npm.taobao.org/@wangeditor/editor-for-vue/-/editor-for-vue-5.1.12.tgz} + resolution: {integrity: sha512-0Ds3D8I+xnpNWezAeO7HmPRgTfUxHLMd9JKcIw+QzvSmhC5xUHbpCcLU+KLmeBKTR/zffnS5GQo6qi3GhTMJWQ==} peerDependencies: '@wangeditor/editor': '>=5.1.0' vue: ^3.0.5 @@ -1832,7 +1841,7 @@ packages: dev: false /@wangeditor/editor@5.1.23: - resolution: {integrity: sha512-0RxfeVTuK1tktUaPROnCoFfaHVJpRAIE2zdS0mpP+vq1axVQpLjM8+fCvKzqYIkH0Pg+C+44hJpe3VVroSkEuQ==, tarball: https://registry.npm.taobao.org/@wangeditor/editor/-/editor-5.1.23.tgz} + resolution: {integrity: sha512-0RxfeVTuK1tktUaPROnCoFfaHVJpRAIE2zdS0mpP+vq1axVQpLjM8+fCvKzqYIkH0Pg+C+44hJpe3VVroSkEuQ==} dependencies: '@uppy/core': 2.3.4 '@uppy/xhr-upload': 2.1.3(@uppy/core@2.3.4) @@ -1858,7 +1867,7 @@ packages: dev: false /@wangeditor/list-module@1.0.5(@wangeditor/core@1.1.19)(dom7@3.0.0)(slate@0.72.8)(snabbdom@3.5.1): - resolution: {integrity: sha512-uDuYTP6DVhcYf7mF1pTlmNn5jOb4QtcVhYwSSAkyg09zqxI1qBqsfUnveeDeDqIuptSJhkh81cyxi+MF8sEPOQ==, tarball: https://registry.npm.taobao.org/@wangeditor/list-module/-/list-module-1.0.5.tgz} + resolution: {integrity: sha512-uDuYTP6DVhcYf7mF1pTlmNn5jOb4QtcVhYwSSAkyg09zqxI1qBqsfUnveeDeDqIuptSJhkh81cyxi+MF8sEPOQ==} peerDependencies: '@wangeditor/core': 1.x dom7: ^3.0.0 @@ -1872,7 +1881,7 @@ packages: dev: false /@wangeditor/table-module@1.1.4(@wangeditor/core@1.1.19)(dom7@3.0.0)(lodash.isequal@4.5.0)(lodash.throttle@4.1.1)(nanoid@3.3.4)(slate@0.72.8)(snabbdom@3.5.1): - resolution: {integrity: sha512-5saanU9xuEocxaemGdNi9t8MCDSucnykEC6jtuiT72kt+/Hhh4nERYx1J20OPsTCCdVr7hIyQenFD1iSRkIQ6w==, tarball: https://registry.npm.taobao.org/@wangeditor/table-module/-/table-module-1.1.4.tgz} + resolution: {integrity: sha512-5saanU9xuEocxaemGdNi9t8MCDSucnykEC6jtuiT72kt+/Hhh4nERYx1J20OPsTCCdVr7hIyQenFD1iSRkIQ6w==} peerDependencies: '@wangeditor/core': 1.x dom7: ^3.0.0 @@ -1892,7 +1901,7 @@ packages: dev: false /@wangeditor/upload-image-module@1.0.2(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3)(@wangeditor/basic-modules@1.1.7)(@wangeditor/core@1.1.19)(dom7@3.0.0)(lodash.foreach@4.5.0)(slate@0.72.8)(snabbdom@3.5.1): - resolution: {integrity: sha512-z81lk/v71OwPDYeQDxj6cVr81aDP90aFuywb8nPD6eQeECtOymrqRODjpO6VGvCVxVck8nUxBHtbxKtjgcwyiA==, tarball: https://registry.npm.taobao.org/@wangeditor/upload-image-module/-/upload-image-module-1.0.2.tgz} + resolution: {integrity: sha512-z81lk/v71OwPDYeQDxj6cVr81aDP90aFuywb8nPD6eQeECtOymrqRODjpO6VGvCVxVck8nUxBHtbxKtjgcwyiA==} peerDependencies: '@uppy/core': ^2.0.3 '@uppy/xhr-upload': ^2.0.3 @@ -1914,7 +1923,7 @@ packages: dev: false /@wangeditor/video-module@1.1.4(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3)(@wangeditor/core@1.1.19)(dom7@3.0.0)(nanoid@3.3.4)(slate@0.72.8)(snabbdom@3.5.1): - resolution: {integrity: sha512-ZdodDPqKQrgx3IwWu4ZiQmXI8EXZ3hm2/fM6E3t5dB8tCaIGWQZhmqd6P5knfkRAd3z2+YRSRbxOGfoRSp/rLg==, tarball: https://registry.npm.taobao.org/@wangeditor/video-module/-/video-module-1.1.4.tgz} + resolution: {integrity: sha512-ZdodDPqKQrgx3IwWu4ZiQmXI8EXZ3hm2/fM6E3t5dB8tCaIGWQZhmqd6P5knfkRAd3z2+YRSRbxOGfoRSp/rLg==} peerDependencies: '@uppy/core': ^2.1.4 '@uppy/xhr-upload': ^2.0.7 @@ -2139,6 +2148,21 @@ packages: - debug dev: false + /babel-polyfill@6.26.0: + resolution: {integrity: sha512-F2rZGQnAdaHWQ8YAoeRbukc7HS9QgdgeyJ0rQDd485v9opwuPvjpPFcOOT/WmkKTdgy9ESgSPXDcTNpzrGr6iQ==} + dependencies: + babel-runtime: 6.26.0 + core-js: 2.6.12 + regenerator-runtime: 0.10.5 + dev: false + + /babel-runtime@6.26.0: + resolution: {integrity: sha512-ITKNuq2wKlW1fJg9sSW52eepoYgZBggvOAHC0u/CYu/qxQ9EVzThCgR69BnSXLHjy2f7SY5zaQ4yt7H9ZVxY2g==} + dependencies: + core-js: 2.6.12 + regenerator-runtime: 0.11.1 + dev: false + /balanced-match@1.0.2: resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==} dev: true @@ -2421,6 +2445,12 @@ packages: is-what: 3.14.1 dev: true + /core-js@2.6.12: + resolution: {integrity: sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==} + deprecated: core-js@<3.23.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Some versions have web compatibility issues. Please, upgrade your dependencies to the actual version of core-js. + requiresBuild: true + dev: false + /core-js@3.29.1: resolution: {integrity: sha512-+jwgnhg6cQxKYIIjGtAHq2nwUOolo9eoFZ4sHfUH09BLXBgxnH4gA0zEd+t+BO2cNB8idaBtZFcFTRjQJRJmAw==} requiresBuild: true @@ -2621,7 +2651,7 @@ packages: dev: true /dom7@3.0.0: - resolution: {integrity: sha512-oNlcUdHsC4zb7Msx7JN3K0Nro1dzJ48knvBOnDPKJ2GV9wl1i5vydJZUSyOfrkKFDZEud/jBsTk92S/VGSAe/g==, tarball: https://registry.npm.taobao.org/dom7/-/dom7-3.0.0.tgz} + resolution: {integrity: sha512-oNlcUdHsC4zb7Msx7JN3K0Nro1dzJ48knvBOnDPKJ2GV9wl1i5vydJZUSyOfrkKFDZEud/jBsTk92S/VGSAe/g==} dependencies: ssr-window: 3.0.0 @@ -3491,7 +3521,7 @@ packages: optional: true /immer@9.0.21: - resolution: {integrity: sha512-bc4NBHqOqSfRW7POMkHd51LvClaeMXpm8dx0e8oE2GORbq5aRK7Bxl4FyzVLdGtLmvLKL7BTDBG5ACQm4HWjTA==, tarball: https://registry.npm.taobao.org/immer/-/immer-9.0.21.tgz} + resolution: {integrity: sha512-bc4NBHqOqSfRW7POMkHd51LvClaeMXpm8dx0e8oE2GORbq5aRK7Bxl4FyzVLdGtLmvLKL7BTDBG5ACQm4HWjTA==} /import-fresh@3.3.0: resolution: {integrity: sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==} @@ -3609,7 +3639,7 @@ packages: dev: true /is-hotkey@0.2.0: - resolution: {integrity: sha512-UknnZK4RakDmTgz4PI1wIph5yxSs/mvChWs9ifnlXsKuXgWmOkY/hAE0H/k2MIqH0RlRye0i1oC07MCRSD28Mw==, tarball: https://registry.npm.taobao.org/is-hotkey/-/is-hotkey-0.2.0.tgz} + resolution: {integrity: sha512-UknnZK4RakDmTgz4PI1wIph5yxSs/mvChWs9ifnlXsKuXgWmOkY/hAE0H/k2MIqH0RlRye0i1oC07MCRSD28Mw==} /is-negative-zero@2.0.2: resolution: {integrity: sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==} @@ -3709,7 +3739,7 @@ packages: dev: true /is-url@1.2.4: - resolution: {integrity: sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==, tarball: https://registry.npm.taobao.org/is-url/-/is-url-1.2.4.tgz} + resolution: {integrity: sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==} dev: false /is-weakref@1.0.2: @@ -3737,6 +3767,11 @@ packages: minimatch: 3.1.2 dev: true + /js-cookie@3.0.5: + resolution: {integrity: sha512-cEiJEAEoIbWfCZYKWhVwFuvPX1gETRYPw6LlaTKoxD3s2AkXzkCjnp6h0V77ozyqj0jakteJ4YqDJT830+lVGw==} + engines: {node: '>=14'} + dev: false + /js-tokens@4.0.0: resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==} @@ -3942,20 +3977,20 @@ packages: resolution: {integrity: sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==} /lodash.clonedeep@4.5.0: - resolution: {integrity: sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==, tarball: https://registry.npm.taobao.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz} + resolution: {integrity: sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==} /lodash.debounce@4.0.8: - resolution: {integrity: sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==, tarball: https://registry.npm.taobao.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz} + resolution: {integrity: sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==} /lodash.find@4.6.0: resolution: {integrity: sha512-yaRZoAV3Xq28F1iafWN1+a0rflOej93l1DQUejs3SZ41h2O9UJBoS9aueGjPDgAl4B6tPC0NuuchLKaDQQ3Isg==} dev: false /lodash.foreach@4.5.0: - resolution: {integrity: sha512-aEXTF4d+m05rVOAUG3z4vZZ4xVexLKZGF0lIxuHZ1Hplpk/3B6Z1+/ICICYRLm7c41Z2xiejbkCkJoTlypoXhQ==, tarball: https://registry.npm.taobao.org/lodash.foreach/-/lodash.foreach-4.5.0.tgz} + resolution: {integrity: sha512-aEXTF4d+m05rVOAUG3z4vZZ4xVexLKZGF0lIxuHZ1Hplpk/3B6Z1+/ICICYRLm7c41Z2xiejbkCkJoTlypoXhQ==} /lodash.isequal@4.5.0: - resolution: {integrity: sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==, tarball: https://registry.npm.taobao.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz} + resolution: {integrity: sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==} /lodash.isfunction@3.0.9: resolution: {integrity: sha512-AirXNj15uRIMMPihnkInB4i3NHeb4iBtNg9WRWuK2o31S+ePwwNmDPaTL3o7dTJ+VXNZim7rFs4rxN4YU1oUJw==} @@ -3986,10 +4021,10 @@ packages: dev: true /lodash.throttle@4.1.1: - resolution: {integrity: sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ==, tarball: https://registry.npm.taobao.org/lodash.throttle/-/lodash.throttle-4.1.1.tgz} + resolution: {integrity: sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ==} /lodash.toarray@4.4.0: - resolution: {integrity: sha512-QyffEA3i5dma5q2490+SgCvDN0pXLmRGSyAANuVi0HQ01Pkfr9fuoKQW8wm1wGBnJITs/mS7wQvS6VshUEBFCw==, tarball: https://registry.npm.taobao.org/lodash.toarray/-/lodash.toarray-4.4.0.tgz} + resolution: {integrity: sha512-QyffEA3i5dma5q2490+SgCvDN0pXLmRGSyAANuVi0HQ01Pkfr9fuoKQW8wm1wGBnJITs/mS7wQvS6VshUEBFCw==} /lodash.uniq@4.5.0: resolution: {integrity: sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ==} @@ -4123,7 +4158,7 @@ packages: dev: false /mime-match@1.0.2: - resolution: {integrity: sha512-VXp/ugGDVh3eCLOBCiHZMYWQaTNUHv2IJrut+yXA6+JbLPXHglHwfS/5A5L0ll+jkCY7fIzRJcH6OIunF+c6Cg==, tarball: https://registry.npm.taobao.org/mime-match/-/mime-match-1.0.2.tgz} + resolution: {integrity: sha512-VXp/ugGDVh3eCLOBCiHZMYWQaTNUHv2IJrut+yXA6+JbLPXHglHwfS/5A5L0ll+jkCY7fIzRJcH6OIunF+c6Cg==} dependencies: wildcard: 1.1.2 @@ -4198,7 +4233,7 @@ packages: dev: true /mitt@3.0.0: - resolution: {integrity: sha512-7dX2/10ITVyqh4aOSVI9gdape+t9l2/8QxHrFmUXu4EEUpdlxl6RudZUPZoc+zuY2hk1j7XxVroIVIan/pD/SQ==, tarball: https://registry.npm.taobao.org/mitt/-/mitt-3.0.0.tgz} + resolution: {integrity: sha512-7dX2/10ITVyqh4aOSVI9gdape+t9l2/8QxHrFmUXu4EEUpdlxl6RudZUPZoc+zuY2hk1j7XxVroIVIan/pD/SQ==} dev: false /mlly@1.2.0: @@ -4225,7 +4260,7 @@ packages: dev: true /namespace-emitter@2.0.1: - resolution: {integrity: sha512-N/sMKHniSDJBjfrkbS/tpkPj4RAbvW3mr8UAzvlMHyun93XEm83IAvhWtJVHo+RHn/oO8Job5YN4b+wRjSVp5g==, tarball: https://registry.npm.taobao.org/namespace-emitter/-/namespace-emitter-2.0.1.tgz} + resolution: {integrity: sha512-N/sMKHniSDJBjfrkbS/tpkPj4RAbvW3mr8UAzvlMHyun93XEm83IAvhWtJVHo+RHn/oO8Job5YN4b+wRjSVp5g==} /nanoid@3.3.4: resolution: {integrity: sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==} @@ -4623,7 +4658,7 @@ packages: source-map-js: 1.0.2 /preact@10.13.2: - resolution: {integrity: sha512-q44QFLhOhty2Bd0Y46fnYW0gD/cbVM9dUVtNTDKPcdXSMA7jfY+Jpd6rk3GB0lcQss0z5s/6CmVP0Z/hV+g6pw==, tarball: https://registry.npm.taobao.org/preact/-/preact-10.13.2.tgz} + resolution: {integrity: sha512-q44QFLhOhty2Bd0Y46fnYW0gD/cbVM9dUVtNTDKPcdXSMA7jfY+Jpd6rk3GB0lcQss0z5s/6CmVP0Z/hV+g6pw==} /prelude-ls@1.1.2: resolution: {integrity: sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==} @@ -4649,7 +4684,7 @@ packages: dev: true /prismjs@1.29.0: - resolution: {integrity: sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==, tarball: https://registry.npm.taobao.org/prismjs/-/prismjs-1.29.0.tgz} + resolution: {integrity: sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==} engines: {node: '>=6'} dev: false @@ -4741,6 +4776,14 @@ packages: strip-indent: 3.0.0 dev: true + /regenerator-runtime@0.10.5: + resolution: {integrity: sha512-02YopEIhAgiBHWeoTiA8aitHDt8z6w+rQqNuIftlM+ZtvSl/brTouaU7DW6GO/cHtvxJvS4Hwv2ibKdxIRi24w==} + dev: false + + /regenerator-runtime@0.11.1: + resolution: {integrity: sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==} + dev: false + /regenerator-runtime@0.13.11: resolution: {integrity: sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==} @@ -4962,7 +5005,7 @@ packages: slate: 0.72.8 /slate@0.72.8: - resolution: {integrity: sha512-/nJwTswQgnRurpK+bGJFH1oM7naD5qDmHd89JyiKNT2oOKD8marW0QSBtuFnwEbL5aGCS8AmrhXQgNOsn4osAw==, tarball: https://registry.npm.taobao.org/slate/-/slate-0.72.8.tgz} + resolution: {integrity: sha512-/nJwTswQgnRurpK+bGJFH1oM7naD5qDmHd89JyiKNT2oOKD8marW0QSBtuFnwEbL5aGCS8AmrhXQgNOsn4osAw==} dependencies: immer: 9.0.21 is-plain-object: 5.0.0 @@ -4995,7 +5038,7 @@ packages: dev: true /snabbdom@3.5.1: - resolution: {integrity: sha512-wHMNIOjkm/YNE5EM3RCbr/+DVgPg6AqQAX1eOxO46zYNvCXjKP5Y865tqQj3EXnaMBjkxmQA5jFuDpDK/dbfiA==, tarball: https://registry.npm.taobao.org/snabbdom/-/snabbdom-3.5.1.tgz} + resolution: {integrity: sha512-wHMNIOjkm/YNE5EM3RCbr/+DVgPg6AqQAX1eOxO46zYNvCXjKP5Y865tqQj3EXnaMBjkxmQA5jFuDpDK/dbfiA==} engines: {node: '>=8.3.0'} /source-map-js@1.0.2: @@ -5047,7 +5090,7 @@ packages: dev: true /ssr-window@3.0.0: - resolution: {integrity: sha512-q+8UfWDg9Itrg0yWK7oe5p/XRCJpJF9OBtXfOPgSJl+u3Xd5KI328RUEvUqSMVM9CiQUEf1QdBzJMkYGErj9QA==, tarball: https://registry.npm.taobao.org/ssr-window/-/ssr-window-3.0.0.tgz} + resolution: {integrity: sha512-q+8UfWDg9Itrg0yWK7oe5p/XRCJpJF9OBtXfOPgSJl+u3Xd5KI328RUEvUqSMVM9CiQUEf1QdBzJMkYGErj9QA==} /string-argv@0.3.1: resolution: {integrity: sha512-a1uQGz7IyVy9YwhqjZIZu1c8JO8dNIe20xBmSS6qu9kv++k3JGzCVmprbNN5Kn+BgzD5E7YYwg1CcjuJMRNsvg==} @@ -5217,7 +5260,7 @@ packages: dev: false /tiny-warning@1.0.3: - resolution: {integrity: sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==, tarball: https://registry.npm.taobao.org/tiny-warning/-/tiny-warning-1.0.3.tgz} + resolution: {integrity: sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==} /to-fast-properties@2.0.0: resolution: {integrity: sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==} @@ -5604,6 +5647,12 @@ packages: '@vue/devtools-api': 6.5.0 vue: 3.3.4 + /vue-image-crop-upload@3.0.3: + resolution: {integrity: sha512-VeBsU0oI1hXeCvdpnu19DM/r3KTlI8SUXTxsHsU4MhDXR0ahRziiL9tf4FbILGx+gRVNZhGbl32yuM6TiaGNhA==} + dependencies: + babel-runtime: 6.26.0 + dev: false + /vue-router@4.2.1(vue@3.3.4): resolution: {integrity: sha512-nW28EeifEp8Abc5AfmAShy5ZKGsGzjcnZ3L1yc2DYUo+MqbBClrRP9yda3dIekM4I50/KnEwo1wkBLf7kHH5Cw==} peerDependencies: @@ -5704,7 +5753,7 @@ packages: dev: true /wildcard@1.1.2: - resolution: {integrity: sha512-DXukZJxpHA8LuotRwL0pP1+rS6CS7FF2qStDDE1C7DDg2rLud2PXRMuEDYIPhgEezwnlHNL4c+N6MfMTjCGTng==, tarball: https://registry.npm.taobao.org/wildcard/-/wildcard-1.1.2.tgz} + resolution: {integrity: sha512-DXukZJxpHA8LuotRwL0pP1+rS6CS7FF2qStDDE1C7DDg2rLud2PXRMuEDYIPhgEezwnlHNL4c+N6MfMTjCGTng==} /word-wrap@1.2.3: resolution: {integrity: sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==} diff --git a/src/api/auth/types.ts b/src/api/auth/types.ts index 4ba403c..49c5e8d 100644 --- a/src/api/auth/types.ts +++ b/src/api/auth/types.ts @@ -33,6 +33,7 @@ export interface LoginUserInfo { type: number organizationId: number nickname: string + phoneNumber: string avatar?: string salesmanType: number } diff --git a/src/api/clueaccess/accessDetail/types.ts b/src/api/clueaccess/accessDetail/types.ts index df89b7d..7ad9ad0 100644 --- a/src/api/clueaccess/accessDetail/types.ts +++ b/src/api/clueaccess/accessDetail/types.ts @@ -126,3 +126,4 @@ export interface SysMenuI18n { // 地区语言标签 languageTag: string } + diff --git a/src/api/customermanagement/customerList/types.ts b/src/api/customermanagement/customerList/types.ts index d47e572..6e67763 100644 --- a/src/api/customermanagement/customerList/types.ts +++ b/src/api/customermanagement/customerList/types.ts @@ -5,7 +5,7 @@ import type { PageParam } from '@/api/types' */ export type SysUserPageParam = CustomerListQO & PageParam /** - * 我的线索查询对象 + * 查询对象 */ export type CustomerListQO = { //标签 diff --git a/src/api/geopoliticalCustomers/index.ts b/src/api/geopoliticalCustomers/index.ts index 0bc0436..87dfbca 100644 --- a/src/api/geopoliticalCustomers/index.ts +++ b/src/api/geopoliticalCustomers/index.ts @@ -8,12 +8,13 @@ import type { GeopoliticalCustomersDTO, CustomerDTO, customId, - auditDTO -} from '@/api/geopoliticalCustomers/types' -import type { + auditDTO, GeopoliticalCustomersPageParam, storePageParam } from '@/api/geopoliticalCustomers/types' +// import type { + +// } from '@/api/geopoliticalCustomers/types' /** * 地缘获客分页查询 diff --git a/src/api/personCenter/index.ts b/src/api/personCenter/index.ts new file mode 100644 index 0000000..14ef00a --- /dev/null +++ b/src/api/personCenter/index.ts @@ -0,0 +1,34 @@ +import httpClient from '@/utils/axios' +import type { ApiResult } from '@/api/types' + +import type { SysPassDTO, SysConfigurationDTO } from '@/api/personCenter/types' +/** + * 个人中心修改密码 + * @param passDto 修改密码对象 + */ +export function updatePass(passDto: SysPassDTO) { + return httpClient.put>(`/system/user/pass/${passDto.userId}`, { + oldPass: passDto.oldPass, + pass: passDto.pass, + confirmPass: passDto.confirmPass + }) +} +/** + * 个人中心 + * @param saveConfigurationDto 个人中心对象 + */ +export function saveConfiguration(saveConfigurationDto: SysConfigurationDTO) { + return httpClient.put>(`system/user`, { + gender: saveConfigurationDto.gender, + userId: saveConfigurationDto.userId, + nickname: saveConfigurationDto.nickname, + phone: saveConfigurationDto.phone, + username: saveConfigurationDto.username + }) +} +/** + * 获取指定用户的基本信息 + */ +export function getUserInfo(userId: number | undefined) { + return httpClient.get(`system/user/${userId}`) +} diff --git a/src/api/personCenter/types.ts b/src/api/personCenter/types.ts new file mode 100644 index 0000000..92922c4 --- /dev/null +++ b/src/api/personCenter/types.ts @@ -0,0 +1,17 @@ +//个人中心修改密码 +export interface SysPassDTO { + userId: number | undefined + oldPass: string + pass: string + confirmPass: string +} + +//个人中心保存配置 +export interface SysConfigurationDTO { + gender: number | undefined + userId: number | undefined + // jobNumber: number + nickname: string | undefined + phone: string | undefined + username: string | undefined +} diff --git a/src/assets/images/avatar.png b/src/assets/images/avatar.png new file mode 100644 index 0000000..997732a Binary files /dev/null and b/src/assets/images/avatar.png differ diff --git a/src/layouts/components/RightContent/AvatarDropdown.vue b/src/layouts/components/RightContent/AvatarDropdown.vue index d1f22c2..20dfb47 100644 --- a/src/layouts/components/RightContent/AvatarDropdown.vue +++ b/src/layouts/components/RightContent/AvatarDropdown.vue @@ -2,6 +2,7 @@ + @@ -11,15 +12,17 @@