feat: Merge branch 'dev' of http://192.168.0.115:3000/chenzhiguang/qjkankan_v1.1.1 into dev

# Conflicts:
#	packages/qjkankan-view/src/components/UIGather/mobile/list.vue

packages/qjkankan-components/package-lock.json

@@ -1,505 +0,0 @@
-{
-  "name": "@qjkankan/components",
-  "version": "1.2.0",
-  "lockfileVersion": 2,
-  "requires": true,
-  "packages": {
-    "": {
-      "name": "@qjkankan/components",
-      "version": "1.2.0",
-      "dependencies": {
-        "c-scrollbar": "^0.1.6",
-        "vue-cropper": "^1.0.2",
-        "vue3-smooth-scrollbar": "^1.0.2"
-      }
-    },
-    "node_modules/@babel/parser": {
-      "version": "7.19.3",
-      "resolved": "https://registry.npmmirror.com/@babel/parser/-/parser-7.19.3.tgz",
-      "integrity": "sha512-pJ9xOlNWHiy9+FuFP09DEAFbAn4JskgRsVcc169w2xRBC3FRGuQEwjeIMMND9L2zc0iEhO/tGv4Zq+km+hxNpQ==",
-      "bin": {
-        "parser": "bin/babel-parser.js"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@vue/compiler-core": {
-      "version": "3.2.40",
-      "resolved": "https://registry.npmmirror.com/@vue/compiler-core/-/compiler-core-3.2.40.tgz",
-      "integrity": "sha512-2Dc3Stk0J/VyQ4OUr2yEC53kU28614lZS+bnrCbFSAIftBJ40g/2yQzf4mPBiFuqguMB7hyHaujdgZAQ67kZYA==",
-      "dependencies": {
-        "@babel/parser": "^7.16.4",
-        "@vue/shared": "3.2.40",
-        "estree-walker": "^2.0.2",
-        "source-map": "^0.6.1"
-      }
-    },
-    "node_modules/@vue/compiler-dom": {
-      "version": "3.2.40",
-      "resolved": "https://registry.npmmirror.com/@vue/compiler-dom/-/compiler-dom-3.2.40.tgz",
-      "integrity": "sha512-OZCNyYVC2LQJy4H7h0o28rtk+4v+HMQygRTpmibGoG9wZyomQiS5otU7qo3Wlq5UfHDw2RFwxb9BJgKjVpjrQw==",
-      "dependencies": {
-        "@vue/compiler-core": "3.2.40",
-        "@vue/shared": "3.2.40"
-      }
-    },
-    "node_modules/@vue/compiler-sfc": {
-      "version": "3.2.40",
-      "resolved": "https://registry.npmmirror.com/@vue/compiler-sfc/-/compiler-sfc-3.2.40.tgz",
-      "integrity": "sha512-tzqwniIN1fu1PDHC3CpqY/dPCfN/RN1thpBC+g69kJcrl7mbGiHKNwbA6kJ3XKKy8R6JLKqcpVugqN4HkeBFFg==",
-      "dependencies": {
-        "@babel/parser": "^7.16.4",
-        "@vue/compiler-core": "3.2.40",
-        "@vue/compiler-dom": "3.2.40",
-        "@vue/compiler-ssr": "3.2.40",
-        "@vue/reactivity-transform": "3.2.40",
-        "@vue/shared": "3.2.40",
-        "estree-walker": "^2.0.2",
-        "magic-string": "^0.25.7",
-        "postcss": "^8.1.10",
-        "source-map": "^0.6.1"
-      }
-    },
-    "node_modules/@vue/compiler-ssr": {
-      "version": "3.2.40",
-      "resolved": "https://registry.npmmirror.com/@vue/compiler-ssr/-/compiler-ssr-3.2.40.tgz",
-      "integrity": "sha512-80cQcgasKjrPPuKcxwuCx7feq+wC6oFl5YaKSee9pV3DNq+6fmCVwEEC3vvkf/E2aI76rIJSOYHsWSEIxK74oQ==",
-      "dependencies": {
-        "@vue/compiler-dom": "3.2.40",
-        "@vue/shared": "3.2.40"
-      }
-    },
-    "node_modules/@vue/reactivity": {
-      "version": "3.2.40",
-      "resolved": "https://registry.npmmirror.com/@vue/reactivity/-/reactivity-3.2.40.tgz",
-      "integrity": "sha512-N9qgGLlZmtUBMHF9xDT4EkD9RdXde1Xbveb+niWMXuHVWQP5BzgRmE3SFyUBBcyayG4y1lhoz+lphGRRxxK4RA==",
-      "dependencies": {
-        "@vue/shared": "3.2.40"
-      }
-    },
-    "node_modules/@vue/reactivity-transform": {
-      "version": "3.2.40",
-      "resolved": "https://registry.npmmirror.com/@vue/reactivity-transform/-/reactivity-transform-3.2.40.tgz",
-      "integrity": "sha512-HQUCVwEaacq6fGEsg2NUuGKIhUveMCjOk8jGHqLXPI2w6zFoPrlQhwWEaINTv5kkZDXKEnCijAp+4gNEHG03yw==",
-      "dependencies": {
-        "@babel/parser": "^7.16.4",
-        "@vue/compiler-core": "3.2.40",
-        "@vue/shared": "3.2.40",
-        "estree-walker": "^2.0.2",
-        "magic-string": "^0.25.7"
-      }
-    },
-    "node_modules/@vue/runtime-core": {
-      "version": "3.2.40",
-      "resolved": "https://registry.npmmirror.com/@vue/runtime-core/-/runtime-core-3.2.40.tgz",
-      "integrity": "sha512-U1+rWf0H8xK8aBUZhnrN97yoZfHbjgw/bGUzfgKPJl69/mXDuSg8CbdBYBn6VVQdR947vWneQBFzdhasyzMUKg==",
-      "dependencies": {
-        "@vue/reactivity": "3.2.40",
-        "@vue/shared": "3.2.40"
-      }
-    },
-    "node_modules/@vue/runtime-dom": {
-      "version": "3.2.40",
-      "resolved": "https://registry.npmmirror.com/@vue/runtime-dom/-/runtime-dom-3.2.40.tgz",
-      "integrity": "sha512-AO2HMQ+0s2+MCec8hXAhxMgWhFhOPJ/CyRXnmTJ6XIOnJFLrH5Iq3TNwvVcODGR295jy77I6dWPj+wvFoSYaww==",
-      "dependencies": {
-        "@vue/runtime-core": "3.2.40",
-        "@vue/shared": "3.2.40",
-        "csstype": "^2.6.8"
-      }
-    },
-    "node_modules/@vue/server-renderer": {
-      "version": "3.2.40",
-      "resolved": "https://registry.npmmirror.com/@vue/server-renderer/-/server-renderer-3.2.40.tgz",
-      "integrity": "sha512-gtUcpRwrXOJPJ4qyBpU3EyxQa4EkV8I4f8VrDePcGCPe4O/hd0BPS7v9OgjIQob6Ap8VDz9G+mGTKazE45/95w==",
-      "dependencies": {
-        "@vue/compiler-ssr": "3.2.40",
-        "@vue/shared": "3.2.40"
-      },
-      "peerDependencies": {
-        "vue": "3.2.40"
-      }
-    },
-    "node_modules/@vue/shared": {
-      "version": "3.2.40",
-      "resolved": "https://registry.npmmirror.com/@vue/shared/-/shared-3.2.40.tgz",
-      "integrity": "sha512-0PLQ6RUtZM0vO3teRfzGi4ltLUO5aO+kLgwh4Um3THSR03rpQWLTuRCkuO5A41ITzwdWeKdPHtSARuPkoo5pCQ=="
-    },
-    "node_modules/c-scrollbar": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmmirror.com/c-scrollbar/-/c-scrollbar-0.1.7.tgz",
-      "integrity": "sha512-xD0VLJOmZ9MFhO6dGEF+Vr7zEk5QpH/oPmdONuWvWV14XbHiFd4A8A67rg+Nxcs5qjPIHunflbe+ZUHTvUdN8g==",
-      "dependencies": {
-        "vue": "^3.0.0"
-      }
-    },
-    "node_modules/core-js": {
-      "version": "3.25.5",
-      "resolved": "https://registry.npmmirror.com/core-js/-/core-js-3.25.5.tgz",
-      "integrity": "sha512-nbm6eZSjm+ZuBQxCUPQKQCoUEfFOXjUZ8dTTyikyKaWrTYmAVbykQfwsKE5dBK88u3QCkCrzsx/PPlKfhsvgpw==",
-      "hasInstallScript": true
-    },
-    "node_modules/csstype": {
-      "version": "2.6.21",
-      "resolved": "https://registry.npmmirror.com/csstype/-/csstype-2.6.21.tgz",
-      "integrity": "sha512-Z1PhmomIfypOpoMjRQB70jfvy/wxT50qW08YXO5lMIJkrdq4yOTR+AW7FqutScmB9NkLwxo+jU+kZLbofZZq/w=="
-    },
-    "node_modules/estree-walker": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmmirror.com/estree-walker/-/estree-walker-2.0.2.tgz",
-      "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w=="
-    },
-    "node_modules/lodash": {
-      "version": "4.17.21",
-      "resolved": "https://registry.npmmirror.com/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
-    },
-    "node_modules/lodash.clamp": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmmirror.com/lodash.clamp/-/lodash.clamp-4.0.3.tgz",
-      "integrity": "sha512-HvzRFWjtcguTW7yd8NJBshuNaCa8aqNFtnswdT7f/cMd/1YKy5Zzoq4W/Oxvnx9l7aeY258uSdDfM793+eLsVg=="
-    },
-    "node_modules/lodash.debounce": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmmirror.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
-      "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow=="
-    },
-    "node_modules/magic-string": {
-      "version": "0.25.9",
-      "resolved": "https://registry.npmmirror.com/magic-string/-/magic-string-0.25.9.tgz",
-      "integrity": "sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==",
-      "dependencies": {
-        "sourcemap-codec": "^1.4.8"
-      }
-    },
-    "node_modules/nanoid": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmmirror.com/nanoid/-/nanoid-3.3.4.tgz",
-      "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==",
-      "bin": {
-        "nanoid": "bin/nanoid.cjs"
-      },
-      "engines": {
-        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
-      }
-    },
-    "node_modules/picocolors": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmmirror.com/picocolors/-/picocolors-1.0.0.tgz",
-      "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="
-    },
-    "node_modules/postcss": {
-      "version": "8.4.17",
-      "resolved": "https://registry.npmmirror.com/postcss/-/postcss-8.4.17.tgz",
-      "integrity": "sha512-UNxNOLQydcOFi41yHNMcKRZ39NeXlr8AxGuZJsdub8vIb12fHzcq37DTU/QtbI6WLxNg2gF9Z+8qtRwTj1UI1Q==",
-      "dependencies": {
-        "nanoid": "^3.3.4",
-        "picocolors": "^1.0.0",
-        "source-map-js": "^1.0.2"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >=14"
-      }
-    },
-    "node_modules/smooth-scrollbar": {
-      "version": "8.8.1",
-      "resolved": "https://registry.npmmirror.com/smooth-scrollbar/-/smooth-scrollbar-8.8.1.tgz",
-      "integrity": "sha512-FQDRtdLTRye8LdRHohNAxh0hyo7gl8+APfA+8Qu5S38MBqR8/WqOoRVzjizH6FTdbU1qGsB7gs8LhMeFJ4Jr8g==",
-      "dependencies": {
-        "core-js": "^3.6.4",
-        "lodash.clamp": "^4.0.3",
-        "lodash.debounce": "^4.0.8",
-        "tslib": "^1.10.0"
-      }
-    },
-    "node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmmirror.com/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/source-map-js": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmmirror.com/source-map-js/-/source-map-js-1.0.2.tgz",
-      "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/sourcemap-codec": {
-      "version": "1.4.8",
-      "resolved": "https://registry.npmmirror.com/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz",
-      "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA=="
-    },
-    "node_modules/tslib": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmmirror.com/tslib/-/tslib-1.14.1.tgz",
-      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
-    },
-    "node_modules/vue": {
-      "version": "3.2.40",
-      "resolved": "https://registry.npmmirror.com/vue/-/vue-3.2.40.tgz",
-      "integrity": "sha512-1mGHulzUbl2Nk3pfvI5aXYYyJUs1nm4kyvuz38u4xlQkLUn1i2R7nDbI4TufECmY8v1qNBHYy62bCaM+3cHP2A==",
-      "dependencies": {
-        "@vue/compiler-dom": "3.2.40",
-        "@vue/compiler-sfc": "3.2.40",
-        "@vue/runtime-dom": "3.2.40",
-        "@vue/server-renderer": "3.2.40",
-        "@vue/shared": "3.2.40"
-      }
-    },
-    "node_modules/vue-cropper": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmmirror.com/vue-cropper/-/vue-cropper-1.0.5.tgz",
-      "integrity": "sha512-D4XXdqWmMWRLOIV9LIh7/mkH6OBOMQDFbRjwntkxmAtxOtwpC9U5ZZ6lSXw5F5cbd4g8znDjk6MuCwIL+fZSrA=="
-    },
-    "node_modules/vue3-smooth-scrollbar": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmmirror.com/vue3-smooth-scrollbar/-/vue3-smooth-scrollbar-1.0.2.tgz",
-      "integrity": "sha512-TfO0WGbA5KzAosHMmIa4UfB5LcSR3YefNgRbTBZrKw4A5F58vIMALqwXeSCoLtsywdLInN+7u8Fq9cRDiT9EXg==",
-      "dependencies": {
-        "core-js": "^3.8.3",
-        "lodash": "^4.17.21",
-        "smooth-scrollbar": "^8.6.2",
-        "vue": "^3.0.4"
-      },
-      "peerDependencies": {
-        "smooth-scrollbar": "^8.6.2"
-      }
-    }
-  },
-  "dependencies": {
-    "@babel/parser": {
-      "version": "7.19.3",
-      "resolved": "https://registry.npmmirror.com/@babel/parser/-/parser-7.19.3.tgz",
-      "integrity": "sha512-pJ9xOlNWHiy9+FuFP09DEAFbAn4JskgRsVcc169w2xRBC3FRGuQEwjeIMMND9L2zc0iEhO/tGv4Zq+km+hxNpQ=="
-    },
-    "@vue/compiler-core": {
-      "version": "3.2.40",
-      "resolved": "https://registry.npmmirror.com/@vue/compiler-core/-/compiler-core-3.2.40.tgz",
-      "integrity": "sha512-2Dc3Stk0J/VyQ4OUr2yEC53kU28614lZS+bnrCbFSAIftBJ40g/2yQzf4mPBiFuqguMB7hyHaujdgZAQ67kZYA==",
-      "requires": {
-        "@babel/parser": "^7.16.4",
-        "@vue/shared": "3.2.40",
-        "estree-walker": "^2.0.2",
-        "source-map": "^0.6.1"
-      }
-    },
-    "@vue/compiler-dom": {
-      "version": "3.2.40",
-      "resolved": "https://registry.npmmirror.com/@vue/compiler-dom/-/compiler-dom-3.2.40.tgz",
-      "integrity": "sha512-OZCNyYVC2LQJy4H7h0o28rtk+4v+HMQygRTpmibGoG9wZyomQiS5otU7qo3Wlq5UfHDw2RFwxb9BJgKjVpjrQw==",
-      "requires": {
-        "@vue/compiler-core": "3.2.40",
-        "@vue/shared": "3.2.40"
-      }
-    },
-    "@vue/compiler-sfc": {
-      "version": "3.2.40",
-      "resolved": "https://registry.npmmirror.com/@vue/compiler-sfc/-/compiler-sfc-3.2.40.tgz",
-      "integrity": "sha512-tzqwniIN1fu1PDHC3CpqY/dPCfN/RN1thpBC+g69kJcrl7mbGiHKNwbA6kJ3XKKy8R6JLKqcpVugqN4HkeBFFg==",
-      "requires": {
-        "@babel/parser": "^7.16.4",
-        "@vue/compiler-core": "3.2.40",
-        "@vue/compiler-dom": "3.2.40",
-        "@vue/compiler-ssr": "3.2.40",
-        "@vue/reactivity-transform": "3.2.40",
-        "@vue/shared": "3.2.40",
-        "estree-walker": "^2.0.2",
-        "magic-string": "^0.25.7",
-        "postcss": "^8.1.10",
-        "source-map": "^0.6.1"
-      }
-    },
-    "@vue/compiler-ssr": {
-      "version": "3.2.40",
-      "resolved": "https://registry.npmmirror.com/@vue/compiler-ssr/-/compiler-ssr-3.2.40.tgz",
-      "integrity": "sha512-80cQcgasKjrPPuKcxwuCx7feq+wC6oFl5YaKSee9pV3DNq+6fmCVwEEC3vvkf/E2aI76rIJSOYHsWSEIxK74oQ==",
-      "requires": {
-        "@vue/compiler-dom": "3.2.40",
-        "@vue/shared": "3.2.40"
-      }
-    },
-    "@vue/reactivity": {
-      "version": "3.2.40",
-      "resolved": "https://registry.npmmirror.com/@vue/reactivity/-/reactivity-3.2.40.tgz",
-      "integrity": "sha512-N9qgGLlZmtUBMHF9xDT4EkD9RdXde1Xbveb+niWMXuHVWQP5BzgRmE3SFyUBBcyayG4y1lhoz+lphGRRxxK4RA==",
-      "requires": {
-        "@vue/shared": "3.2.40"
-      }
-    },
-    "@vue/reactivity-transform": {
-      "version": "3.2.40",
-      "resolved": "https://registry.npmmirror.com/@vue/reactivity-transform/-/reactivity-transform-3.2.40.tgz",
-      "integrity": "sha512-HQUCVwEaacq6fGEsg2NUuGKIhUveMCjOk8jGHqLXPI2w6zFoPrlQhwWEaINTv5kkZDXKEnCijAp+4gNEHG03yw==",
-      "requires": {
-        "@babel/parser": "^7.16.4",
-        "@vue/compiler-core": "3.2.40",
-        "@vue/shared": "3.2.40",
-        "estree-walker": "^2.0.2",
-        "magic-string": "^0.25.7"
-      }
-    },
-    "@vue/runtime-core": {
-      "version": "3.2.40",
-      "resolved": "https://registry.npmmirror.com/@vue/runtime-core/-/runtime-core-3.2.40.tgz",
-      "integrity": "sha512-U1+rWf0H8xK8aBUZhnrN97yoZfHbjgw/bGUzfgKPJl69/mXDuSg8CbdBYBn6VVQdR947vWneQBFzdhasyzMUKg==",
-      "requires": {
-        "@vue/reactivity": "3.2.40",
-        "@vue/shared": "3.2.40"
-      }
-    },
-    "@vue/runtime-dom": {
-      "version": "3.2.40",
-      "resolved": "https://registry.npmmirror.com/@vue/runtime-dom/-/runtime-dom-3.2.40.tgz",
-      "integrity": "sha512-AO2HMQ+0s2+MCec8hXAhxMgWhFhOPJ/CyRXnmTJ6XIOnJFLrH5Iq3TNwvVcODGR295jy77I6dWPj+wvFoSYaww==",
-      "requires": {
-        "@vue/runtime-core": "3.2.40",
-        "@vue/shared": "3.2.40",
-        "csstype": "^2.6.8"
-      }
-    },
-    "@vue/server-renderer": {
-      "version": "3.2.40",
-      "resolved": "https://registry.npmmirror.com/@vue/server-renderer/-/server-renderer-3.2.40.tgz",
-      "integrity": "sha512-gtUcpRwrXOJPJ4qyBpU3EyxQa4EkV8I4f8VrDePcGCPe4O/hd0BPS7v9OgjIQob6Ap8VDz9G+mGTKazE45/95w==",
-      "requires": {
-        "@vue/compiler-ssr": "3.2.40",
-        "@vue/shared": "3.2.40"
-      }
-    },
-    "@vue/shared": {
-      "version": "3.2.40",
-      "resolved": "https://registry.npmmirror.com/@vue/shared/-/shared-3.2.40.tgz",
-      "integrity": "sha512-0PLQ6RUtZM0vO3teRfzGi4ltLUO5aO+kLgwh4Um3THSR03rpQWLTuRCkuO5A41ITzwdWeKdPHtSARuPkoo5pCQ=="
-    },
-    "c-scrollbar": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmmirror.com/c-scrollbar/-/c-scrollbar-0.1.7.tgz",
-      "integrity": "sha512-xD0VLJOmZ9MFhO6dGEF+Vr7zEk5QpH/oPmdONuWvWV14XbHiFd4A8A67rg+Nxcs5qjPIHunflbe+ZUHTvUdN8g==",
-      "requires": {
-        "vue": "^3.0.0"
-      }
-    },
-    "core-js": {
-      "version": "3.25.5",
-      "resolved": "https://registry.npmmirror.com/core-js/-/core-js-3.25.5.tgz",
-      "integrity": "sha512-nbm6eZSjm+ZuBQxCUPQKQCoUEfFOXjUZ8dTTyikyKaWrTYmAVbykQfwsKE5dBK88u3QCkCrzsx/PPlKfhsvgpw=="
-    },
-    "csstype": {
-      "version": "2.6.21",
-      "resolved": "https://registry.npmmirror.com/csstype/-/csstype-2.6.21.tgz",
-      "integrity": "sha512-Z1PhmomIfypOpoMjRQB70jfvy/wxT50qW08YXO5lMIJkrdq4yOTR+AW7FqutScmB9NkLwxo+jU+kZLbofZZq/w=="
-    },
-    "estree-walker": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmmirror.com/estree-walker/-/estree-walker-2.0.2.tgz",
-      "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w=="
-    },
-    "lodash": {
-      "version": "4.17.21",
-      "resolved": "https://registry.npmmirror.com/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
-    },
-    "lodash.clamp": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmmirror.com/lodash.clamp/-/lodash.clamp-4.0.3.tgz",
-      "integrity": "sha512-HvzRFWjtcguTW7yd8NJBshuNaCa8aqNFtnswdT7f/cMd/1YKy5Zzoq4W/Oxvnx9l7aeY258uSdDfM793+eLsVg=="
-    },
-    "lodash.debounce": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmmirror.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
-      "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow=="
-    },
-    "magic-string": {
-      "version": "0.25.9",
-      "resolved": "https://registry.npmmirror.com/magic-string/-/magic-string-0.25.9.tgz",
-      "integrity": "sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==",
-      "requires": {
-        "sourcemap-codec": "^1.4.8"
-      }
-    },
-    "nanoid": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmmirror.com/nanoid/-/nanoid-3.3.4.tgz",
-      "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw=="
-    },
-    "picocolors": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmmirror.com/picocolors/-/picocolors-1.0.0.tgz",
-      "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="
-    },
-    "postcss": {
-      "version": "8.4.17",
-      "resolved": "https://registry.npmmirror.com/postcss/-/postcss-8.4.17.tgz",
-      "integrity": "sha512-UNxNOLQydcOFi41yHNMcKRZ39NeXlr8AxGuZJsdub8vIb12fHzcq37DTU/QtbI6WLxNg2gF9Z+8qtRwTj1UI1Q==",
-      "requires": {
-        "nanoid": "^3.3.4",
-        "picocolors": "^1.0.0",
-        "source-map-js": "^1.0.2"
-      }
-    },
-    "smooth-scrollbar": {
-      "version": "8.8.1",
-      "resolved": "https://registry.npmmirror.com/smooth-scrollbar/-/smooth-scrollbar-8.8.1.tgz",
-      "integrity": "sha512-FQDRtdLTRye8LdRHohNAxh0hyo7gl8+APfA+8Qu5S38MBqR8/WqOoRVzjizH6FTdbU1qGsB7gs8LhMeFJ4Jr8g==",
-      "requires": {
-        "core-js": "^3.6.4",
-        "lodash.clamp": "^4.0.3",
-        "lodash.debounce": "^4.0.8",
-        "tslib": "^1.10.0"
-      }
-    },
-    "source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmmirror.com/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
-    },
-    "source-map-js": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmmirror.com/source-map-js/-/source-map-js-1.0.2.tgz",
-      "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw=="
-    },
-    "sourcemap-codec": {
-      "version": "1.4.8",
-      "resolved": "https://registry.npmmirror.com/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz",
-      "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA=="
-    },
-    "tslib": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmmirror.com/tslib/-/tslib-1.14.1.tgz",
-      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
-    },
-    "vue": {
-      "version": "3.2.40",
-      "resolved": "https://registry.npmmirror.com/vue/-/vue-3.2.40.tgz",
-      "integrity": "sha512-1mGHulzUbl2Nk3pfvI5aXYYyJUs1nm4kyvuz38u4xlQkLUn1i2R7nDbI4TufECmY8v1qNBHYy62bCaM+3cHP2A==",
-      "requires": {
-        "@vue/compiler-dom": "3.2.40",
-        "@vue/compiler-sfc": "3.2.40",
-        "@vue/runtime-dom": "3.2.40",
-        "@vue/server-renderer": "3.2.40",
-        "@vue/shared": "3.2.40"
-      }
-    },
-    "vue-cropper": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmmirror.com/vue-cropper/-/vue-cropper-1.0.5.tgz",
-      "integrity": "sha512-D4XXdqWmMWRLOIV9LIh7/mkH6OBOMQDFbRjwntkxmAtxOtwpC9U5ZZ6lSXw5F5cbd4g8znDjk6MuCwIL+fZSrA=="
-    },
-    "vue3-smooth-scrollbar": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmmirror.com/vue3-smooth-scrollbar/-/vue3-smooth-scrollbar-1.0.2.tgz",
-      "integrity": "sha512-TfO0WGbA5KzAosHMmIa4UfB5LcSR3YefNgRbTBZrKw4A5F58vIMALqwXeSCoLtsywdLInN+7u8Fq9cRDiT9EXg==",
-      "requires": {
-        "core-js": "^3.8.3",
-        "lodash": "^4.17.21",
-        "smooth-scrollbar": "^8.6.2",
-        "vue": "^3.0.4"
-      }
-    }
-  }
-}

