diff --git a/main.js b/main.js
index 7628154..e7bc726 100644
--- a/main.js
+++ b/main.js
@@ -23,7 +23,6 @@ Vue.component('uni-pop', uniPop)
Vue.component('liu-step-bar', liuStepBar)
import Vant from 'vant';
-console.log(Vant)
import 'vant/lib/index.less';
Vue.use(Vant);
import {
diff --git a/package-lock.json b/package-lock.json
index 003bc7f..55e4e55 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,291 +1,294 @@
{
- "name": "port-pad",
- "lockfileVersion": 3,
- "requires": true,
- "packages": {
- "": {
- "dependencies": {
- "vant": "^2.12.54"
- }
- },
- "node_modules/@babel/parser": {
- "version": "7.22.7",
- "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.7.tgz",
- "integrity": "sha512-7NF8pOkHP5o2vpmGgNGcfAeCvOYhGLyA3Z4eBQkT1RJlWu47n63bCs93QfJ2hIAFCil7L5P2IWhs1oToVgrL0Q==",
- "peer": true,
- "bin": {
- "parser": "bin/babel-parser.js"
- },
- "engines": {
- "node": ">=6.0.0"
- }
- },
- "node_modules/@babel/runtime": {
- "version": "7.22.6",
- "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.22.6.tgz",
- "integrity": "sha512-wDb5pWm4WDdF6LFUde3Jl8WzPA+3ZbxYqkC6xAXuD3irdEHN1k0NfTRrJD8ZD378SJ61miMLCqIOXYhd8x+AJQ==",
- "dependencies": {
- "regenerator-runtime": "^0.13.11"
- },
- "engines": {
- "node": ">=6.9.0"
- }
- },
- "node_modules/@jridgewell/sourcemap-codec": {
- "version": "1.4.15",
- "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
- "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==",
- "peer": true
- },
- "node_modules/@vant/icons": {
- "version": "1.8.0",
- "resolved": "https://registry.npmjs.org/@vant/icons/-/icons-1.8.0.tgz",
- "integrity": "sha512-sKfEUo2/CkQFuERxvkuF6mGQZDKu3IQdj5rV9Fm0weJXtchDSSQ+zt8qPCNUEhh9Y8shy5PzxbvAfOOkCwlCXg=="
- },
- "node_modules/@vant/popperjs": {
- "version": "1.3.0",
- "resolved": "https://registry.npmjs.org/@vant/popperjs/-/popperjs-1.3.0.tgz",
- "integrity": "sha512-hB+czUG+aHtjhaEmCJDuXOep0YTZjdlRR+4MSmIFnkCQIxJaXLQdSsR90XWvAI2yvKUI7TCGqR8pQg2RtvkMHw=="
- },
- "node_modules/@vue/babel-helper-vue-jsx-merge-props": {
- "version": "1.4.0",
- "resolved": "https://registry.npmjs.org/@vue/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-1.4.0.tgz",
- "integrity": "sha512-JkqXfCkUDp4PIlFdDQ0TdXoIejMtTHP67/pvxlgeY+u5k3LEdKuWZ3LK6xkxo52uDoABIVyRwqVkfLQJhk7VBA=="
- },
- "node_modules/@vue/compiler-core": {
- "version": "3.3.4",
- "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.3.4.tgz",
- "integrity": "sha512-cquyDNvZ6jTbf/+x+AgM2Arrp6G4Dzbb0R64jiG804HRMfRiFXWI6kqUVqZ6ZR0bQhIoQjB4+2bhNtVwndW15g==",
- "peer": true,
- "dependencies": {
- "@babel/parser": "^7.21.3",
- "@vue/shared": "3.3.4",
- "estree-walker": "^2.0.2",
- "source-map-js": "^1.0.2"
- }
- },
- "node_modules/@vue/compiler-dom": {
- "version": "3.3.4",
- "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.3.4.tgz",
- "integrity": "sha512-wyM+OjOVpuUukIq6p5+nwHYtj9cFroz9cwkfmP9O1nzH68BenTTv0u7/ndggT8cIQlnBeOo6sUT/gvHcIkLA5w==",
- "peer": true,
- "dependencies": {
- "@vue/compiler-core": "3.3.4",
- "@vue/shared": "3.3.4"
- }
- },
- "node_modules/@vue/compiler-sfc": {
- "version": "3.3.4",
- "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.3.4.tgz",
- "integrity": "sha512-6y/d8uw+5TkCuzBkgLS0v3lSM3hJDntFEiUORM11pQ/hKvkhSKZrXW6i69UyXlJQisJxuUEJKAWEqWbWsLeNKQ==",
- "peer": true,
- "dependencies": {
- "@babel/parser": "^7.20.15",
- "@vue/compiler-core": "3.3.4",
- "@vue/compiler-dom": "3.3.4",
- "@vue/compiler-ssr": "3.3.4",
- "@vue/reactivity-transform": "3.3.4",
- "@vue/shared": "3.3.4",
- "estree-walker": "^2.0.2",
- "magic-string": "^0.30.0",
- "postcss": "^8.1.10",
- "source-map-js": "^1.0.2"
- }
- },
- "node_modules/@vue/compiler-ssr": {
- "version": "3.3.4",
- "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.3.4.tgz",
- "integrity": "sha512-m0v6oKpup2nMSehwA6Uuu+j+wEwcy7QmwMkVNVfrV9P2qE5KshC6RwOCq8fjGS/Eak/uNb8AaWekfiXxbBB6gQ==",
- "peer": true,
- "dependencies": {
- "@vue/compiler-dom": "3.3.4",
- "@vue/shared": "3.3.4"
- }
- },
- "node_modules/@vue/reactivity": {
- "version": "3.3.4",
- "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.3.4.tgz",
- "integrity": "sha512-kLTDLwd0B1jG08NBF3R5rqULtv/f8x3rOFByTDz4J53ttIQEDmALqKqXY0J+XQeN0aV2FBxY8nJDf88yvOPAqQ==",
- "peer": true,
- "dependencies": {
- "@vue/shared": "3.3.4"
- }
- },
- "node_modules/@vue/reactivity-transform": {
- "version": "3.3.4",
- "resolved": "https://registry.npmjs.org/@vue/reactivity-transform/-/reactivity-transform-3.3.4.tgz",
- "integrity": "sha512-MXgwjako4nu5WFLAjpBnCj/ieqcjE2aJBINUNQzkZQfzIZA4xn+0fV1tIYBJvvva3N3OvKGofRLvQIwEQPpaXw==",
- "peer": true,
- "dependencies": {
- "@babel/parser": "^7.20.15",
- "@vue/compiler-core": "3.3.4",
- "@vue/shared": "3.3.4",
- "estree-walker": "^2.0.2",
- "magic-string": "^0.30.0"
- }
- },
- "node_modules/@vue/runtime-core": {
- "version": "3.3.4",
- "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.3.4.tgz",
- "integrity": "sha512-R+bqxMN6pWO7zGI4OMlmvePOdP2c93GsHFM/siJI7O2nxFRzj55pLwkpCedEY+bTMgp5miZ8CxfIZo3S+gFqvA==",
- "peer": true,
- "dependencies": {
- "@vue/reactivity": "3.3.4",
- "@vue/shared": "3.3.4"
- }
- },
- "node_modules/@vue/runtime-dom": {
- "version": "3.3.4",
- "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.3.4.tgz",
- "integrity": "sha512-Aj5bTJ3u5sFsUckRghsNjVTtxZQ1OyMWCr5dZRAPijF/0Vy4xEoRCwLyHXcj4D0UFbJ4lbx3gPTgg06K/GnPnQ==",
- "peer": true,
- "dependencies": {
- "@vue/runtime-core": "3.3.4",
- "@vue/shared": "3.3.4",
- "csstype": "^3.1.1"
- }
- },
- "node_modules/@vue/server-renderer": {
- "version": "3.3.4",
- "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.3.4.tgz",
- "integrity": "sha512-Q6jDDzR23ViIb67v+vM1Dqntu+HUexQcsWKhhQa4ARVzxOY2HbC7QRW/ggkDBd5BU+uM1sV6XOAP0b216o34JQ==",
- "peer": true,
- "dependencies": {
- "@vue/compiler-ssr": "3.3.4",
- "@vue/shared": "3.3.4"
- },
- "peerDependencies": {
- "vue": "3.3.4"
- }
- },
- "node_modules/@vue/shared": {
- "version": "3.3.4",
- "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.3.4.tgz",
- "integrity": "sha512-7OjdcV8vQ74eiz1TZLzZP4JwqM5fA94K6yntPS5Z25r9HDuGNzaGdgvwKYq6S+MxwF0TFRwe50fIR/MYnakdkQ==",
- "peer": true
- },
- "node_modules/csstype": {
- "version": "3.1.2",
- "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.2.tgz",
- "integrity": "sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ==",
- "peer": true
- },
- "node_modules/estree-walker": {
- "version": "2.0.2",
- "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz",
- "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==",
- "peer": true
- },
- "node_modules/magic-string": {
- "version": "0.30.1",
- "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.1.tgz",
- "integrity": "sha512-mbVKXPmS0z0G4XqFDCTllmDQ6coZzn94aMlb0o/A4HEHJCKcanlDZwYJgwnkmgD3jyWhUgj9VsPrfd972yPffA==",
- "peer": true,
- "dependencies": {
- "@jridgewell/sourcemap-codec": "^1.4.15"
- },
- "engines": {
- "node": ">=12"
- }
- },
- "node_modules/nanoid": {
- "version": "3.3.6",
- "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz",
- "integrity": "sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==",
- "funding": [
- {
- "type": "github",
- "url": "https://github.com/sponsors/ai"
- }
- ],
- "peer": true,
- "bin": {
- "nanoid": "bin/nanoid.cjs"
- },
- "engines": {
- "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
- }
- },
- "node_modules/picocolors": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
- "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==",
- "peer": true
- },
- "node_modules/postcss": {
- "version": "8.4.25",
- "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.25.tgz",
- "integrity": "sha512-7taJ/8t2av0Z+sQEvNzCkpDynl0tX3uJMCODi6nT3PfASC7dYCWV9aQ+uiCf+KBD4SEFcu+GvJdGdwzQ6OSjCw==",
- "funding": [
- {
- "type": "opencollective",
- "url": "https://opencollective.com/postcss/"
+ "name": "tongtong-条件筛选",
+ "version": "1.0.6",
+ "lockfileVersion": 3,
+ "requires": true,
+ "packages": {
+ "": {
+ "name": "tongtong-条件筛选",
+ "version": "1.0.6",
+ "dependencies": {
+ "vant": "^2.12.54"
+ }
},
- {
- "type": "tidelift",
- "url": "https://tidelift.com/funding/github/npm/postcss"
+ "node_modules/@babel/parser": {
+ "version": "7.22.7",
+ "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.7.tgz",
+ "integrity": "sha512-7NF8pOkHP5o2vpmGgNGcfAeCvOYhGLyA3Z4eBQkT1RJlWu47n63bCs93QfJ2hIAFCil7L5P2IWhs1oToVgrL0Q==",
+ "peer": true,
+ "bin": {
+ "parser": "bin/babel-parser.js"
+ },
+ "engines": {
+ "node": ">=6.0.0"
+ }
},
- {
- "type": "github",
- "url": "https://github.com/sponsors/ai"
+ "node_modules/@babel/runtime": {
+ "version": "7.22.6",
+ "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.22.6.tgz",
+ "integrity": "sha512-wDb5pWm4WDdF6LFUde3Jl8WzPA+3ZbxYqkC6xAXuD3irdEHN1k0NfTRrJD8ZD378SJ61miMLCqIOXYhd8x+AJQ==",
+ "dependencies": {
+ "regenerator-runtime": "^0.13.11"
+ },
+ "engines": {
+ "node": ">=6.9.0"
+ }
+ },
+ "node_modules/@jridgewell/sourcemap-codec": {
+ "version": "1.4.15",
+ "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
+ "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==",
+ "peer": true
+ },
+ "node_modules/@vant/icons": {
+ "version": "1.8.0",
+ "resolved": "https://registry.npmjs.org/@vant/icons/-/icons-1.8.0.tgz",
+ "integrity": "sha512-sKfEUo2/CkQFuERxvkuF6mGQZDKu3IQdj5rV9Fm0weJXtchDSSQ+zt8qPCNUEhh9Y8shy5PzxbvAfOOkCwlCXg=="
+ },
+ "node_modules/@vant/popperjs": {
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/@vant/popperjs/-/popperjs-1.3.0.tgz",
+ "integrity": "sha512-hB+czUG+aHtjhaEmCJDuXOep0YTZjdlRR+4MSmIFnkCQIxJaXLQdSsR90XWvAI2yvKUI7TCGqR8pQg2RtvkMHw=="
+ },
+ "node_modules/@vue/babel-helper-vue-jsx-merge-props": {
+ "version": "1.4.0",
+ "resolved": "https://registry.npmjs.org/@vue/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-1.4.0.tgz",
+ "integrity": "sha512-JkqXfCkUDp4PIlFdDQ0TdXoIejMtTHP67/pvxlgeY+u5k3LEdKuWZ3LK6xkxo52uDoABIVyRwqVkfLQJhk7VBA=="
+ },
+ "node_modules/@vue/compiler-core": {
+ "version": "3.3.4",
+ "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.3.4.tgz",
+ "integrity": "sha512-cquyDNvZ6jTbf/+x+AgM2Arrp6G4Dzbb0R64jiG804HRMfRiFXWI6kqUVqZ6ZR0bQhIoQjB4+2bhNtVwndW15g==",
+ "peer": true,
+ "dependencies": {
+ "@babel/parser": "^7.21.3",
+ "@vue/shared": "3.3.4",
+ "estree-walker": "^2.0.2",
+ "source-map-js": "^1.0.2"
+ }
+ },
+ "node_modules/@vue/compiler-dom": {
+ "version": "3.3.4",
+ "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.3.4.tgz",
+ "integrity": "sha512-wyM+OjOVpuUukIq6p5+nwHYtj9cFroz9cwkfmP9O1nzH68BenTTv0u7/ndggT8cIQlnBeOo6sUT/gvHcIkLA5w==",
+ "peer": true,
+ "dependencies": {
+ "@vue/compiler-core": "3.3.4",
+ "@vue/shared": "3.3.4"
+ }
+ },
+ "node_modules/@vue/compiler-sfc": {
+ "version": "3.3.4",
+ "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.3.4.tgz",
+ "integrity": "sha512-6y/d8uw+5TkCuzBkgLS0v3lSM3hJDntFEiUORM11pQ/hKvkhSKZrXW6i69UyXlJQisJxuUEJKAWEqWbWsLeNKQ==",
+ "peer": true,
+ "dependencies": {
+ "@babel/parser": "^7.20.15",
+ "@vue/compiler-core": "3.3.4",
+ "@vue/compiler-dom": "3.3.4",
+ "@vue/compiler-ssr": "3.3.4",
+ "@vue/reactivity-transform": "3.3.4",
+ "@vue/shared": "3.3.4",
+ "estree-walker": "^2.0.2",
+ "magic-string": "^0.30.0",
+ "postcss": "^8.1.10",
+ "source-map-js": "^1.0.2"
+ }
+ },
+ "node_modules/@vue/compiler-ssr": {
+ "version": "3.3.4",
+ "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.3.4.tgz",
+ "integrity": "sha512-m0v6oKpup2nMSehwA6Uuu+j+wEwcy7QmwMkVNVfrV9P2qE5KshC6RwOCq8fjGS/Eak/uNb8AaWekfiXxbBB6gQ==",
+ "peer": true,
+ "dependencies": {
+ "@vue/compiler-dom": "3.3.4",
+ "@vue/shared": "3.3.4"
+ }
+ },
+ "node_modules/@vue/reactivity": {
+ "version": "3.3.4",
+ "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.3.4.tgz",
+ "integrity": "sha512-kLTDLwd0B1jG08NBF3R5rqULtv/f8x3rOFByTDz4J53ttIQEDmALqKqXY0J+XQeN0aV2FBxY8nJDf88yvOPAqQ==",
+ "peer": true,
+ "dependencies": {
+ "@vue/shared": "3.3.4"
+ }
+ },
+ "node_modules/@vue/reactivity-transform": {
+ "version": "3.3.4",
+ "resolved": "https://registry.npmjs.org/@vue/reactivity-transform/-/reactivity-transform-3.3.4.tgz",
+ "integrity": "sha512-MXgwjako4nu5WFLAjpBnCj/ieqcjE2aJBINUNQzkZQfzIZA4xn+0fV1tIYBJvvva3N3OvKGofRLvQIwEQPpaXw==",
+ "peer": true,
+ "dependencies": {
+ "@babel/parser": "^7.20.15",
+ "@vue/compiler-core": "3.3.4",
+ "@vue/shared": "3.3.4",
+ "estree-walker": "^2.0.2",
+ "magic-string": "^0.30.0"
+ }
+ },
+ "node_modules/@vue/runtime-core": {
+ "version": "3.3.4",
+ "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.3.4.tgz",
+ "integrity": "sha512-R+bqxMN6pWO7zGI4OMlmvePOdP2c93GsHFM/siJI7O2nxFRzj55pLwkpCedEY+bTMgp5miZ8CxfIZo3S+gFqvA==",
+ "peer": true,
+ "dependencies": {
+ "@vue/reactivity": "3.3.4",
+ "@vue/shared": "3.3.4"
+ }
+ },
+ "node_modules/@vue/runtime-dom": {
+ "version": "3.3.4",
+ "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.3.4.tgz",
+ "integrity": "sha512-Aj5bTJ3u5sFsUckRghsNjVTtxZQ1OyMWCr5dZRAPijF/0Vy4xEoRCwLyHXcj4D0UFbJ4lbx3gPTgg06K/GnPnQ==",
+ "peer": true,
+ "dependencies": {
+ "@vue/runtime-core": "3.3.4",
+ "@vue/shared": "3.3.4",
+ "csstype": "^3.1.1"
+ }
+ },
+ "node_modules/@vue/server-renderer": {
+ "version": "3.3.4",
+ "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.3.4.tgz",
+ "integrity": "sha512-Q6jDDzR23ViIb67v+vM1Dqntu+HUexQcsWKhhQa4ARVzxOY2HbC7QRW/ggkDBd5BU+uM1sV6XOAP0b216o34JQ==",
+ "peer": true,
+ "dependencies": {
+ "@vue/compiler-ssr": "3.3.4",
+ "@vue/shared": "3.3.4"
+ },
+ "peerDependencies": {
+ "vue": "3.3.4"
+ }
+ },
+ "node_modules/@vue/shared": {
+ "version": "3.3.4",
+ "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.3.4.tgz",
+ "integrity": "sha512-7OjdcV8vQ74eiz1TZLzZP4JwqM5fA94K6yntPS5Z25r9HDuGNzaGdgvwKYq6S+MxwF0TFRwe50fIR/MYnakdkQ==",
+ "peer": true
+ },
+ "node_modules/csstype": {
+ "version": "3.1.2",
+ "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.2.tgz",
+ "integrity": "sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ==",
+ "peer": true
+ },
+ "node_modules/estree-walker": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz",
+ "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==",
+ "peer": true
+ },
+ "node_modules/magic-string": {
+ "version": "0.30.1",
+ "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.1.tgz",
+ "integrity": "sha512-mbVKXPmS0z0G4XqFDCTllmDQ6coZzn94aMlb0o/A4HEHJCKcanlDZwYJgwnkmgD3jyWhUgj9VsPrfd972yPffA==",
+ "peer": true,
+ "dependencies": {
+ "@jridgewell/sourcemap-codec": "^1.4.15"
+ },
+ "engines": {
+ "node": ">=12"
+ }
+ },
+ "node_modules/nanoid": {
+ "version": "3.3.6",
+ "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz",
+ "integrity": "sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==",
+ "funding": [
+ {
+ "type": "github",
+ "url": "https://github.com/sponsors/ai"
+ }
+ ],
+ "peer": true,
+ "bin": {
+ "nanoid": "bin/nanoid.cjs"
+ },
+ "engines": {
+ "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
+ }
+ },
+ "node_modules/picocolors": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
+ "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==",
+ "peer": true
+ },
+ "node_modules/postcss": {
+ "version": "8.4.25",
+ "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.25.tgz",
+ "integrity": "sha512-7taJ/8t2av0Z+sQEvNzCkpDynl0tX3uJMCODi6nT3PfASC7dYCWV9aQ+uiCf+KBD4SEFcu+GvJdGdwzQ6OSjCw==",
+ "funding": [
+ {
+ "type": "opencollective",
+ "url": "https://opencollective.com/postcss/"
+ },
+ {
+ "type": "tidelift",
+ "url": "https://tidelift.com/funding/github/npm/postcss"
+ },
+ {
+ "type": "github",
+ "url": "https://github.com/sponsors/ai"
+ }
+ ],
+ "peer": true,
+ "dependencies": {
+ "nanoid": "^3.3.6",
+ "picocolors": "^1.0.0",
+ "source-map-js": "^1.0.2"
+ },
+ "engines": {
+ "node": "^10 || ^12 || >=14"
+ }
+ },
+ "node_modules/regenerator-runtime": {
+ "version": "0.13.11",
+ "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz",
+ "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg=="
+ },
+ "node_modules/source-map-js": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
+ "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
+ "peer": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/vant": {
+ "version": "2.12.54",
+ "resolved": "https://registry.npmjs.org/vant/-/vant-2.12.54.tgz",
+ "integrity": "sha512-t7DCiLxNosDrg0Jm5EY9p0A5cAMo5OadmizbYtPEc0ru+OJKEa3kcfxtKIK5on7ZPqoOkyYJt8e6BQ1VDMPsrg==",
+ "dependencies": {
+ "@babel/runtime": "7.x",
+ "@vant/icons": "^1.7.1",
+ "@vant/popperjs": "^1.1.0",
+ "@vue/babel-helper-vue-jsx-merge-props": "^1.0.0",
+ "vue-lazyload": "1.2.3"
+ },
+ "peerDependencies": {
+ "vue": ">= 2.6.0"
+ }
+ },
+ "node_modules/vue": {
+ "version": "3.3.4",
+ "resolved": "https://registry.npmjs.org/vue/-/vue-3.3.4.tgz",
+ "integrity": "sha512-VTyEYn3yvIeY1Py0WaYGZsXnz3y5UnGi62GjVEqvEGPl6nxbOrCXbVOTQWBEJUqAyTUk2uJ5JLVnYJ6ZzGbrSw==",
+ "peer": true,
+ "dependencies": {
+ "@vue/compiler-dom": "3.3.4",
+ "@vue/compiler-sfc": "3.3.4",
+ "@vue/runtime-dom": "3.3.4",
+ "@vue/server-renderer": "3.3.4",
+ "@vue/shared": "3.3.4"
+ }
+ },
+ "node_modules/vue-lazyload": {
+ "version": "1.2.3",
+ "resolved": "https://registry.npmjs.org/vue-lazyload/-/vue-lazyload-1.2.3.tgz",
+ "integrity": "sha512-DC0ZwxanbRhx79tlA3zY5OYJkH8FYp3WBAnAJbrcuoS8eye1P73rcgAZhyxFSPUluJUTelMB+i/+VkNU/qVm7g=="
}
- ],
- "peer": true,
- "dependencies": {
- "nanoid": "^3.3.6",
- "picocolors": "^1.0.0",
- "source-map-js": "^1.0.2"
- },
- "engines": {
- "node": "^10 || ^12 || >=14"
- }
- },
- "node_modules/regenerator-runtime": {
- "version": "0.13.11",
- "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz",
- "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg=="
- },
- "node_modules/source-map-js": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
- "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
- "peer": true,
- "engines": {
- "node": ">=0.10.0"
- }
- },
- "node_modules/vant": {
- "version": "2.12.54",
- "resolved": "https://registry.npmmirror.com/vant/-/vant-2.12.54.tgz",
- "integrity": "sha512-t7DCiLxNosDrg0Jm5EY9p0A5cAMo5OadmizbYtPEc0ru+OJKEa3kcfxtKIK5on7ZPqoOkyYJt8e6BQ1VDMPsrg==",
- "dependencies": {
- "@babel/runtime": "7.x",
- "@vant/icons": "^1.7.1",
- "@vant/popperjs": "^1.1.0",
- "@vue/babel-helper-vue-jsx-merge-props": "^1.0.0",
- "vue-lazyload": "1.2.3"
- },
- "peerDependencies": {
- "vue": ">= 2.6.0"
- }
- },
- "node_modules/vue": {
- "version": "3.3.4",
- "resolved": "https://registry.npmjs.org/vue/-/vue-3.3.4.tgz",
- "integrity": "sha512-VTyEYn3yvIeY1Py0WaYGZsXnz3y5UnGi62GjVEqvEGPl6nxbOrCXbVOTQWBEJUqAyTUk2uJ5JLVnYJ6ZzGbrSw==",
- "peer": true,
- "dependencies": {
- "@vue/compiler-dom": "3.3.4",
- "@vue/compiler-sfc": "3.3.4",
- "@vue/runtime-dom": "3.3.4",
- "@vue/server-renderer": "3.3.4",
- "@vue/shared": "3.3.4"
- }
- },
- "node_modules/vue-lazyload": {
- "version": "1.2.3",
- "resolved": "https://registry.npmjs.org/vue-lazyload/-/vue-lazyload-1.2.3.tgz",
- "integrity": "sha512-DC0ZwxanbRhx79tlA3zY5OYJkH8FYp3WBAnAJbrcuoS8eye1P73rcgAZhyxFSPUluJUTelMB+i/+VkNU/qVm7g=="
}
- }
}
diff --git a/package.json b/package.json
index 7803ae3..85e9e44 100644
--- a/package.json
+++ b/package.json
@@ -15,5 +15,8 @@
"前端组件",
"通用组件"
]
+ },
+ "dependencies": {
+ "vant": "^2.12.54"
}
-}
\ No newline at end of file
+}
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 6911e18..3a2677c 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -102,6 +102,8 @@
url: '/pages/index/instruct'
})
},
+ input_json() {},
+ select_json() {},
}
};
diff --git a/pages/shipWork/documentList.vue b/pages/shipWork/documentList.vue
index 62b1577..9dbf24c 100644
--- a/pages/shipWork/documentList.vue
+++ b/pages/shipWork/documentList.vue
@@ -23,31 +23,41 @@
export default {
data() {
return {
+ // 当前船的信息
+ shipInfo: {},
infoList: [{
- name: "杂项作业单",
- url: "mixWork"
- }, {
- name: "系解缆",
- url: "untieCord"
- }, {
- name: "供给",
- url: "supply"
- }, {
- name: "指导员作业布置",
- url: "workAssign"
- }, {
- name: "船舶装卸通知单",
- url: "notice"
- }, {
- name: "质量意见征询",
- url: "opinion"
- }, {
- name: "异常情况",
- url: "abnormal"
- }, {
- name: "MAFI清单",
- url: "mafi"
- }],
+ name: "杂项作业单",
+ url: "mixWork"
+ },
+ {
+ name: "系解缆",
+ url: "untieCord"
+ },
+ {
+ name: "供给",
+ url: "supply"
+ },
+ {
+ name: "指导员作业布置",
+ url: "workAssign"
+ },
+ {
+ name: "船舶装卸通知单",
+ url: "notice"
+ },
+ {
+ name: "质量意见征询",
+ url: "opinion"
+ },
+ {
+ name: "异常情况",
+ url: "abnormal"
+ },
+ {
+ name: "MAFI清单",
+ url: "mafi"
+ }
+ ],
otherListh: [{
name: "安全巡检",
url: "patrol"
@@ -71,10 +81,18 @@
],
}
},
+ onLoad(options) {
+ if ('params' in options) {
+ // 获取传递的对象参数,使用decodeURIComponent解码,并转为对象
+ this.shipInfo = JSON.parse(decodeURIComponent(options.params))
+ }
+ console.log(this.shipInfo)
+ },
methods: {
toGo(url) {
+ const params = encodeURIComponent(JSON.stringify(this.shipInfo));
uni.navigateTo({
- url: `/pages/shipWork/${url}`
+ url: `/pages/shipWork/${url}?params=${params}`
})
}
}
diff --git a/pages/shipWork/index.vue b/pages/shipWork/index.vue
index 269f862..a543452 100644
--- a/pages/shipWork/index.vue
+++ b/pages/shipWork/index.vue
@@ -11,74 +11,80 @@
-
-
+
搜索
-
-
-
- {{item.spmName}}
-
-
-
-
-
- 进口航次: {{item.inVvyName}}
-
-
- 进口贸易类型: {{item.inTradeTypeName}}
+
+
+
+
+ {{item.spmName}}
-
-
- 出口航次: {{item.outVvyName}}
+
+
+
+ 进口航次: {{item.inVvyName}}
+
+
+ 进口贸易类型: {{item.inTradeTypeName}}
+
-
- 出口贸易类型: {{item.outTradeTypeName}}
+
+
+ 出口航次: {{item.outVvyName}}
+
+
+ 出口贸易类型: {{item.outTradeTypeName}}
+
-
-
-
- 计划泊位: {{item.planBerthageName}}
+
+
+ 计划泊位: {{item.planBerthageName}}
+
+
+ 实际泊位: {{item.actualBerthageName}}
+
-
- 实际泊位: {{item.actualBerthageName}}
+
+
+ {{item.uploadStatusDesc}}
+ {{item.uploadTime}}
+
+
-
-
-
- {{item.uploadStatusDesc}}
- {{item.uploadTime}}
-
-
-
-
-
+
+
+
+
+
@@ -96,9 +102,15 @@
pamValue: "",
pamList: [],
// 船名航次
+ shipName: "",
shipValue: '',
shipList: [],
- ltemList: [],
+ shipInput: "",
+ itemList: [],
+ // 分页
+ total: 0,
+ pageSize: 4,
+ current: 1,
}
},
onLoad() {
@@ -110,7 +122,6 @@
},
mounted() {
this.getPam();
- this.getShip();
},
methods: {
// 获取船的数据
@@ -125,11 +136,30 @@
success: (res) => {
console.log('接口返回------', res);
if (res.statusCode === 200) {
- this.ltemList = res.data.data.records
+ this.total = res.data.data.records.length
+ const newArr = this.getMapping(res.data.data.records, this.pageSize)
+ this.itemList = newArr[this.current - 1];
}
}
})
},
+ // 分页切割数组(数组,分割个数)
+ getMapping(list, num) {
+ let len = list.length
+ let newList = []
+ if (len) {
+ var chunk = num
+ for (var i = 0, j = len; i < j; i += chunk) {
+ newList.push(list.slice(i, i + chunk))
+ }
+ }
+ return newList
+ },
+ // 点击页面
+ changePage(e) {
+ this.current = e.current;
+ this.initData()
+ },
// 获取港区下拉数据
getPam() {
uni.request({
@@ -155,7 +185,7 @@
// 获取船名航次下拉数据
getShip() {
uni.request({
- url: this.$local + '/api/shipOperate/queryShipmentVoyageData?key=阳',
+ url: this.$local + '/api/shipOperate/queryShipmentVoyageData?key=' + this.shipInput,
header: {
'Content-Type': 'application/json' //自定义请求头信息
},
@@ -163,29 +193,38 @@
success: (res) => {
console.log('接口返回------', res);
if (res.statusCode === 200) {
- // this.shipList = res.data.data
- let arr = res.data.data;
- arr.forEach((v, index) => {
- this.shipList.push({
- text: v.spmName,
- value: v.vvyId
- })
- })
+ this.shipList = res.data.data
}
}
})
},
// 港区下拉
pamChange(event) {},
- // 船名航次下拉
- shipChange(e) {},
+ // 船名航次下拉模糊查询
+ input_json(e) {
+ this.shipInput = e;
+ this.getShip();
+ },
+ // 船名航次下拉选项
+ select_json(e) {
+ this.shipValue = e.vvyId
+ this.shipName = e.spmName
+ },
// 点击搜索
search() {
this.initData()
},
- // 点击下载
+ // 下载
download(item) {
- let ids = [item.outVvyName, item.inVvyName]
+ let ids = []
+ if (item.inVvyId != null && item.outVvyId == null) {
+ ids.push(item.inVvyId)
+ } else if (item.outVvyId != null && item.inVvyId == null) {
+ ids.push(item.outVvyId)
+ } else if (item.inVvyId != null && item.outVvyId != null) {
+ ids.push(item.inVvyId)
+ ids.push(item.outVvyId)
+ }
console.log(ids)
uni.request({
url: this.$local + '/api/shipOperate/download?vvyIds=' + ids,
@@ -195,15 +234,207 @@
method: 'GET', //请求方式,必须为大写
success: (res) => {
console.log('接口返回------', res);
- if (res.statusCode === 200) {}
}
})
},
- // 点击上传
- upload() {},
- toGo() {
+ // 上传
+ upload(item) {
+ let workDataInfo = {
+ "adviserLayoutReqList": [{
+ "altId": "33333333333",
+ "bthId": "2f166d975bdc58e6a461e3d01de11289",
+ "createTime": "",
+ "createUser": "",
+ "endTime": "2023-07-14 10:00",
+ "loaderType": "装货",
+ "personNumber": 10,
+ "pwcType": "123321",
+ "remark": "12312312",
+ "sparePart": 10,
+ "startTime": "2023-07-13 12:00",
+ "tenantId": "",
+ "termcd": "",
+ "updateTime": "",
+ "updateUser": "",
+ "valid": "",
+ "vehicleSize": 20,
+ "version": "",
+ "vvyId": "6cb63df0526f20ecbaa43795774a1299"
+ }],
+ "conditionReqList": [{
+ "operationDate": "2023-07-14",
+ "remark": "123123",
+ "type": "2321312",
+ "vacId": "333333",
+ "vvyId": "6cb63df0526f20ecbaa43795774a1299"
+ }],
+ "consultationReqList": [{
+ "bthId": "2f166d975bdc58e6a461e3d01de11289",
+ "handlingType": "装货",
+ "operationDate": "2023-07-14",
+ "spareNumber": "12",
+ "vehiclesNumber": "22",
+ "vqcId": "123132132131321",
+ "vvyId": "6cb63df0526f20ecbaa43795774a1299"
+ }],
+ "delAlIds": [],
+ "delCsIds": [],
+ "delCtIds": [],
+ "delLnIds": [],
+ "delMfIds": [],
+ "delPmIds": [],
+ "delSauIds": [],
+ "delSiIds": [],
+ "delSoiIds": [],
+ "delSrmIds": [],
+ "delSsIds": [],
+ "delSwmIds": [],
+ "inVvyId": "6cb63df0526f20ecbaa43795774a1299",
+ "loadUnloadNoticeReqList": [{
+ "sluId": "11111",
+ "vbtId": "22222222",
+ "vvyId": "6cb63df0526f20ecbaa43795774a1299",
+ "workDate": "2023-07-14"
+ }],
+ "outVvyId": "6cb63df0526f20ecbaa43795774a1299",
+ "personMessageReqList": [{
+ "bthId": "2f166d975bdc58e6a461e3d01de11289",
+ "jobEndTime": "2023-7-14 10:00",
+ "jobStartTime": "2023-7-13 12:00",
+ "pmeId": "111",
+ "remark": "123123123remark",
+ "shipPerson": 0,
+ "termcd": "2222",
+ "valid": "33333",
+ "vbtId": "44444",
+ "vvyId": "6cb63df0526f20ecbaa43795774a1299",
+ "weatherType": "晴",
+ "workSuite": 0
+ }],
+ "shipmentAttachUnmoorReqList": [{
+ "attachTime": "2023-07-13 12:00",
+ "bthId": "2f166d975bdc58e6a461e3d01de11289",
+ "createTime": "",
+ "createUser": "",
+ "noProductBerthTime": "2023-07-13 12:00",
+ "remark": "23123123",
+ "sauId": "333333",
+ "shiftingBerthTime": "2023-07-13 12:00",
+ "shipDeadWeight": 30,
+ "tenantId": "11122222",
+ "termcd": "111222",
+ "unmoorTime": "2023-07-13 12:00",
+ "updateTime": "2023-07-13 12:00",
+ "updateUser": "111111",
+ "valid": "2222222",
+ "version": 20,
+ "vvyId": "6cb63df0526f20ecbaa43795774a1299"
+ }],
+ "shipmentMafiListReqList": [{
+ "loadType": "卸货",
+ "mafiBarcode": "000002",
+ "pamId": "ac9b606e04a2bc71b876914a64ccb0b6",
+ "size": 10,
+ "smlId": "1111",
+ "type": "FULL",
+ "vtpId": "222222",
+ "vvyId": "6cb63df0526f20ecbaa43795774a1299",
+ "workDate": "2023-07-14"
+ }],
+ "shipmentOtherInfoReqList": [{
+ "auxRemark": "111111",
+ "endTm": "2023-07-14 10:00:00",
+ "genNum": 20,
+ "remark": "12312321",
+ "soiId": "222222",
+ "startTm": "2023-07-13 12:00:00",
+ "tecNum": 30,
+ "volume": 20,
+ "vvyId": "6cb63df0526f20ecbaa43795774a1299",
+ "waitRemark": "123123",
+ "weight": 40,
+ "workRemark": "1231231"
+ }],
+ "shipmentRetallyMessageReqList": [{
+ "remId": "123123",
+ "retallyReqDTOS": [{
+ "remId": "1231231312",
+ "retallyDetailReqDTOS": [{
+ "carType": "中型车",
+ "goodsNumber": 10,
+ "goodsVolume": 20,
+ "goodsWeight": 30,
+ "retallyEndTime": "2023-07-14 10:00:00",
+ "retallyOrigin": "123123",
+ "retallyStartTime": "2023-07-13 12:00:00",
+ "retallyTerminus": "1231321",
+ "reyId": "1231321",
+ "rydId": "23123123"
+ }],
+ "retallyType": "",
+ "reyId": ""
+ }],
+ "vvyId": "6cb63df0526f20ecbaa43795774a1299"
+ }],
+ "shipmentSafetyInspectionReqList": [{
+ "importExport": "1231312",
+ "remark": "123123",
+ "spmId": "32131",
+ "tradeType": "123213",
+ "type": "123123",
+ "uploadStatus": "未上传",
+ "url": [],
+ "vsiId": "123123",
+ "vvyId": "6cb63df0526f20ecbaa43795774a1299"
+ }],
+ "shipmentShipSupplyReqList": [{
+ "sssId": "",
+ "stopBerthage": "2f166d975bdc58e6a461e3d01de11289",
+ "supplyAmount": 8,
+ "supplyDate": "2023-07-14",
+ "supplyType": "",
+ "vvyId": "6cb63df0526f20ecbaa43795774a1299",
+ "vvyName": "511I"
+ }],
+ "shipmentWorkMessageReqList": [{
+ "loadType": "自装",
+ "pwcType": "123",
+ "remark": "132311231",
+ "vvyId": "6cb63df0526f20ecbaa43795774a1299",
+ "wkmId": "123123",
+ "workEndTime": "2023-07-13 10:00:00",
+ "workStartTime": "2023-07-13 12:00:00",
+ "workMessageDetailReqDTOS": [{
+ "carType": "中型车",
+ "goodsNumber": 3,
+ "loadingType": "自装",
+ "remark": "",
+ "tenantId": "",
+ "termcd": "",
+ "valid": "",
+ "wkdId": "",
+ "wkmId": ""
+ }],
+ }],
+ "vtpId": "123123"
+ }
+ uni.request({
+ url: this.$local + '/api/shipOperate/upload',
+ data: workDataInfo,
+ header: {
+ 'Content-Type': 'application/json' //自定义请求头信息
+ },
+ method: 'POST', //请求方式,必须为大写
+ success: (res) => {
+ console.log('接口返回------', res);
+ }
+ })
+ },
+ toGo(item) {
+ const shipInfo = item;
+ const params = encodeURIComponent(JSON.stringify(shipInfo));
uni.navigateTo({
- url: `/pages/shipWork/documentList`
+ url: `/pages/shipWork/documentList?params=${params}`
})
}
}
@@ -248,6 +479,11 @@
justify-content: flex-start;
flex-wrap: wrap;
+ /deep/.o-empty {
+ width: 100%;
+ margin-top: 15px;
+ }
+
.item {
width: 49%;
margin-top: 15px;
@@ -265,7 +501,7 @@
.row {
display: flex;
justify-content: space-between;
- font-size: 18px;
+ font-size: 14px;
padding: 10px 20px;
.nitem {
@@ -278,17 +514,13 @@
}
.footer {
+ width: 100%;
display: flex;
- justify-content: space-between;
- height: 60px;
- line-height: 60px;
- font-size: 21px;
- background-color: #f7f9fa;
- color: #8d8f8f;
+ justify-content: space-around;
.fitem {
- width: 50%;
- text-align: center;
+ flex: 1;
+ margin: 10px 20px;
}
}
}
@@ -297,5 +529,9 @@
margin-right: 0;
}
}
+
+ .pageBox {
+ margin-top: 20px;
+ }
}
\ No newline at end of file
diff --git a/pages/shipWork/mixWork.vue b/pages/shipWork/mixWork.vue
index 4d122c1..47e003e 100644
--- a/pages/shipWork/mixWork.vue
+++ b/pages/shipWork/mixWork.vue
@@ -45,32 +45,37 @@
export default {
data() {
return {
+ // 当前船只信息
+ shipInfo: {},
tabsList: ["人员信息", "工班信息"],
tabsType: 1, // 1是人员信息 2是工班信息
tabsIndex: 0,
// 人员信息列表
peopleInfo: [{
- val1: "JK9795799",
- val2: "内贸",
- val3: "进口",
- val4: "100",
- val5: "100",
- val6: "未上传",
- }, {
- val1: "JK9795799",
- val2: "内贸",
- val3: "进口",
- val4: "100",
- val5: "100",
- val6: "未上传",
- }, {
- val1: "JK9795799",
- val2: "内贸",
- val3: "进口",
- val4: "100",
- val5: "100",
- val6: "未上传",
- }],
+ val1: "JK9795799",
+ val2: "内贸",
+ val3: "进口",
+ val4: "100",
+ val5: "100",
+ val6: "未上传",
+ },
+ {
+ val1: "JK9795799",
+ val2: "内贸",
+ val3: "进口",
+ val4: "100",
+ val5: "100",
+ val6: "未上传",
+ },
+ {
+ val1: "JK9795799",
+ val2: "内贸",
+ val3: "进口",
+ val4: "100",
+ val5: "100",
+ val6: "未上传",
+ }
+ ],
// 工班信息列表
shiftInfo: [{
val1: "JK9795799",
@@ -79,6 +84,13 @@
}
},
+ onLoad(options) {
+ if ('params' in options) {
+ // 获取传递的对象参数,使用decodeURIComponent解码,并转为对象
+ this.shipInfo = JSON.parse(decodeURIComponent(options.params))
+ }
+ console.log(this.shipInfo)
+ },
methods: {
tabsClick(item, index) {
this.tabsIndex = index;
@@ -89,10 +101,8 @@
}
},
add(state) {
- const obj = {
- state: state,
- }
- const params = encodeURIComponent(JSON.stringify(obj));
+ this.shipInfo["state"] = state;
+ const params = encodeURIComponent(JSON.stringify(this.shipInfo));
if (this.tabsType == 1) {
uni.navigateTo({
url: `/pages/shipWork/peopleAdd?params=${params}`
diff --git a/pages/shipWork/shiftDetails.vue b/pages/shipWork/shiftDetails.vue
index 1fa4f21..9d979ff 100644
--- a/pages/shipWork/shiftDetails.vue
+++ b/pages/shipWork/shiftDetails.vue
@@ -203,7 +203,7 @@
export default {
data() {
return {
- value: 2,
+ value: 0,
fcList: [{
infoList: [{}, {}]
}, {
diff --git a/uni_modules/o-empty/changelog.md b/uni_modules/o-empty/changelog.md
new file mode 100644
index 0000000..267750a
--- /dev/null
+++ b/uni_modules/o-empty/changelog.md
@@ -0,0 +1,5 @@
+## 1.0.1(2023-06-13)
+- 优化部分代码
+- 新增 占位高度参数
+## 1.0.0(2022-10-04)
+初始化组件
diff --git a/uni_modules/o-empty/components/o-empty/o-empty.vue b/uni_modules/o-empty/components/o-empty/o-empty.vue
new file mode 100644
index 0000000..9156f72
--- /dev/null
+++ b/uni_modules/o-empty/components/o-empty/o-empty.vue
@@ -0,0 +1,85 @@
+
+
+
+ {{text}}
+
+
+
+
+
+
+
diff --git a/uni_modules/o-empty/package.json b/uni_modules/o-empty/package.json
new file mode 100644
index 0000000..a58cbd1
--- /dev/null
+++ b/uni_modules/o-empty/package.json
@@ -0,0 +1,85 @@
+{
+ "id": "o-empty",
+ "displayName": "o-empty 暂无数据 缺省页 空白数据 占位提示组件",
+ "version": "1.0.1",
+ "description": "简单好用的暂无数据、Empty、缺省页、空白数据、占位提示组件, 内置通用无数据、错误、网络、搜索四类图标,支持传入图片URL",
+ "keywords": [
+ "Empty",
+ "缺省页",
+ "暂无数据",
+ "空白数据",
+ "占位提示"
+],
+ "repository": "",
+ "engines": {
+ "HBuilderX": "^3.4.9"
+ },
+"dcloudext": {
+ "sale": {
+ "regular": {
+ "price": "0.00"
+ },
+ "sourcecode": {
+ "price": "0.00"
+ }
+ },
+ "contact": {
+ "qq": "65166445"
+ },
+ "declaration": {
+ "ads": "无",
+ "data": "无",
+ "permissions": "无"
+ },
+ "npmurl": "",
+ "type": "component-vue"
+ },
+ "uni_modules": {
+ "dependencies": [],
+ "encrypt": [],
+ "platforms": {
+ "cloud": {
+ "tcb": "y",
+ "aliyun": "y"
+ },
+ "client": {
+ "Vue": {
+ "vue2": "y",
+ "vue3": "u"
+ },
+ "App": {
+ "app-vue": "y",
+ "app-nvue": "u"
+ },
+ "H5-mobile": {
+ "Safari": "y",
+ "Android Browser": "y",
+ "微信浏览器(Android)": "y",
+ "QQ浏览器(Android)": "y"
+ },
+ "H5-pc": {
+ "Chrome": "y",
+ "IE": "u",
+ "Edge": "y",
+ "Firefox": "y",
+ "Safari": "y"
+ },
+ "小程序": {
+ "微信": "y",
+ "阿里": "u",
+ "百度": "u",
+ "字节跳动": "u",
+ "QQ": "u",
+ "钉钉": "u",
+ "快手": "u",
+ "飞书": "u",
+ "京东": "u"
+ },
+ "快应用": {
+ "华为": "u",
+ "联盟": "u"
+ }
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/uni_modules/o-empty/pages/index.vue b/uni_modules/o-empty/pages/index.vue
new file mode 100644
index 0000000..ebae111
--- /dev/null
+++ b/uni_modules/o-empty/pages/index.vue
@@ -0,0 +1,30 @@
+
+
+ 基本用法
+
+ 自定义背景色
+
+ 自定义大小
+
+ 自定义插槽内容
+
+
+
+ 自定义图片
+
+
+
+
+
+
+
+
+
+
diff --git a/uni_modules/o-empty/readme.md b/uni_modules/o-empty/readme.md
new file mode 100644
index 0000000..6ab4c83
--- /dev/null
+++ b/uni_modules/o-empty/readme.md
@@ -0,0 +1,54 @@
+# o-empty 暂无数据 缺省页 空白数据 占位提示组件
+
+## 描述
+Empty 简单易用 暂无数据 缺省页 空白数据 占位提示组件
+
+## 使用方法
+```html
+
+
+ 基本用法
+
+ 自定义背景色
+
+ 自定义大小
+
+ 自定义插槽内容
+
+
+
+ 自定义图片
+
+
+
+
+
+
+
+
+
+
+```
+
+
+
+## API
+
+#### oEmpty Props
+
+| 属性名 | 类型 | 默认值 | 可选值 | 说明 |
+| --------- | ------ | ------- | ----------------------------------- | ----------------------------------- |
+| img | String | - | network、search、error | 缺省图片,支持传入图片URL(支持jpg、png、svg格式) |
+| imgSize | String | 320rpx | | 缺省图片大小,单位rpx |
+| text | String | 暂无数据 | | 缺省图下方描述文字 |
+| bg | String | #fff | transparent | 组件背景,style模式 |
+| height | String | 480rpx | rpx,px,em,rem,vh均可 | 占位高度,style模式,支持calc()公式,高度值单位为必填 |
+
+
+
+
+
diff --git a/uni_modules/o-empty/static/empty.svg b/uni_modules/o-empty/static/empty.svg
new file mode 100644
index 0000000..854a7c9
--- /dev/null
+++ b/uni_modules/o-empty/static/empty.svg
@@ -0,0 +1,38 @@
+
\ No newline at end of file
diff --git a/uni_modules/o-empty/static/error.svg b/uni_modules/o-empty/static/error.svg
new file mode 100644
index 0000000..05f0786
--- /dev/null
+++ b/uni_modules/o-empty/static/error.svg
@@ -0,0 +1,28 @@
+
\ No newline at end of file
diff --git a/uni_modules/o-empty/static/network.svg b/uni_modules/o-empty/static/network.svg
new file mode 100644
index 0000000..c9b1b88
--- /dev/null
+++ b/uni_modules/o-empty/static/network.svg
@@ -0,0 +1,28 @@
+
\ No newline at end of file
diff --git a/uni_modules/o-empty/static/search.svg b/uni_modules/o-empty/static/search.svg
new file mode 100644
index 0000000..b681603
--- /dev/null
+++ b/uni_modules/o-empty/static/search.svg
@@ -0,0 +1,63 @@
+
\ No newline at end of file