From 589fe6cfb2a079eaf25041e9be5dd6fef5252eb6 Mon Sep 17 00:00:00 2001 From: czmpower <2192718639@qq.com> Date: Sat, 17 Dec 2022 14:49:21 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9E=20fix(ID1000977=E9=A6=96=E9=A1=B5-?= =?UTF-8?q?=E9=82=80=E8=AF=B7=E7=A0=81=E5=BC=B9=E7=AA=97bug):?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vscode/settings.json | 18 +-------- src/common/constant.ts | 4 +- src/components/Dialog/index.module.scss | 5 ++- .../bindSalesManDialog/index.module.scss | 4 +- src/components/sideBar/index.module.scss | 2 +- .../components/productClass/index.module.scss | 2 +- yarn.lock | 40 +++++++++---------- 7 files changed, 30 insertions(+), 45 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index d061590..83175d5 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -15,22 +15,6 @@ // Set the default "editor.formatOnSave": true, // Enable per-language - "[javascript]": { - "editor.formatOnSave": true, - "editor.defaultFormatter": "dbaeumer.vscode-eslint" - }, - "[typescript]": { - "editor.formatOnSave": true, - "editor.defaultFormatter": "dbaeumer.vscode-eslint" - }, - "[typescriptreact]": { - "editor.formatOnSave": true, - "editor.defaultFormatter": "dbaeumer.vscode-eslint" - }, - "[javascriptreact]": { - "editor.formatOnSave": true, - "editor.defaultFormatter": "dbaeumer.vscode-eslint" - }, "[css]": { "editor.formatOnSave": true, "editor.defaultFormatter": "esbenp.prettier-vscode" @@ -42,4 +26,4 @@ "[jsonc]": { "editor.defaultFormatter": "vscode.json-language-features" }, -} +} \ No newline at end of file diff --git a/src/common/constant.ts b/src/common/constant.ts index 2f06165..cc281c1 100644 --- a/src/common/constant.ts +++ b/src/common/constant.ts @@ -1,11 +1,11 @@ -export const BASE_URL = CURRENT_BASE_URL +// export const BASE_URL = CURRENT_BASE_URL // export const BASE_URL = `http://192.168.0.75:50001/lymarket` // export const BASE_URL = `http://192.168.0.89:50001/lymarket` // export const BASE_URL = `http://10.0.0.5:50001/lymarket` // export const BASE_URL = `http://192.168.0.89:40001/lymarket` // export const BASE_URL = `http://192.168.1.165:40001/lymarket` // 王霞 // export const BASE_URL = `https://test.zzfzyc.com/lymarket` // 测试环境 -// export const BASE_URL = 'https://pre.zzfzyc.com/lymarket' // 预发布 +export const BASE_URL = 'https://pre.zzfzyc.com/lymarket' // 预发布 // export const BASE_URL = `http://192.168.1.9:40001/lymarket` // 发 // export const BASE_URL = `http://192.168.1.9:50005/lymarket` // 发 // export const BASE_URL = `http://192.168.1.30:50001/lymarket` // 发 diff --git a/src/components/Dialog/index.module.scss b/src/components/Dialog/index.module.scss index c3468ac..b6c6264 100644 --- a/src/components/Dialog/index.module.scss +++ b/src/components/Dialog/index.module.scss @@ -8,6 +8,7 @@ $am-ms: 200ms; bottom: 0; width: 100vw; height: 100vh; + z-index: 999; &_mask { position: fixed; top: 0; @@ -15,7 +16,7 @@ $am-ms: 200ms; width: 100%; height: 100%; background: rgba(0, 0, 0, 0.8); - z-index: 1; + z-index: 999; opacity: 0; transition: opacity $am-ms ease-in; &_active { @@ -27,7 +28,7 @@ $am-ms: 200ms; } &_content { position: fixed; - z-index: 2; + z-index: 999; left: 50%; top: 50%; transform: translate(-50%, -50%); diff --git a/src/components/bindSalesManDialog/index.module.scss b/src/components/bindSalesManDialog/index.module.scss index ebc3d64..ddd1cfb 100644 --- a/src/components/bindSalesManDialog/index.module.scss +++ b/src/components/bindSalesManDialog/index.module.scss @@ -11,7 +11,7 @@ justify-content: space-between; height: 160px; position: relative; - z-index: 99; + z-index: 1000; .left { margin-left: 20px; margin-top: 16px; @@ -28,7 +28,7 @@ } .right { position: relative; - z-index: 99; + z-index: 1000; .iconContainer { width: 260px; position: relative; diff --git a/src/components/sideBar/index.module.scss b/src/components/sideBar/index.module.scss index b2e4b8f..5cb25b9 100644 --- a/src/components/sideBar/index.module.scss +++ b/src/components/sideBar/index.module.scss @@ -58,7 +58,7 @@ width: 100%; position: absolute; top: 0; - z-index: 999; + z-index: 333; } .sideBar_con_scroll { width: 100%; diff --git a/src/pages/index/components/productClass/index.module.scss b/src/pages/index/components/productClass/index.module.scss index e124093..8508f05 100644 --- a/src/pages/index/components/productClass/index.module.scss +++ b/src/pages/index/components/productClass/index.module.scss @@ -74,7 +74,7 @@ .product_class_block_con { max-height: 500px; background-color: #fff; - z-index: 999; + z-index: 333; position: relative; } .product_class_scroll { diff --git a/yarn.lock b/yarn.lock index 066b47c..4e0060e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1469,15 +1469,15 @@ dependencies: eslint-visitor-keys "^3.3.0" -"@eslint/eslintrc@^1.3.3": - version "1.3.3" - resolved "https://registry.npmmirror.com/@eslint/eslintrc/-/eslintrc-1.3.3.tgz" - integrity sha512-uj3pT6Mg+3t39fvLrj8iuCIJ38zKO9FpGtJ4BBJebJhEwjoT+KLVNCcHT5QC9NGRIEi7fZ0ZR8YRb884auB4Lg== +"@eslint/eslintrc@^1.4.0": + version "1.4.0" + resolved "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.4.0.tgz#8ec64e0df3e7a1971ee1ff5158da87389f167a63" + integrity sha512-7yfvXy6MWLgWSFsLhz5yH3iQ52St8cdUY6FoGieKkRDVxuxmrNuUetIuu6cmjNWwniUHiWXjxCr5tTXDrbYS5A== dependencies: ajv "^6.12.4" debug "^4.3.2" espree "^9.4.0" - globals "^13.15.0" + globals "^13.19.0" ignore "^5.2.0" import-fresh "^3.2.1" js-yaml "^4.1.0" @@ -1501,10 +1501,10 @@ dependencies: "@hapi/hoek" "^9.0.0" -"@humanwhocodes/config-array@^0.11.6": - version "0.11.7" - resolved "https://registry.npmmirror.com/@humanwhocodes/config-array/-/config-array-0.11.7.tgz" - integrity sha512-kBbPWzN8oVMLb0hOUYXhmxggL/1cJE6ydvjDIGi9EnAGUyA7cLVKQg+d/Dsm+KZwx2czGHrCmMVLiyg8s5JPKw== +"@humanwhocodes/config-array@^0.11.8": + version "0.11.8" + resolved "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.8.tgz#03595ac2075a4dc0f191cc2131de14fbd7d410b9" + integrity sha512-UybHIJzJnR5Qc/MsD9Kr+RpO2h+/P1GhOwdiLPXK5TWk5sgTdu88bTD9UP+CKbPPh5Rni1u0GjAdYQLemG8g+g== dependencies: "@humanwhocodes/object-schema" "^1.2.1" debug "^4.1.1" @@ -6942,13 +6942,13 @@ eslint-visitor-keys@^3.0.0, eslint-visitor-keys@^3.3.0: resolved "https://registry.npmmirror.com/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz" integrity sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA== -eslint@^8.28.0: - version "8.29.0" - resolved "https://registry.npmmirror.com/eslint/-/eslint-8.29.0.tgz" - integrity sha512-isQ4EEiyUjZFbEKvEGJKKGBwXtvXX+zJbkVKCgTuB9t/+jUBcy8avhkEwWJecI15BkRkOYmvIM5ynbhRjEkoeg== +eslint@^8.29.0: + version "8.30.0" + resolved "https://registry.npmjs.org/eslint/-/eslint-8.30.0.tgz#83a506125d089eef7c5b5910eeea824273a33f50" + integrity sha512-MGADB39QqYuzEGov+F/qb18r4i7DohCDOfatHaxI2iGlPuC65bwG2gxgO+7DkyL38dRFaRH7RaRAgU6JKL9rMQ== dependencies: - "@eslint/eslintrc" "^1.3.3" - "@humanwhocodes/config-array" "^0.11.6" + "@eslint/eslintrc" "^1.4.0" + "@humanwhocodes/config-array" "^0.11.8" "@humanwhocodes/module-importer" "^1.0.1" "@nodelib/fs.walk" "^1.2.8" ajv "^6.10.0" @@ -6967,7 +6967,7 @@ eslint@^8.28.0: file-entry-cache "^6.0.1" find-up "^5.0.0" glob-parent "^6.0.2" - globals "^13.15.0" + globals "^13.19.0" grapheme-splitter "^1.0.4" ignore "^5.2.0" import-fresh "^3.0.0" @@ -7727,10 +7727,10 @@ globals@^11.1.0: resolved "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz" integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA== -globals@^13.15.0: - version "13.18.0" - resolved "https://registry.npmmirror.com/globals/-/globals-13.18.0.tgz" - integrity sha512-/mR4KI8Ps2spmoc0Ulu9L7agOF0du1CZNQ3dke8yItYlyKNmGrkONemBbd6V8UTc1Wgcqn21t3WYB7dbRmh6/A== +globals@^13.19.0: + version "13.19.0" + resolved "https://registry.npmjs.org/globals/-/globals-13.19.0.tgz#7a42de8e6ad4f7242fbcca27ea5b23aca367b5c8" + integrity sha512-dkQ957uSRWHw7CFXLUtUHQI3g3aWApYhfNR2O6jn/907riyTYKVBmxYVROkBcY614FSSeSJh7Xm7SrUWCxvJMQ== dependencies: type-fest "^0.20.2"