packages/qjkankan-editor/src/components/dragTree/index.vue

@@ -11,6 +11,7 @@
       :expand-on-click-node="false"
       node-key="id"
       class="custom-tree"
+      empty-text=" "
       :default-expand-all="false"
       @node-drag-start="handleDragStart"
       @node-drag-enter="handleDragEnter"

packages/qjkankan-editor/src/framework/play/pano/index.vue

@@ -10,8 +10,8 @@
       :src="`${locationOrigin}/sp${currentSceneVersion === 'V3' ? 'c' : currentSceneVersion === 'V4' ? 'g' : 'g'}.html?m=${currentScene?.sceneCode}&lang=${lang}`"
       frameborder="0"
     />
-
-    <div class="showexplanation" v-if="showExplanation && currentScene?.explanation && currentScene?.explanation.audioId">
+    <!-- v-if="showExplanation && currentScene?.explanation && currentScene?.explanation.audioId" -->
+    <div class="showexplanation" v-if="showExplanation && currentExplanation.fodderId"  >
       <img :src="require(`@/assets/images/commentary@2x.png`)" alt="" />
     </div>
     <!-- <list></list> -->
@@ -63,6 +63,7 @@ export default {
       hotspotList: "hotspot/hotspotList",
       workVisualAngleList: "screen/workVisualAngleList",
       workCustomMaskList: "mask/workCustomMaskList",
+      workExplanationList: "explanation/workExplanationList",
     }),
 
     showSnapshot() {
@@ -71,6 +72,9 @@ export default {
     showExplanation() {
       return this.$route.name == "explanation";
     },
+    currentExplanation() {
+      return this.workExplanationList.find((item) => item.navigationId == this.currentScene.id || item.navigationId == this.currentScene.sid);
+    },
   },
   watch: {
     "$route.name": function (newVal) {

packages/qjkankan-view/package.json

@@ -55,4 +55,4 @@
   "browser": {
     "process": false
   }
-}
+}

packages/qjkankan-view/src/components/UIGather/mobile/list.vue

@@ -66,18 +66,26 @@
       </div>
     </div>
 
-    <div
+    <!-- <div
       class="swiper-container root-group-list"
       ref="root-group"
       id="swcatalogRoot"
       :style="`width:${Math.min(catalogRootW, innerW)}px;
     padding:${catalogRootW > innerW ? '0 15px' : '0'}`"
       v-if="metadata?.navigationTrees?.length > 1"
+    > -->
+    <div
+      class="swiper-container root-group-list"
+      ref="root-group"
+      id="swcatalogRoot"
+      :style="`width:${Math.min(catalogRootW, innerW)}px;
+    padding:${catalogRootW > innerW ? '0 15px' : '0'}`"
+      v-if="rootTabShow"
     >
       <ul class="swiper-wrapper">
         <template v-for="(item, i) in metadata?.navigationTrees" :key="item.id">
           <li
-            v-if="item.children.length"
+            v-if="getCurrentTabScenes(item).length"
             class="swiper-slide"
             :class="{
               active: currentRootId == item.id,
@@ -163,14 +171,70 @@ const secondaryW = computed(() => {
   let list = metadata.value?.navigationTrees[rootTabIndex.value].children.filter((item) => item.children.length);
   return list.length * (swidth.value["swSecondary"] + 10) - 10;
 });
+const rootTabShow = computed(() => {
+  let list = [];
+
+  metadata.value.navigationTrees.forEach((item) => {
+    let show = false;
+    item.children.forEach((i) => {
+      if (i.type != "group") {
+        // list.push(i);
+        show = true;
+      } else {
+        let res = i.children.filter((t) => t.type != "group");
+        if (res.length) {
+          show = true;
+        }
+        // list = list.concat(res);
+      }
+    });
+    if (show) {
+      list.push(item);
+    }
+  });
 
+  return list.length > 1 ? true : false;
+});
 const catalogRootW = computed(() => {
-  let list = metadata.value.navigationTrees.filter((item) => item.children.length);
+  // let list = metadata.value.navigationTrees.filter((item) => item.children.length);
+
+  let list = [];
+
+  metadata.value.navigationTrees.forEach((item) => {
+    let show = false;
+    item.children.forEach((i) => {
+      if (i.type != "group") {
+        // list.push(i);
+        show = true;
+      } else {
+        let res = i.children.filter((t) => t.type != "group");
+        if (res.length) {
+          show = true;
+        }
+        // list = list.concat(res);
+      }
+    });
+    if (show) {
+      list.push(item);
+    }
+    // return list.length * (swidth.value["swcatalogRoot"] + 10);
+  });
   return list.length * (swidth.value["swcatalogRoot"] + 10);
 });
 
 const innerW = computed(() => window.innerWidth);
-
+const getCurrentTabScenes = (item) => {
+  let list = [];
+  item.children.forEach((i) => {
+    if (i.type != "group") {
+      list.push(i);
+    } else {
+      let res = i.children.filter((t) => t.type != "group");
+      list = list.concat(res);
+    }
+  });
+  return list;
+};
 watch(
   () => currentScenesList.value,
   () => {
@@ -200,6 +264,8 @@ const fixTitle = (name) => {
     name = t("navigation.default_group_two");
   } else if (name == "一级分组") {
     name = t("navigation.group_one");
+  } else if (name == "二级分组") {
+    name = t("navigation.group_two");
   } else {
     name = name;
   }
@@ -245,10 +311,11 @@ const changeSceneList = () => {
   let currentList = null;
 
   if (metadata.value.navigationTrees[rootTabIndex.value].children.length && metadata.value.navigationTrees[rootTabIndex.value].children[0].type == "group") {
-    store.commit("scene/setData", { currentSecondId: metadata.value.navigationTrees[rootTabIndex.value].children[0].id });
+    // store.commit("scene/setData", { currentSecondId: metadata.value.navigationTrees[rootTabIndex.value].children[0].id });
     //如果有当前视图则选择二级目录
     metadata.value.navigationTrees[rootTabIndex.value].children.forEach((item, index) => {
       if (item.children.length) {
+        store.commit("scene/setData", { currentSecondId: item.id });
         item.children.forEach((t_item, t_index) => {
           if (t_item.id == currentScene.value.id || (t_item.sid && currentScene.value.sid && t_item.sid == currentScene.value.sid)) {
             store.commit("scene/setData", { currentSecondId: item.id });
@@ -347,7 +414,7 @@ const tabCurrentRootGroup = (data, index) => {
 
 onMounted(() => {
   useApp().then(async (app) => {
-    if(currentScene.value.type == '4dkk' && currentScene.value.version == 'V4') {
+    if (currentScene.value.type == "4dkk" && currentScene.value.version == "V4") {
       store.commit("functions/setShowScenesList", false);
     }
     show.value = true;
@@ -556,4 +623,4 @@ onMounted(() => {
 .marquee-text-text {
   padding: 0 5px;
 }
-</style>
+</style>

packages/qjkankan-view/src/hooks/useAudio.js

@@ -6,7 +6,6 @@ import { computed, onMounted, watch, ref, unref, reactive } from "vue";
 import debounce from "lodash-es/debounce";
 import mitt from "mitt";
 let CLICKFIRST = false;
-
 const currentPlayer = ref(null);
 const isInit = ref(false);
 const currentAudio = computed(() => store.getters["audio/currentAudio"]);
@@ -196,6 +195,7 @@ class AudioPlayer {
     this.audio = null;
     this.createAudio();
     this.play();
+    // this.audio.play();
     this.emit("change", this.audio);
   }
   init() {
@@ -234,6 +234,7 @@ class AudioPlayer {
       $player.removeEventListener("click", onclick);
       $player.removeEventListener("touchstart", onclick);
       //判断是否第一次进入或者是否已点击过 或已自动播放过。
+
       if (CLICKFIRST || this._isPlaying) {
         console.log("已点击过或自动播放中");
         return;