diff --git a/package-lock.json b/package-lock.json
index 1a26e7e..2771f11 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -262,6 +262,12 @@
"@babel/types": "^7.16.7"
}
},
+ "@babel/helper-string-parser": {
+ "version": "7.22.5",
+ "resolved": "https://registry.npmmirror.com/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz",
+ "integrity": "sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==",
+ "dev": true
+ },
"@babel/helper-validator-identifier": {
"version": "7.16.7",
"resolved": "https://registry.npmmirror.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz",
@@ -1020,9 +1026,9 @@
}
},
"@babel/register": {
- "version": "7.17.7",
- "resolved": "https://registry.npmmirror.com/@babel/register/-/register-7.17.7.tgz",
- "integrity": "sha512-fg56SwvXRifootQEDQAu1mKdjh5uthPzdO0N6t358FktfL4XjAVXuH58ULoiW8mesxiOgNIrxiImqEwv0+hRRA==",
+ "version": "7.22.5",
+ "resolved": "https://registry.npmmirror.com/@babel/register/-/register-7.22.5.tgz",
+ "integrity": "sha512-vV6pm/4CijSQ8Y47RH5SopXzursN35RQINfGJkmOlcpAtGuf94miFvIPhCKGQN7WGIcsgG1BHEX2KVdTYwTwUQ==",
"requires": {
"clone-deep": "^4.0.1",
"find-cache-dir": "^2.0.0",
@@ -1035,7 +1041,6 @@
"version": "7.12.18",
"resolved": "https://registry.npmmirror.com/@babel/runtime/-/runtime-7.12.18.tgz",
"integrity": "sha512-BogPQ7ciE6SYAUPtlm9tWbgI9+2AgqSam6QivMgXgAT+fKbgppaj4ZX15MHeLC1PVF5sNk70huBu20XxWOs8Cg==",
- "dev": true,
"requires": {
"regenerator-runtime": "^0.13.4"
},
@@ -1043,8 +1048,7 @@
"regenerator-runtime": {
"version": "0.13.9",
"resolved": "https://registry.npmmirror.com/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz",
- "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==",
- "dev": true
+ "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA=="
}
}
},
@@ -1101,20 +1105,25 @@
}
},
"@dcloudio/types": {
- "version": "2.5.18",
- "resolved": "https://registry.npmmirror.com/@dcloudio/types/-/types-2.5.18.tgz",
- "integrity": "sha512-1EMwZsi5j9KHI5wdLwZJmUyo5b8HnG60CRqsqW5kcd3cgSrKtgL3EKCYUjmJw+3gd9G/4NeEkSx5pT5l+4rNXg==",
+ "version": "3.3.3",
+ "resolved": "https://registry.npmmirror.com/@dcloudio/types/-/types-3.3.3.tgz",
+ "integrity": "sha512-xfp88QOJ2fgCzv49HhEGrX0L+3xDsCyyvcoApL7z0J1Lr7tqPUkxqAVBe9zBlKsDX/mO9mNj7NzKIisHfp+fNQ==",
"dev": true
},
+ "@dcloudio/uni-app": {
+ "version": "2.0.2-3080420230530001",
+ "resolved": "https://registry.npmmirror.com/@dcloudio/uni-app/-/uni-app-2.0.2-3080420230530001.tgz",
+ "integrity": "sha512-LML9DzX6iK6+pNYhCH7EZOhe7y8sRzwod95uAeZ1ZRR+oyfBTNDB9o7VG25KtcfrtUFFcWOZD5jXJCbF4XZvyw=="
+ },
"@dcloudio/uni-app-plus": {
- "version": "2.0.1-33920220314002",
- "resolved": "https://registry.npmmirror.com/@dcloudio/uni-app-plus/-/uni-app-plus-2.0.1-33920220314002.tgz",
- "integrity": "sha512-+IBQr7FKlugzqNSa06K8iSE6N3hGBtM4aNy0h0oPqHvQN17dsHRFyu8yBe9MGFty7r1k89LFv8t4uixUbAoxZA=="
+ "version": "2.0.2-3080420230530001",
+ "resolved": "https://registry.npmmirror.com/@dcloudio/uni-app-plus/-/uni-app-plus-2.0.2-3080420230530001.tgz",
+ "integrity": "sha512-r8y4On97AS7EtqLCfBc+0xitaNUnjRWNkn5VS3pcPYrTPOjf8rmQI+E04b/MNW4jyqys+sJc+hqK5tNA3i61Xg=="
},
"@dcloudio/uni-automator": {
- "version": "2.0.1-33920220314002",
- "resolved": "https://registry.npmmirror.com/@dcloudio/uni-automator/-/uni-automator-2.0.1-33920220314002.tgz",
- "integrity": "sha512-XAu2pxT10SIPUqRnwxowjswKMozFzdJ9R3VFY6FT/sPG8ZplMQ7+iuNplMtJg2KK891IB5zgCrx454FdZmyGgQ==",
+ "version": "2.0.2-3080420230530001",
+ "resolved": "https://registry.npmmirror.com/@dcloudio/uni-automator/-/uni-automator-2.0.2-3080420230530001.tgz",
+ "integrity": "sha512-hHkALndpQpHoAlRUppy1gLZs6fKfbZGm4/pWTVP7UJ0N2k/SsI3YzTVv0a3IgKfj1X8k7GVuohAoso6vKss/lA==",
"dev": true,
"requires": {
"address": "^1.1.2",
@@ -1129,9 +1138,9 @@
}
},
"@dcloudio/uni-cli-i18n": {
- "version": "2.0.1-33920220314002",
- "resolved": "https://registry.npmmirror.com/@dcloudio/uni-cli-i18n/-/uni-cli-i18n-2.0.1-33920220314002.tgz",
- "integrity": "sha512-4vD8LAeyEYOLXpBoOxHlLThzn9hb71PeiDkA5Jig5fYbQ2cJQdToM/0NjB4TgDpYLSN7HCpwy7nvPNd5fWp+3w==",
+ "version": "2.0.2-3080420230530001",
+ "resolved": "https://registry.npmmirror.com/@dcloudio/uni-cli-i18n/-/uni-cli-i18n-2.0.2-3080420230530001.tgz",
+ "integrity": "sha512-enLxb6lHb8EDz27mg2kTuZo5aUEDBYG8c85RVHoapd4hQ5hOMtG45VhVGheoFjG5EBGRX4GYjl6xGhmuMJi03g==",
"dev": true,
"requires": {
"i18n": "^0.13.3",
@@ -1139,20 +1148,93 @@
}
},
"@dcloudio/uni-cli-shared": {
- "version": "2.0.1-33920220314002",
- "resolved": "https://registry.npmmirror.com/@dcloudio/uni-cli-shared/-/uni-cli-shared-2.0.1-33920220314002.tgz",
- "integrity": "sha512-gAZSDYNQhHlaklqYUvXMjk6TNh6EFJkzg5s0aPn4lxRXQMIhyHyeSvWj7xVmO11R1nCUAGP+ihq9rikBK7yVKg==",
+ "version": "2.0.2-3080420230530001",
+ "resolved": "https://registry.npmmirror.com/@dcloudio/uni-cli-shared/-/uni-cli-shared-2.0.2-3080420230530001.tgz",
+ "integrity": "sha512-rTcDjX8LZkVS6X6LDuRzJgmV83gtSrRiGq8wduJjEMNd5Q5w4x4XtqefpXnavtNaC94ru4RBRD2qdgBOEzQLgA==",
"dev": true,
"requires": {
+ "escape-string-regexp": "^4.0.0",
+ "fast-glob": "^3.2.11",
+ "glob-escape": "^0.0.2",
"hash-sum": "^1.0.2",
"postcss-urlrewrite": "^0.2.2",
"strip-json-comments": "^2.0.1"
+ },
+ "dependencies": {
+ "@nodelib/fs.stat": {
+ "version": "2.0.5",
+ "resolved": "https://registry.npmmirror.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
+ "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
+ "dev": true
+ },
+ "braces": {
+ "version": "3.0.2",
+ "resolved": "https://registry.npmmirror.com/braces/-/braces-3.0.2.tgz",
+ "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+ "dev": true,
+ "requires": {
+ "fill-range": "^7.0.1"
+ }
+ },
+ "escape-string-regexp": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmmirror.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+ "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+ "dev": true
+ },
+ "fast-glob": {
+ "version": "3.2.12",
+ "resolved": "https://registry.npmmirror.com/fast-glob/-/fast-glob-3.2.12.tgz",
+ "integrity": "sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==",
+ "dev": true,
+ "requires": {
+ "@nodelib/fs.stat": "^2.0.2",
+ "@nodelib/fs.walk": "^1.2.3",
+ "glob-parent": "^5.1.2",
+ "merge2": "^1.3.0",
+ "micromatch": "^4.0.4"
+ }
+ },
+ "fill-range": {
+ "version": "7.0.1",
+ "resolved": "https://registry.npmmirror.com/fill-range/-/fill-range-7.0.1.tgz",
+ "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+ "dev": true,
+ "requires": {
+ "to-regex-range": "^5.0.1"
+ }
+ },
+ "is-number": {
+ "version": "7.0.0",
+ "resolved": "https://registry.npmmirror.com/is-number/-/is-number-7.0.0.tgz",
+ "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+ "dev": true
+ },
+ "micromatch": {
+ "version": "4.0.5",
+ "resolved": "https://registry.npmmirror.com/micromatch/-/micromatch-4.0.5.tgz",
+ "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
+ "dev": true,
+ "requires": {
+ "braces": "^3.0.2",
+ "picomatch": "^2.3.1"
+ }
+ },
+ "to-regex-range": {
+ "version": "5.0.1",
+ "resolved": "https://registry.npmmirror.com/to-regex-range/-/to-regex-range-5.0.1.tgz",
+ "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+ "dev": true,
+ "requires": {
+ "is-number": "^7.0.0"
+ }
+ }
}
},
"@dcloudio/uni-h5": {
- "version": "2.0.1-33920220314002",
- "resolved": "https://registry.npmmirror.com/@dcloudio/uni-h5/-/uni-h5-2.0.1-33920220314002.tgz",
- "integrity": "sha512-bi4DkELTglkjCeJ7cpqAZgN4T7yXWAZTAZbYRRIKZaZV05a0gronPCgFazFCAUDoAWyxYxWUSuEinGqLemuWSQ==",
+ "version": "2.0.2-3080420230530001",
+ "resolved": "https://registry.npmmirror.com/@dcloudio/uni-h5/-/uni-h5-2.0.2-3080420230530001.tgz",
+ "integrity": "sha512-FELEczSG2sd5k5bcz3XEOflpnNag2lBBj75B3vJxOpRNDYYATUwt/H0QfKdKsZwOz2LpQ8QNV13J5mtXDrdOVA==",
"requires": {
"base64-arraybuffer": "^0.2.0",
"intersection-observer": "^0.7.0",
@@ -1166,14 +1248,14 @@
"integrity": "sha512-FO9Iu4zW4td3Tr+eiCDWuele2ehkJ4qxQ/UhpAMLjso+ZdWz6NagK5Syh6cdy1hoDqbxpNoqnLynuJXe81Ereg=="
},
"@dcloudio/uni-i18n": {
- "version": "2.0.1-33920220314002",
- "resolved": "https://registry.npmmirror.com/@dcloudio/uni-i18n/-/uni-i18n-2.0.1-33920220314002.tgz",
- "integrity": "sha512-yPxJMsSO7pduzvCcYlqyPT0V5yQc2tDK3GMxcVdRkd7339S63yK9jqWh/b99PAY4Cq/yzwiT9rx40fne5/8d4w=="
+ "version": "2.0.2-3080420230530001",
+ "resolved": "https://registry.npmmirror.com/@dcloudio/uni-i18n/-/uni-i18n-2.0.2-3080420230530001.tgz",
+ "integrity": "sha512-ggC5VV/TeqoftVi7aPBe4lF9/XEIowMUjuziLoAdv9B/4M4JyYYBmCyJIefy9id8RPZEu+/EVLYWWXulXOR/Uw=="
},
"@dcloudio/uni-migration": {
- "version": "2.0.1-33920220314002",
- "resolved": "https://registry.npmmirror.com/@dcloudio/uni-migration/-/uni-migration-2.0.1-33920220314002.tgz",
- "integrity": "sha512-PEhSsUiyBH6NVfosfX/cr8iD5atodM73EAS+/ChaaOmRp4Y2vQqz5VR3m3eun2suGA6IFheTv/u0z/S2Ds3zPA==",
+ "version": "2.0.2-3080420230530001",
+ "resolved": "https://registry.npmmirror.com/@dcloudio/uni-migration/-/uni-migration-2.0.2-3080420230530001.tgz",
+ "integrity": "sha512-TJxbWzbDrd8M+x0+ShV3HoeYrLY3dgyPVOyzfTHsRaZNGXzMkINMx0XSPtR4ngMos8E6+RO8+je+RT+/OQkCgw==",
"dev": true,
"requires": {
"commander": "^4.0.1",
@@ -1209,59 +1291,64 @@
}
},
"@dcloudio/uni-mp-360": {
- "version": "2.0.1-33920220314002",
- "resolved": "https://registry.npmmirror.com/@dcloudio/uni-mp-360/-/uni-mp-360-2.0.1-33920220314002.tgz",
- "integrity": "sha512-L16FB6qnKNI/y+p2I9f0ZZZdxp8BpZfPN92sBT7XizRu3WWUwnvFT4w79i7ieARwlOXYMuCkBX5VZzxFrZyMcg=="
+ "version": "2.0.2-3080420230530001",
+ "resolved": "https://registry.npmmirror.com/@dcloudio/uni-mp-360/-/uni-mp-360-2.0.2-3080420230530001.tgz",
+ "integrity": "sha512-lJP2ysL2n0Fv6CN43NTujkF0L7Z2fTSxexeSWN5vT2IvG2vBKZ2COd/FUUPcN4bfgzFUfROGZ8iZ4G39VJqnTw=="
},
"@dcloudio/uni-mp-alipay": {
- "version": "2.0.1-33920220314002",
- "resolved": "https://registry.npmmirror.com/@dcloudio/uni-mp-alipay/-/uni-mp-alipay-2.0.1-33920220314002.tgz",
- "integrity": "sha512-pDKtPkleH/K3bUHk+mI2H1+GzwKaqxfrRQhD1GHfvR8gn1Ay9k5cRnbUfOJMEQ5pxIDxzI+M6eFqljfB+XHHLg=="
+ "version": "2.0.2-3080420230530001",
+ "resolved": "https://registry.npmmirror.com/@dcloudio/uni-mp-alipay/-/uni-mp-alipay-2.0.2-3080420230530001.tgz",
+ "integrity": "sha512-nTkloIBpi5a1wWntpHQ2FzJXI8BDH5zlX6qI5r5T0jXp4BLfL6BGr6vybIK1JDfS2srUA5Iwxn+fF4j1vR3Y6A=="
},
"@dcloudio/uni-mp-baidu": {
- "version": "2.0.1-33920220314002",
- "resolved": "https://registry.npmmirror.com/@dcloudio/uni-mp-baidu/-/uni-mp-baidu-2.0.1-33920220314002.tgz",
- "integrity": "sha512-2oxPoXFiPHXtHsyv2OCdDVTx+qL3rXQbMjfxRB3Gji83NM0PMM+bmKwdXTy+AcojaBSjCmA0cvB9Nqi3xDj0ug=="
+ "version": "2.0.2-3080420230530001",
+ "resolved": "https://registry.npmmirror.com/@dcloudio/uni-mp-baidu/-/uni-mp-baidu-2.0.2-3080420230530001.tgz",
+ "integrity": "sha512-kPTMMgOWb+nagNty5n2s/ZEct5clq2aO4URJnPUQksUjmNEB9BZ9bwcbH+q576MnTNq65i0TOF8mQ694U9P13w=="
},
"@dcloudio/uni-mp-jd": {
- "version": "2.0.1-33920220314002",
- "resolved": "https://registry.npmmirror.com/@dcloudio/uni-mp-jd/-/uni-mp-jd-2.0.1-33920220314002.tgz",
- "integrity": "sha512-yVK2U9opS2fFy62sfz6XpIDBnbyj1XZVxO3VtD9UVXuPtrFC5lXBxdtCpLV6EHJ4V8X6YvdKJI36jTWYLaJvdw=="
+ "version": "2.0.2-3080420230530001",
+ "resolved": "https://registry.npmmirror.com/@dcloudio/uni-mp-jd/-/uni-mp-jd-2.0.2-3080420230530001.tgz",
+ "integrity": "sha512-okAEBPZbNifJdr4cUikbBKywmWxlmtCZRoMz6L21GFf5DzLm24galXhhP6NdFV/tmIuAUQJ53NNUHXPKM2XvwA=="
},
"@dcloudio/uni-mp-kuaishou": {
- "version": "2.0.1-33920220314002",
- "resolved": "https://registry.npmmirror.com/@dcloudio/uni-mp-kuaishou/-/uni-mp-kuaishou-2.0.1-33920220314002.tgz",
- "integrity": "sha512-c4KPAnbkrVcJpwDl72lgeegP0FxOjcbq4gQJoqZ+0DdjQE75Mb0DTbtqOXCplWaAMoxLt/dK5DA97VpymVaqig=="
+ "version": "2.0.2-3080420230530001",
+ "resolved": "https://registry.npmmirror.com/@dcloudio/uni-mp-kuaishou/-/uni-mp-kuaishou-2.0.2-3080420230530001.tgz",
+ "integrity": "sha512-zTl6/TPuZNavIp7qiQRqxIhZYJS+zN0BCGgi8rjrKAhqEoIy4iwPAKAAI8qaVFhWVehmmHjo9PtyZH5xdZ2wWA=="
},
"@dcloudio/uni-mp-lark": {
- "version": "2.0.1-33920220314002",
- "resolved": "https://registry.npmmirror.com/@dcloudio/uni-mp-lark/-/uni-mp-lark-2.0.1-33920220314002.tgz",
- "integrity": "sha512-QECpG1x6a1hm7/hc/dtI3B+CRjeEDzKIwYXCuCXwPBSgi7HFnFAftEEocD+rkra0mNRymb1XTeHPlBHXekKwww=="
+ "version": "2.0.2-3080420230530001",
+ "resolved": "https://registry.npmmirror.com/@dcloudio/uni-mp-lark/-/uni-mp-lark-2.0.2-3080420230530001.tgz",
+ "integrity": "sha512-py2GkdTuNPSP7UKQ1BO9MM22DlTLbWeie1kvn2b/eqYVbp5SwIUuZeMwU7P1ApS4q4JAvWsIb83WIqIpnJ/95Q=="
},
"@dcloudio/uni-mp-qq": {
- "version": "2.0.1-33920220314002",
- "resolved": "https://registry.npmmirror.com/@dcloudio/uni-mp-qq/-/uni-mp-qq-2.0.1-33920220314002.tgz",
- "integrity": "sha512-f/Vc2tag+YhY2sJ98/22JciZhOlWsi6lpcWG2NfZOrJmiYX5qKKwa9ej4NbwIZQGU8vpqHeyRs7bbM/P/Z6AKQ=="
+ "version": "2.0.2-3080420230530001",
+ "resolved": "https://registry.npmmirror.com/@dcloudio/uni-mp-qq/-/uni-mp-qq-2.0.2-3080420230530001.tgz",
+ "integrity": "sha512-kscDWCQLzHxugf82g5dok2Uz5ZIrQtd7fraaX/xR/o25Rie607VZCOdMw31n1Gm8Uyts5vB6RTr8VKIwfozzVw=="
},
"@dcloudio/uni-mp-toutiao": {
- "version": "2.0.1-33920220314002",
- "resolved": "https://registry.npmmirror.com/@dcloudio/uni-mp-toutiao/-/uni-mp-toutiao-2.0.1-33920220314002.tgz",
- "integrity": "sha512-5KUD2F//q50FeAP4tH5YzS8zWhDLsk0ptIE0tj4cZAW0ZE/UfUGcs/qG2jR2CoiZzFQaom2eU7g/7qHs2yoixA=="
+ "version": "2.0.2-3080420230530001",
+ "resolved": "https://registry.npmmirror.com/@dcloudio/uni-mp-toutiao/-/uni-mp-toutiao-2.0.2-3080420230530001.tgz",
+ "integrity": "sha512-PrJAyI4VyCWevqHMZR94gmIx6Jm2t3kUAiwKnEnmNgHn/G8zLtL8zYIuDzLDCrhb1EN52Lo3PuYdDMBzsgYj+A=="
},
"@dcloudio/uni-mp-vue": {
- "version": "2.0.1-33920220314002",
- "resolved": "https://registry.npmmirror.com/@dcloudio/uni-mp-vue/-/uni-mp-vue-2.0.1-33920220314002.tgz",
- "integrity": "sha512-ShgsGDsizSybGiUSQGM8+8idecdEfLVdMOg25v87OhjCWyRSwkIvKzx2nHZv3YexMduJuFRCfs+r6geliAM9Zg=="
+ "version": "2.0.2-3080420230530001",
+ "resolved": "https://registry.npmmirror.com/@dcloudio/uni-mp-vue/-/uni-mp-vue-2.0.2-3080420230530001.tgz",
+ "integrity": "sha512-U+ZXIwioBHgO8KdZwua293k0yoJPgJ5rW/KbELUU+i3AmMEiNU88lsFg6oBDjvLNN4lfLbr5PnatsC/C90Ycag=="
},
"@dcloudio/uni-mp-weixin": {
- "version": "2.0.1-33920220314002",
- "resolved": "https://registry.npmmirror.com/@dcloudio/uni-mp-weixin/-/uni-mp-weixin-2.0.1-33920220314002.tgz",
- "integrity": "sha512-1H8+ZwNfmBDRwfV7r+6EEyb6GISKEY8owLGE8La4QIdZk+zqRhNKB7SG89sVTflWnH3xcAUjwnz1rWxdklp5bA=="
+ "version": "2.0.2-3080420230530001",
+ "resolved": "https://registry.npmmirror.com/@dcloudio/uni-mp-weixin/-/uni-mp-weixin-2.0.2-3080420230530001.tgz",
+ "integrity": "sha512-PxU0E+VOzpqATn23DfHNj7Chea9xCjBaTs1jcj5ajk6Z5aVnMHpyl5Z+7xUoAQwuJKz0leuZEboax0n24uxl3Q=="
+ },
+ "@dcloudio/uni-mp-xhs": {
+ "version": "2.0.2-3080420230530001",
+ "resolved": "https://registry.npmmirror.com/@dcloudio/uni-mp-xhs/-/uni-mp-xhs-2.0.2-3080420230530001.tgz",
+ "integrity": "sha512-v8jwRaC/oYy3rIf6GtCPr3nOHXt7H8LrGyYeghuLtxjwOozTqCtT0/Hx+JgTzPGAtP4yd55PNosbKcmLoFIsLQ=="
},
"@dcloudio/uni-quickapp-native": {
- "version": "2.0.1-33920220314002",
- "resolved": "https://registry.npmmirror.com/@dcloudio/uni-quickapp-native/-/uni-quickapp-native-2.0.1-33920220314002.tgz",
- "integrity": "sha512-lW9bhY0fT2eTUAc81TClMOiSnUMHlXrGPagq5FnWK/pOuTzxqTsbEvrF29CTQVSP93IxKhBbO/cm39Yv5tnO9g==",
+ "version": "2.0.2-3080420230530001",
+ "resolved": "https://registry.npmmirror.com/@dcloudio/uni-quickapp-native/-/uni-quickapp-native-2.0.2-3080420230530001.tgz",
+ "integrity": "sha512-Ey/k7Dt/M7KjlfoomBHVZv7Re80q7aTk9lIVdoLXjLtCKdj7RD6DmtlFEZYTsVg0PdgU2ZdpHpmSQQsisQGR6w==",
"requires": {
"@hap-toolkit/dsl-vue": "0.6.13",
"@hap-toolkit/packager": "0.6.13",
@@ -1270,31 +1357,37 @@
}
},
"@dcloudio/uni-quickapp-webview": {
- "version": "2.0.1-33920220314002",
- "resolved": "https://registry.npmmirror.com/@dcloudio/uni-quickapp-webview/-/uni-quickapp-webview-2.0.1-33920220314002.tgz",
- "integrity": "sha512-Q7VcVghIMNiiUjmoO4IB9CNVNA64q25lcdHCMjxpi+nrgRf76DRYD1mjR1lz+tjsnzOhm5gAdhActP3+6EqpBw=="
+ "version": "2.0.2-3080420230530001",
+ "resolved": "https://registry.npmmirror.com/@dcloudio/uni-quickapp-webview/-/uni-quickapp-webview-2.0.2-3080420230530001.tgz",
+ "integrity": "sha512-0qcMg3Q/NntMjRA+iDQCudBgYzevFABfCYsSkSeqOx9x3eAj8drzqhSTzU02ojxxD0rpLrgFXJMJ4VOO7ccslQ=="
+ },
+ "@dcloudio/uni-stacktracey": {
+ "version": "2.0.2-3080420230530001",
+ "resolved": "https://registry.npmmirror.com/@dcloudio/uni-stacktracey/-/uni-stacktracey-2.0.2-3080420230530001.tgz",
+ "integrity": "sha512-UUkewQEyZvj42sP7byPUEnk7sL4abKKRDD+PKvOlblkOMty7qh+2a0yDa9lXZJaYtIvf/u6+/P0TPm/4oCi5xg=="
},
"@dcloudio/uni-stat": {
- "version": "2.0.1-33920220314002",
- "resolved": "https://registry.npmmirror.com/@dcloudio/uni-stat/-/uni-stat-2.0.1-33920220314002.tgz",
- "integrity": "sha512-NDx9DUamZDPlKVfdub0drT+WU6Bf9ziGh4xRpT5w/lXo8vWxEl0TwKxB2vWjCS+GXeXcjynU+FIdYtWi1F/iVw=="
+ "version": "2.0.2-3080420230530001",
+ "resolved": "https://registry.npmmirror.com/@dcloudio/uni-stat/-/uni-stat-2.0.2-3080420230530001.tgz",
+ "integrity": "sha512-Llux/4Ps/+Xm2yw71ZNFd81M3NG34+of1wU/3i4qQuNv11x7YP8IW++VLfhFypm4Dm62DHhSBdfo1x87wNft4g=="
},
"@dcloudio/uni-template-compiler": {
- "version": "2.0.1-33920220314002",
- "resolved": "https://registry.npmmirror.com/@dcloudio/uni-template-compiler/-/uni-template-compiler-2.0.1-33920220314002.tgz",
- "integrity": "sha512-mM9rSJ0Z7JzNgP1aGgPdxKN+N2Kq0itXJ4aTXluW1DNswviW9nC2rr9AYWe7t2dklTs7DH2sx5pjUow6xQ7uwA==",
+ "version": "2.0.2-3080420230530001",
+ "resolved": "https://registry.npmmirror.com/@dcloudio/uni-template-compiler/-/uni-template-compiler-2.0.2-3080420230530001.tgz",
+ "integrity": "sha512-F2b2cLRabI8RuQ90WlGoEmX/IvClTZhO88dIWIbdvINmsSi9fqOUKlkQn5M75V1OwUZbXA13efNi6juE2dk9vw==",
"dev": true,
"requires": {
"@babel/parser": "^7.3.3",
+ "@babel/template": "^7.3.3",
"@babel/traverse": "^7.3.3",
"@babel/types": "^7.3.3",
"vue-template-compiler": "^2.6.10"
}
},
"@dcloudio/vue-cli-plugin-hbuilderx": {
- "version": "2.0.1-33920220314002",
- "resolved": "https://registry.npmmirror.com/@dcloudio/vue-cli-plugin-hbuilderx/-/vue-cli-plugin-hbuilderx-2.0.1-33920220314002.tgz",
- "integrity": "sha512-7Kw5qq218rw5QDz0IuqxCQker/ViOSy/qldAwUeiyEoKJDD+Rb6gY8Y1d6NtRiFDqYNMHARPzcVkqGa7YBQ5BQ==",
+ "version": "2.0.2-3080420230530001",
+ "resolved": "https://registry.npmmirror.com/@dcloudio/vue-cli-plugin-hbuilderx/-/vue-cli-plugin-hbuilderx-2.0.2-3080420230530001.tgz",
+ "integrity": "sha512-kWeAHNvA8HrB6ue9lU9ZsSXSZlTodHb/imJ/8pp+ynCbgi5euVON6vmzN6O74R/BpOR2X/lu2ibw1Jm/QAqQvA==",
"dev": true,
"requires": {
"acorn": "^5.2.1",
@@ -1311,15 +1404,14 @@
}
},
"@dcloudio/vue-cli-plugin-uni": {
- "version": "2.0.1-33920220314002",
- "resolved": "https://registry.npmmirror.com/@dcloudio/vue-cli-plugin-uni/-/vue-cli-plugin-uni-2.0.1-33920220314002.tgz",
- "integrity": "sha512-6hbjRkaJr2D+b+ZRFRlp6mbVO9f1AxGxA28u7Sl8FNMsOVNUa0eW7udS4JyZEUZg30mLjkkfg0O40wAVup9fXw==",
+ "version": "2.0.2-3080420230530001",
+ "resolved": "https://registry.npmmirror.com/@dcloudio/vue-cli-plugin-uni/-/vue-cli-plugin-uni-2.0.2-3080420230530001.tgz",
+ "integrity": "sha512-b85r1rOrUV6ZmqRwQObEL9mFiFWmPRMj7CePpIssQ80lsg8XGMjERjOpyreGvEPp5HxE9RTtfNxSYjfK6wToNA==",
"dev": true,
"requires": {
- "@dcloudio/uni-stat": "^2.0.1-33920220314002",
+ "@dcloudio/uni-stat": "^2.0.2-3080420230530001",
"buffer-json": "^2.0.0",
"clone-deep": "^4.0.1",
- "copy-webpack-plugin": "^5.1.1",
"cross-env": "^5.2.0",
"envinfo": "^6.0.1",
"hash-sum": "^1.0.2",
@@ -1328,7 +1420,6 @@
"mkdirp": "^0.5.1",
"module-alias": "^2.1.0",
"neo-async": "^2.6.1",
- "postcss": "^7.0.7",
"postcss-import": "^12.0.1",
"postcss-selector-parser": "^5.0.0",
"postcss-value-parser": "^3.3.1",
@@ -1424,21 +1515,21 @@
}
},
"@dcloudio/vue-cli-plugin-uni-optimize": {
- "version": "2.0.1-33920220314002",
- "resolved": "https://registry.npmmirror.com/@dcloudio/vue-cli-plugin-uni-optimize/-/vue-cli-plugin-uni-optimize-2.0.1-33920220314002.tgz",
- "integrity": "sha512-OFPk4m9NTxST4+rsTsNFHbtFYxjG1DP1BGHqhU5XtNH08+GYm3/lz3RHo41qJaQdBJwRzGnuccyzjLv2gW96Fw==",
+ "version": "2.0.2-3080420230530001",
+ "resolved": "https://registry.npmmirror.com/@dcloudio/vue-cli-plugin-uni-optimize/-/vue-cli-plugin-uni-optimize-2.0.2-3080420230530001.tgz",
+ "integrity": "sha512-8nP8fXfBMgl8FLipQeiDoawanQfHKGUpv5sQLYuDPlv3x+RAvjd+Q97VHNqKtTGMzb/sQkEO5ycBepjm7HjQ3g==",
"dev": true
},
"@dcloudio/webpack-uni-mp-loader": {
- "version": "2.0.1-33920220314002",
- "resolved": "https://registry.npmmirror.com/@dcloudio/webpack-uni-mp-loader/-/webpack-uni-mp-loader-2.0.1-33920220314002.tgz",
- "integrity": "sha512-ey/r45y4bDHgcX6RuUqUEvvtm4vqAnuhaCk5JR15fL2RAnmMPQ4FcYKL36kuwyKYTEA7HHA8XjKNPg+xbwen8w==",
+ "version": "2.0.2-3080420230530001",
+ "resolved": "https://registry.npmmirror.com/@dcloudio/webpack-uni-mp-loader/-/webpack-uni-mp-loader-2.0.2-3080420230530001.tgz",
+ "integrity": "sha512-l6fRZouk0QH1fQyx7eubeWcuctoMpHHrNsbnT6JXp9uAWXbZYt0YtTYGZqfeQU/y0YfyD3Hcjn1hmC6S+VHq1w==",
"dev": true
},
"@dcloudio/webpack-uni-pages-loader": {
- "version": "2.0.1-33920220314002",
- "resolved": "https://registry.npmmirror.com/@dcloudio/webpack-uni-pages-loader/-/webpack-uni-pages-loader-2.0.1-33920220314002.tgz",
- "integrity": "sha512-gdtbUM3rRIKsc47FZTKqhAi0yHpWUQciQrebGUiewd/pEIv8k9bsTBzQLFk/YlYblz7WzrR/y/BmcCedm93e3g==",
+ "version": "2.0.2-3080420230530001",
+ "resolved": "https://registry.npmmirror.com/@dcloudio/webpack-uni-pages-loader/-/webpack-uni-pages-loader-2.0.2-3080420230530001.tgz",
+ "integrity": "sha512-R274L+cWsPh8VenyrQI6HDNEBqlAtC6CP8EfZVBA0b+XVArxo+OgD3CelHl+nGYkhQtJBdBuWtHrrAXuQ1Mw6A==",
"dev": true,
"requires": {
"merge": "^2.1.1",
@@ -1521,21 +1612,6 @@
"moment": "^2.24.0",
"qr-image": "^3.2.0",
"webpack": "^4.29.5"
- },
- "dependencies": {
- "@babel/runtime": {
- "version": "7.17.8",
- "resolved": "https://registry.npmmirror.com/@babel/runtime/-/runtime-7.17.8.tgz",
- "integrity": "sha512-dQpEpK0O9o6lj6oPu0gRDbbnk+4LeHlNcBpspf6Olzt3GIX4P1lWF1gS+pHLDFlaJvbR6q7jCfQ08zA4QJBnmA==",
- "requires": {
- "regenerator-runtime": "^0.13.4"
- }
- },
- "regenerator-runtime": {
- "version": "0.13.9",
- "resolved": "https://registry.npmmirror.com/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz",
- "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA=="
- }
}
},
"@hap-toolkit/server": {
@@ -1557,21 +1633,6 @@
"opn": "^5.4.0",
"portfinder": "^1.0.20",
"qr-image": "^3.2.0"
- },
- "dependencies": {
- "@babel/runtime": {
- "version": "7.17.8",
- "resolved": "https://registry.npmmirror.com/@babel/runtime/-/runtime-7.17.8.tgz",
- "integrity": "sha512-dQpEpK0O9o6lj6oPu0gRDbbnk+4LeHlNcBpspf6Olzt3GIX4P1lWF1gS+pHLDFlaJvbR6q7jCfQ08zA4QJBnmA==",
- "requires": {
- "regenerator-runtime": "^0.13.4"
- }
- },
- "regenerator-runtime": {
- "version": "0.13.9",
- "resolved": "https://registry.npmmirror.com/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz",
- "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA=="
- }
}
},
"@hap-toolkit/shared-utils": {
@@ -1865,13 +1926,13 @@
"dev": true
},
"micromatch": {
- "version": "4.0.4",
- "resolved": "https://registry.npmmirror.com/micromatch/-/micromatch-4.0.4.tgz",
- "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==",
+ "version": "4.0.5",
+ "resolved": "https://registry.npmmirror.com/micromatch/-/micromatch-4.0.5.tgz",
+ "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
"dev": true,
"requires": {
- "braces": "^3.0.1",
- "picomatch": "^2.2.3"
+ "braces": "^3.0.2",
+ "picomatch": "^2.3.1"
}
},
"rimraf": {
@@ -2179,13 +2240,13 @@
"dev": true
},
"micromatch": {
- "version": "4.0.4",
- "resolved": "https://registry.npmmirror.com/micromatch/-/micromatch-4.0.4.tgz",
- "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==",
+ "version": "4.0.5",
+ "resolved": "https://registry.npmmirror.com/micromatch/-/micromatch-4.0.5.tgz",
+ "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
"dev": true,
"requires": {
- "braces": "^3.0.1",
- "picomatch": "^2.2.3"
+ "braces": "^3.0.2",
+ "picomatch": "^2.3.1"
}
},
"slash": {
@@ -2312,16 +2373,44 @@
"glob-to-regexp": "^0.3.0"
}
},
+ "@nodelib/fs.scandir": {
+ "version": "2.1.5",
+ "resolved": "https://registry.npmmirror.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
+ "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
+ "dev": true,
+ "requires": {
+ "@nodelib/fs.stat": "2.0.5",
+ "run-parallel": "^1.1.9"
+ },
+ "dependencies": {
+ "@nodelib/fs.stat": {
+ "version": "2.0.5",
+ "resolved": "https://registry.npmmirror.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
+ "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
+ "dev": true
+ }
+ }
+ },
"@nodelib/fs.stat": {
"version": "1.1.3",
"resolved": "https://registry.npmmirror.com/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz",
"integrity": "sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==",
"dev": true
},
+ "@nodelib/fs.walk": {
+ "version": "1.2.8",
+ "resolved": "https://registry.npmmirror.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
+ "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
+ "dev": true,
+ "requires": {
+ "@nodelib/fs.scandir": "2.1.5",
+ "fastq": "^1.6.0"
+ }
+ },
"@sinonjs/commons": {
- "version": "1.8.3",
- "resolved": "https://registry.npmmirror.com/@sinonjs/commons/-/commons-1.8.3.tgz",
- "integrity": "sha512-xkNcLAn/wZaX14RPlwizcKicDk9G3F8m2nU3L7Ukm5zBgTwiT0wsoFAHx9Jq56fJA1z/7uKGtCRu16sOUCLIHQ==",
+ "version": "1.8.6",
+ "resolved": "https://registry.npmmirror.com/@sinonjs/commons/-/commons-1.8.6.tgz",
+ "integrity": "sha512-Ky+XkAkqPZSm3NLBeUng77EBQl3cmeJhITaGHdYH8kjVB+aun3S4XBRti2zt17mtt0mIUDiNxYeoJm6drVvBJQ==",
"dev": true,
"requires": {
"type-detect": "4.0.8"
@@ -2397,16 +2486,41 @@
"dev": true
},
"@types/babel__core": {
- "version": "7.1.19",
- "resolved": "https://registry.npmmirror.com/@types/babel__core/-/babel__core-7.1.19.tgz",
- "integrity": "sha512-WEOTgRsbYkvA/KCsDwVEGkd7WAr1e3g31VHQ8zy5gul/V1qKullU/BU5I68X5v7V3GnB9eotmom4v5a5gjxorw==",
+ "version": "7.20.1",
+ "resolved": "https://registry.npmmirror.com/@types/babel__core/-/babel__core-7.20.1.tgz",
+ "integrity": "sha512-aACu/U/omhdk15O4Nfb+fHgH/z3QsfQzpnvRZhYhThms83ZnAOZz7zZAWO7mn2yyNQaA4xTO8GLK3uqFU4bYYw==",
"dev": true,
"requires": {
- "@babel/parser": "^7.1.0",
- "@babel/types": "^7.0.0",
+ "@babel/parser": "^7.20.7",
+ "@babel/types": "^7.20.7",
"@types/babel__generator": "*",
"@types/babel__template": "*",
"@types/babel__traverse": "*"
+ },
+ "dependencies": {
+ "@babel/helper-validator-identifier": {
+ "version": "7.22.5",
+ "resolved": "https://registry.npmmirror.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz",
+ "integrity": "sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ==",
+ "dev": true
+ },
+ "@babel/parser": {
+ "version": "7.22.5",
+ "resolved": "https://registry.npmmirror.com/@babel/parser/-/parser-7.22.5.tgz",
+ "integrity": "sha512-DFZMC9LJUG9PLOclRC32G63UXwzqS2koQC8dkx+PLdmt1xSePYpbT/NbsrJy8Q/muXz7o/h/d4A7Fuyixm559Q==",
+ "dev": true
+ },
+ "@babel/types": {
+ "version": "7.22.5",
+ "resolved": "https://registry.npmmirror.com/@babel/types/-/types-7.22.5.tgz",
+ "integrity": "sha512-zo3MIHGOkPOfoRXitsgHLjEXmlDaD/5KU1Uzuc9GNiZPhSqVxVRtxuPaSBZDsYZ9qV88AjtMtWW7ww98loJ9KA==",
+ "dev": true,
+ "requires": {
+ "@babel/helper-string-parser": "^7.22.5",
+ "@babel/helper-validator-identifier": "^7.22.5",
+ "to-fast-properties": "^2.0.0"
+ }
+ }
}
},
"@types/babel__generator": {
@@ -2429,12 +2543,31 @@
}
},
"@types/babel__traverse": {
- "version": "7.14.2",
- "resolved": "https://registry.npmmirror.com/@types/babel__traverse/-/babel__traverse-7.14.2.tgz",
- "integrity": "sha512-K2waXdXBi2302XUdcHcR1jCeU0LL4TD9HRs/gk0N2Xvrht+G/BfJa4QObBQZfhMdxiCpV3COl5Nfq4uKTeTnJA==",
+ "version": "7.20.1",
+ "resolved": "https://registry.npmmirror.com/@types/babel__traverse/-/babel__traverse-7.20.1.tgz",
+ "integrity": "sha512-MitHFXnhtgwsGZWtT68URpOvLN4EREih1u3QtQiN4VdAxWKRVvGCSvw/Qth0M0Qq3pJpnGOu5JaM/ydK7OGbqg==",
"dev": true,
"requires": {
- "@babel/types": "^7.3.0"
+ "@babel/types": "^7.20.7"
+ },
+ "dependencies": {
+ "@babel/helper-validator-identifier": {
+ "version": "7.22.5",
+ "resolved": "https://registry.npmmirror.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz",
+ "integrity": "sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ==",
+ "dev": true
+ },
+ "@babel/types": {
+ "version": "7.22.5",
+ "resolved": "https://registry.npmmirror.com/@babel/types/-/types-7.22.5.tgz",
+ "integrity": "sha512-zo3MIHGOkPOfoRXitsgHLjEXmlDaD/5KU1Uzuc9GNiZPhSqVxVRtxuPaSBZDsYZ9qV88AjtMtWW7ww98loJ9KA==",
+ "dev": true,
+ "requires": {
+ "@babel/helper-string-parser": "^7.22.5",
+ "@babel/helper-validator-identifier": "^7.22.5",
+ "to-fast-properties": "^2.0.0"
+ }
+ }
}
},
"@types/body-parser": {
@@ -2508,9 +2641,9 @@
}
},
"@types/graceful-fs": {
- "version": "4.1.5",
- "resolved": "https://registry.npmmirror.com/@types/graceful-fs/-/graceful-fs-4.1.5.tgz",
- "integrity": "sha512-anKkLmZZ+xm4p8JWBf4hElkM4XR+EZeA2M9BAkkTldmcyDY4mbdIJnRghDJH3Ov5ooY7/UAoENtmdMSkaAd7Cw==",
+ "version": "4.1.6",
+ "resolved": "https://registry.npmmirror.com/@types/graceful-fs/-/graceful-fs-4.1.6.tgz",
+ "integrity": "sha512-Sig0SNORX9fdW+bQuTEovKj3uHcUL6LQKbCrrqb1X7J6/ReAbhCXRAhc+SMejhLELFj2QcyuxmUooZ4bt5ReSw==",
"dev": true,
"requires": {
"@types/node": "*"
@@ -2700,9 +2833,9 @@
}
},
"@types/yargs": {
- "version": "15.0.14",
- "resolved": "https://registry.npmmirror.com/@types/yargs/-/yargs-15.0.14.tgz",
- "integrity": "sha512-yEJzHoxf6SyQGhBhIYGXQDSCkJjB6HohDShto7m8vaKg9Yp0Yn8+71J9eakh2bnPg6BfsH9PRMhiRTZnd4eXGQ==",
+ "version": "15.0.15",
+ "resolved": "https://registry.npmmirror.com/@types/yargs/-/yargs-15.0.15.tgz",
+ "integrity": "sha512-IziEYMU9XoVj8hWg7k+UJrXALkGFjWJhn5QFEv9q4p+v40oZhSuC135M38st8XPjICL7Ey4TV64ferBGUoJhBg==",
"dev": true,
"requires": {
"@types/yargs-parser": "*"
@@ -3406,9 +3539,9 @@
"dev": true
},
"@vue/shared": {
- "version": "3.2.31",
- "resolved": "https://registry.npmmirror.com/@vue/shared/-/shared-3.2.31.tgz",
- "integrity": "sha512-ymN2pj6zEjiKJZbrf98UM2pfDd6F2H7ksKw7NDt/ZZ1fh5Ei39X5tABugtT03ZRlWd9imccoK0hE8hpjpU7irQ=="
+ "version": "3.3.4",
+ "resolved": "https://registry.npmmirror.com/@vue/shared/-/shared-3.3.4.tgz",
+ "integrity": "sha512-7OjdcV8vQ74eiz1TZLzZP4JwqM5fA94K6yntPS5Z25r9HDuGNzaGdgvwKYq6S+MxwF0TFRwe50fIR/MYnakdkQ=="
},
"@vue/web-component-wrapper": {
"version": "1.3.0",
@@ -3584,17 +3717,17 @@
"integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ=="
},
"aaptjs": {
- "version": "1.3.1",
- "resolved": "https://registry.npmmirror.com/aaptjs/-/aaptjs-1.3.1.tgz",
- "integrity": "sha512-0YE9/DCvJel2NVQbvuEWJsjuGgy1d1dlB9Hsgi3sw160VBiFl222h4OTXh4RfFvUl4NFP8sEiZpjC3ZbeVJVLw==",
+ "version": "1.3.2",
+ "resolved": "https://registry.npmmirror.com/aaptjs/-/aaptjs-1.3.2.tgz",
+ "integrity": "sha512-zB1Kyxw7uwUhDYaxWfX41pu6eGzyYzPhfC6Zr3wjEUjaWt0rRQdn3KBmifaB6H60IMcvrvweXZdBEQYWLww4XA==",
"requires": {
"shelljs": "^0.8.1"
}
},
"abab": {
- "version": "2.0.5",
- "resolved": "https://registry.npmmirror.com/abab/-/abab-2.0.5.tgz",
- "integrity": "sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q==",
+ "version": "2.0.6",
+ "resolved": "https://registry.npmmirror.com/abab/-/abab-2.0.6.tgz",
+ "integrity": "sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==",
"dev": true
},
"abbrev": {
@@ -3923,9 +4056,9 @@
"integrity": "sha512-Q+JC7Whu8HhmTdBph/Tq59IoRtoy6KAm5zzPv00WdujX82lbAL8K7WVjne7vdCsAmbF4AYaDOPyO3k0kl8qIrw=="
},
"ast-types": {
- "version": "0.14.2",
- "resolved": "https://registry.npmmirror.com/ast-types/-/ast-types-0.14.2.tgz",
- "integrity": "sha512-O0yuUDnZeQDL+ncNGlJ78BiO4jnYI3bvMsD5prT0/nsgijG/LpNBIr63gTjVTNsiGkgQhiyCShTgxt8oXOrklA==",
+ "version": "0.16.1",
+ "resolved": "https://registry.npmmirror.com/ast-types/-/ast-types-0.16.1.tgz",
+ "integrity": "sha512-6t10qk83GOG8p0vKmaCr8eiilZwO171AvbROMtvvNiwrTly62t+7XkA8RdIIVbpMhCASAsxgAzdRSwh6nw/5Dg==",
"dev": true,
"requires": {
"tslib": "^2.0.1"
@@ -4001,6 +4134,12 @@
}
}
},
+ "available-typed-arrays": {
+ "version": "1.0.5",
+ "resolved": "https://registry.npmmirror.com/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz",
+ "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==",
+ "dev": true
+ },
"aws-sign2": {
"version": "0.7.0",
"resolved": "https://registry.npmmirror.com/aws-sign2/-/aws-sign2-0.7.0.tgz",
@@ -4172,13 +4311,12 @@
}
},
"babel-plugin-import": {
- "version": "1.13.3",
- "resolved": "https://registry.npmmirror.com/babel-plugin-import/-/babel-plugin-import-1.13.3.tgz",
- "integrity": "sha512-1qCWdljJOrDRH/ybaCZuDgySii4yYrtQ8OJQwrcDqdt0y67N30ng3X3nABg6j7gR7qUJgcMa9OMhc4AGViDwWw==",
+ "version": "1.13.6",
+ "resolved": "https://registry.npmmirror.com/babel-plugin-import/-/babel-plugin-import-1.13.6.tgz",
+ "integrity": "sha512-N7FYnGh0DFsvDRkAPsvFq/metVfVD7P2h1rokOPpEH4cZbdRHCW+2jbXt0nnuqowkm/xhh2ww1anIdEpfYa7ZA==",
"dev": true,
"requires": {
- "@babel/helper-module-imports": "^7.0.0",
- "@babel/runtime": "^7.0.0"
+ "@babel/helper-module-imports": "^7.0.0"
}
},
"babel-plugin-istanbul": {
@@ -4195,9 +4333,9 @@
},
"dependencies": {
"istanbul-lib-instrument": {
- "version": "5.1.0",
- "resolved": "https://registry.npmmirror.com/istanbul-lib-instrument/-/istanbul-lib-instrument-5.1.0.tgz",
- "integrity": "sha512-czwUz525rkOFDJxfKK6mYfIs9zBKILyrZQxjz3ABhjQXhbhFsSbo1HW/BFcsDnfJYJWA6thRR5/TUY2qs5W99Q==",
+ "version": "5.2.1",
+ "resolved": "https://registry.npmmirror.com/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz",
+ "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==",
"dev": true,
"requires": {
"@babel/core": "^7.12.3",
@@ -6582,9 +6720,9 @@
}
},
"engine.io": {
- "version": "3.5.0",
- "resolved": "https://registry.npmmirror.com/engine.io/-/engine.io-3.5.0.tgz",
- "integrity": "sha512-21HlvPUKaitDGE4GXNtQ7PLP0Sz4aWLddMPw2VTyFz1FVZqu/kZsJUO8WNpKuE/OCL7nkfRaOui2ZCJloGznGA==",
+ "version": "3.6.1",
+ "resolved": "https://registry.npmmirror.com/engine.io/-/engine.io-3.6.1.tgz",
+ "integrity": "sha512-dfs8EVg/i7QjFsXxn7cCRQ+Wai1G1TlEvHhdYEi80fxn5R1vZ2K661O6v/rezj1FP234SZ14r9CmJke99iYDGg==",
"requires": {
"accepts": "~1.3.4",
"base64id": "2.0.0",
@@ -6605,9 +6743,9 @@
}
},
"engine.io-client": {
- "version": "3.5.2",
- "resolved": "https://registry.npmmirror.com/engine.io-client/-/engine.io-client-3.5.2.tgz",
- "integrity": "sha512-QEqIp+gJ/kMHeUun7f5Vv3bteRHppHH/FMBQX/esFj/fuYfjyUKWGMo3VCvIP/V8bE9KcjHmRZrhIz2Z9oNsDA==",
+ "version": "3.5.3",
+ "resolved": "https://registry.npmmirror.com/engine.io-client/-/engine.io-client-3.5.3.tgz",
+ "integrity": "sha512-qsgyc/CEhJ6cgMUwxRRtOndGVhIu5hpL5tR4umSpmX/MvkFoIxUTM7oFMDQumHNzlNLwSVy6qhstFPoWTf7dOw==",
"requires": {
"component-emitter": "~1.3.0",
"component-inherit": "0.0.3",
@@ -6754,6 +6892,12 @@
"is-symbol": "^1.0.2"
}
},
+ "es6-object-assign": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmmirror.com/es6-object-assign/-/es6-object-assign-1.1.0.tgz",
+ "integrity": "sha512-MEl9uirslVwqQU369iHNWZXsI8yaZYGg/D65aOgZkeyFJwHYSxilf7rQzXKI7DdDuBPrBXbfk3sl9hJhmd5AUw==",
+ "dev": true
+ },
"escalade": {
"version": "3.1.1",
"resolved": "https://registry.npmmirror.com/escalade/-/escalade-3.1.1.tgz",
@@ -7217,6 +7361,15 @@
"resolved": "https://registry.npmmirror.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
"integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw=="
},
+ "fastq": {
+ "version": "1.15.0",
+ "resolved": "https://registry.npmmirror.com/fastq/-/fastq-1.15.0.tgz",
+ "integrity": "sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==",
+ "dev": true,
+ "requires": {
+ "reusify": "^1.0.4"
+ }
+ },
"faye-websocket": {
"version": "0.11.4",
"resolved": "https://registry.npmmirror.com/faye-websocket/-/faye-websocket-0.11.4.tgz",
@@ -7227,9 +7380,9 @@
}
},
"fb-watchman": {
- "version": "2.0.1",
- "resolved": "https://registry.npmmirror.com/fb-watchman/-/fb-watchman-2.0.1.tgz",
- "integrity": "sha512-DkPJKQeY6kKwmuMretBhr7G6Vodr7bFwDYTXIkfG1gjvNpaxBTQV3PbXg6bR1c1UP4jPOX0jHUbbHANL9vRjVg==",
+ "version": "2.0.2",
+ "resolved": "https://registry.npmmirror.com/fb-watchman/-/fb-watchman-2.0.2.tgz",
+ "integrity": "sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==",
"dev": true,
"requires": {
"bser": "2.1.1"
@@ -7384,6 +7537,15 @@
"integrity": "sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w==",
"dev": true
},
+ "for-each": {
+ "version": "0.3.3",
+ "resolved": "https://registry.npmmirror.com/for-each/-/for-each-0.3.3.tgz",
+ "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==",
+ "dev": true,
+ "requires": {
+ "is-callable": "^1.1.3"
+ }
+ },
"for-in": {
"version": "1.0.2",
"resolved": "https://registry.npmmirror.com/for-in/-/for-in-1.0.2.tgz",
@@ -7629,11 +7791,16 @@
"path-is-absolute": "^1.0.0"
}
},
+ "glob-escape": {
+ "version": "0.0.2",
+ "resolved": "https://registry.npmmirror.com/glob-escape/-/glob-escape-0.0.2.tgz",
+ "integrity": "sha512-L/cXYz8x7qer1HAyUQ+mbjcUsJVdpRxpAf7CwqHoNBs9vTpABlGfNN4tzkDxt+u3Z7ZncVyKlCNPtzb0R/7WbA==",
+ "dev": true
+ },
"glob-parent": {
"version": "5.1.2",
"resolved": "https://registry.npmmirror.com/glob-parent/-/glob-parent-5.1.2.tgz",
"integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
- "optional": true,
"requires": {
"is-glob": "^4.0.1"
}
@@ -7707,6 +7874,29 @@
}
}
},
+ "gopd": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmmirror.com/gopd/-/gopd-1.0.1.tgz",
+ "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
+ "dev": true,
+ "requires": {
+ "get-intrinsic": "^1.1.3"
+ },
+ "dependencies": {
+ "get-intrinsic": {
+ "version": "1.2.1",
+ "resolved": "https://registry.npmmirror.com/get-intrinsic/-/get-intrinsic-1.2.1.tgz",
+ "integrity": "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==",
+ "dev": true,
+ "requires": {
+ "function-bind": "^1.1.1",
+ "has": "^1.0.3",
+ "has-proto": "^1.0.1",
+ "has-symbols": "^1.0.3"
+ }
+ }
+ }
+ },
"graceful-fs": {
"version": "4.2.9",
"resolved": "https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.9.tgz",
@@ -7805,6 +7995,12 @@
"resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-3.0.0.tgz",
"integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw=="
},
+ "has-proto": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmmirror.com/has-proto/-/has-proto-1.0.1.tgz",
+ "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==",
+ "dev": true
+ },
"has-symbols": {
"version": "1.0.3",
"resolved": "https://registry.npmmirror.com/has-symbols/-/has-symbols-1.0.3.tgz",
@@ -8596,6 +8792,16 @@
}
}
},
+ "is-arguments": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmmirror.com/is-arguments/-/is-arguments-1.1.1.tgz",
+ "integrity": "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==",
+ "dev": true,
+ "requires": {
+ "call-bind": "^1.0.2",
+ "has-tostringtag": "^1.0.0"
+ }
+ },
"is-arrayish": {
"version": "0.2.1",
"resolved": "https://registry.npmmirror.com/is-arrayish/-/is-arrayish-0.2.1.tgz",
@@ -8772,6 +8978,16 @@
"is-extglob": "^2.1.1"
}
},
+ "is-nan": {
+ "version": "1.3.2",
+ "resolved": "https://registry.npmmirror.com/is-nan/-/is-nan-1.3.2.tgz",
+ "integrity": "sha512-E+zBKpQ2t6MEo1VsonYmluk9NxGrbzpeeLC2xIViuO2EjU2xsXsBPwTr3Ykv9l08UYEVEdWeRZNouaZqF6RN0w==",
+ "dev": true,
+ "requires": {
+ "call-bind": "^1.0.0",
+ "define-properties": "^1.1.3"
+ }
+ },
"is-negative-zero": {
"version": "2.0.2",
"resolved": "https://registry.npmmirror.com/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
@@ -8895,6 +9111,19 @@
"has-symbols": "^1.0.2"
}
},
+ "is-typed-array": {
+ "version": "1.1.10",
+ "resolved": "https://registry.npmmirror.com/is-typed-array/-/is-typed-array-1.1.10.tgz",
+ "integrity": "sha512-PJqgEHiWZvMpaFZ3uTc8kHPM4+4ADTlDniuQL7cU/UDA0Ql7F70yGfHph3cLNe+c9toaigv+DFzTJKhc2CtO6A==",
+ "dev": true,
+ "requires": {
+ "available-typed-arrays": "^1.0.5",
+ "call-bind": "^1.0.2",
+ "for-each": "^0.3.3",
+ "gopd": "^1.0.1",
+ "has-tostringtag": "^1.0.0"
+ }
+ },
"is-typedarray": {
"version": "1.0.0",
"resolved": "https://registry.npmmirror.com/is-typedarray/-/is-typedarray-1.0.0.tgz",
@@ -9026,9 +9255,9 @@
}
},
"istanbul-reports": {
- "version": "3.1.4",
- "resolved": "https://registry.npmmirror.com/istanbul-reports/-/istanbul-reports-3.1.4.tgz",
- "integrity": "sha512-r1/DshN4KSE7xWEknZLLLLDn5CJybV3nw01VTkp6D5jzLuELlcbudfj/eSQFvrKsJuTVCGnePO7ho82Nw9zzfw==",
+ "version": "3.1.5",
+ "resolved": "https://registry.npmmirror.com/istanbul-reports/-/istanbul-reports-3.1.5.tgz",
+ "integrity": "sha512-nUsEMa9pBt/NOHqbcbeJEgqIlY/K7rVWUX6Lql2orY5e9roQOthbR3vtY4zzf2orPELg80fnxxk9zUyPlgwD1w==",
"dev": true,
"requires": {
"html-escaper": "^2.0.0",
@@ -9345,9 +9574,9 @@
"dev": true
},
"deepmerge": {
- "version": "4.2.2",
- "resolved": "https://registry.npmmirror.com/deepmerge/-/deepmerge-4.2.2.tgz",
- "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==",
+ "version": "4.3.1",
+ "resolved": "https://registry.npmmirror.com/deepmerge/-/deepmerge-4.3.1.tgz",
+ "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==",
"dev": true
},
"fill-range": {
@@ -9372,13 +9601,13 @@
"dev": true
},
"micromatch": {
- "version": "4.0.4",
- "resolved": "https://registry.npmmirror.com/micromatch/-/micromatch-4.0.4.tgz",
- "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==",
+ "version": "4.0.5",
+ "resolved": "https://registry.npmmirror.com/micromatch/-/micromatch-4.0.5.tgz",
+ "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
"dev": true,
"requires": {
- "braces": "^3.0.1",
- "picomatch": "^2.2.3"
+ "braces": "^3.0.2",
+ "picomatch": "^2.3.1"
}
},
"supports-color": {
@@ -9617,13 +9846,13 @@
"dev": true
},
"micromatch": {
- "version": "4.0.4",
- "resolved": "https://registry.npmmirror.com/micromatch/-/micromatch-4.0.4.tgz",
- "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==",
+ "version": "4.0.5",
+ "resolved": "https://registry.npmmirror.com/micromatch/-/micromatch-4.0.5.tgz",
+ "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
"dev": true,
"requires": {
- "braces": "^3.0.1",
- "picomatch": "^2.2.3"
+ "braces": "^3.0.2",
+ "picomatch": "^2.3.1"
}
},
"to-regex-range": {
@@ -9876,13 +10105,13 @@
"dev": true
},
"micromatch": {
- "version": "4.0.4",
- "resolved": "https://registry.npmmirror.com/micromatch/-/micromatch-4.0.4.tgz",
- "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==",
+ "version": "4.0.5",
+ "resolved": "https://registry.npmmirror.com/micromatch/-/micromatch-4.0.5.tgz",
+ "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
"dev": true,
"requires": {
- "braces": "^3.0.1",
- "picomatch": "^2.2.3"
+ "braces": "^3.0.2",
+ "picomatch": "^2.3.1"
}
},
"slash": {
@@ -9921,9 +10150,9 @@
}
},
"jest-pnp-resolver": {
- "version": "1.2.2",
- "resolved": "https://registry.npmmirror.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz",
- "integrity": "sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==",
+ "version": "1.2.3",
+ "resolved": "https://registry.npmmirror.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz",
+ "integrity": "sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==",
"dev": true
},
"jest-regex-util": {
@@ -10735,14 +10964,14 @@
"integrity": "sha512-hNN6476wY3ZP9X5HXdCmf/ovcbK+K56Fhg3cAIhgxy1WYXtGSNYDmlplecMqz1RbmqdBolkr4iyl5FAl6s4Xtg=="
},
"jszip": {
- "version": "3.7.1",
- "resolved": "https://registry.npmmirror.com/jszip/-/jszip-3.7.1.tgz",
- "integrity": "sha512-ghL0tz1XG9ZEmRMcEN2vt7xabrDdqHHeykgARpmZ0BiIctWxM47Vt63ZO2dnp4QYt/xJVLLy5Zv1l/xRdh2byg==",
+ "version": "3.10.1",
+ "resolved": "https://registry.npmmirror.com/jszip/-/jszip-3.10.1.tgz",
+ "integrity": "sha512-xXDvecyTpGLrqFrvkrUSoxxfJI5AH7U8zxxtVclpsUtMCq4JQ290LY8AW5c7Ggnr/Y/oK+bQMbqK2qmtk3pN4g==",
"requires": {
"lie": "~3.3.0",
"pako": "~1.0.2",
"readable-stream": "~2.3.6",
- "set-immediate-shim": "~1.0.1"
+ "setimmediate": "^1.0.5"
}
},
"keygrip": {
@@ -10787,9 +11016,9 @@
"dev": true
},
"koa": {
- "version": "2.13.4",
- "resolved": "https://registry.npmmirror.com/koa/-/koa-2.13.4.tgz",
- "integrity": "sha512-43zkIKubNbnrULWlHdN5h1g3SEKXOEzoAlRsHOTFpnlDu8JlAOZSMJBLULusuXRequboiwJcj5vtYXKB3k7+2g==",
+ "version": "2.14.2",
+ "resolved": "https://registry.npmmirror.com/koa/-/koa-2.14.2.tgz",
+ "integrity": "sha512-VFI2bpJaodz6P7x2uyLiX6RLYpZmOJqNmoCst/Yyd7hQlszyPwG/I9CQJ63nOtKSxpt5M7NH67V6nJL2BwCl7g==",
"requires": {
"accepts": "^1.3.5",
"cache-content-type": "^1.0.0",
@@ -10871,9 +11100,9 @@
}
},
"koa-bodyparser": {
- "version": "4.3.0",
- "resolved": "https://registry.npmmirror.com/koa-bodyparser/-/koa-bodyparser-4.3.0.tgz",
- "integrity": "sha512-uyV8G29KAGwZc4q/0WUAjH+Tsmuv9ImfBUF2oZVyZtaeo0husInagyn/JH85xMSxM0hEk/mbCII5ubLDuqW/Rw==",
+ "version": "4.4.0",
+ "resolved": "https://registry.npmmirror.com/koa-bodyparser/-/koa-bodyparser-4.4.0.tgz",
+ "integrity": "sha512-AXPY7wwKZUmbgb8VkTEUFoRNOlx6aWRJwEnQD+zfNf33/7KSAkN4Oo9BqlIk80D+5TvuqlhpQT5dPVcyxl5Zsw==",
"requires": {
"co-body": "^6.0.0",
"copy-to": "^2.0.1"
@@ -11174,9 +11403,9 @@
}
},
"licia": {
- "version": "1.34.0",
- "resolved": "https://registry.npmmirror.com/licia/-/licia-1.34.0.tgz",
- "integrity": "sha512-EKSzTKn8OTEBgySpDWq7dZ98DpfXXmFJHOi55RWDzm/UsD1LZuSwFzz6EVm4hHia2Manb0OM0Y0eUPkNWc7+Ww==",
+ "version": "1.38.1",
+ "resolved": "https://registry.npmmirror.com/licia/-/licia-1.38.1.tgz",
+ "integrity": "sha512-2CRiNVqkI48Om+eA4cvYn1+bxxHUYlt3XCR1RtuBK/y0Uu7OiWYSgKKHX2KGIaBxuSZjLSqp7zTNBXJgxuSpzg==",
"dev": true
},
"lie": {
@@ -11383,9 +11612,9 @@
}
},
"make-plural": {
- "version": "7.1.0",
- "resolved": "https://registry.npmmirror.com/make-plural/-/make-plural-7.1.0.tgz",
- "integrity": "sha512-PKkwVlAxYVo98NrbclaQIT4F5Oy+X58PZM5r2IwUSCe3syya6PXkIRCn2XCdz7p58Scgpp50PBeHmepXVDG3hg==",
+ "version": "7.3.0",
+ "resolved": "https://registry.npmmirror.com/make-plural/-/make-plural-7.3.0.tgz",
+ "integrity": "sha512-/K3BC0KIsO+WK2i94LkMPv3wslMrazrQhfi5We9fMbLlLjzoOSJWr7TAdupLlDWaJcWxwoNosBkhFDejiu5VDw==",
"dev": true
},
"makeerror": {
@@ -11789,9 +12018,9 @@
"integrity": "sha512-A/78XjoX2EmNvppVWEhM2oGk3x4lLxnkEA4jTbaK97QKSDjkIoOsKQlfylt/d3kKKi596Qy3NP5XrXJ6fZIC9Q=="
},
"moment": {
- "version": "2.29.1",
- "resolved": "https://registry.npmmirror.com/moment/-/moment-2.29.1.tgz",
- "integrity": "sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ=="
+ "version": "2.29.4",
+ "resolved": "https://registry.npmmirror.com/moment/-/moment-2.29.4.tgz",
+ "integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w=="
},
"move-concurrently": {
"version": "1.0.1",
@@ -12245,9 +12474,9 @@
"dev": true
},
"nwsapi": {
- "version": "2.2.0",
- "resolved": "https://registry.npmmirror.com/nwsapi/-/nwsapi-2.2.0.tgz",
- "integrity": "sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==",
+ "version": "2.2.5",
+ "resolved": "https://registry.npmmirror.com/nwsapi/-/nwsapi-2.2.5.tgz",
+ "integrity": "sha512-6xpotnECFy/og7tKSBVmUNft7J3jyXAka4XvG6AUhFWRz+Q/Ljus7znJAA3bxColfQLdS+XsjoodtJfCgeTEFQ==",
"dev": true
},
"oauth-sign": {
@@ -12293,6 +12522,16 @@
"resolved": "https://registry.npmmirror.com/object-inspect/-/object-inspect-1.12.0.tgz",
"integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g=="
},
+ "object-is": {
+ "version": "1.1.5",
+ "resolved": "https://registry.npmmirror.com/object-is/-/object-is-1.1.5.tgz",
+ "integrity": "sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==",
+ "dev": true,
+ "requires": {
+ "call-bind": "^1.0.2",
+ "define-properties": "^1.1.3"
+ }
+ },
"object-keys": {
"version": "1.1.1",
"resolved": "https://registry.npmmirror.com/object-keys/-/object-keys-1.1.1.tgz",
@@ -12939,9 +13178,9 @@
}
},
"postcss-helpers": {
- "version": "0.3.2",
- "resolved": "https://registry.npmmirror.com/postcss-helpers/-/postcss-helpers-0.3.2.tgz",
- "integrity": "sha512-hppnMXY6Ehe8CgLHQCDWbyUsXvBFggdzftWzznL65MhgZsE8o8pUTYbmUbLst0rps+wyUSLIUJ0bGpV2Tzv7lw==",
+ "version": "0.3.3",
+ "resolved": "https://registry.npmmirror.com/postcss-helpers/-/postcss-helpers-0.3.3.tgz",
+ "integrity": "sha512-VumiUcrpbxGlTBNQj6fUOkb/HNRUk/xYz8bNlhgVOdvk3yWEy4B+0nlDUZZM9mTVZ5bJoxUy7WT6z/4E7oMTgw==",
"dev": true,
"requires": {
"urijs": "^1.18.12"
@@ -13495,9 +13734,9 @@
"integrity": "sha512-EXtzRZmC+YGmGlDFbXKxQiMZNwCLEO6BANKXG4iCtSIM0yqc/pappSx3RIKr4r0uh5JsBckOXeKrB3Iz7mdQpQ=="
},
"qs": {
- "version": "6.10.3",
- "resolved": "https://registry.npmmirror.com/qs/-/qs-6.10.3.tgz",
- "integrity": "sha512-wr7M2E0OFRfIfJZjKGieI8lBKb7fRCH4Fv5KNPEs7gJ8jadvotdsS08PzOKR7opXhZ/Xkjtt3WF9g38drmyRqQ==",
+ "version": "6.11.2",
+ "resolved": "https://registry.npmmirror.com/qs/-/qs-6.11.2.tgz",
+ "integrity": "sha512-tDNIz22aBzCDxLtVH++VnTfzxlfeK5CbqohpSqpJgj1Wg/cQbStNAz3NuqCs5vV+pjBsK4x4pN9HlVh7rcYRiA==",
"requires": {
"side-channel": "^1.0.4"
}
@@ -13528,6 +13767,12 @@
"integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==",
"dev": true
},
+ "queue-microtask": {
+ "version": "1.2.3",
+ "resolved": "https://registry.npmmirror.com/queue-microtask/-/queue-microtask-1.2.3.tgz",
+ "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
+ "dev": true
+ },
"randombytes": {
"version": "2.1.0",
"resolved": "https://registry.npmmirror.com/randombytes/-/randombytes-2.1.0.tgz",
@@ -13552,9 +13797,9 @@
"dev": true
},
"raw-body": {
- "version": "2.5.1",
- "resolved": "https://registry.npmmirror.com/raw-body/-/raw-body-2.5.1.tgz",
- "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==",
+ "version": "2.5.2",
+ "resolved": "https://registry.npmmirror.com/raw-body/-/raw-body-2.5.2.tgz",
+ "integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==",
"requires": {
"bytes": "3.1.2",
"http-errors": "2.0.0",
@@ -13692,22 +13937,48 @@
"dev": true
},
"recast": {
- "version": "0.20.5",
- "resolved": "https://registry.npmmirror.com/recast/-/recast-0.20.5.tgz",
- "integrity": "sha512-E5qICoPoNL4yU0H0NoBDntNB0Q5oMSNh9usFctYniLBluTthi3RsQVBXIJNbApOlvSwW/RGxIuokPcAc59J5fQ==",
+ "version": "0.23.2",
+ "resolved": "https://registry.npmmirror.com/recast/-/recast-0.23.2.tgz",
+ "integrity": "sha512-Qv6cPfVZyMOtPszK6PgW70pUgm7gPlFitAPf0Q69rlOA0zLw2XdDcNmPbVGYicFGT9O8I7TZ/0ryJD+6COvIPw==",
"dev": true,
"requires": {
- "ast-types": "0.14.2",
+ "assert": "^2.0.0",
+ "ast-types": "^0.16.1",
"esprima": "~4.0.0",
"source-map": "~0.6.1",
"tslib": "^2.0.1"
},
"dependencies": {
+ "assert": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmmirror.com/assert/-/assert-2.0.0.tgz",
+ "integrity": "sha512-se5Cd+js9dXJnu6Ag2JFc00t+HmHOen+8Q+L7O9zI0PqQXr20uk2J0XQqMxZEeo5U50o8Nvmmx7dZrl+Ufr35A==",
+ "dev": true,
+ "requires": {
+ "es6-object-assign": "^1.1.0",
+ "is-nan": "^1.2.1",
+ "object-is": "^1.0.1",
+ "util": "^0.12.0"
+ }
+ },
"source-map": {
"version": "0.6.1",
"resolved": "https://registry.npmmirror.com/source-map/-/source-map-0.6.1.tgz",
"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
"dev": true
+ },
+ "util": {
+ "version": "0.12.5",
+ "resolved": "https://registry.npmmirror.com/util/-/util-0.12.5.tgz",
+ "integrity": "sha512-kZf/K6hEIrWHI6XqOFUiiMa+79wE/D8Q+NCNAWclkyg3b4d2k7s0QGepNjiABc+aR3N1PAyHL7p6UcLY6LmrnA==",
+ "dev": true,
+ "requires": {
+ "inherits": "^2.0.3",
+ "is-arguments": "^1.0.4",
+ "is-generator-function": "^1.0.7",
+ "is-typed-array": "^1.1.3",
+ "which-typed-array": "^1.1.2"
+ }
}
}
},
@@ -14135,6 +14406,12 @@
"integrity": "sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==",
"dev": true
},
+ "reusify": {
+ "version": "1.0.4",
+ "resolved": "https://registry.npmmirror.com/reusify/-/reusify-1.0.4.tgz",
+ "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
+ "dev": true
+ },
"rgb-regex": {
"version": "1.0.1",
"resolved": "https://registry.npmmirror.com/rgb-regex/-/rgb-regex-1.0.1.tgz",
@@ -14170,6 +14447,15 @@
"integrity": "sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA==",
"dev": true
},
+ "run-parallel": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmmirror.com/run-parallel/-/run-parallel-1.2.0.tgz",
+ "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
+ "dev": true,
+ "requires": {
+ "queue-microtask": "^1.2.2"
+ }
+ },
"run-queue": {
"version": "1.0.3",
"resolved": "https://registry.npmmirror.com/run-queue/-/run-queue-1.0.3.tgz",
@@ -14807,11 +15093,6 @@
"integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==",
"dev": true
},
- "set-immediate-shim": {
- "version": "1.0.1",
- "resolved": "https://registry.npmmirror.com/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz",
- "integrity": "sha512-Li5AOqrZWCVA2n5kryzEmqai6bKSIvpz5oUJHPVj6+dsbD3X1ixtsY5tEnsaNpH3pFAHmG8eIHUrtEtohrg+UQ=="
- },
"set-value": {
"version": "2.0.1",
"resolved": "https://registry.npmmirror.com/set-value/-/set-value-2.0.1.tgz",
@@ -15065,15 +15346,15 @@
}
},
"socket.io": {
- "version": "2.4.1",
- "resolved": "https://registry.npmmirror.com/socket.io/-/socket.io-2.4.1.tgz",
- "integrity": "sha512-Si18v0mMXGAqLqCVpTxBa8MGqriHGQh8ccEOhmsmNS3thNCGBwO8WGrwMibANsWtQQ5NStdZwHqZR3naJVFc3w==",
+ "version": "2.5.0",
+ "resolved": "https://registry.npmmirror.com/socket.io/-/socket.io-2.5.0.tgz",
+ "integrity": "sha512-gGunfS0od3VpwDBpGwVkzSZx6Aqo9uOcf1afJj2cKnKFAoyl16fvhpsUhmUFd4Ldbvl5JvRQed6eQw6oQp6n8w==",
"requires": {
"debug": "~4.1.0",
- "engine.io": "~3.5.0",
+ "engine.io": "~3.6.0",
"has-binary2": "~1.0.2",
"socket.io-adapter": "~1.1.0",
- "socket.io-client": "2.4.0",
+ "socket.io-client": "2.5.0",
"socket.io-parser": "~3.4.0"
},
"dependencies": {
@@ -15093,9 +15374,9 @@
"integrity": "sha512-WzZRUj1kUjrTIrUKpZLEzFZ1OLj5FwLlAFQs9kuZJzJi5DKdU7FsWc36SNmA8iDOtwBQyT8FkrriRM8vXLYz8g=="
},
"socket.io-client": {
- "version": "2.4.0",
- "resolved": "https://registry.npmmirror.com/socket.io-client/-/socket.io-client-2.4.0.tgz",
- "integrity": "sha512-M6xhnKQHuuZd4Ba9vltCLT9oa+YvTsP8j9NcEiLElfIg8KeYPyhWOes6x4t+LTAC8enQbE/995AdTem2uNyKKQ==",
+ "version": "2.5.0",
+ "resolved": "https://registry.npmmirror.com/socket.io-client/-/socket.io-client-2.5.0.tgz",
+ "integrity": "sha512-lOO9clmdgssDykiOmVQQitwBAF3I6mYcQAo7hQ7AM6Ny5X7fp8hIJ3HcQs3Rjz4SoggoxA1OgrQyY8EgTbcPYw==",
"requires": {
"backo2": "1.0.2",
"component-bind": "1.0.0",
@@ -15129,9 +15410,9 @@
"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
},
"socket.io-parser": {
- "version": "3.3.2",
- "resolved": "https://registry.npmmirror.com/socket.io-parser/-/socket.io-parser-3.3.2.tgz",
- "integrity": "sha512-FJvDBuOALxdCI9qwRrO/Rfp9yfndRtc1jSgVgV8FDraihmSP/MLGD5PEuJrNfjALvcQ+vMDM/33AWOYP/JSjDg==",
+ "version": "3.3.3",
+ "resolved": "https://registry.npmmirror.com/socket.io-parser/-/socket.io-parser-3.3.3.tgz",
+ "integrity": "sha512-qOg87q1PMWWTeO01768Yh9ogn7chB9zkKtQnya41Y355S0UmpXgpcrFwAgjYJxu9BdKug5r5e9YtVSeWhKBUZg==",
"requires": {
"component-emitter": "~1.3.0",
"debug": "~3.1.0",
@@ -15141,9 +15422,9 @@
}
},
"socket.io-parser": {
- "version": "3.4.1",
- "resolved": "https://registry.npmmirror.com/socket.io-parser/-/socket.io-parser-3.4.1.tgz",
- "integrity": "sha512-11hMgzL+WCLWf1uFtHSNvliI++tcRUWdoeYuwIl+Axvwy9z2gQM+7nJyN3STj1tLj5JyIUH8/gpDGxzAlDdi0A==",
+ "version": "3.4.3",
+ "resolved": "https://registry.npmmirror.com/socket.io-parser/-/socket.io-parser-3.4.3.tgz",
+ "integrity": "sha512-1rE4dZN3kCI/E5wixd393hmbqa78vVpkKmnEJhLeWoS/C5hbFYAbcSfnWoaVH43u9ToUVtzKjguxEZq+1XZfCQ==",
"requires": {
"component-emitter": "1.2.1",
"debug": "~4.1.0",
@@ -15649,9 +15930,9 @@
}
},
"supports-hyperlinks": {
- "version": "2.2.0",
- "resolved": "https://registry.npmmirror.com/supports-hyperlinks/-/supports-hyperlinks-2.2.0.tgz",
- "integrity": "sha512-6sXEzV5+I5j8Bmq9/vUphGRM/RJNT9SCURJLjwfOg51heRtguGWDzcaBlgAzKhQa0EVNpPEKzQuBwZ8S8WaCeQ==",
+ "version": "2.3.0",
+ "resolved": "https://registry.npmmirror.com/supports-hyperlinks/-/supports-hyperlinks-2.3.0.tgz",
+ "integrity": "sha512-RpsAZlpWcDwOPQA22aCH4J0t7L8JmAvsCxfOSEwm7cQs3LshN36QaTkwd70DnBOXDWGssw2eUoc8CaRWT0XunA==",
"dev": true,
"requires": {
"has-flag": "^4.0.0",
@@ -17154,6 +17435,20 @@
"integrity": "sha512-B+enWhmw6cjfVC7kS8Pj9pCrKSc5txArRyaYGe088shv/FGWH+0Rjx/xPgtsWfsUtS27FkP697E4DDhgrgoc0Q==",
"dev": true
},
+ "which-typed-array": {
+ "version": "1.1.9",
+ "resolved": "https://registry.npmmirror.com/which-typed-array/-/which-typed-array-1.1.9.tgz",
+ "integrity": "sha512-w9c4xkx6mPidwp7180ckYWfMmvxpjlZuIudNtDf4N/tTAUB8VJbX25qZoAsrtGuYNnGw3pa0AXgbGKRB8/EceA==",
+ "dev": true,
+ "requires": {
+ "available-typed-arrays": "^1.0.5",
+ "call-bind": "^1.0.2",
+ "for-each": "^0.3.3",
+ "gopd": "^1.0.1",
+ "has-tostringtag": "^1.0.0",
+ "is-typed-array": "^1.1.10"
+ }
+ },
"wide-align": {
"version": "1.1.5",
"resolved": "https://registry.npmmirror.com/wide-align/-/wide-align-1.1.5.tgz",
diff --git a/package.json b/package.json
index 329e958..4a9c971 100644
--- a/package.json
+++ b/package.json
@@ -46,51 +46,54 @@
"test:mp-weixin": "cross-env UNI_PLATFORM=mp-weixin jest -i"
},
"dependencies": {
- "@dcloudio/uni-app-plus": "^2.0.1-33920220314002",
- "@dcloudio/uni-h5": "^2.0.1-33920220314002",
+ "@dcloudio/uni-app": "2.0.2-3080420230530001",
+ "@dcloudio/uni-app-plus": "2.0.2-3080420230530001",
+ "@dcloudio/uni-h5": "2.0.2-3080420230530001",
"@dcloudio/uni-helper-json": "*",
- "@dcloudio/uni-i18n": "^2.0.1-33920220314002",
- "@dcloudio/uni-mp-360": "^2.0.1-33920220314002",
- "@dcloudio/uni-mp-alipay": "^2.0.1-33920220314002",
- "@dcloudio/uni-mp-baidu": "^2.0.1-33920220314002",
- "@dcloudio/uni-mp-jd": "^2.0.1-33920220314002",
- "@dcloudio/uni-mp-kuaishou": "^2.0.1-33920220314002",
- "@dcloudio/uni-mp-lark": "^2.0.1-33920220314002",
- "@dcloudio/uni-mp-qq": "^2.0.1-33920220314002",
- "@dcloudio/uni-mp-toutiao": "^2.0.1-33920220314002",
- "@dcloudio/uni-mp-vue": "^2.0.1-33920220314002",
- "@dcloudio/uni-mp-weixin": "^2.0.1-33920220314002",
- "@dcloudio/uni-quickapp-native": "^2.0.1-33920220314002",
- "@dcloudio/uni-quickapp-webview": "^2.0.1-33920220314002",
- "@dcloudio/uni-stat": "^2.0.1-33920220314002",
- "@vue/shared": "^3.0.0",
+ "@dcloudio/uni-i18n": "2.0.2-3080420230530001",
+ "@dcloudio/uni-mp-360": "2.0.2-3080420230530001",
+ "@dcloudio/uni-mp-alipay": "2.0.2-3080420230530001",
+ "@dcloudio/uni-mp-baidu": "2.0.2-3080420230530001",
+ "@dcloudio/uni-mp-jd": "2.0.2-3080420230530001",
+ "@dcloudio/uni-mp-kuaishou": "2.0.2-3080420230530001",
+ "@dcloudio/uni-mp-lark": "2.0.2-3080420230530001",
+ "@dcloudio/uni-mp-qq": "2.0.2-3080420230530001",
+ "@dcloudio/uni-mp-toutiao": "2.0.2-3080420230530001",
+ "@dcloudio/uni-mp-vue": "2.0.2-3080420230530001",
+ "@dcloudio/uni-mp-weixin": "2.0.2-3080420230530001",
+ "@dcloudio/uni-mp-xhs": "2.0.2-3080420230530001",
+ "@dcloudio/uni-quickapp-native": "2.0.2-3080420230530001",
+ "@dcloudio/uni-quickapp-webview": "2.0.2-3080420230530001",
+ "@dcloudio/uni-stacktracey": "2.0.2-3080420230530001",
+ "@dcloudio/uni-stat": "2.0.2-3080420230530001",
+ "@vue/shared": "3.3.4",
"core-js": "^3.6.5",
- "flyio": "^0.6.2",
+ "flyio": "0.6.14",
"image-tools": "^1.4.0",
"regenerator-runtime": "^0.12.1",
"uview-ui": "^2.0.31",
"vconsole": "^3.15.0",
"vue": "^2.6.11",
- "vuex": "^3.2.0"
+ "vuex": "3.6.2"
},
"devDependencies": {
"@babel/runtime": "~7.12.0",
"@dcloudio/types": "*",
- "@dcloudio/uni-automator": "^2.0.1-33920220314002",
- "@dcloudio/uni-cli-i18n": "^2.0.1-33920220314002",
- "@dcloudio/uni-cli-shared": "^2.0.1-33920220314002",
- "@dcloudio/uni-migration": "^2.0.1-33920220314002",
- "@dcloudio/uni-template-compiler": "^2.0.1-33920220314002",
- "@dcloudio/vue-cli-plugin-hbuilderx": "^2.0.1-33920220314002",
- "@dcloudio/vue-cli-plugin-uni": "^2.0.1-33920220314002",
- "@dcloudio/vue-cli-plugin-uni-optimize": "^2.0.1-33920220314002",
- "@dcloudio/webpack-uni-mp-loader": "^2.0.1-33920220314002",
- "@dcloudio/webpack-uni-pages-loader": "^2.0.1-33920220314002",
+ "@dcloudio/uni-automator": "2.0.2-3080420230530001",
+ "@dcloudio/uni-cli-i18n": "2.0.2-3080420230530001",
+ "@dcloudio/uni-cli-shared": "2.0.2-3080420230530001",
+ "@dcloudio/uni-migration": "2.0.2-3080420230530001",
+ "@dcloudio/uni-template-compiler": "2.0.2-3080420230530001",
+ "@dcloudio/vue-cli-plugin-hbuilderx": "2.0.2-3080420230530001",
+ "@dcloudio/vue-cli-plugin-uni": "2.0.2-3080420230530001",
+ "@dcloudio/vue-cli-plugin-uni-optimize": "2.0.2-3080420230530001",
+ "@dcloudio/webpack-uni-mp-loader": "2.0.2-3080420230530001",
+ "@dcloudio/webpack-uni-pages-loader": "2.0.2-3080420230530001",
"@vue/cli-plugin-babel": "~4.5.13",
"@vue/cli-service": "~4.5.13",
- "babel-plugin-import": "^1.11.0",
- "cross-env": "^7.0.2",
- "jest": "^25.4.0",
+ "babel-plugin-import": "1.13.6",
+ "cross-env": "7.0.3",
+ "jest": "25.5.4",
"less": "^4.1.3",
"less-loader": "^6.2.0",
"mini-types": "*",
diff --git a/src/static/js/qrcode.js b/src/components/js/qrcode.js
similarity index 100%
rename from src/static/js/qrcode.js
rename to src/components/js/qrcode.js
diff --git a/src/static/pdf/pdf.html b/src/components/pdf/pdf.html
similarity index 100%
rename from src/static/pdf/pdf.html
rename to src/components/pdf/pdf.html
diff --git a/src/static/pdf/pdf/jquery-1.11.3.min.js b/src/components/pdf/pdf/jquery-1.11.3.min.js
similarity index 100%
rename from src/static/pdf/pdf/jquery-1.11.3.min.js
rename to src/components/pdf/pdf/jquery-1.11.3.min.js
diff --git a/src/static/pdf/pdf/pdf.js b/src/components/pdf/pdf/pdf.js
similarity index 100%
rename from src/static/pdf/pdf/pdf.js
rename to src/components/pdf/pdf/pdf.js
diff --git a/src/static/pdf/pdf/pdf.worker.js b/src/components/pdf/pdf/pdf.worker.js
similarity index 100%
rename from src/static/pdf/pdf/pdf.worker.js
rename to src/components/pdf/pdf/pdf.worker.js
diff --git a/src/static/pdf/pdf/pdfh5.css b/src/components/pdf/pdf/pdfh5.css
similarity index 100%
rename from src/static/pdf/pdf/pdfh5.css
rename to src/components/pdf/pdf/pdfh5.css
diff --git a/src/static/pdf/pdf/pdfh5.js b/src/components/pdf/pdf/pdfh5.js
similarity index 100%
rename from src/static/pdf/pdf/pdfh5.js
rename to src/components/pdf/pdf/pdfh5.js
diff --git a/src/static/pdf/pdf/style.css b/src/components/pdf/pdf/style.css
similarity index 100%
rename from src/static/pdf/pdf/style.css
rename to src/components/pdf/pdf/style.css
diff --git a/src/components/tabbar/tabbar.vue b/src/components/tabbar/tabbar.vue
index c816e39..766f1d9 100644
--- a/src/components/tabbar/tabbar.vue
+++ b/src/components/tabbar/tabbar.vue
@@ -49,22 +49,22 @@
return
} else if (val == '2') {
uni.reLaunch({
- url: '/pages/activity/activity'
+ url: '/pagesC/activity/activity'
});
return
} else if (val == '3') {
uni.navigateTo({
- url: '/pages/PublishWorks/PublishWorks'
+ url: '/pagesB/PublishWorks/PublishWorks'
})
return
} else if (val == '4') {
uni.reLaunch({
- url: '/pages/shop/Shop'
+ url: '/pagesC/shop/Shop'
});
return
} else if (val == '5') {
uni.reLaunch({
- url: '/pages/my/My'
+ url: '/pagesA/my/My'
});
return
}
diff --git a/src/manifest.json b/src/manifest.json
index eeb85e7..c4fad60 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -1,5 +1,5 @@
{
- "name" : "艺象心",
+ "name" : "yxx",
"appid" : "__UNI__77CA6BC",
"description" : "",
"versionName" : "1.0.0",
@@ -54,13 +54,18 @@
"quickapp" : {},
/* 快应用特有相关 */
"mp-weixin" : {
- /* 微信小程序特有相关 */
- "appid" : "wx4f17720066e6ab83",
+ "appid" : "wx55b187e6ed92e2ac",
"setting" : {
- "urlCheck" : false,
- "minified" : true
+ "urlCheck" : true,
+ "minified" : true,
+ "es6" : true,
+ "postcss" : true
},
- "usingComponents" : true
+ "usingComponents" : true,
+ "lazyCodeLoading" : "requiredComponents",
+ "optimization" : {
+ "subPackages" : true
+ }
},
"mp-alipay" : {
"usingComponents" : true
@@ -85,7 +90,7 @@
// 与vue中的proxyTable配置大致上一致,此处我同时代理了两个
"/pre" : {
// 预发布
- "target" : "http://10.0.0.28:8080/h5/api", // 目标接口域名
+ "target" : "http://10.0.0.61:8080/h5/api", // 目标接口域名
// "target" : "https://yxx.ydool.net/h5/api", // 目标接口域名
"changeOrigin" : true, // 是否跨域
diff --git a/src/pages.json b/src/pages.json
index 0f4fa41..2407ce9 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -9,553 +9,16 @@
"enablePullDownRefresh": false,
"navigationStyle": "custom"
}
- },
- {
- "path": "pages/enjoy/enjoy",
- "style": {
- "navigationBarTitleText": "每日一赏",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/famousArts/artistList",
- "style": {
- "navigationBarTitleText": "文艺名家",
- "enablePullDownRefresh": true,
- "onReachBottomDistance": 20
- }
- },
- {
- "path": "pages/mediaProp/mediaProp",
- "style": {
- "enablePullDownRefresh": false,
- "navigationStyle": "custom"
- }
- },
-
- {
- "path": "pages/literHelp/literHelp",
- "style": {
- "enablePullDownRefresh": false,
- "navigationStyle": "custom"
- }
- },
-
- {
- "path": "pages/literFamily/literFamily",
- "style": {
- "navigationStyle": "custom",
- "enablePullDownRefresh": true,
- "onReachBottomDistance": 20
- }
- },
- {
- "path": "pages/activity/activity",
- "style": {
- "enablePullDownRefresh": false,
- "navigationStyle": "custom"
- }
- },
-
- {
- "path": "pages/moreFun/moreFun",
- "style": {
- "navigationBarTitleText": "更多功能",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/index/index",
- "style": {
- "navigationBarTitleText": "中间按钮"
- }
}, {
- "path": "pages/shop/Shop",
- "style": {
- "navigationStyle": "custom",
- "enablePullDownRefresh": true,
- "onReachBottomDistance": 20
- }
-
- }
- // 政策速通
- , {
- "path": "pages/PolicyExpress/PolicyExpress",
- "style": {
- "navigationBarTitleText": "政策速通",
- "enablePullDownRefresh": true,
- "onReachBottomDistance": 20
- }
-
- }
- // 政策速通详情
- , {
- "path": "pages/PolicyExpress/PolicyExpressDetail",
- "style": {
- "navigationBarTitleText": "详情",
- "enablePullDownRefresh": false
- }
-
- }
- // 动态详情
- , {
- "path": "pages/activity/activityDetail",
- "style": {
- "navigationBarTitleText": "动态详情",
- "enablePullDownRefresh": false
- }
-
- }
- // 文艺作品
- , {
- "path": "pages/ArtWorks/ArtWorks",
- "style": {
- "navigationBarTitleText": "文艺作品",
- "enablePullDownRefresh": true,
- "onReachBottomDistance": 20
- }
-
- }
- , {
- "path": "pages/ArtWorks/artWorkDetail",
- "style": {
- "navigationBarTitleText": "作品详情",
- "enablePullDownRefresh": false
- }
-
- }
- , {
- "path": "pages/ArtWorks/webView",
- "style": {
- "navigationBarTitleText": "文件浏览",
- "enablePullDownRefresh": false
- }
-
- }
- , {
"path": "pages/pageHome/pdfView",
"style": {
"navigationBarTitleText": "文件浏览",
"enablePullDownRefresh": false
}
-
- }
- // 文艺活动
- , {
- "path": "pages/ArtActivities/ArtActivities",
- "style": {
- "navigationBarTitleText": "文艺活动",
- "enablePullDownRefresh": false
- }
-
- },
- // 活动详情
- {
- "path": "pages/ActivitiesDetail/ActivitiesDetail",
- "style": {
- "navigationBarTitleText": "活动详情",
- "enablePullDownRefresh": false
- }
- }
- // 我的页面
- , {
- "path": "pages/my/My",
- "style": {
- "enablePullDownRefresh": false,
- "navigationStyle": "custom"
- }
- },
- {
- "path": "pages/my/myCollection",
- "style": {
- "navigationBarTitleText": "我的收藏",
- "enablePullDownRefresh": true,
- "onReachBottomDistance": 20
- }
- },
- {
- "path": "pages/my/logOut",
- "style": {
- "navigationBarTitleText": "设置",
- "enablePullDownRefresh": false
- }
- },
- // 作者主页
- {
- "path": "pages/my/myWorks",
- "style": {
- "enablePullDownRefresh": true,
- "onReachBottomDistance": 20
- }
- },
- // 我的作品
- {
- "path": "pages/my/myWoekList",
- "style": {
- "enablePullDownRefresh": true,
- "onReachBottomDistance": 20
- }
- },
- // 我的关注
- {
- "path": "pages/my/myFollow",
- "style": {
- "enablePullDownRefresh": true,
- "onReachBottomDistance": 20
- }
- },
- {
- "path": "pages/my/myWorkDetail",
- "style": {
- "navigationBarTitleText": "作品详情",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/my/editWork",
- "style": {
- "navigationBarTitleText": "编辑作品",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/my/editWorkNext",
- "style": {
- "navigationBarTitleText": "编辑作品",
- "enablePullDownRefresh": false
- }
- },
- // 我的积分
- {
- "path": "pages/MyPoints/MyPoints",
- "style": {
- "navigationBarTitleText": "我的积分",
- "enablePullDownRefresh": false,
- "navigationStyle": "custom"
-
- }
- },
- // 积分明细
- {
- "path": "pages/MyPoints/pointDetail",
- "style": {
- "navigationBarTitleText": "积分明细",
- "enablePullDownRefresh": false
- }
- },
- // 订单详情
- {
- "path": "pages/OrderDetail/OrderDetail",
- "style": {
- "enablePullDownRefresh": false,
- "navigationStyle": "custom"
- }
}
- ,{
- "path" : "pages/famousArts/famousArts",
- "style" :
- {
- "enablePullDownRefresh": false
- }
-
- }
- ,{
- "path" : "pages/SelectId/SelectId",
- "style" :
- {
- "enablePullDownRefresh": false,
- "navigationStyle":"custom"
- }
-
- }
- ,{
- "path" : "pages/improveData/improveData",
- "style" :
- {
- "navigationBarTitleText": "完善资料",
- "enablePullDownRefresh": false
- }
-
- }
- ,{
- "path" : "pages/ShoppingCart/ShoppingCart",
- "style" :
- {
- "navigationBarTitleText": "购物车",
- "enablePullDownRefresh": true,
- "onReachBottomDistance": 20
- }
-
- }
- ,{
- "path" : "pages/PublishWorks/PublishWorks",
- "style" :
- {
- "navigationBarTitleText": "发布作品",
- "enablePullDownRefresh": false
- }
-
- }
- ,{
- "path" : "pages/PublishWorks/PublishWorksNext",
- "style" :
- {
- "navigationBarTitleText": "发布作品",
- "enablePullDownRefresh": false
- }
-
- }
- ,{
- "path" : "pages/DataSearch/DataSearch",
- "style" :
- {
- "navigationBarTitleText": "资料查找",
- "enablePullDownRefresh": false
- }
-
- }
-
- ,{
- "path" : "pages/folderDetail/folderDetail",
- "style" :
- {
- "enablePullDownRefresh": false
- }
-
- }
- ,{
- "path" : "pages/AwardWinningWork/AwardWinningWork",
- "style" :
- {
- "navigationBarTitleText": "艺起战疫获奖作品",
- "enablePullDownRefresh": false
- }
-
- }
- ,{
- "path" : "pages/ArtRace/ArtRace",
- "style" :
- {
- "navigationBarTitleText": "文艺比赛",
- "enablePullDownRefresh": false
- }
-
- }
- ,{
- "path" : "pages/ArtRace/ArtRaceDetail",
- "style" :
- {
- "enablePullDownRefresh": false,
- "navigationStyle":"custom"
- }
-
- }
- ,{
- "path" : "pages/ArtRace/ThrowWork",
- "style" :
- {
- "navigationBarTitleText": "投稿",
- "enablePullDownRefresh": false
- }
-
- }
- ,{
- "path" : "pages/MyOrder/MyOrder",
- "style" :
- {
- "navigationStyle":"custom",
- "enablePullDownRefresh": true,
- "onReachBottomDistance": 20
- }
-
- }
- ,{
- "path" : "pages/ConfirmOrder/ConfirmOrder",
- "style" :
- {
- "navigationBarTitleText": "确认订单",
- "enablePullDownRefresh": false
- }
- }
- //虚拟物品-线上交易
- ,{
- "path" : "pages/ConfirmOrder/fictitiousOrder",
- "style" :
- {
- "navigationBarTitleText": "确认订单",
- "enablePullDownRefresh": false
- }
- }
- //虚拟物品-购买详情
- ,{
- "path" : "pages/ConfirmOrder/purchaseDetail",
- "style" :
- {
- "navigationBarTitleText": "购买详情",
- "enablePullDownRefresh": false
- }
- }
- ,{
- "path" : "pages/Login/Login",
- "style" :
- {
- "enablePullDownRefresh": false,
- "navigationStyle":"custom"
- }
-
- }
- ,{
- "path" : "pages/Login/Register",
- "style" :
- {
- "enablePullDownRefresh": false
- }
-
- }
- ,{
- "path" : "pages/Login/RemeberPW",
- "style" :
- {
- "enablePullDownRefresh": false
- }
-
- }
- ,{
- "path" : "pages/PingJiaList/PingJiaList",
- "style" :
- {
- "navigationBarTitleText": "评价列表",
- "enablePullDownRefresh": false
- }
-
- }
- ,{
- "path" : "pages/MyOrder/detail",
- "style" :
- {
- "navigationBarTitleText": "订单详情",
- "enablePullDownRefresh": false
- }
- },
- {
- "path" : "pages/MyOrder/fictitiousDetail",
- "style" :
- {
- "navigationBarTitleText": "订单详情",
- "enablePullDownRefresh": false
- }
- }
- ,{
- "path" : "pages/PersonalCenter/PersonalCenter",
- "style" :
- {
- "navigationBarTitleText": "个人中心",
- "enablePullDownRefresh": false
- }
-
- }
- ,{
- "path" : "pages/PersonalCenter/ReEditSingleInfo",
- "style" :
- {
- "navigationBarTitleText": "信息修改",
- "enablePullDownRefresh": false
- }
-
- }
- ,{
- "path" : "pages/literFamily/ActJianDetail",
- "style" :
- {
- "navigationBarTitleText": "活动剪影详情",
- "enablePullDownRefresh": false
- }
-
- }
- ,{
- "path" : "pages/PersonalCenter/changePasw",
- "style" :
- {
- "navigationBarTitleText": "修改密码",
- "enablePullDownRefresh": false
- }
-
- },
- {
- "path" : "pages/my/OrderActControl",
- "style" :
- {
- "navigationBarTitleText": "点单管理",
- "enablePullDownRefresh": true,
- "onReachBottomDistance": 20
- }
-
- },
- {
- "path" : "pages/my/imgUpload",
- "style" :
- {
- "navigationBarTitleText": "图片上传",
- "enablePullDownRefresh": false
- }
-
- },{
- "path" : "pages/my/evaluated",
- "style" :
- {
- "navigationBarTitleText": "已评价",
- "enablePullDownRefresh": false
- }
-
- },
- {
- "path" : "pages/orderHall/orderHall",
- "style" :
- {
- "navigationBarTitleText": "点单大厅",
- "enablePullDownRefresh": true,
- "onReachBottomDistance": 20
- }
- },
- {
- "path" : "pages/orderHall/orderHallDetails",
- "style" :
- {
- "navigationBarTitleText": "点单大厅详情",
- "enablePullDownRefresh": false,
- "navigationStyle":"custom"
- }
- },
- {
- "path" : "pages/orderHall/addOrder",
- "style" :
- {
- "navigationBarTitleText": "需求发布",
- "enablePullDownRefresh": false
- }
- }
- ,{
- "path" : "pages/my/uploadedImgShow",
- "style" :
- {
- "navigationBarTitleText": "已传图片",
- "enablePullDownRefresh": false
- }
-
- },
- {
- "path" : "pages/moreFun/noWeb",
- "style" :
- {
- "navigationBarTitleText": "功能建设中",
- "enablePullDownRefresh": false
- }
-
- }
- ],
- "subPackages":[
- {
+ ],
+ "subPackages": [{
"root": "pagesA/",
"pages": [{
"path": "msg/msg",
@@ -574,81 +37,569 @@
}
},
{
- "path" : "ReceivingAddress/ReceivingAddress",
- "style" :
- {
- "navigationBarTitleText": "收货地址",
- "enablePullDownRefresh": false
- }
+ "path": "ReceivingAddress/ReceivingAddress",
+ "style": {
+ "navigationBarTitleText": "收货地址",
+ "enablePullDownRefresh": false
+ }
},
{
- "path" : "ReceivingAddress/EditAddresspge",
- "style" :
- {
- "navigationBarTitleText": "修改地址",
- "enablePullDownRefresh": false
- }
-
+ "path": "ReceivingAddress/EditAddresspge",
+ "style": {
+ "navigationBarTitleText": "修改地址",
+ "enablePullDownRefresh": false
+ }
+
},
{
- "path" : "activeManage/activeManage",
- "style" :
- {
- "navigationBarTitleText": "活动管理",
- "enablePullDownRefresh": true,
- "onReachBottomDistance": 20
- }
-
+ "path": "activeManage/activeManage",
+ "style": {
+ "navigationBarTitleText": "活动管理",
+ "enablePullDownRefresh": true,
+ "onReachBottomDistance": 20
+ }
+
},
{
- "path" : "activeManage/signIn",
- "style" :
- {
- "navigationBarTitleText": "签到管理",
- "enablePullDownRefresh": false
- }
-
+ "path": "activeManage/signIn",
+ "style": {
+ "navigationBarTitleText": "签到管理",
+ "enablePullDownRefresh": false
+ }
+
},
{
- "path" : "activeManage/examine",
- "style" :
- {
- "navigationBarTitleText": "审核管理",
- "enablePullDownRefresh": false
- }
-
+ "path": "activeManage/examine",
+ "style": {
+ "navigationBarTitleText": "审核管理",
+ "enablePullDownRefresh": false
+ }
+
},
{
- "path" : "activeManage/examineList",
- "style" :
- {
- "navigationBarTitleText": "审核列表",
- "enablePullDownRefresh": true,
- "onReachBottomDistance": 20
- }
-
+ "path": "activeManage/examineList",
+ "style": {
+ "navigationBarTitleText": "审核列表",
+ "enablePullDownRefresh": true,
+ "onReachBottomDistance": 20
+ }
+
},
{
- "path" : "activeManage/toGm",
- "style" :
- {
- "navigationBarTitleText": "申请冠名",
- "enablePullDownRefresh": false
- }
-
+ "path": "activeManage/toGm",
+ "style": {
+ "navigationBarTitleText": "申请冠名",
+ "enablePullDownRefresh": false
+ }
+
},
{
- "path" : "activeManage/qdList",
- "style" :
- {
- "navigationBarTitleText": "签到详情",
- "enablePullDownRefresh": false
- }
-
+ "path": "activeManage/qdList",
+ "style": {
+ "navigationBarTitleText": "签到详情",
+ "enablePullDownRefresh": false
+ }
+
+ },
+ // 我的页面
+ {
+ "path": "my/My",
+ "style": {
+ "enablePullDownRefresh": false,
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "my/myCollection",
+ "style": {
+ "navigationBarTitleText": "我的收藏",
+ "enablePullDownRefresh": true,
+ "onReachBottomDistance": 20
+ }
+ },
+ {
+ "path": "my/logOut",
+ "style": {
+ "navigationBarTitleText": "设置",
+ "enablePullDownRefresh": false
+ }
+ },
+ // 作者主页
+ {
+ "path": "my/myWorks",
+ "style": {
+ "enablePullDownRefresh": true,
+ "onReachBottomDistance": 20
+ }
+ },
+ // 我的作品
+ {
+ "path": "my/myWoekList",
+ "style": {
+ "enablePullDownRefresh": true,
+ "onReachBottomDistance": 20
+ }
+ },
+ // 我的关注
+ {
+ "path": "my/myFollow",
+ "style": {
+ "enablePullDownRefresh": true,
+ "onReachBottomDistance": 20
+ }
+ },
+ {
+ "path": "my/myWorkDetail",
+ "style": {
+ "navigationBarTitleText": "作品详情",
+ "enablePullDownRefresh": false
+ }
+ },
+ {
+ "path": "my/editWork",
+ "style": {
+ "navigationBarTitleText": "编辑作品",
+ "enablePullDownRefresh": false
+ }
+ },
+ {
+ "path": "my/editWorkNext",
+ "style": {
+ "navigationBarTitleText": "编辑作品",
+ "enablePullDownRefresh": false
+ }
+ },
+ {
+ "path": "my/OrderActControl",
+ "style": {
+ "navigationBarTitleText": "点单管理",
+ "enablePullDownRefresh": true,
+ "onReachBottomDistance": 20
+ }
+
+ },
+ {
+ "path": "my/imgUpload",
+ "style": {
+ "navigationBarTitleText": "图片上传",
+ "enablePullDownRefresh": false
+ }
+
+ }, {
+ "path": "my/evaluated",
+ "style": {
+ "navigationBarTitleText": "已评价",
+ "enablePullDownRefresh": false
+ }
+
+ },
+ {
+ "path": "my/uploadedImgShow",
+ "style": {
+ "navigationBarTitleText": "已传图片",
+ "enablePullDownRefresh": false
+ }
+
+ }
+ ]
+ },
+ {
+ "root": "pagesB/",
+ "pages": [{
+ "path": "ArtRace/ArtRace",
+ "style": {
+ "navigationBarTitleText": "文艺比赛",
+ "enablePullDownRefresh": false
+ }
+
+ }, {
+ "path": "ArtRace/ArtRaceDetail",
+ "style": {
+ "enablePullDownRefresh": false,
+ "navigationStyle": "custom"
+ }
+
+ }, {
+ "path": "ArtRace/ThrowWork",
+ "style": {
+ "navigationBarTitleText": "投稿",
+ "enablePullDownRefresh": false
+ }
+
+ }, {
+ "path": "ConfirmOrder/ConfirmOrder",
+ "style": {
+ "navigationBarTitleText": "确认订单",
+ "enablePullDownRefresh": false
+ }
+ }
+ //虚拟物品-线上交易
+ , {
+ "path": "ConfirmOrder/fictitiousOrder",
+ "style": {
+ "navigationBarTitleText": "确认订单",
+ "enablePullDownRefresh": false
+ }
+ }
+ //虚拟物品-购买详情
+ , {
+ "path": "ConfirmOrder/purchaseDetail",
+ "style": {
+ "navigationBarTitleText": "购买详情",
+ "enablePullDownRefresh": false
+ }
+ }, {
+ "path": "MyOrder/MyOrder",
+ "style": {
+ "navigationStyle": "custom",
+ "enablePullDownRefresh": true,
+ "onReachBottomDistance": 20
+ }
+
+ }, {
+ "path": "MyOrder/detail",
+ "style": {
+ "navigationBarTitleText": "订单详情",
+ "enablePullDownRefresh": false
+ }
+ },
+ {
+ "path": "MyOrder/fictitiousDetail",
+ "style": {
+ "navigationBarTitleText": "订单详情",
+ "enablePullDownRefresh": false
+ }
+ },
+ // 我的积分
+ {
+ "path": "MyPoints/MyPoints",
+ "style": {
+ "navigationBarTitleText": "我的积分",
+ "enablePullDownRefresh": false,
+ "navigationStyle": "custom"
+
+ }
+ },
+ // 积分明细
+ {
+ "path": "MyPoints/pointDetail",
+ "style": {
+ "navigationBarTitleText": "积分明细",
+ "enablePullDownRefresh": false
+ }
+ },
+ {
+ "path": "orderHall/orderHall",
+ "style": {
+ "navigationBarTitleText": "点单大厅",
+ "enablePullDownRefresh": true,
+ "onReachBottomDistance": 20
+ }
+ },
+ {
+ "path": "orderHall/orderHallDetails",
+ "style": {
+ "navigationBarTitleText": "点单大厅详情",
+ "enablePullDownRefresh": false,
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "orderHall/addOrder",
+ "style": {
+ "navigationBarTitleText": "需求发布",
+ "enablePullDownRefresh": false
+ }
+ }
+ // 文艺作品
+ , {
+ "path": "ArtWorks/ArtWorks",
+ "style": {
+ "navigationBarTitleText": "文艺作品",
+ "enablePullDownRefresh": true,
+ "onReachBottomDistance": 20
+ }
+
+ }, {
+ "path": "ArtWorks/artWorkDetail",
+ "style": {
+ "navigationBarTitleText": "作品详情",
+ "enablePullDownRefresh": false
+ }
+
+ }, {
+ "path": "ArtWorks/webView",
+ "style": {
+ "navigationBarTitleText": "文件浏览",
+ "enablePullDownRefresh": false
+ }
+
+ }, {
+ "path": "improveData/improveData",
+ "style": {
+ "navigationBarTitleText": "完善资料",
+ "enablePullDownRefresh": false
+ }
+
+ }, {
+ "path": "PersonalCenter/PersonalCenter",
+ "style": {
+ "navigationBarTitleText": "个人中心",
+ "enablePullDownRefresh": false
+ }
+
+ }, {
+ "path": "PersonalCenter/ReEditSingleInfo",
+ "style": {
+ "navigationBarTitleText": "信息修改",
+ "enablePullDownRefresh": false
+ }
+
+ }, {
+ "path": "PersonalCenter/changePasw",
+ "style": {
+ "navigationBarTitleText": "修改密码",
+ "enablePullDownRefresh": false
+ }
+
+ }, {
+ "path": "PublishWorks/PublishWorks",
+ "style": {
+ "navigationBarTitleText": "发布作品",
+ "enablePullDownRefresh": false
+ }
+
+ }, {
+ "path": "PublishWorks/PublishWorksNext",
+ "style": {
+ "navigationBarTitleText": "发布作品",
+ "enablePullDownRefresh": false
+ }
+
+ }, {
+ "path": "literFamily/literFamily",
+ "style": {
+ "navigationStyle": "custom",
+ "enablePullDownRefresh": true,
+ "onReachBottomDistance": 20
+ }
+ }, {
+ "path": "literFamily/ActJianDetail",
+ "style": {
+ "navigationBarTitleText": "活动剪影详情",
+ "enablePullDownRefresh": false
+ }
+
+ }
+ ]
+ },
+ {
+ "root": "pagesC/",
+ "pages": [
+ // 活动详情
+ {
+ "path": "ActivitiesDetail/ActivitiesDetail",
+ "style": {
+ "navigationBarTitleText": "活动详情",
+ "enablePullDownRefresh": false
+ }
+ },
+ {
+ "path": "activity/activity",
+ "style": {
+ "enablePullDownRefresh": false,
+ "navigationStyle": "custom"
+ }
+ }
+ // 动态详情
+ , {
+ "path": "activity/activityDetail",
+ "style": {
+ "navigationBarTitleText": "动态详情",
+ "enablePullDownRefresh": false
+ }
+
+ } // 文艺活动
+ , {
+ "path": "ArtActivities/ArtActivities",
+ "style": {
+ "navigationBarTitleText": "文艺活动",
+ "enablePullDownRefresh": false
+ }
+
+ }, {
+ "path": "AwardWinningWork/AwardWinningWork",
+ "style": {
+ "navigationBarTitleText": "艺起战疫获奖作品",
+ "enablePullDownRefresh": false
+ }
+
+ }, {
+ "path": "DataSearch/DataSearch",
+ "style": {
+ "navigationBarTitleText": "资料查找",
+ "enablePullDownRefresh": false
+ }
+
+ },
+ {
+ "path": "enjoy/enjoy",
+ "style": {
+ "navigationBarTitleText": "每日一赏",
+ "enablePullDownRefresh": false
+ }
+ },
+ {
+ "path": "famousArts/artistList",
+ "style": {
+ "navigationBarTitleText": "文艺名家",
+ "enablePullDownRefresh": true,
+ "onReachBottomDistance": 20
+ }
+ }, {
+ "path": "famousArts/famousArts",
+ "style": {
+ "enablePullDownRefresh": false
+ }
+
+ }, {
+ "path": "folderDetail/folderDetail",
+ "style": {
+ "enablePullDownRefresh": false
+ }
+
+ },
+ {
+ "path": "literHelp/literHelp",
+ "style": {
+ "enablePullDownRefresh": false,
+ "navigationStyle": "custom"
+ }
+ }, {
+ "path": "Login/Login",
+ "style": {
+ "enablePullDownRefresh": false,
+ "navigationStyle": "custom"
+ }
+
+ }, {
+ "path": "Login/Register",
+ "style": {
+ "enablePullDownRefresh": false
+ }
+
+ }, {
+ "path": "Login/setPas",
+ "style": {
+ "navigationBarTitleText": "绑定账号",
+ "enablePullDownRefresh": false
+ }
+ }, {
+ "path": "Login/RemeberPW",
+ "style": {
+ "enablePullDownRefresh": false
+ }
+
+ },
+ {
+ "path": "Login/binding",
+ "style": {
+ "enablePullDownRefresh": false,
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "mediaProp/mediaProp",
+ "style": {
+ "enablePullDownRefresh": false,
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "moreFun/moreFun",
+ "style": {
+ "navigationBarTitleText": "更多功能",
+ "enablePullDownRefresh": false
+ }
+ },
+ {
+ "path": "moreFun/noWeb",
+ "style": {
+ "navigationBarTitleText": "功能建设中",
+ "enablePullDownRefresh": false
+ }
+ },
+ // 订单详情
+ {
+ "path": "OrderDetail/OrderDetail",
+ "style": {
+ "enablePullDownRefresh": false,
+ "navigationStyle": "custom"
+ }
+
+ }, {
+ "path": "SelectId/SelectId",
+ "style": {
+ "enablePullDownRefresh": false,
+ "navigationStyle": "custom"
+ }
+
+ },
+ {
+ "path": "shop/Shop",
+ "style": {
+ "navigationStyle": "custom",
+ "enablePullDownRefresh": true,
+ "onReachBottomDistance": 20
+ }
+
+ }, {
+ "path": "ShoppingCart/ShoppingCart",
+ "style": {
+ "navigationBarTitleText": "购物车",
+ "enablePullDownRefresh": true,
+ "onReachBottomDistance": 20
+ }
+
+ }
+ // 政策速通
+ , {
+ "path": "PolicyExpress/PolicyExpress",
+ "style": {
+ "navigationBarTitleText": "政策速通",
+ "enablePullDownRefresh": true,
+ "onReachBottomDistance": 20
+ }
+
+ }
+ // 政策速通详情
+ , {
+ "path": "PolicyExpress/PolicyExpressDetail",
+ "style": {
+ "navigationBarTitleText": "详情",
+ "enablePullDownRefresh": false
+ }
+
+ }, {
+ "path": "PingJiaList/PingJiaList",
+ "style": {
+ "navigationBarTitleText": "评价列表",
+ "enablePullDownRefresh": false
+ }
+
}
]
}
+
],
+ "preloadRule": {
+ "pages/pageHome/pageHome": {
+ "network": "all",
+ "packages": [
+ "pagesA/", "pagesB/", "pagesC/"
+ ]
+ }
+ },
"globalStyle": {
"navigationBarTitleText": "艺象心",
"navigationBarTextStyle": "black", //导航栏标题颜色及状态栏前景颜色，仅支持 black/white
diff --git a/src/pages/Login/Login.vue b/src/pages/Login/Login.vue
deleted file mode 100644
index ddf9986..0000000
--- a/src/pages/Login/Login.vue
+++ /dev/null
@@ -1,254 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 密码登录
-
-
-
- 验证码登录
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 忘记密码？
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/pages/enjoy/enjoy.vue b/src/pages/enjoy/enjoy.vue
deleted file mode 100644
index 221855c..0000000
--- a/src/pages/enjoy/enjoy.vue
+++ /dev/null
@@ -1,258 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
- {{ item.name }}
-
-
- 类型:{{ item.name }}
-
-
-
-
-
- {{item.views}}
-
-
-
-
-
-
-
-
-
- {{ item.name }}
-
-
- 类型:{{ item.name }}
-
-
-
-
-
- {{item.views}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
deleted file mode 100644
index bca3bf1..0000000
--- a/src/pages/index/index.vue
+++ /dev/null
@@ -1,47 +0,0 @@
-
-
-
-
-
-
-
-
-
-
diff --git a/src/pages/pageHome/pageHome.vue b/src/pages/pageHome/pageHome.vue
index 8fc7d5e..a165201 100644
--- a/src/pages/pageHome/pageHome.vue
+++ b/src/pages/pageHome/pageHome.vue
@@ -3,7 +3,7 @@
-
+
@@ -27,7 +27,7 @@
文艺名家
-
+
更多
@@ -54,7 +54,7 @@
热门活动
-
+
更多
@@ -72,7 +72,7 @@
每日一赏
-
+
更多
@@ -89,7 +89,7 @@
{{ item.name }}
- 类型:{{ item.name }}
+ 类型:{{ item.name }}
@@ -110,7 +110,7 @@
{{ item.name }}
- 类型:{{ item.typesName }}
+ 类型:{{ item.typesName }}
@@ -143,8 +143,8 @@
服务咨询热线：
-
- 65712324
+ 65712324
+
@@ -219,7 +219,8 @@
rightList: [],
// 初始化左右盒子高度
leftH: 0,
- rightH: 0
+ rightH: 0,
+ background: '',
};
},
onReady() {
@@ -343,6 +344,20 @@
}
})
this.list2 = res.data.records
+ this.getBackgroundImage()
+ }
+ }).catch(e => {
+ uni.showToast({
+ title: e.data.message,
+ icon: "none",
+ });
+ })
+ },
+ //获取背景图
+ getBackgroundImage() {
+ this.http.request('/indexImage/sybjt', {}, "GET").then(res => {
+ if (res.code == 200) {
+ this.background = res.data[0].imagePath
this.load = false
}
}).catch(e => {
@@ -361,66 +376,66 @@
switch (name) {
case 1:
uni.navigateTo({
- url: "/pages/PolicyExpress/PolicyExpress"
+ url: "/pagesC/PolicyExpress/PolicyExpress"
})
break;
case 2:
uni.navigateTo({
- url: "/pages/ArtActivities/ArtActivities"
+ url: "/pagesC/ArtActivities/ArtActivities"
})
break;
case 3:
uni.navigateTo({
- url: "/pages/ArtWorks/ArtWorks"
+ url: "/pagesB/ArtWorks/ArtWorks"
})
break;
case 4:
uni.redirectTo({
- url: "/pages/shop/Shop"
+ url: "/pagesC/shop/Shop"
})
break;
case 5:
uni.navigateTo({
- url: "/pages/orderHall/orderHall"
+ url: "/pagesB/orderHall/orderHall"
})
break;
case 6:
uni.navigateTo({
- url: "/pages/literFamily/literFamily"
+ url: "/pagesB/literFamily/literFamily"
})
break;
// case 6:
// uni.navigateTo({
- // url: "/pages/literHelp/literHelp"
+ // url: "/pagesC/literHelp/literHelp"
// })
// break;
case 7:
uni.navigateTo({
- url: "/pages/MyPoints/MyPoints"
+ url: "/pagesB/MyPoints/MyPoints"
})
break;
// case 8:
// uni.navigateTo({
- // url: "/pages/moreFun/moreFun"
+ // url: "/pagesC/moreFun/moreFun"
// })
// break;
}
},
famouserDetaol(val) {
uni.navigateTo({
- url: "/pages/famousArts/famousArts?id=" + val
+ url: "/pagesC/famousArts/famousArts?id=" + val
})
},
ToEnjoy(val) {
uni.navigateTo({
- url: "/pages/ArtWorks/artWorkDetail?id=" + val
+ url: "/pagesB/ArtWorks/artWorkDetail?id=" + val
})
},
//活动详情
goActDeat(index) {
let id = this.list2[index].id
uni.navigateTo({
- url: '/pages/ActivitiesDetail/ActivitiesDetail?id=' + id
+ url: '/pagesC/ActivitiesDetail/ActivitiesDetail?id=' + id
})
},
callPhone() {
@@ -475,7 +490,6 @@
padding: 0 16px;
padding-bottom: 50px;
background-color: #F9F8F7;
- background-image: url('../../static/home/home-bg.png');
background-position: center top;
background-size: 100% auto;
@@ -544,7 +558,6 @@
vertical-align: top;
.scroll-list {
- display: flex;
&__goods-item {
width: 100%;
@@ -599,7 +612,6 @@
}
}
-
}
}
}
@@ -648,13 +660,13 @@
.not {
width: 100%;
text-align: center;
-
+
.notice {
font-size: 24rpx;
color: #CCCCCC;
font-weight: 400;
line-height: 42rpx;
-
+
.phone {
color: #6C8BC7;
}
diff --git a/src/pages/pageHome/pdfView.vue b/src/pages/pageHome/pdfView.vue
index 920ae08..11e81e7 100644
--- a/src/pages/pageHome/pdfView.vue
+++ b/src/pages/pageHome/pdfView.vue
@@ -14,7 +14,7 @@
onLoad(params){
console.log(params)
let {url} = params
- this.url = `../../../static/pdf/pdf.html?url=${url}`
+ this.url = `../../../components/pdf/pdf.html?url=${url}`
},
}
\ No newline at end of file
diff --git a/src/pagesA/activeManage/activeManage.vue b/src/pagesA/activeManage/activeManage.vue
index 0a8cb02..1d858b2 100644
--- a/src/pagesA/activeManage/activeManage.vue
+++ b/src/pagesA/activeManage/activeManage.vue
@@ -5,24 +5,41 @@
-
+
我发布的
-
+
我赞助的
-
+
+
+
+
我报名的
+
+
+
+ 我报名的
+
+
+
+
+
+ 我赞助的
+
+
+
+
-
+
@@ -38,8 +55,8 @@
-
-
+
+
@@ -73,7 +90,7 @@
-
+
@@ -144,7 +161,7 @@
-
+
@@ -207,11 +224,11 @@
-
+
+
+
\ No newline at end of file
diff --git a/src/pagesA/activeManage/signIn.vue b/src/pagesA/activeManage/signIn.vue
index f006a8f..6e2b707 100644
--- a/src/pagesA/activeManage/signIn.vue
+++ b/src/pagesA/activeManage/signIn.vue
@@ -36,7 +36,7 @@
-
+
diff --git a/src/pages/my/My.vue b/src/pagesA/my/My.vue
similarity index 92%
rename from src/pages/my/My.vue
rename to src/pagesA/my/My.vue
index 89ffa05..4c47042 100644
--- a/src/pages/my/My.vue
+++ b/src/pagesA/my/My.vue
@@ -4,7 +4,7 @@
-
+
@@ -13,18 +13,12 @@
{{userName}}
-
+
-
+
-
-
-
-
-
-
@@ -161,9 +155,19 @@
fans:'',
care:'',
yhsf: '',
- isUnread: false
+ isUnread: false,
+ statusHeight: 0,
+ titleHeight: 90,
};
},
+ onReady() {
+ const systemMsg = uni.getSystemInfoSync();
+ this.statusHeight = systemMsg.statusBarHeight
+ // #ifdef MP-WEIXIN
+ const menuButtonInfo = uni.getMenuButtonBoundingClientRect() //胶囊
+ this.titleHeight = 90 + menuButtonInfo.height + (menuButtonInfo.top - systemMsg.statusBarHeight) * 2
+ // #endif
+ },
onShow() {
this.getUserInfo()
},
@@ -264,43 +268,43 @@
//跳转积分
gopointsPg() {
uni.navigateTo({
- url: "/pages/MyPoints/MyPoints"
+ url: "/pagesB/MyPoints/MyPoints"
})
},
//我的交易
goOrderDetails() {
uni.navigateTo({
- url: "/pages/MyOrder/MyOrder"
+ url: "/pagesB/MyOrder/MyOrder"
})
},
//修改个人信息
GoPersonalCenter() {
uni.navigateTo({
- url: "/pages/PersonalCenter/PersonalCenter"
+ url: "/pagesB/PersonalCenter/PersonalCenter"
})
},
//我的收藏
toCol(){
uni.navigateTo({
- url: "/pages/my/myCollection"
+ url: "/pagesA/my/myCollection"
})
},
//我的关注
toFollow(){
uni.navigateTo({
- url: "/pages/my/myFollow?tab=0"
+ url: "/pagesA/my/myFollow?tab=0"
})
},
//我的粉丝
toFans(){
uni.navigateTo({
- url: "/pages/my/myFollow?tab=1"
+ url: "/pagesA/my/myFollow?tab=1"
})
},
//我的作品
toWork(){
uni.navigateTo({
- url: "/pages/my/myWoekList",
+ url: "/pagesA/my/myWoekList",
})
},
//点单管理
@@ -319,7 +323,7 @@
//设置
toSz(){
uni.navigateTo({
- url: "/pages/my/logOut"
+ url: "/pagesA/my/logOut"
})
},
//作品管理
@@ -339,11 +343,13 @@
}
-
+
+
+
\ No newline at end of file
+
diff --git a/src/pages/PublishWorks/PublishWorksNext.vue b/src/pagesB/PublishWorks/PublishWorksNext.vue
similarity index 100%
rename from src/pages/PublishWorks/PublishWorksNext.vue
rename to src/pagesB/PublishWorks/PublishWorksNext.vue
diff --git a/src/pages/improveData/improveData.vue b/src/pagesB/improveData/improveData.vue
similarity index 74%
rename from src/pages/improveData/improveData.vue
rename to src/pagesB/improveData/improveData.vue
index 8997f82..738326b 100644
--- a/src/pages/improveData/improveData.vue
+++ b/src/pagesB/improveData/improveData.vue
@@ -3,7 +3,7 @@
-
+
*姓名
@@ -24,24 +24,26 @@
-
+
- *民族
-
+ *通讯地址
+
-
-
- *籍贯
-
+
+
+ *学历
+
@@ -53,13 +55,20 @@
+
-
*密码
+
+
+ *兴趣爱好
+
+
+
-
-
-
- *所属协会
-
-
-
-
-
- 入会时间
-
-
-
-
-
+
-
- 人才类型
-
+ *单位名称
+
+
+
+
+
+ *办公室电话
+
+
+
+
+
+ 住宅电话
+
+
+
+
+
+
+
+ *所属协会
+
+
+ *会员级别
+
+
+
+
+
+
@@ -166,109 +197,8 @@
-
-
-
- 是否已加入协会
-
-
-
-
-
-
-
-
-
-
- *所属协会
-
-
-
-
-
- 入会时间
-
-
-
-
-
-
-
-
-
-
-
- *服务商名称
-
-
-
-
- *服务商头像上传
-
-
-
-
-
-
- *地址
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- *服务开始时间
-
-
-
-
-
- *服务结束时间
-
-
-
-
-
- *负责人姓名
-
-
-
-
- *密码
-
-
-
@@ -291,28 +221,30 @@
+ @close="close('showBirthday')" @cancel="close('showBirthday')">
+
-
-
+ @close="close('showServeTime')" @cancel="close('showServeTime')">
+
+ @close="close('showServeTimeend')" @cancel="close('showServeTimeend')">
+
+ @close="close('showJionmeet')" @cancel="close('showJionmeet')">
+
+ @cancel="close('zuShow')" @confirm="confimZu" immediateChange :columns="Zucolumns">
+
-
@@ -321,16 +253,18 @@
+ :columns="Zhengcolumns">
+
-
-
+
+ closeOnClickOverlay @confirm="confimJi" immediateChange :columns="Jicolumns">
+
+ closeOnClickOverlay @confirm="confimRenCai" immediateChange :columns="peopleSkillColums">
+
@@ -355,7 +289,7 @@
zhengzhiShow: false,
zhengzhiValue: '',
renCaiValue: '',
- zuValue: "汉族",
+ zuValue: "",
xieValue: '',
zuShow: false,
xieShow: false,
@@ -365,18 +299,20 @@
honorList: [''],
StandradList: [''],
peopleSkillColums: [
- ["无", "乡镇人才", "县级人才", "市级人才", "省级人才", "国家级人才"]
+ ["全国会员", "省会员", "市会员", "区县（市）会员"]
],
Zucolumns: [
["汉族", "朝鲜族"],
],
xiecolumns: [],
Zhengcolumns: [
- ["中共党员", "中共预备党员", '共青团员', "民革党员", "民盟盟员", "民建会员", "民进会员", "农工党党员", "致公党党员", "九三学社社员", "台盟盟员", "无党派人士", "群众"],
+ ["中共党员", "中共预备党员", '共青团员', "民革党员", "民盟盟员", "民建会员", "民进会员", "农工党党员", "致公党党员", "九三学社社员", "台盟盟员",
+ "无党派人士", "群众"
+ ],
],
Jicolumns: [
- ["河南", "浙江", '上海'],
+ ["初中及以下", "高中", '大专', '本科', '硕士', '博士及以上'],
],
fileList4: [], //资质照片上传
fileList1: [], //实景照片上传
@@ -384,7 +320,7 @@
[]
], //代表作照片
fileList3: [], //照片上传
- jiguan: '浙江',
+ jiguan: '',
jigaunShow: false,
showBirthday: false,
showServeTime: false,
@@ -403,7 +339,6 @@
sex: '',
birthday: "2000-01-01",
idCOde: '',
-
phoneNum: '',
meeting: '',
// meetingTime: '',
@@ -415,9 +350,17 @@
jionTime: '2000-01-01',
DutyPeopleName: '', //负责人名称
// ServephoneNum: '', //服务商电话
- pasw: ''
+ pasw: '',
+ education: '',
+ hobby: '',
+ hometTel: '',
+ officeTel: '',
+ unitName: '',
+ mailAddress: '',
+ member: ''
},
},
+ userData: {},
rules: {
'userInfo.pasw': [{
required: true,
@@ -531,7 +474,21 @@
},
onLoad(option) {
this.pageTypeId = option.id
- this.wyrc = option.wyrc
+ this.userData = uni.getStorageSync('userInfo')
+ if (this.userData) {
+ console.log('userInfo', this.userData)
+ this.model1.userInfo.name = this.userData.userName
+ this.model1.userInfo.sex = this.userData.sex
+ this.zhengzhiValue = this.userData.politics
+ // this.jiguan = this.userData.base
+ // this.zuValue = this.userData.nation
+ this.model1.userInfo.education = this.userData.education
+ this.model1.userInfo.hometTel = this.userData.hometTel
+ this.model1.userInfo.officeTel = this.userData.officeTel
+ this.model1.userInfo.unitName = this.userData.unitName
+ this.model1.userInfo.mailAddress = this.userData.mailAddress
+ this.model1.userInfo.birthday = this.userData.birthDay
+ }
},
onReady() {
this.$refs.form1.setRules(this.rules);
@@ -631,7 +588,6 @@
this.xieShow = false
this.xieValue = e.value[0]
this.xiehuiId = this.xiehuiObj[this.xieValue]
- console.log("xiehuiId", this.xiehuiId);
},
confimZheng(e) {
this.zhengzhiShow = false
@@ -639,11 +595,11 @@
},
confimRenCai(e) {
this.renCaiShow = false
- this.renCaiValue = e.value[0]
+ this.model1.userInfo.member = e.value[0]
},
confimJi(e) {
this.jigaunShow = false
- this.jiguan = e.value[0]
+ this.model1.userInfo.education = e.value[0]
},
// 删除图片
deletePic(event) {
@@ -787,43 +743,51 @@
let that = this.model1.userInfo
let data = {
// "phone": that.phoneNum,
- "artAtt": yishucj,
- "associationId": this.xiehuiId,
- "base": this.jiguan,
- "birthDay": that.birthday,
- "cfPhoto": fl4,
- "comeTime": that.jionTime,
- "greats": rongyujx,
- "idCard": that.idCOde,
- "images": fl3,
- "info": that.serverInstrutor,
- "isAssociation": this.isJioned,
- "nation": this.zuValue,
+ artAtt: yishucj,
+ associationId: this.xiehuiId,
+ base: this.jiguan,
+ birthDay: that.birthday,
+ cfPhoto: fl4,
+ comeTime: that.jionTime,
+ greats: rongyujx,
+ idCard: that.idCOde,
+ images: fl3,
+ info: that.serverInstrutor,
+ isAssociation: this.isJioned,
+ nation: this.zuValue,
// "nickName": "",
- "opus": opsArr,
- "password": that.pasw,
- "photo": fl1,
- "politics": this.zhengzhiValue,
- "rcType": this.renCaiValue,
- "serviceAddress": that.Address,
- "serviceName": that.ServerName,
- "sex": that.sex,
- "timeEnd": that.serveTimeend,
- "timeStart": that.serveTime,
- "userName": that.name,
- "userType": this.pageTypeId,
- "fzr": that.DutyPeopleName,
- "wyrc": this.wyrc,
+ opus: opsArr,
+ password: that.pasw,
+ photo: fl1,
+ politics: this.zhengzhiValue,
+ rcType: this.renCaiValue,
+ serviceAddress: that.Address,
+ serviceName: that.ServerName,
+ sex: that.sex,
+ timeEnd: that.serveTimeend,
+ timeStart: that.serveTime,
+ userName: that.name,
+ userType: this.pageTypeId,
+ fzr: that.DutyPeopleName,
+ wyrc: this.wyrc,
+ education: that.education,
+ hobby: that.hobby,
+ hometTel: that.hometTel,
+ officeTel: that.officeTel,
+ unitName: that.unitName,
+ mailAddress: that.mailAddress,
+ member: that.member,
}
- if(this.pageTypeId=='fws'){
- if (!data.serviceName || !data.fzr || !data.cfPhoto || !data.photo || !data.serviceAddress || !data.info || !data.password || !data.images) {
- this.upLoadReady = false
- }else{
- data.userName = data.serviceName
- }
- }else{
- if (!data.userName || !data.sex || !data.idCard || !data.images || !data.password || !data.politics) {
+ console.log(data)
+ if (!data.userName || !data.sex || !data.birthDay || !data.images || !data.password || !data.education || !
+ data.mailAddress || !data.politics) {
+ this.upLoadReady = false
+ console.log(zyz)
+ }
+ if (this.pageTypeId == 'wyrc') {
+ if (!data.member || !data.unitName || !data.officeTel || !data.associationId) {
this.upLoadReady = false
+ console.log(wyrc)
}
}
if (this.upLoadReady) {
@@ -833,7 +797,7 @@
url: '/pages/pageHome/pageHome'
})
uni.showToast({
- title: "成功了",
+ title: "提交成功",
icon: "none",
});
}
@@ -845,14 +809,8 @@
})
} else {
uni.$u.toast('您的资料还未补充完整')
+ this.upLoadReady = true
}
- // this.$refs.form1.validate().then(res => {
- //
- // }).catch(errors => {
- // uni.$u.toast('您的资料还未补充完整')
- // return
- // })
-
}
}
diff --git a/src/pages/literFamily/ActJianDetail.vue b/src/pagesB/literFamily/ActJianDetail.vue
similarity index 100%
rename from src/pages/literFamily/ActJianDetail.vue
rename to src/pagesB/literFamily/ActJianDetail.vue
diff --git a/src/pages/literFamily/literFamily.vue b/src/pagesB/literFamily/literFamily.vue
similarity index 98%
rename from src/pages/literFamily/literFamily.vue
rename to src/pagesB/literFamily/literFamily.vue
index b3ac986..235f563 100644
--- a/src/pages/literFamily/literFamily.vue
+++ b/src/pagesB/literFamily/literFamily.vue
@@ -96,7 +96,7 @@
methods: {
goDetail(id){
uni.navigateTo({
- url:'/pages/literFamily/ActJianDetail?id='+id
+ url:'/pagesB/literFamily/ActJianDetail?id='+id
})
},
//文创展厅数据
@@ -183,7 +183,7 @@
},
GoWorksShow(id) {
uni.navigateTo({
- url: "/pages/AwardWinningWork/AwardWinningWork?id=" + String(id)
+ url: "/pagesC/AwardWinningWork/AwardWinningWork?id=" + String(id)
})
}
},
diff --git a/src/pages/orderHall/addOrder.vue b/src/pagesB/orderHall/addOrder.vue
similarity index 85%
rename from src/pages/orderHall/addOrder.vue
rename to src/pagesB/orderHall/addOrder.vue
index caf764f..11c3a2b 100644
--- a/src/pages/orderHall/addOrder.vue
+++ b/src/pagesB/orderHall/addOrder.vue
@@ -74,36 +74,6 @@
接单设置
-
-
- 可接单用户选择
-
-
-
-
-
-
-
-
-
-
-
- 确认
-
-
是否支持多人接单
@@ -124,12 +94,9 @@
附件上传
- 可上传图片(png/jpg/jpeg/bmp/gif/tif/tiff)或pdf
+ 可上传图片(png/jpg/jpeg/bmp/gif/tif/tiff)
-
- (若有图片请先上传图片)
-
-
@@ -159,7 +126,7 @@
timeValue: Number(new Date()),
showUser: false,
userType: '',
- userTypeValue: '',
+ userTypeValue: 'wyrc,zyz',
radiovalue2: [],
radiolist2: [],
morePer: true,
@@ -496,6 +463,9 @@
padding: 10rpx 32rpx;
font-size: 32rpx;
}
+ ::v-deep .u-upload__wrap {
+ padding: 32rpx;
+ }
.upload {
padding: 32rpx;
diff --git a/src/pages/orderHall/orderHall.vue b/src/pagesB/orderHall/orderHall.vue
similarity index 98%
rename from src/pages/orderHall/orderHall.vue
rename to src/pagesB/orderHall/orderHall.vue
index 09315ab..30dd28d 100644
--- a/src/pages/orderHall/orderHall.vue
+++ b/src/pagesB/orderHall/orderHall.vue
@@ -145,12 +145,12 @@
},
toDetail(val){
uni.navigateTo({
- url: `/pages/orderHall/orderHallDetails?id=` + val
+ url: `/pagesB/orderHall/orderHallDetails?id=` + val
})
},
toAddOrder(){
uni.navigateTo({
- url: `/pages/orderHall/addOrder`
+ url: `/pagesB/orderHall/addOrder`
})
}
}
diff --git a/src/pages/orderHall/orderHallDetails.vue b/src/pagesB/orderHall/orderHallDetails.vue
similarity index 98%
rename from src/pages/orderHall/orderHallDetails.vue
rename to src/pagesB/orderHall/orderHallDetails.vue
index 7ff7052..68de8f3 100644
--- a/src/pages/orderHall/orderHallDetails.vue
+++ b/src/pagesB/orderHall/orderHallDetails.vue
@@ -58,13 +58,13 @@
{{data.typeName}}
-
+
@@ -193,7 +193,7 @@
downLoad(val) {
this.contractUrl = val
uni.navigateTo({
- url: "/pages/ArtWorks/webView?url=" + this.contractUrl
+ url: "/pagesB/ArtWorks/webView?url=" + this.contractUrl
})
},
bao() {
diff --git a/src/pages/ActivitiesDetail/ActivitiesDetail.vue b/src/pagesC/ActivitiesDetail/ActivitiesDetail.vue
similarity index 92%
rename from src/pages/ActivitiesDetail/ActivitiesDetail.vue
rename to src/pagesC/ActivitiesDetail/ActivitiesDetail.vue
index 99c3d2e..1f50296 100644
--- a/src/pages/ActivitiesDetail/ActivitiesDetail.vue
+++ b/src/pagesC/ActivitiesDetail/ActivitiesDetail.vue
@@ -83,19 +83,10 @@
-
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
@@ -257,12 +256,12 @@
})
} else if (this.bm == 1) {
this.http.request('/activityUser/addZyzActivity?activityId=' + this.activityId, {}, "POST").then(
- res => {
- if (res.code == 200) {
- this.showH = false
- this.getList()
- }
- }).catch(e => {
+ res => {
+ if (res.code == 200) {
+ this.showH = false
+ this.getList()
+ }
+ }).catch(e => {
uni.showToast({
title: e.data.message,
icon: "none",
@@ -435,7 +434,7 @@
.collection {
flex: 1;
- margin-left: 24rpx;
+ margin-left: 10rpx;
background-color: #FFFFFF;
border: 1px solid #99241B;
color: #99241B;
@@ -446,7 +445,7 @@
.collection-A {
flex: 1;
- margin-left: 24rpx;
+ margin-left: 10rpx;
font-size: 32rpx;
font-weight: 600;
@@ -474,4 +473,41 @@
}
}
}
-
+ .operation-A {
+ display: flex;
+ // justify-content: space-between;
+ padding: 12rpx 32rpx 12rpx;
+ position: fixed;
+ left: 0;
+ bottom: 80px;
+ right: 0;
+ background-color: #FFFFFF;
+ box-shadow: 0px -4px 10px 1px rgba(192, 192, 192, 0.12);
+
+ .collection {
+ flex: 1;
+ margin-left: 10rpx;
+ background-color: #FFFFFF;
+ border: 1px solid #99241B;
+ color: #99241B;
+ font-size: 32rpx;
+ font-weight: 600;
+
+ }
+
+ .apply {
+ flex: 1;
+ background-color: $red;
+ color: #fff;
+ font-size: 32rpx;
+ font-weight: 600;
+ border: none;
+ }
+
+ button {
+ &::after {
+ border: none;
+ }
+ }
+ }
+
\ No newline at end of file
diff --git a/src/pages/ArtActivities/ArtActivities.vue b/src/pagesC/ArtActivities/ArtActivities.vue
similarity index 93%
rename from src/pages/ArtActivities/ArtActivities.vue
rename to src/pagesC/ArtActivities/ArtActivities.vue
index 473ea84..8a8f6b9 100644
--- a/src/pages/ArtActivities/ArtActivities.vue
+++ b/src/pagesC/ArtActivities/ArtActivities.vue
@@ -3,10 +3,10 @@
-
+
-
+
{{v.title}}
@@ -63,7 +63,7 @@
methods: {
goActDeat(id) {
uni.navigateTo({
- url: `/pages/ActivitiesDetail/ActivitiesDetail?id=${id}`
+ url: `/pagesC/ActivitiesDetail/ActivitiesDetail?id=${id}`
})
},
getData(){
@@ -109,6 +109,11 @@
width: 100%;
height: 100%;
}
+
+ .main{
+ width: 686rpx;
+ margin: 0px 32rpx;
+ }
.art_act_itm {
margin-top: 24rpx;
diff --git a/src/pages/AwardWinningWork/AwardWinningWork.vue b/src/pagesC/AwardWinningWork/AwardWinningWork.vue
similarity index 79%
rename from src/pages/AwardWinningWork/AwardWinningWork.vue
rename to src/pagesC/AwardWinningWork/AwardWinningWork.vue
index 74ee34c..faf84db 100644
--- a/src/pages/AwardWinningWork/AwardWinningWork.vue
+++ b/src/pagesC/AwardWinningWork/AwardWinningWork.vue
@@ -26,29 +26,29 @@
fightVirusList: [{
id: 1,
author: "谢万里",
- workImgUrl: '../../static/RewardWork/fightVirus.png',
- avatorUrl: '../../static/RewardWork/avator.png',
+ workImgUrl: '../../static/orderE.png',
+ avatorUrl: '../../static/new/tx.png',
workTitle: '致敬英雄'
},
{
id: 2,
author: "谢万里",
- workImgUrl: '../../static/RewardWork/fightVirus1.png',
- avatorUrl: '../../static/RewardWork/avator.png',
+ workImgUrl: '../../static/orderE.png',
+ avatorUrl: '../../static/new/tx.png',
workTitle: '致敬英雄'
},
{
id: 3,
author: "谢万里",
- workImgUrl: '../../static/RewardWork/fightVirus1.png',
- avatorUrl: '../../static/RewardWork/avator.png',
+ workImgUrl: '../../static/orderE.png',
+ avatorUrl: '../../static/new/tx.png',
workTitle: '致敬英雄'
},
{
id: 4,
author: "谢万里",
- workImgUrl: '../../static/RewardWork/fightVirus.png',
- avatorUrl: '../../static/RewardWork/avator.png',
+ workImgUrl: '../../static/orderE.png',
+ avatorUrl: '../../static/new/tx.png',
workTitle: '致敬英雄'
}
diff --git a/src/pages/DataSearch/DataSearch.vue b/src/pagesC/DataSearch/DataSearch.vue
similarity index 97%
rename from src/pages/DataSearch/DataSearch.vue
rename to src/pagesC/DataSearch/DataSearch.vue
index 034fb6f..0d9829f 100644
--- a/src/pages/DataSearch/DataSearch.vue
+++ b/src/pagesC/DataSearch/DataSearch.vue
@@ -56,7 +56,7 @@
-
+
@@ -179,7 +179,7 @@
GofileDetail(id) {
uni.navigateTo({
- url: "/pages/folderDetail/folderDetail?id=" + String(id)
+ url: "/pagesC/folderDetail/folderDetail?id=" + String(id)
})
}
diff --git a/src/pagesC/Login/Login.vue b/src/pagesC/Login/Login.vue
new file mode 100644
index 0000000..c24af41
--- /dev/null
+++ b/src/pagesC/Login/Login.vue
@@ -0,0 +1,402 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 密码登录
+
+
+
+ 验证码登录
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 忘记密码？
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/Login/Register.vue b/src/pagesC/Login/Register.vue
similarity index 100%
rename from src/pages/Login/Register.vue
rename to src/pagesC/Login/Register.vue
diff --git a/src/pages/Login/RemeberPW.vue b/src/pagesC/Login/RemeberPW.vue
similarity index 99%
rename from src/pages/Login/RemeberPW.vue
rename to src/pagesC/Login/RemeberPW.vue
index 2197024..7b1db85 100644
--- a/src/pages/Login/RemeberPW.vue
+++ b/src/pagesC/Login/RemeberPW.vue
@@ -149,7 +149,7 @@
});
setTimeout(() => {
uni.navigateTo({
- url: '/pages/Login/Login'
+ url: '/pagesC/Login/Login'
})
}, 1200)
}
diff --git a/src/pagesC/Login/binding.vue b/src/pagesC/Login/binding.vue
new file mode 100644
index 0000000..5da3238
--- /dev/null
+++ b/src/pagesC/Login/binding.vue
@@ -0,0 +1,238 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 您的账号首次登录
+
+
+
+ 请选择创建新账号或绑定已有账号
+
+
+
+
+
+
+
+ {{v}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pagesC/Login/setPas.vue b/src/pagesC/Login/setPas.vue
new file mode 100644
index 0000000..550349c
--- /dev/null
+++ b/src/pagesC/Login/setPas.vue
@@ -0,0 +1,205 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 确认
+
+
+
+
+
+
+
+ 确定绑定该账号？
+
+
+
+
+
+ 取消
+
+
+ 确定
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/OrderDetail/OrderDetail.vue b/src/pagesC/OrderDetail/OrderDetail.vue
similarity index 89%
rename from src/pages/OrderDetail/OrderDetail.vue
rename to src/pagesC/OrderDetail/OrderDetail.vue
index 55af20c..668c89f 100644
--- a/src/pages/OrderDetail/OrderDetail.vue
+++ b/src/pagesC/OrderDetail/OrderDetail.vue
@@ -99,8 +99,9 @@
-
- 购买数量
+
+ 购买数量
@@ -110,28 +111,31 @@
-
商品总价 {{serveList.moneyPrice * orderDet[0].count}}积分
-
商品总价 {{serveList.pointPrice * orderDet[0].count}}积分
-
- 提货方式
+
+ 提货方式
-
-
+ -->
购买
+ type="error" @click="DoBuy">购买
@@ -140,16 +144,17 @@
- >
+
-
-
+
+
@@ -281,11 +286,11 @@
}
if (this.orderDet[0].mType == 0) {
// uni.navigateTo({
- // url:'/pages/ConfirmOrder/ConfirmOrder?data=' + encodeURIComponent(JSON.stringify(this.orderDet))
+ // url:'/pagesB/ConfirmOrder/ConfirmOrder?data=' + encodeURIComponent(JSON.stringify(this.orderDet))
// })
} else if (this.orderDet[0].mType == 1) {
uni.navigateTo({
- url: '/pages/ConfirmOrder/fictitiousOrder?data=' + JSON.stringify(this.orderDet)
+ url: '/pagesB/ConfirmOrder/fictitiousOrder?data=' + JSON.stringify(this.orderDet)
})
}
},
@@ -320,7 +325,7 @@
// 跳转到全部评价
goAllPingjia() {
uni.navigateTo({
- url: "/pages/PingJiaList/PingJiaList?score=" + JSON.stringify(this.allScor)
+ url: "/pagesC/PingJiaList/PingJiaList?score=" + JSON.stringify(this.allScor)
})
},
//加入购物车
@@ -346,7 +351,7 @@
//跳转购物车
ClickBuy() {
uni.navigateTo({
- url: '/pages/ShoppingCart/ShoppingCart'
+ url: '/pagesC/ShoppingCart/ShoppingCart'
})
},
//改变数量
@@ -378,7 +383,6 @@
display: flex;
justify-content: space-between;
align-items: center;
-
padding: 24rpx 0rpx;
.order_itm_t {
@@ -387,6 +391,15 @@
}
}
+ ::v-deep .u-button--error.data-v-3bf2dba7 {
+ background-color: #99241B;
+ border-color: #99241B;
+ }
+
+ ::v-deep .u-radio-group {
+ justify-content: flex-end;
+ }
+
/deep/ uni-swiper .uni-swiper-dots-horizontal {
bottom: 120rpx;
diff --git a/src/pages/PingJiaList/PingJiaList.vue b/src/pagesC/PingJiaList/PingJiaList.vue
similarity index 100%
rename from src/pages/PingJiaList/PingJiaList.vue
rename to src/pagesC/PingJiaList/PingJiaList.vue
diff --git a/src/pages/PolicyExpress/PolicyExpress.vue b/src/pagesC/PolicyExpress/PolicyExpress.vue
similarity index 97%
rename from src/pages/PolicyExpress/PolicyExpress.vue
rename to src/pagesC/PolicyExpress/PolicyExpress.vue
index 9d6585e..597949c 100644
--- a/src/pages/PolicyExpress/PolicyExpress.vue
+++ b/src/pagesC/PolicyExpress/PolicyExpress.vue
@@ -86,7 +86,7 @@
},
toDetail(val) {
uni.navigateTo({
- url: "/pages/PolicyExpress/PolicyExpressDetail?id=" + val
+ url: "/pagesC/PolicyExpress/PolicyExpressDetail?id=" + val
})
}
}
diff --git a/src/pages/PolicyExpress/PolicyExpressDetail.vue b/src/pagesC/PolicyExpress/PolicyExpressDetail.vue
similarity index 100%
rename from src/pages/PolicyExpress/PolicyExpressDetail.vue
rename to src/pagesC/PolicyExpress/PolicyExpressDetail.vue
diff --git a/src/pages/SelectId/SelectId.vue b/src/pagesC/SelectId/SelectId.vue
similarity index 68%
rename from src/pages/SelectId/SelectId.vue
rename to src/pagesC/SelectId/SelectId.vue
index aac4639..6b8f133 100644
--- a/src/pages/SelectId/SelectId.vue
+++ b/src/pagesC/SelectId/SelectId.vue
@@ -1,6 +1,6 @@
-
+
@@ -15,7 +15,7 @@
请选择您的身份
-
+
选择身份后不能修改哦！
@@ -35,46 +35,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 请选择您的身份
-
-
-
- 选择身份后不能修改哦！
-
-
-
-
-
-
- {{j.name}}
-
-
-
-
-
-
-
-
-
-
+
@@ -88,53 +49,36 @@
return {
id: null,
wyrc: null,
- show: true,
statusHeight: 0,
titleHeight: 50,
selectList: {
- xhhy: "协会会员",
- wyrc: "文艺人才",
- zyz: "文艺志愿者",
- fws: "服务商"
+ wyrc: "文艺工作者",
+ zyz: "文艺爱好者",
},
- rcList: [{
- name: "文艺名家",
- value: 'wymj',
- },{
- name: "文艺工作者",
- value: 'wygzz',
- }
- ]
+ userInfo: {},
};
},
+ onLoad() {
+ this.userInfo = uni.getStorageSync('userInfo')
+ if(this.userInfo){
+ console.log('userInfo',this.userInfo)
+ if(this.userInfo.yhsf == '文艺工作者'){
+ this.id = 'wyrc'
+ this.next()
+ }else if(this.userInfo.yhsf == '文艺爱好者'){
+ this.id = 'zyz'
+ this.next()
+ }
+ }
+ },
methods: {
next() {
console.log("下一步");
- let _this = this
if (this.id || this.id == 0) {
- if (this.id == 'wyrc') {
- this.show = false
- }
- else{
- this.wyrc = ''
- uni.navigateTo({
- url:`/pages/improveData/improveData?id=` + this.id + '&wyrc=' + this.wyrc
- })
- }
- } else {
- uni.showToast({
- title: '请选择身份',
- duration: 2000,
- icon: 'error'
- });
- }
- },
- nextT(){
- if (this.wyrc) {
uni.navigateTo({
- url:`/pages/improveData/improveData?id=` + this.id + '&wyrc=' + this.wyrc
+ url: `/pagesB/improveData/improveData?id=` + this.id
})
- }else {
+ } else {
uni.showToast({
title: '请选择身份',
duration: 2000,
@@ -278,6 +222,7 @@
}
}
}
+
.navbar {
position: fixed;
top: 0;
@@ -299,4 +244,4 @@
}
}
}
-
+
\ No newline at end of file
diff --git a/src/pages/ShoppingCart/ShoppingCart.vue b/src/pagesC/ShoppingCart/ShoppingCart.vue
similarity index 98%
rename from src/pages/ShoppingCart/ShoppingCart.vue
rename to src/pagesC/ShoppingCart/ShoppingCart.vue
index 883eb85..22a5254 100644
--- a/src/pages/ShoppingCart/ShoppingCart.vue
+++ b/src/pagesC/ShoppingCart/ShoppingCart.vue
@@ -288,13 +288,13 @@
}else{
if(this.total > this.point){
uni.navigateTo({
- url:'/pages/ConfirmOrder/purchaseDetail?success=1&id=0&num=0'
+ url:'/pagesB/ConfirmOrder/purchaseDetail?success=1&id=0&num=0'
})
}else{
this.http.request('/order/newOrder', this.orderDet, "POST").then(res => {
if (res.code == 200) {
uni.navigateTo({
- url:'/pages/ConfirmOrder/purchaseDetail?success=0&id=0&num=0'
+ url:'/pagesB/ConfirmOrder/purchaseDetail?success=0&id=0&num=0'
})
}
}).catch(e => {
diff --git a/src/pages/activity/activity.vue b/src/pagesC/activity/activity.vue
similarity index 98%
rename from src/pages/activity/activity.vue
rename to src/pagesC/activity/activity.vue
index 8c8b8c3..e7ad131 100644
--- a/src/pages/activity/activity.vue
+++ b/src/pagesC/activity/activity.vue
@@ -79,7 +79,7 @@
methods:{
toDetail(val){
uni.navigateTo({
- url: "/pages/activity/activityDetail?id=" + val
+ url: "/pagesC/activity/activityDetail?id=" + val
})
},
getData(){
diff --git a/src/pages/activity/activityDetail.vue b/src/pagesC/activity/activityDetail.vue
similarity index 100%
rename from src/pages/activity/activityDetail.vue
rename to src/pagesC/activity/activityDetail.vue
diff --git a/src/pagesC/enjoy/enjoy.vue b/src/pagesC/enjoy/enjoy.vue
new file mode 100644
index 0000000..1d80eb6
--- /dev/null
+++ b/src/pagesC/enjoy/enjoy.vue
@@ -0,0 +1,256 @@
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.name }}
+
+
+ 类型:{{ item.name }}
+
+
+
+
+
+ {{ item.views }}
+
+
+
+
+
+
+
+
+
+ {{ item.name }}
+
+
+ 类型:{{ item.name }}
+
+
+
+
+
+ {{ item.views }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/famousArts/artistList.vue b/src/pagesC/famousArts/artistList.vue
similarity index 95%
rename from src/pages/famousArts/artistList.vue
rename to src/pagesC/famousArts/artistList.vue
index fa56d02..744d43f 100644
--- a/src/pages/famousArts/artistList.vue
+++ b/src/pagesC/famousArts/artistList.vue
@@ -35,7 +35,7 @@
this.dateTime = Y + '-' + M + '-' + D
// #ifdef MP-WEIXIN
// 微信小程序设置格式
- this.$refs.datetimePicker.setFormatter(this.formatter)
+ // this.$refs.datetimePicker.setFormatter(this.formatter)
// #endif
},
onLoad() {
@@ -84,7 +84,7 @@
},
ToEnjoy(val){
uni.navigateTo({
- url:"/pages/famousArts/famousArts?id=" + val
+ url:"/pagesC/famousArts/famousArts?id=" + val
})
},
},
diff --git a/src/pages/famousArts/famousArts.vue b/src/pagesC/famousArts/famousArts.vue
similarity index 90%
rename from src/pages/famousArts/famousArts.vue
rename to src/pagesC/famousArts/famousArts.vue
index 86e0666..c05edf9 100644
--- a/src/pages/famousArts/famousArts.vue
+++ b/src/pagesC/famousArts/famousArts.vue
@@ -23,7 +23,7 @@
-
-
+ -->
-
-
+
+
@@ -48,11 +48,6 @@
{{v}}
-
-
-
-
-
-
-
-
-
-
diff --git a/src/pages/folderDetail/folderDetail.vue b/src/pagesC/folderDetail/folderDetail.vue
similarity index 99%
rename from src/pages/folderDetail/folderDetail.vue
rename to src/pagesC/folderDetail/folderDetail.vue
index c38bce3..ffa8381 100644
--- a/src/pages/folderDetail/folderDetail.vue
+++ b/src/pagesC/folderDetail/folderDetail.vue
@@ -127,7 +127,7 @@
-
+
diff --git a/src/pages/literHelp/literHelp.vue b/src/pagesC/literHelp/literHelp.vue
similarity index 100%
rename from src/pages/literHelp/literHelp.vue
rename to src/pagesC/literHelp/literHelp.vue
diff --git a/src/pages/mediaProp/mediaProp.vue b/src/pagesC/mediaProp/mediaProp.vue
similarity index 96%
rename from src/pages/mediaProp/mediaProp.vue
rename to src/pagesC/mediaProp/mediaProp.vue
index 7dc1d0a..227e44c 100644
--- a/src/pages/mediaProp/mediaProp.vue
+++ b/src/pagesC/mediaProp/mediaProp.vue
@@ -25,8 +25,8 @@
公众号链接/二维码
-
-
+
+